@ganglion/xacpx-relay 0.10.2 → 0.10.4

package/dist/cli.js

@@ -1085,14 +1085,17 @@ function boundField(v) {
 }
 function rpcSessionLocks(type, payload) {
   const value = payload;
-  if (type === MSG3.prompt || type === MSG3.commandExecute) {
-    return typeof value.sessionAlias === "string" && value.sessionAlias ? { alias: value.sessionAlias, lifecycle: false, turn: true } : undefined;
+  if (type === MSG3.prompt) {
+    return typeof value.sessionAlias === "string" && value.sessionAlias ? { alias: value.sessionAlias, lifecycle: false, turn: "shared" } : undefined;
+  }
+  if (type === MSG3.commandExecute) {
+    return typeof value.sessionAlias === "string" && value.sessionAlias ? { alias: value.sessionAlias, lifecycle: false, turn: "exclusive" } : undefined;
   }
   if (type === MSG3.sessionsRename) {
-    return typeof value.alias === "string" && value.alias ? { alias: value.alias, lifecycle: true, turn: false } : undefined;
+    return typeof value.alias === "string" && value.alias ? { alias: value.alias, lifecycle: true, turn: "none" } : undefined;
   }
   if (type === MSG3.sessionsCreate || type === MSG3.sessionsRemove || type === MSG3.sessionsArchive || type === MSG3.sessionsUnarchive) {
-    return typeof value.alias === "string" && value.alias ? { alias: value.alias, lifecycle: true, turn: true } : undefined;
+    return typeof value.alias === "string" && value.alias ? { alias: value.alias, lifecycle: true, turn: "exclusive" } : undefined;
   }
   return;
 }
@@ -1118,13 +1121,71 @@ function createKeyedRpcLock() {
     };
   };
 }
+function createKeyedRwLock() {
+  const tails = new Map;
+  const openShared = new Map;
+  function setTail(key, tail) {
+    tails.set(key, tail);
+    tail.then(() => {
+      if (tails.get(key) === tail)
+        tails.delete(key);
+    });
+  }
+  return {
+    async acquireExclusive(key) {
+      openShared.delete(key);
+      const previous = tails.get(key) ?? Promise.resolve();
+      let release;
+      const held = new Promise((resolve) => {
+        release = resolve;
+      });
+      setTail(key, previous.then(() => held));
+      await previous;
+      let released = false;
+      return () => {
+        if (released)
+          return;
+        released = true;
+        release();
+      };
+    },
+    async acquireShared(key) {
+      let group = openShared.get(key);
+      if (!group) {
+        const previous = tails.get(key) ?? Promise.resolve();
+        let settle;
+        const settled = new Promise((resolve) => {
+          settle = resolve;
+        });
+        group = { count: 0, settle, start: previous };
+        openShared.set(key, group);
+        setTail(key, previous.then(() => settled));
+      }
+      group.count += 1;
+      const g = group;
+      await g.start;
+      let released = false;
+      return () => {
+        if (released)
+          return;
+        released = true;
+        g.count -= 1;
+        if (g.count === 0) {
+          if (openShared.get(key) === g)
+            openShared.delete(key);
+          g.settle();
+        }
+      };
+    }
+  };
+}
 function createApp(deps) {
   const sessionTtlMs = deps.sessionTtlMs ?? 7 * 24 * 60 * 60 * 1000;
   const pairingTtlMs = deps.pairingTtlMs ?? 10 * 60 * 1000;
   const trustProxy = deps.trustProxy ?? false;
   const now = deps.now ?? (() => new Date);
   const acquireSessionLifecycleRpcLock = createKeyedRpcLock();
-  const acquireSessionTurnRpcLock = createKeyedRpcLock();
+  const sessionTurnRpcLock = createKeyedRwLock();
   const loginFailures = new Map;
   let globalFailures = { count: 0, windowStart: 0 };
   function sweepPerIpLoginFailures(nowMs) {
@@ -1355,8 +1416,10 @@ function createApp(deps) {
         if (sessionLocks.lifecycle) {
           releaseSessionRpcLocks.push(await acquireSessionLifecycleRpcLock(key));
         }
-        if (sessionLocks.turn) {
-          releaseSessionRpcLocks.push(await acquireSessionTurnRpcLock(key));
+        if (sessionLocks.turn === "shared") {
+          releaseSessionRpcLocks.push(await sessionTurnRpcLock.acquireShared(key));
+        } else if (sessionLocks.turn === "exclusive") {
+          releaseSessionRpcLocks.push(await sessionTurnRpcLock.acquireExclusive(key));
         }
       }
       if (body.type === MSG3.prompt || body.type === MSG3.commandExecute) {