diff --git a/package-lock.json b/package-lock.json index a0c5271..97b9719 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "cloudflared", "dependencies": { - "@start9labs/start-sdk": "2.0.7" + "@start9labs/start-sdk": "2.0.9" }, "devDependencies": { "@types/node": "^22.19.17", @@ -61,9 +61,9 @@ "license": "MIT" }, "node_modules/@start9labs/start-sdk": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@start9labs/start-sdk/-/start-sdk-2.0.7.tgz", - "integrity": "sha512-lJuZto0vfD/2fPubzwavuStAdlnQQo8AmYFvBBhENY4WbXAXJ64b5zuXwrkmJ8wZObUngno5LYZWWr7yOlYLxQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@start9labs/start-sdk/-/start-sdk-2.0.9.tgz", + "integrity": "sha512-HuSYrS10Bb+f6OyAMlCzd5Qyr+rIauiI0dF8MVh5Ny+eU0gF8/DeFAXlHFgL+9wkSv4UAP5q5yOzlBpXzsNbWQ==", "bundleDependencies": [ "@start9labs/start-core", "eslint", @@ -334,163 +334,6 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core": { - "inBundle": true, - "license": "MIT", - "dependencies": { - "@iarna/toml": "^3.0.0", - "@noble/curves": "^1.9.7", - "@noble/hashes": "^1.8.0", - "deep-equality-data-structures": "^2.0.0", - "isomorphic-fetch": "^3.0.0", - "mime": "^4.1.0", - "yaml": "^2.8.3", - "zod": "4.4.3", - "zod-deep-partial": "^1.4.4" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/@iarna/toml": { - "version": "3.0.0", - "inBundle": true, - "license": "ISC" - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/@noble/curves": { - "version": "1.9.7", - "inBundle": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.8.0" - }, - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/@noble/hashes": { - "version": "1.8.0", - "inBundle": true, - "license": "MIT", - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/deep-equality-data-structures": { - "version": "2.0.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "object-hash": "^3.0.0" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/isomorphic-fetch": { - "version": "3.0.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "node-fetch": "^2.6.1", - "whatwg-fetch": "^3.4.1" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/mime": { - "version": "4.1.0", - "funding": [ - "https://github.com/sponsors/broofa" - ], - "inBundle": true, - "license": "MIT", - "bin": { - "mime": "bin/cli.js" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/node-fetch": { - "version": "2.7.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/object-hash": { - "version": "3.0.0", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/tr46": { - "version": "0.0.3", - "inBundle": true, - "license": "MIT" - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/webidl-conversions": { - "version": "3.0.1", - "inBundle": true, - "license": "BSD-2-Clause" - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/whatwg-fetch": { - "version": "3.6.20", - "inBundle": true, - "license": "MIT" - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/whatwg-url": { - "version": "5.0.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/yaml": { - "version": "2.9.0", - "inBundle": true, - "license": "ISC", - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14.6" - }, - "funding": { - "url": "https://github.com/sponsors/eemeli" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/zod": { - "version": "4.4.3", - "inBundle": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, - "node_modules/@start9labs/start-sdk/node_modules/@start9labs/start-core/node_modules/zod-deep-partial": { - "version": "1.4.4", - "inBundle": true, - "license": "MIT", - "peerDependencies": { - "zod": "^4.1.13" - } - }, "node_modules/@start9labs/start-sdk/node_modules/@types/estree": { "version": "1.0.9", "inBundle": true, diff --git a/package.json b/package.json index b32d716..bdcd4a7 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "check": "tsc --noEmit" }, "dependencies": { - "@start9labs/start-sdk": "2.0.7" + "@start9labs/start-sdk": "2.0.9" }, "devDependencies": { "@types/node": "^22.19.17", @@ -19,5 +19,8 @@ "tabWidth": 2, "semi": false, "singleQuote": true + }, + "overrides": { + "@start9labs/start-sdk": "$@start9labs/start-sdk" } } diff --git a/startos/init/reconcileIngress.ts b/startos/init/reconcileIngress.ts index fee4494..be67468 100644 --- a/startos/init/reconcileIngress.ts +++ b/startos/init/reconcileIngress.ts @@ -74,15 +74,11 @@ async function resolveService( entry: StableIngress, reactive: boolean, ) { - const osIp = await sdk.getOsIp(effects) - const address = sdk.host.get( - effects, - { packageId: entry.packageId, hostId: entry.hostId }, - (host) => { - const port = host?.bindings[entry.internalPort]?.net.assignedPort - return port == null ? null : `${osIp}:${port}` - }, - ) + const address = sdk.host.getBridgeAddress(effects, { + packageId: entry.packageId, + hostId: entry.hostId, + internalPort: entry.internalPort, + }) const value = reactive ? await address.const() : await address.once() return value ? `http://${value}` : null } diff --git a/startos/versions/current.ts b/startos/versions/current.ts index 76d5ed5..df12c8f 100644 --- a/startos/versions/current.ts +++ b/startos/versions/current.ts @@ -1,18 +1,18 @@ import { VersionInfo } from '@start9labs/start-sdk' export const current = VersionInfo.of({ - version: '2026.7.3:0', + version: '2026.7.3:1', releaseNotes: { en_US: - 'Updates cloudflared to 2026.7.3 with QUIC precheck improvements and dependency security fixes. Full changes: https://github.com/cloudflare/cloudflared/compare/2026.6.1...2026.7.3', + 'Updates Start SDK to 2.0.9, deduplicates SDK copies in package dependencies, and resolves connected service addresses more reliably.', es_ES: - 'Actualiza cloudflared a 2026.7.3 con mejoras en las comprobaciones previas de QUIC y correcciones de seguridad en dependencias. Cambios completos: https://github.com/cloudflare/cloudflared/compare/2026.6.1...2026.7.3', + 'Actualiza Start SDK a 2.0.9, elimina copias duplicadas del SDK en las dependencias del paquete y resuelve de forma más fiable las direcciones de los servicios conectados.', de_DE: - 'Aktualisiert cloudflared auf 2026.7.3 mit verbesserten QUIC-Vorabprüfungen und Sicherheitskorrekturen für Abhängigkeiten. Vollständige Änderungen: https://github.com/cloudflare/cloudflared/compare/2026.6.1...2026.7.3', + 'Aktualisiert das Start SDK auf 2.0.9, entfernt doppelte SDK-Kopien in den Paketabhängigkeiten und ermittelt die Adressen verbundener Dienste zuverlässiger.', pl_PL: - 'Aktualizuje cloudflared do wersji 2026.7.3, dodając ulepszenia wstępnych kontroli QUIC i poprawki bezpieczeństwa zależności. Pełna lista zmian: https://github.com/cloudflare/cloudflared/compare/2026.6.1...2026.7.3', + 'Aktualizuje Start SDK do wersji 2.0.9, usuwa zduplikowane kopie SDK z zależności pakietu i pewniej ustala adresy połączonych usług.', fr_FR: - 'Met à jour cloudflared vers 2026.7.3 avec des améliorations des vérifications préalables QUIC et des correctifs de sécurité pour les dépendances. Modifications complètes : https://github.com/cloudflare/cloudflared/compare/2026.6.1...2026.7.3', + 'Met à jour Start SDK vers la version 2.0.9, déduplique les copies du SDK dans les dépendances du paquet et détermine plus fiablement les adresses des services connectés.', }, migrations: { up: async ({ effects }) => {},