@tonyruan/dsh-bridge-host 0.1.1-beta.4 → 0.1.1-beta.6

package/README.md

@@ -7,3 +7,6 @@ Package: @tonyruan/dsh-bridge-host. Use the official DSH plugin manager for inst
 This generic build contains no personal relay preset or update root/feed. Import the original trusted deployment configuration or use the private migration bridge locally before replacing an old configured build. Existing paired profiles without deployment configuration fail recoverably and retain identity, pairing and login data. Strict LAN-only use does not enable update or diagnostic networking.
 
 Own project code is licensed under the standard PolyForm Noncommercial License1.0.0 in LICENSE. This is not OSI open-source; permitted purposes and exceptions are governed by that exact text, not a blanket promise about every business/payment scenario. Third-party components retain their own permission, copyright and NOTICE terms in THIRD-PARTY-NOTICES.txt and oss-licenses/. These own-code terms do not restrict upstream rights. The complete own development project/Git repository is not included; npm runtime JavaScript is publicly readable. Native platform download assets are not included in this npm release.
+
+
+Beta6/build26 retains the original validated persisted connection realm across upgrades and LAN-only restarts, including previously paired WSS realms without an unused relay leaf. Existing trusted deployment is reused without import or rewrite. AUTO still requires trusted TLS material. Legacy private code-only presets require the separately delivered Linux pre-upgrade migration helper before replacement; it statically validates the original local package and pin, never executes old code or fetches a new network leaf. No identity/pairing/schema reinitialization or client update-source JSON is required. Physical LAN management and the original phone-connection product label/icon remain as in the tested beta5.

package/lib/agent.mjs

@@ -332,7 +332,13 @@ var require_is_electron = __commonJS({
   }
 });
 
-// npm-release-beta-r1/host/phone-access-plugin/src/agent.mjs
+// host-config-migration-r1/host/phone-access-plugin/src/lan-provenance.mjs
+var accepted = /* @__PURE__ */ new WeakMap();
+function acceptedLanEndpoint(socket) {
+  return socket.destroyed ? null : accepted.get(socket) ?? null;
+}
+
+// host-config-migration-r1/host/phone-access-plugin/src/agent.mjs
 import net from "node:net";
 import { once } from "node:events";
 
@@ -15327,7 +15333,7 @@ function noise(init = {}) {
   return (components) => new Noise(components, init);
 }
 
-// npm-release-beta-r1/host/phone-access-plugin/src/lan-trace.mjs
+// host-config-migration-r1/host/phone-access-plugin/src/lan-trace.mjs
 var LAN_DETAIL_CODES = Object.freeze(["LAN_TCP_ACCEPTED", "LAN_TCP_CLOSED_REJECTED", "LAN_TCP_DISABLED_REJECTED", "LAN_TCP_POLICY_REJECTED", "LAN_TCP_SUBNET_REJECTED", "LAN_TCP_LIMIT_REJECTED", "LAN_TCP_GLOBAL_RATE_REJECTED", "LAN_TCP_SOURCE_RATE_REJECTED", "LAN_TCP_RATE_KEYS_REJECTED", "LAN_AGENT_CLOSED_REJECTED", "LAN_AGENT_LIMIT_REJECTED", "LAN_AGENT_HANDSHAKE_LIMIT_REJECTED", "LAN_AGENT_PEER_LIMIT_REJECTED", "LAN_AGENT_ADMISSION_REJECTED", "LAN_AGENT_READMISSION_REJECTED", "LAN_AGENT_FIRST_FRAME_EOF", "LAN_AGENT_NOISE_FAILED", "LAN_AGENT_FIRST_FRAME_TIMEOUT", "LAN_AGENT_FIRST_FRAME_FAILED", "LAN_AGENT_BACKEND_CONNECT_FAILED", "LAN_AGENT_REGISTER_FAILED", "LAN_AGENT_FORWARD_FAILED", "LAN_AGENT_CHANNEL_READY", "LAN_AGENT_CHANNEL_CLOSED"]);
 var codes = new Set(LAN_DETAIL_CODES);
 var bounded = (v, max) => Number.isSafeInteger(v) && v >= 0 ? Math.min(max, v) : 0;
