@volter/teams 0.2.34 → 0.2.36

package/client.mjs

@@ -62,10 +62,19 @@ import { lineSplitter } from './lines.mjs';
  */
 export function harnessTransport(channel) {
   let stream = null;
+  // Each start and close moves the generation on: a stream whose open was overtaken by a close is closed as it arrives,
+  // so a start the client gave up on (its start timeout) leaves no harness stream open on the machine.
+  let generation = 0;
   return {
     get running() { return stream !== null && !stream.closed; },
     async start(handlers) {
-      stream = await channel.open('harness');
+      const mine = ++generation;
+      const opened = await channel.open('harness');
+      if (mine !== generation) {
+        opened.close();
+        throw new Error('harness stream was closed while it opened');
+      }
+      stream = opened;
       const lines = lineSplitter();
       stream.on('data', (chunk) => {
         for (const line of lines(chunk)) if (line) handlers.onLine(line);
@@ -77,6 +86,7 @@ export function harnessTransport(channel) {
       stream.write(line.endsWith('\n') ? line : line + '\n');
     },
     async close() {
+      generation += 1;
       stream?.close();
       stream = null;
     },

package/http-client.mjs

@@ -242,7 +242,10 @@ async function sseError(response){let value=null;try{value=await response.json()
 // 5 s; a refusal that names none waits 30 s. Null for an error that is not a refusal for load.
 export function retryAfterMs(error,response=null){
   if(typeof error?.retryAfterMs==='number')return error.retryAfterMs;
-  if(error?.code!=='rate_limited'&&response?.status!==429&&error?.status!==429)return null;
+  // a rate limit, or a 503 that says when to come back (Retry-After: the Teams Worker's own, 15 s when its object is
+  // overloaded): a refusal for load, waited out, never re-dialled into on a fixed backoff by every machine at once
+  const unavailable=(response?.status===503||error?.status===503)&&response?.headers?.get?.('retry-after');
+  if(error?.code!=='rate_limited'&&response?.status!==429&&error?.status!==429&&!unavailable)return null;
   const named=error?.details?.retry_after_seconds??error?.retry_after_seconds??response?.headers?.get?.('retry-after'),seconds=named==null||named===''?NaN:Number(named);
   return Math.max(5000,Number.isFinite(seconds)?seconds*1000:30000);
 }

package/machine-core.mjs

@@ -201,6 +201,16 @@ export class MachineCore extends EventEmitter {
         this.emit('link', { event: 'up', server });
       } catch (error) { socket.terminate(); dropped(error); }
     });
+    // A refused upgrade (a 503 from the Worker, a 429) says when to come back: its Retry-After is waited, at least,
+    // before the next dial, so every machine does not re-dial an overloaded server at 1/2/4/8 s (#1246 review).
+    socket.once('unexpected-response', (request, response) => {
+      const seconds = Number(response.headers?.['retry-after']);
+      if ([429, 503].includes(response.statusCode) && Number.isFinite(seconds) && seconds > 0) this.linkRetryAfter = Math.min(seconds * 1000, LINK_BACKOFF_MAX_MS * 4);
+      response.resume();
+      request.destroy();
+      dropped(new Error(`the server refused the link: HTTP ${response.statusCode}`));
+    });
+    socket.on('error', () => {}); // after a refused upgrade, its aborted request's error too
     socket.once('error', dropped);
     socket.once('close', (_code, reason) => {
       // The server keeps one link per machine and closes the older one as `replaced`: another
@@ -216,7 +226,8 @@ export class MachineCore extends EventEmitter {
 
   #retryLink() {
     if (this.stopping || !this.link || this.linkTimer || this.linkReplaced) return;
-    const delay = this.linkBackoff;
+    const delay = Math.max(this.linkBackoff, this.linkRetryAfter ?? 0);
+    this.linkRetryAfter = null;
     this.linkBackoff = Math.min(this.linkBackoff * 2, LINK_BACKOFF_MAX_MS);
     this.linkTimer = setTimeout(() => { this.linkTimer = null; this.#connectLink(); }, delay);
     this.linkTimer.unref?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "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",