dsh-mobile 0.3.15 → 0.3.16

package/lib/index.mjs

@@ -8708,7 +8708,6 @@ async function materializeManagedSetup(setup, table) {
 	return {
 		publicOrigin: `https://${network.address}:${String(setup.listenPort)}`,
 		listenHost: network.address,
-		upstreamOrigin: setup.upstreamOrigin,
 		allowedCidrs: [network.cidr],
 		instanceId: ca.fingerprint256.replaceAll(":", "").toLowerCase(),
 		pairingCaFile: setup.tls.caCertFile,
@@ -8852,6 +8851,7 @@ async function loadSetup(config) {
 	};
 	if (record.version !== 1 || Reflect.ownKeys(record).some((key) => typeof key !== "string" || !SETUP_KEYS.has(key))) throw new Error("mobile setup file has an unsupported format");
 	const { version: _version, ...setup } = record;
+	delete setup.upstreamOrigin;
 	return {
 		kind: "fixed",
 		config: {
@@ -8861,9 +8861,11 @@ async function loadSetup(config) {
 	};
 }
 function loopbackTemplate(loaded, webServerPort) {
+	const base = withoutSetupKeys(loaded.config);
+	const activeUpstreamOrigin = `http://127.0.0.1:${String(webServerPort)}`;
 	return parseGatewayConfig({
-		...withoutSetupKeys(loaded.config),
-		...loaded.kind === "managed" ? { upstreamOrigin: loaded.setup.upstreamOrigin } : { upstreamOrigin: loaded.config.upstreamOrigin ?? `http://127.0.0.1:${String(webServerPort)}` },
+		...base,
+		...loaded.kind === "managed" ? { upstreamOrigin: activeUpstreamOrigin } : { upstreamOrigin: loaded.config.upstreamOrigin ?? activeUpstreamOrigin },
 		listenHost: "127.0.0.1",
 		listenPort: 0,
 		publicAuthorities: ["127.0.0.1"],
@@ -8983,7 +8985,10 @@ async function apply(ctx, config) {
 	const blockedUpgradePaths = new BlockedUpgradePathLog();
 	let lanGateway;
 	const startGateway = async (candidateConfig) => {
-		const resolved = parseGatewayConfig(candidateConfig);
+		const resolved = parseGatewayConfig({
+			...candidateConfig,
+			upstreamOrigin: template.upstreamOrigin.origin
+		});
 		const candidate = new MobileAccessGateway(resolved, new JsonDeviceStore(resolved.stateFile, resolved.maxDevices), mobileAccess, upstreamLoginUrl, webSocketPaths, blockedUpgradePaths);
 		await candidate.start();
 		lanGateway = candidate;