@@ -15395,7 +15401,7 @@ function createLanTrace(diagnostic = () => {
   return { sample, lifetime, now };
 }
 
-// npm-release-beta-r1/host/noise-lab/core.mjs
+// host-config-migration-r1/host/noise-lab/core.mjs
 var silent = Object.assign(() => {
 }, { enabled: false, error: () => {
 }, trace: () => {
@@ -15435,7 +15441,7 @@ async function temporaryIdentity() {
   return { privateKey, peerId: peerIdFromPrivateKey(privateKey) };
 }
 
-// npm-release-beta-r1/host/phone-access-plugin/src/agent.mjs
+// host-config-migration-r1/host/phone-access-plugin/src/agent.mjs
 async function createPcAgent({ backendPort, listenPort = 0, listen = true, identity: providedIdentity, pairing = () => ({ confirmed: false, pin: null }), acquireLease, registerBackend, diagnostic = () => {
 }, factories = {} }) {
   if (!Number.isInteger(backendPort) || backendPort < 1 || backendPort > 65535) throw Error("INVALID_FIXED_BACKEND");
@@ -15452,7 +15458,7 @@ async function createPcAgent({ backendPort, listenPort = 0, listen = true, ident
   let handshaking = 0, closed = false, attempts = 0;
   const stats = { handshakes: 0, rejected: 0, handshakeFailed: 0, dshConnections: 0, upBytes: 0, downBytes: 0 };
   const acceptWire = (wire, { route = "RELAY", pairId } = {}) => {
-    const attempt = ++attempts, began = trace.now();
+    const attempt = ++attempts, began = trace.now(), lanEndpoint = route === "LAN" ? acceptedLanEndpoint(wire) : null;
     const event = (code3) => {
       try {
         diagnostic({ stage: route === "LAN" ? "LAN" : "AUTH", code: code3, attempt });
@@ -15629,7 +15635,7 @@ async function createPcAgent({ backendPort, listenPort = 0, listen = true, ident
         check();
         if (registerBackend) {
           phase = "REGISTER";
-          const registration = Promise.resolve(registerBackend({ localAddress: backend.localAddress, localPort: backend.localPort, remoteAddress: backend.remoteAddress, remotePort: backend.remotePort })).then((fn) => {
+          const registration = Promise.resolve(registerBackend({ localAddress: backend.localAddress, localPort: backend.localPort, remoteAddress: backend.remoteAddress, remotePort: backend.remotePort }, lease && lease.valid() ? { schema: 1, route: route === "LAN" && lanEndpoint ? "LAN" : route === "RELAY" ? "RELAY" : "UNKNOWN", peerId: lease.peerId, pairId: lease.pairId, generation: lease.generation, lanEndpoint: route === "LAN" ? lanEndpoint : null } : null)).then((fn) => {
             let released = false;
             const once2 = () => {
               if (released) return;

package/lib/child.mjs

@@ -1,38 +1,38 @@
-import {createPcAgent} from './agent.mjs';
-import {createPhoneSession} from './session.mjs';
-import {randomUUID} from 'node:crypto';
-let agent,closing=false,heartbeat;
-const registrations=new Map();
-function registerBackend(tuple){return new Promise((resolve,reject)=>{
- const registrationId=randomUUID(),timer=setTimeout(()=>{registrations.delete(registrationId);process.send?.({op:'backend.close',registrationId},()=>{});reject(Error('BACKEND_REGISTRATION_TIMEOUT'));},3000);
- registrations.set(registrationId,{resolve,reject,timer});
- process.send?.({op:'backend.open',registrationId,tuple},error=>{if(error){clearTimeout(timer);registrations.delete(registrationId);reject(Error('BACKEND_REGISTRATION_FAILED'));}});
-});}
-const finish=async()=>{if(closing)return;closing=true;clearInterval(heartbeat);await agent?.close();process.exit(0);};
-process.on('disconnect',finish);process.on('SIGTERM',finish);process.on('SIGINT',finish);
-// Parent IPC is the only controller. No unauthenticated control HTTP listener exists.
-process.on('message',async message=>{
- if(closing)return;
- try{
-  if(message?.op==='backend.ack'){
-   const r=registrations.get(message.registrationId);if(!r)return;registrations.delete(message.registrationId);clearTimeout(r.timer);
-   if(!message.ok)r.reject(Error('BACKEND_REGISTRATION_REJECTED'));else {let released=false;r.resolve(()=>{if(released)return;released=true;process.send?.({op:'backend.close',registrationId:message.registrationId},()=>{});});}return;
-  }
-  if(message?.op==='init'){
-   if(agent)throw Error('ALREADY_INITIALIZED');
-   if(message.profileDirectory&&!message.relay)throw Error('PERSISTENT_PROFILE_REQUIRES_FIXED_RELAY');
-   agent=message.relay?await createPhoneSession({backendPort:message.backendPort,connectionMode:message.connectionMode??'auto',lanAddress:message.lanAddress,relay:message.relay,relayCa:message.relayCa,relayLeaf:message.relayLeaf,profileDirectory:message.profileDirectory,lanEnabled:message.lanEnabled===true,registerBackend,diagnostics:{record:event=>{if(process.connected)process.send?.({op:'diagnostic',event:{...event,generation:Number.isInteger(message.diagnosticGeneration)?message.diagnosticGeneration:0}},()=>{});}}}):await createPcAgent({backendPort:message.backendPort,registerBackend});
-   heartbeat=setInterval(()=>{if(process.connected)process.send?.({op:'diagnostic',event:{stage:'LOCAL',code:'COMPANION_HEARTBEAT',count:1,generation:Number.isInteger(message.diagnosticGeneration)?message.diagnosticGeneration:0}},()=>{});},30000);heartbeat.unref?.();
-   process.send?.({id:message.id,ok:true,status:{pid:process.pid,...agent.status()}});
-  }else if(message?.op==='status'&&agent)process.send?.({id:message.id,ok:true,status:{pid:process.pid,...agent.status()}});
-  else if(message?.op==='confirmReverseScan'&&agent?.confirmReverseScan){await agent.confirmReverseScan(message.qr);process.send?.({id:message.id,ok:true,status:agent.status()});}
-  else if(message?.op==='pair/start'&&agent?.beginPairing){await agent.beginPairing();process.send?.({id:message.id,ok:true,status:agent.status()});}
-  else if(message?.op==='pair/cancel'&&agent?.cancelPairing){await agent.cancelPairing(message.sessionId);process.send?.({id:message.id,ok:true,status:agent.status()});}
-  else if(message?.op==='revoke'&&agent?.revoke){await agent.revoke(message.target);process.send?.({id:message.id,ok:true,status:agent.status()});}
-  else if(message?.op==='lan/settings'&&agent?.setLanEnabled){await agent.setLanEnabled(message.enabled);process.send?.({id:message.id,ok:true,status:agent.status()});}
-  else if(message?.op==='reconnect'&&agent?.reconnect){await agent.reconnect();process.send?.({id:message.id,ok:true,status:agent.status()});}
-  else if(message?.op==='stop')await finish();
- }catch(error){const code=error?.code??error?.message;process.send?.({id:message?.id,ok:false,error:/^[A-Z_]{3,70}$/.test(code??'')?code:'AGENT_OPERATION_FAILED'});if(!agent)await finish();}
-});
-// Failed owners must not leave a child waiting forever before init.
-setTimeout(()=>{if(!agent)finish();},10000).unref();
+import {createPcAgent} from './agent.mjs';
+import {createPhoneSession} from './session.mjs';
+import {randomUUID} from 'node:crypto';
+let agent,closing=false,heartbeat;
+const registrations=new Map();
+function registerBackend(tuple,provenance){return new Promise((resolve,reject)=>{
+ const registrationId=randomUUID(),timer=setTimeout(()=>{registrations.delete(registrationId);process.send?.({op:'backend.close',registrationId},()=>{});reject(Error('BACKEND_REGISTRATION_TIMEOUT'));},3000);
+ registrations.set(registrationId,{resolve,reject,timer});
+ process.send?.({op:'backend.open',registrationId,tuple,provenance},error=>{if(error){clearTimeout(timer);registrations.delete(registrationId);reject(Error('BACKEND_REGISTRATION_FAILED'));}});
+});}
+const finish=async()=>{if(closing)return;closing=true;clearInterval(heartbeat);await agent?.close();process.exit(0);};
+process.on('disconnect',finish);process.on('SIGTERM',finish);process.on('SIGINT',finish);
+// Parent IPC is the only controller. No unauthenticated control HTTP listener exists.
+process.on('message',async message=>{
+ if(closing)return;
+ try{
+  if(message?.op==='backend.ack'){
+   const r=registrations.get(message.registrationId);if(!r)return;registrations.delete(message.registrationId);clearTimeout(r.timer);
+   if(!message.ok)r.reject(Error('BACKEND_REGISTRATION_REJECTED'));else {let released=false;r.resolve(()=>{if(released)return;released=true;process.send?.({op:'backend.close',registrationId:message.registrationId},()=>{});});}return;
+  }
+  if(message?.op==='init'){
+   if(agent)throw Error('ALREADY_INITIALIZED');
+   if(message.profileDirectory&&!message.relay)throw Error('PERSISTENT_PROFILE_REQUIRES_FIXED_RELAY');
+   agent=message.relay?await createPhoneSession({backendPort:message.backendPort,connectionMode:message.connectionMode??'auto',lanAddress:message.lanAddress,relay:message.relay,relayCa:message.relayCa,relayLeaf:message.relayLeaf,profileDirectory:message.profileDirectory,lanEnabled:message.lanEnabled===true,registerBackend,diagnostics:{record:event=>{if(process.connected)process.send?.({op:'diagnostic',event:{...event,generation:Number.isInteger(message.diagnosticGeneration)?message.diagnosticGeneration:0}},()=>{});}}}):await createPcAgent({backendPort:message.backendPort,registerBackend});
+   heartbeat=setInterval(()=>{if(process.connected)process.send?.({op:'diagnostic',event:{stage:'LOCAL',code:'COMPANION_HEARTBEAT',count:1,generation:Number.isInteger(message.diagnosticGeneration)?message.diagnosticGeneration:0}},()=>{});},30000);heartbeat.unref?.();
+   process.send?.({id:message.id,ok:true,status:{pid:process.pid,...agent.status()}});
+  }else if(message?.op==='status'&&agent)process.send?.({id:message.id,ok:true,status:{pid:process.pid,...agent.status()}});
+  else if(message?.op==='confirmReverseScan'&&agent?.confirmReverseScan){await agent.confirmReverseScan(message.qr);process.send?.({id:message.id,ok:true,status:agent.status()});}
+  else if(message?.op==='pair/start'&&agent?.beginPairing){await agent.beginPairing();process.send?.({id:message.id,ok:true,status:agent.status()});}
+  else if(message?.op==='pair/cancel'&&agent?.cancelPairing){await agent.cancelPairing(message.sessionId);process.send?.({id:message.id,ok:true,status:agent.status()});}
+  else if(message?.op==='revoke'&&agent?.revoke){await agent.revoke(message.target);process.send?.({id:message.id,ok:true,status:agent.status()});}
+  else if(message?.op==='lan/settings'&&agent?.setLanEnabled){await agent.setLanEnabled(message.enabled);process.send?.({id:message.id,ok:true,status:agent.status()});}
+  else if(message?.op==='reconnect'&&agent?.reconnect){await agent.reconnect();process.send?.({id:message.id,ok:true,status:agent.status()});}
+  else if(message?.op==='stop')await finish();
+ }catch(error){const code=error?.code??error?.message;process.send?.({id:message?.id,ok:false,error:/^[A-Z_]{3,70}$/.test(code??'')?code:'AGENT_OPERATION_FAILED'});if(!agent)await finish();}
+});
+// Failed owners must not leave a child waiting forever before init.
+setTimeout(()=>{if(!agent)finish();},10000).unref();