@volter/teams 0.1.69 → 0.1.70

package/browser-channel.mjs

@@ -104,14 +104,16 @@ export class BrowserChannel extends Emitter {
 
   /** Open a named stream; resolves once the machine accepts it, rejects with its refusal. */
   open(name, params = {}) {
+    if (this.closed || this.socket.readyState !== 1 || !this.hello) return Promise.reject(new Error('the machine channel is not connected'));
     const id = this.next; this.next += 2;
     const stream = new BrowserStream(this, id, name);
     this.streams.set(id, stream);
     return new Promise((resolve, reject) => {
       // The refusal listener leaves once the stream opens, so a close after that is the caller's.
-      const refused = (reason) => reject(new Error(`${name} refused: ${reason ?? 'closed'}`));
+      const timer = setTimeout(() => stream.close('stream opening timed out'), 15_000);
+      const refused = (reason) => { clearTimeout(timer); reject(new Error(`${name} refused: ${reason ?? 'closed'}`)); };
       stream.on('close', refused);
-      stream.once('opened', () => { stream.off('close', refused); resolve(stream); });
+      stream.once('opened', () => { clearTimeout(timer); stream.off('close', refused); resolve(stream); });
       this.send({ ch: id, t: 'open', name, params });
     });
   }
@@ -119,6 +121,30 @@ export class BrowserChannel extends Emitter {
   close() { this.socket.close(1000, 'closed'); }
 }
 
+// The HTTP/WebSocket opening and the machine's hello are both required. A
+// failed opening owns its cleanup; callers never inherit an abandoned socket.
+function connectBrowserChannel(socket, channel, unreachable, closed) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const finish = error => {
+      if (settled) return;
+      settled = true; clearTimeout(timer);
+      channel.off('hello', hello);
+      socket.removeEventListener('open', opened); socket.removeEventListener('error', failed); socket.removeEventListener('close', ended);
+      if (error) { try { channel.close(); } finally { reject(error); } } else resolve(channel);
+    };
+    const opened = () => { try { socket.send(frame({ p: PROTOCOL, nv: NODE_PROTOCOL })); } catch (error) { finish(error); } };
+    const hello = value => finish(value.error ? new Error(value.error) : null);
+    const failed = () => finish(new Error(unreachable));
+    const ended = () => finish(new Error(closed));
+    const timer = setTimeout(() => finish(new Error('The machine channel did not connect before the deadline')), 15_000);
+    socket.addEventListener('open', opened, { once: true });
+    channel.on('hello', hello);
+    socket.addEventListener('error', failed, { once: true });
+    socket.addEventListener('close', ended, { once: true });
+  });
+}
+
 /**
  * Machine `machineId` of team `teamId` on the Teams server at `origin`, reached with the
  * caller's own `token`. `WebSocketImpl` defaults to the browser's WebSocket.
@@ -127,12 +153,7 @@ export function openBrowserMachine({ origin, teamId, machineId, token }, { WebSo
   const url = `${String(origin).replace(/^http/, 'ws')}/api/v1/teams/${encodeURIComponent(teamId)}/machines/${encodeURIComponent(machineId)}/channel`;
   const socket = new WebSocketImpl(url, [CHANNEL_PROTOCOL, `bearer.${token}`]);
   const channel = new BrowserChannel(socket);
-  return new Promise((resolve, reject) => {
-    socket.addEventListener('open', () => socket.send(frame({ p: PROTOCOL, nv: NODE_PROTOCOL })), { once: true });
-    channel.once('hello', (hello) => (hello.error ? reject(new Error(hello.error)) : resolve(channel)));
-    socket.addEventListener('error', () => reject(new Error(`could not reach machine ${machineId} through ${origin}`)), { once: true });
-    socket.addEventListener('close', () => reject(new Error('the server closed the machine channel')), { once: true });
-  });
+  return connectBrowserChannel(socket, channel, `could not reach machine ${machineId} through ${origin}`, 'the server closed the machine channel');
 }
 
 /**
@@ -143,12 +164,7 @@ export function openBrowserSession({ origin, teamId, sessionId, token }, { WebSo
   const url = `${String(origin).replace(/^http/, 'ws')}/api/v1/teams/${encodeURIComponent(teamId)}/sessions/${encodeURIComponent(sessionId)}/channel`;
   const socket = new WebSocketImpl(url, [CHANNEL_PROTOCOL, `bearer.${token}`]);
   const channel = new BrowserChannel(socket);
-  return new Promise((resolve, reject) => {
-    socket.addEventListener('open', () => socket.send(frame({ p: PROTOCOL, nv: NODE_PROTOCOL })), { once: true });
-    channel.once('hello', (hello) => (hello.error ? reject(new Error(hello.error)) : resolve(channel)));
-    socket.addEventListener('error', () => reject(new Error(`could not reach session ${sessionId} through ${origin}`)), { once: true });
-    socket.addEventListener('close', () => reject(new Error('the server closed the session channel')), { once: true });
-  });
+  return connectBrowserChannel(socket, channel, `could not reach session ${sessionId} through ${origin}`, 'the server closed the session channel');
 }
 
 /**
@@ -172,8 +188,10 @@ export async function readBrowserMail(channel) {
   const stream = await channel.open('mail', { request: { op: 'history' } });
   return new Promise((resolve, reject) => {
     let answer = '';
-    const timer = setTimeout(() => { stream.close(); reject(new Error('Mailbox read timed out')); }, 25_000);
-    stream.on('data', chunk => { answer += chunk; if (answer.length > 8_000_000) { stream.close(); reject(new Error('Mailbox response too large')); } });
+    // Reject before closing: close emits synchronously and its parser must
+    // not turn a timed-out or oversized response into a successful receipt.
+    const timer = setTimeout(() => { reject(new Error('Mailbox read timed out')); stream.close('mailbox read timed out'); }, 25_000);
+    stream.on('data', chunk => { answer += chunk; if (answer.length > 8_000_000) { reject(new Error('Mailbox response too large')); stream.close('mailbox response too large'); } });
     stream.on('close', () => {
       clearTimeout(timer);
       try { const body = JSON.parse(answer); if (body.code !== 0) throw new Error(body.text || 'Mailbox unavailable'); resolve(body.rows); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.1.69",
+  "version": "0.1.70",
   "type": "module",
   "description": "Volter Teams, the neutral team plane: machine identity and daemon core, the local door and server link, admission from machine grants, product doors, and the Teams server's neutral routes (company RFC 0008).",
   "license": "MIT",