@volter/teams 0.1.24 → 0.1.25

package/package.json

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

package/server/http.mjs

@@ -36,7 +36,9 @@ export function createHttpHandler(api){return async(req,res)=>{const requestId=a
   if(req.method==='POST'&&path==='/api/v1/login/volter'){checkRate(api,`login:${req.socket.remoteAddress}`,10,5);const body=await parseJson(req);return await identityLogin(api,res,body,requestId);}
   if(req.method==='POST'&&path==='/api/v1/login/volter/teams'){checkRate(api,`login-teams:${req.socket.remoteAddress}`,10,5);const body=await parseJson(req);return await identityTeams(api,res,body,requestId);}
   if(!auth)fail(401,'authentication_required','authentication required');auth.now=api.clock.nowMs();auth.clock=api.clock;
-  const bulk=/\/captures\/[^/]+\/parts\/\d+$/.test(path)||/\/uploads\/[^/]+\/chunks\/\d+$/.test(path);checkRate(api,`credential:${auth.credential_id}:${bulk?'bulk':'ordinary'}`,bulk?600:120,bulk?60:30);
+  const bulk=/\/captures\/[^/]+\/parts\/\d+$/.test(path)||/\/uploads\/[^/]+\/chunks\/\d+$/.test(path);// A machine's own credential syncs its live sessions as they change (a capture is a begin and a commit), so it
+  // gets the bulk allowance for ordinary requests too; a person's or a service's stays at 120 a minute.
+  checkRate(api,`credential:${auth.credential_id}:${bulk?'bulk':'ordinary'}`,bulk||auth.kind==='machine'?600:120,bulk||auth.kind==='machine'?60:30);
   if(req.method==='GET'&&path==='/api/v1/me'){if(!['user','service'].includes(auth.kind))fail(403,'forbidden','credential kind cannot use this operation');const teams=await api.store.query('SELECT t.id,t.name,t.revision,m.role FROM memberships m JOIN teams t ON t.id=m.team_id WHERE m.principal_id=? AND m.active=1 AND (? IS NULL OR m.team_id=?)',[auth.principal_id,auth.team_id,auth.team_id]);return send(res,200,{server_id:api.serverId,principal:{id:auth.principal_id,kind:auth.principal_kind,display_name:auth.display_name},teams:teams.map(x=>({team:{id:x.id,name:x.name,revision:x.revision},role:x.role}))},requestId);}
   if(req.method==='POST'&&path==='/api/v1/me/identities')return await linkIdentity(api,req,res,auth,requestId);
   if(req.method==='GET'&&path==='/api/v1/capabilities')return send(res,200,{version:1,server_id:api.serverId,protocol:'teams.v1',operations:['catalog','search','read','follow','access','ingest'],auth_modes:['token','invitation',...(api.identityIssuer?['volter']:[])],...(api.identityIssuer?{identity:{issuer:api.identityIssuer,audience:api.publicOrigin}}:{})},requestId);

package/server/machine-link.mjs

@@ -305,6 +305,17 @@ async function acceptLink(api, teamId, machineId, duplex, closeSocket) {
   });
 }
 
+const LINK_WAIT_MS = 10_000;
+
+/** The machine's live link, waiting up to `ms` for one that is relinking. */
+async function linkWithin(api, linkKey, ms) {
+  for (const deadline = Date.now() + ms; ; await new Promise((resolve) => setTimeout(resolve, 250))) {
+    const link = links(api).get(linkKey);
+    if (link && !link.channel.closed) return link;
+    if (Date.now() >= deadline) return null;
+  }
+}
+
 /** A caller's channel: each stream it opens is forwarded to the machine with a fresh claim. */
 async function acceptChannel(api, auth, machineId, duplex, closeSocket) {
   let channel;
@@ -326,13 +337,19 @@ async function acceptChannel(api, auth, machineId, duplex, closeSocket) {
     const claim = await claimFor(api, auth, machineId).catch(() => null);
     if (!claim) return refuse('no machine grant for this caller');
     entry.claim = claim;
-    const link = links(api).get(key(auth.team_id, machineId));
-    if (!link) return refuse('machine_offline: the machine is not linked to this server');
+    // A machine relinks within seconds of this server restarting (a deploy drops every link): a stream waits for its
+    // link that long, and retries once on a link that closed under it, rather than refusing a message mid-relink.
     let upstream;
-    try {
-      upstream = await link.channel.open(stream.name, { ...(stream.params ?? {}), _admitted: claim });
-    } catch (error) {
-      return refuse(error.message.replace(/^[a-z]+ refused: /, ''));
+    for (let attempt = 0; ; attempt += 1) {
+      const link = await linkWithin(api, key(auth.team_id, machineId), LINK_WAIT_MS);
+      if (!link) return refuse('machine_offline: the machine is not linked to this server');
+      try {
+        upstream = await link.channel.open(stream.name, { ...(stream.params ?? {}), _admitted: claim });
+        break;
+      } catch (error) {
+        if (attempt === 0 && link.channel.closed) continue;
+        return refuse(error.message.replace(/^[a-z]+ refused: /, ''));
+      }
     }
     accept();
     const pair = { close: (reason) => { if (!stream.closed) stream.close(reason); if (!upstream.closed) upstream.close(reason); } };