diff --git a/scripts/runtime-impact.mjs b/scripts/runtime-impact.mjs index b770342..454a911 100644 --- a/scripts/runtime-impact.mjs +++ b/scripts/runtime-impact.mjs @@ -33,7 +33,7 @@ const controlAndDataplane = [ new RegExp(`^src/server/main${CODE_EXTENSION}`), new RegExp(`^src/server/(?:config|gatewayRouting|singbox|singboxRuntime|version)${CODE_EXTENSION}`), new RegExp(`^src/server/adapters/neighbors${CODE_EXTENSION}`), - new RegExp(`^src/server/services/(?:connectivityDiagnosticsService|deviceInventoryService|devicePolicyService)${CODE_EXTENSION}`), + new RegExp(`^src/server/services/(?:connectivityDiagnosticsService|deviceInventoryService|devicePolicyService|singboxSelectorService)${CODE_EXTENSION}`), new RegExp(`^src/shared/(?:connectivityDiagnostics|errors)${CODE_EXTENSION}`), /^src\/server\/infrastructure\/dataplane\//, ]; diff --git a/src/shared/versions.ts b/src/shared/versions.ts index 9f89206..3ef2f1f 100644 --- a/src/shared/versions.ts +++ b/src/shared/versions.ts @@ -1,7 +1,7 @@ export const HARBOR_VERSIONS = Object.freeze({ - macClient: '0.29.1', - gatewayClient: '0.30.1', - gatewayBackend: '0.30.1', + macClient: '0.29.2', + gatewayClient: '0.30.2', + gatewayBackend: '0.30.2', }); export interface ParsedVersion { diff --git a/src/web/styles/features/failover.css b/src/web/styles/features/failover.css index eb80c2b..bcb4cea 100644 --- a/src/web/styles/features/failover.css +++ b/src/web/styles/features/failover.css @@ -11,18 +11,18 @@ .client-failover-switch[aria-checked='true'] > span { background: var(--client-text); box-shadow: 0 0 10px color-mix(in oklch, var(--client-accent) 46%, transparent); transform: translateX(20px); } .client-failover-switch:disabled { cursor: default; opacity: .42; } .client-failover-switch:focus-visible { outline: 2px solid var(--client-accent); outline-offset: 0; border-radius: 999px; } -.client-failover-channel { position: relative; display: grid; grid-template-columns: auto minmax(0, 1fr) auto; align-items: center; gap: 14px; min-height: 52px; } +.client-failover-channel { position: relative; display: grid; grid-template-columns: 142px minmax(0, 1fr) 126px; align-items: center; gap: 14px; min-height: 52px; } .client-failover-channel-title { display: contents; } -.client-failover-channel-title > span { display: flex; align-items: center; gap: 8px; font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); } +.client-failover-channel-title > span { grid-column: 1; grid-row: 1; display: flex; align-items: center; justify-content: flex-end; gap: 8px; font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); } .client-failover-channel-title > span b { font: inherit; } .client-failover-channel-title > span i { color: var(--client-muted); font-style: normal; } .client-failover-channel[data-channel='primary'] .client-failover-channel-title > span b { color: var(--harbor-connect); text-shadow: 0 0 9px color-mix(in oklch, var(--harbor-connect) 30%, transparent); } .client-failover-channel[data-channel='reserve'] .client-failover-channel-title > span b { color: var(--harbor-gateway); text-shadow: 0 0 9px color-mix(in oklch, var(--harbor-gateway) 30%, transparent); } -.client-failover-channel-title strong { grid-column: 3; min-width: 0; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); text-align: right; white-space: nowrap; transition: color 600ms ease, filter 600ms ease; } +.client-failover-channel-title strong { grid-column: 3; grid-row: 1; min-width: 0; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); text-align: right; white-space: nowrap; transition: color 600ms ease, filter 600ms ease; } .client-failover-channel-title strong.is-healthy { color: var(--client-accent); } .client-failover-channel-title strong.is-unhealthy { color: oklch(0.68 0.15 28); } .client-failover-picker { position: relative; min-width: 0; z-index: 1; } -.client-failover-channel > .client-failover-picker { grid-column: 2; } +.client-failover-channel > .client-failover-picker { grid-column: 2; grid-row: 1; } .client-failover-picker.is-open { z-index: 6; } .client-failover-picker-trigger { width: 100%; min-height: 42px; display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 0 2px; border: 0; border-bottom: 1px solid var(--client-border); background: transparent; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); text-align: left; box-shadow: 0 1px 0 transparent; cursor: pointer; transition: color 220ms ease, box-shadow 300ms ease, text-shadow 300ms ease; } .client-failover-picker-trigger span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } @@ -95,5 +95,5 @@ @keyframes failover-service-out { from { opacity: 1; filter: blur(0); transform: translateX(0) scale(1); } to { opacity: 0; filter: blur(6px); transform: translateX(16px) scale(.96); } } @keyframes failover-advanced-in { from { opacity: 0; filter: blur(5px); transform: translateY(-5px); } to { opacity: 1; filter: blur(0); transform: translateY(0); } } @keyframes failover-advanced-out { from { opacity: 1; filter: blur(0); transform: translateY(0); } to { opacity: 0; filter: blur(5px); transform: translateY(-5px); } } -@media (max-width: 560px) { .client-failover-heading { padding-right: 44px; } .client-failover-channel { grid-template-columns: auto minmax(0, 1fr); gap: 5px 10px; } .client-failover-channel-title strong { grid-column: 2; grid-row: 2; text-align: left; } .client-failover-channel > .client-failover-picker { grid-column: 2; grid-row: 1; } .client-failover-timing label, .client-failover-advanced label { grid-template-columns: 1fr; gap: 4px; } .client-failover-service { grid-template-columns: minmax(0, 1fr) 32px; gap: 6px 10px; } .client-failover-service-timeout { grid-column: 1; grid-row: 2; justify-self: start; } .client-failover-remove-service { grid-column: 2; grid-row: 1 / span 2; } .client-failover-service-editor { grid-template-columns: 1fr; gap: 2px; } } +@media (max-width: 560px) { .client-failover-heading { padding-right: 44px; } .client-failover-channel { grid-template-columns: 112px minmax(0, 1fr); gap: 5px 10px; } .client-failover-channel-title strong { grid-column: 2; grid-row: 2; text-align: left; } .client-failover-channel > .client-failover-picker { grid-column: 2; grid-row: 1; } .client-failover-timing label, .client-failover-advanced label { grid-template-columns: 1fr; gap: 4px; } .client-failover-service { grid-template-columns: minmax(0, 1fr) 32px; gap: 6px 10px; } .client-failover-service-timeout { grid-column: 1; grid-row: 2; justify-self: start; } .client-failover-remove-service { grid-column: 2; grid-row: 1 / span 2; } .client-failover-service-editor { grid-template-columns: 1fr; gap: 2px; } } @media (prefers-reduced-motion: reduce) { .client-failover-channel-title strong, .client-failover-switch::before, .client-failover-switch > span, .client-failover-picker-trigger, .client-failover-picker-trigger::before, .client-failover-picker-trigger svg, .client-failover-picker-list, .client-failover-picker-list button, .client-failover-remove-service, .client-failover-remove-lid, .client-failover-advanced > button i::before, .client-failover-advanced > button i::after { transition: none; } .client-failover-service, .client-failover-service-editor, .client-failover-advanced-options { animation: none; } } diff --git a/test/deploy/runtime-impact.test.js b/test/deploy/runtime-impact.test.js index 31a2e1c..112dee2 100644 --- a/test/deploy/runtime-impact.test.js +++ b/test/deploy/runtime-impact.test.js @@ -48,6 +48,7 @@ test('every displaced regex path keeps dataplane restart coverage in JS and TS', 'src/server/services/connectivityDiagnosticsService', 'src/server/services/deviceTrafficService', 'src/server/services/devicePolicyService', + 'src/server/services/singboxSelectorService', 'src/shared/connectivityDiagnostics', 'src/shared/errors', ]; @@ -76,6 +77,10 @@ test('classifier covers current dataplane reachability without promoting its cli affectedComponents: ['control', 'dataplane'], restartScope: 'both', }); + assert.deepEqual(classifyRuntimeImpact(['src/server/services/singboxSelectorService.ts']), { + affectedComponents: ['control', 'dataplane'], + restartScope: 'both', + }); assert.deepEqual(classifyRuntimeImpact(['src/server/dataplaneClient.ts']), { affectedComponents: ['control'], restartScope: 'control', diff --git a/test/web/style-boundaries.test.js b/test/web/style-boundaries.test.js index f4ed75f..242f59c 100644 --- a/test/web/style-boundaries.test.js +++ b/test/web/style-boundaries.test.js @@ -39,9 +39,9 @@ const expectedImports = [ const sha256 = (value) => crypto.createHash('sha256').update(value).digest('hex'); const acceptedLedger = { counts: { - cascadeEdges: 1053, + cascadeEdges: 1060, customProperties: 106, - declarations: 4094, + declarations: 4099, important: 0, keyframes: 52, media: 17, @@ -49,13 +49,13 @@ const acceptedLedger = { variableReferences: 1030, }, hashes: { - cascadeEdges: '6e645a4af9c0d5631f2d20723648f863cd90fe05e08a7c38466ad1ddf37a18de', + cascadeEdges: '8ec691911ca42f8b0d57a8449999e423686001d3b8ea52706aaa4eac96b4e323', customProperties: 'fd6f16069f9fe3526f09d4d574431ddae67150d8e7a8a40e04c9fd2d179ec7ac', - declarations: 'b5060e6b480cc565390095950396af40e1e593eca6b0d50543e58d8db7cb89c1', + declarations: 'c171ffe2c526b92b49c501cce0e38ee46c790433aaf98892309cbee36aebdd63', duplicateKeyframes: '4f53cda18c2baa0c0354bb5f9a3ecbe5ed12ab4d8e11ba873c2f11161202b945', duplicateSelectors: '8982145dba05b33bf1c93b2d54cfbe76305b276ff3c657aa020144016ada5848', keyframes: 'afdfc9691f8ef629fd5f263f3eebecf2373b54f0940d8deedd5e74497d55d0f3', - ruleDeclarationSequences: '7853d3fa55954dc279c0a8788280bea6079b8c39e8a809e3508f673e0e25ee85', + ruleDeclarationSequences: '850acd4eca4c74643d0e325025108462ed16f2cc6a2e91b3b539157cfd090d38', selectors: '12d7e3921cd5ebddbe3a0fb10a1113ca3165a7c5597c8e80d3917d19df5737e9', variableReferences: 'e70f638b46142b1cf78cc9d82410735d9f72a32a9711bc1f0eac34e13fd653c4', witnesses: 'a033ac2b7b6c297c6876e68818a6566a0eb95095494d45af6423c85476918061', @@ -407,8 +407,8 @@ test('main owns one public stylesheet and the regrouped production CSS is determ assert.equal((main.match(/import ['"][^'"]+\.css['"]/g) || []).length, 1); const assets = fs.readdirSync(path.join(root, 'dist/assets')).filter((file) => file.endsWith('.css')); - assert.deepEqual(assets, ['index-egC2pF0y.css']); + assert.deepEqual(assets, ['index-xefTODRY.css']); const built = fs.readFileSync(path.join(root, 'dist/assets', assets[0])); - assert.equal(built.byteLength, 155655); - assert.equal(sha256(built), '08abd35b2cb28ad64a637a3ae45cbccb65ddba803184cd6f65bcb9bf59101a8a'); + assert.equal(built.byteLength, 155730); + assert.equal(sha256(built), '01b3820d2be82e0d364fc2319ef8833f1ad4edc1129f66aa5d9ac04de54b89aa'); });