@volter/supercode-teams 0.3.8 → 0.3.9

package/machine-events.mjs

@@ -35,13 +35,17 @@ export class MachineEvents {
         if(!response.ok||!response.headers.get('content-type')?.includes('text/event-stream'))throw new Error(`machine events returned HTTP ${response.status}, expected event stream`);
         const reader=response.body.getReader();const decoder=new TextDecoder();let buffer='';
         try{for(;;){const {value,done}=await reader.read();if(done)break;clearTimeout(deadline);deadline=setTimeout(()=>streamAbort.abort(new Error('machine event stream timed out')),45000);buffer+=decoder.decode(value,{stream:true});if(buffer.length>2*1024*1024)throw new Error('machine event exceeded stream bound');let boundary;while((boundary=buffer.indexOf('\n\n'))>=0){const frame=buffer.slice(0,boundary);buffer=buffer.slice(boundary+2);const data=frame.split('\n').filter(line=>line.startsWith('data:')).map(line=>line.slice(5).trimStart()).join('\n');if(data)await this.receive(JSON.parse(data));}}}finally{await reader.cancel().catch(()=>{});}
-      }catch(error){if(!this.abort.signal.aborted){if(this.error!==error.message)process.stderr.write(`supercode teams machine events: ${error.message}\n`);this.error=error.message;}}
+      }catch(error){if(!this.abort.signal.aborted){this.failingSince??=Date.now();if(this.error!==error.message)process.stderr.write(`${new Date().toISOString()} supercode teams machine events: ${error.message} (cursor ${this.state.cursor})\n`);this.error=error.message;}}
       clearTimeout(deadline);this.connected=false;
       if(!this.abort.signal.aborted)await new Promise(resolve=>{const done=()=>{clearTimeout(timer);this.abort.signal.removeEventListener('abort',done);resolve();};const timer=setTimeout(done,5000);this.abort.signal.addEventListener('abort',done,{once:true});});
     }
   }
   async receive(event){
-    if(event.type==='machine_ready'){this.connected=true;this.error=null;return;}
+    if(event.type==='machine_ready'){
+      // A stream back after a failure says so, with how long it was down: a notice that arrives late is then traceable.
+      if(this.failingSince)process.stderr.write(`${new Date().toISOString()} supercode teams machine events: stream back at cursor ${event.cursor} after ${Math.round((Date.now()-this.failingSince)/1000)} s of: ${this.error}\n`);
+      this.connected=true;this.error=null;this.failingSince=null;return;
+    }
     if(event.type==='access_revoked')throw new Error('machine event subscription authorization revoked');
     if(!['machine_snapshot','machine_linked','machine_unlinked'].includes(event.type))return;
     if(!/^\d+$/.test(event.cursor??''))throw new Error('invalid machine event cursor');
@@ -74,6 +78,6 @@ export class MachineEvents {
     child.stdout.on('data',chunk=>{detail=(detail+chunk).slice(-1000);});child.stderr.on('data',chunk=>{detail=(detail+chunk).slice(-1000);});
     child.once('error',error=>{clearTimeout(timer);reject(error);});child.once('close',code=>{clearTimeout(timer);let receipt;try{receipt=JSON.parse(detail.trim().split('\n').at(-1));}catch{}code===0&&receipt?.code===0?resolve():reject(new Error(receipt?.text||detail||`exit ${code}`));});
     child.stdin.on('error',()=>{});
-    child.stdin.end(JSON.stringify({op:'send',from:`sc:${this.machine}:operator:teams-events`,from_name:'Teams machine events',to:item.to,id:item.id,queue:item.to.split(':')[2]==='board',body:item.to.split(':')[2]==='board'?JSON.stringify({machine_event:item.event,text:item.body}):item.body}));
+    child.stdin.end(JSON.stringify({op:'send',from:`sc:${this.machine}:operator:teams-events`,from_name:'Teams machine events',to:item.to,id:item.id,queue:item.to.split(':')[2]==='board',notice:true,body:item.body}));
   });}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "type": "module",
   "description": "A machine daemon serving this machine's doors, and a local or remote Teams server for shared session discovery, OpenTelemetry ingestion and access to enrolled machines.",
   "license": "MIT",
@@ -66,7 +66,7 @@
     "@volter/supercode-health": "^0.1.0",
     "@volter/supercode-terminal": "^0.2.54",
     "@volter/supercode-trace": "^0.1.0",
-    "@volter/teams": "0.2.5",
+    "@volter/teams": "0.2.6",
     "@xterm/addon-serialize": "^0.14.0",
     "@xterm/headless": "^6.0.0",
     "protobufjs": "8.8.0",

package/server/node-upgrade.mjs

@@ -22,11 +22,14 @@ export function createMachineUpgradeHandler(api, { authenticate }) {
     socket.end(`HTTP/1.1 ${status} ${code}\r\nContent-Type: application/json\r\nContent-Length: ${Buffer.byteLength(body)}\r\nConnection: close\r\n\r\n${body}`);
   };
   const handler = async (req, socket, head) => {
+    // A caller that drops its connection mid-handshake (or later) ends only its own socket: an unheard socket error
+    // would end the whole server (measured: a client's ECONNRESET during authorization stopped the Node host).
+    socket.on('error', () => socket.destroy());
     try {
       const decision = await authorizeMachineUpgrade(api, { authenticate, url: req.url, headers: req.headers });
       if (decision.status) return refuse(socket, decision.status, decision.code, decision.message);
       return wss.handleUpgrade(req, socket, head, (ws) => {
-        ws.alive = true; ws.on('pong', () => { ws.alive = true; });
+        ws.alive = true; ws.on('pong', () => { ws.alive = true; }); ws.on('error', () => ws.terminate());
         void acceptMachineSocket(api, decision, createWebSocketStream(ws), (reason) => ws.close(1000, String(reason ?? 'closed').slice(0, 100)));
       });
     } catch (error) {

package/workspaces.mjs

@@ -20,7 +20,9 @@ export function repositoryId(value) {
 export function inspectCheckout(path) {
   const raw = git(path, ['rev-parse', '--path-format=absolute', '--show-toplevel', '--git-dir', '--git-common-dir']);
   const [root, dir, common] = raw.split('\n').map(p => realpathSync(resolve(path, p)));
-  const remote = git(root, ['remote', 'get-url', 'origin'], true);
+  // The repository the checkout declares (remote.origin.url), not where a URL rewrite (insteadOf: a mirror, a proxy, a
+  // World's twin) sends its transport.
+  const remote = git(root, ['config', '--get', 'remote.origin.url'], true);
   return { path: realpathSync(path), root, linked: dir !== common, repository: remote ? repositoryId(remote) : null, branch: git(root, ['branch', '--show-current']) || null };
 }
 export class Workspaces {