@aiam/ciba 0.8.1 → 0.8.3

package/ciba.mjs

@@ -496,10 +496,6 @@ function startDaemon(provider, deviceDoc, privateKey, serverUrl) {
           dlog(`cache miss; writing requests[${newRid}] attrs=${JSON.stringify(attrs)}`);
           requests.set(newRid, { ...attrs, status: 'pending', created_at: new Date().toISOString() });
 
-          // Watch both token:<newRid> AND resources[requestedResource] for
-          // the result. resources map updates survive WS reconnects because
-          // Yjs re-syncs the full doc state; token:<newRid> may be missed
-          // if the write happened during a reconnect gap.
           const prevTokenMapName = resourcesMap.get(requestedResource);
           const newTokenMap = deviceDoc.getMap(`token:${newRid}`);
 
@@ -512,14 +508,28 @@ function startDaemon(provider, deviceDoc, privateKey, serverUrl) {
             30_000
           ).then((newMapName) => {
             const m = deviceDoc.getMap(newMapName);
-            // wait for ciphertext to land on the new map (may arrive right after resources update)
             return firstInYMap(m, (key) => key === 'ciphertext' || key === 'error', 5_000)
               .then(() => m).catch(() => m);
           });
 
+          // Poll every 2s — handles updates that arrived during a WS reconnect
+          // gap where Yjs observers were missed.
+          const viaPoll = new Promise((resolve, reject) => {
+            const iv = setInterval(() => {
+              const name = resourcesMap.get(requestedResource);
+              if (name && name !== prevTokenMapName) {
+                const m = deviceDoc.getMap(name);
+                if (m.get('ciphertext')) { clearInterval(iv); resolve(m); return; }
+              }
+              if (newTokenMap.get('ciphertext')) { clearInterval(iv); resolve(newTokenMap); }
+            }, 2000);
+            setTimeout(() => { clearInterval(iv); reject(new Error('Timeout')); }, 31_000);
+          });
+
           Promise.race([
             viaRid.then((map) => ({ src: 'rid', map })),
             viaResources.then((map) => ({ src: 'resources', map })),
+            viaPoll.then((map) => ({ src: 'poll', map })),
           ])
             .then(({ src, map }) => {
               dlog(`token resolved via ${src} for ${requestedResource}`);
@@ -752,9 +762,14 @@ const logoutCmd = defineCommand({
 const stopCmd = defineCommand({
   meta: { description: 'Stop daemon and clear session' },
   args: {},
-  run() {
-    const cfg = loadConfig();
+  async run() {
     if (cfg.pid) { try { process.kill(parseInt(cfg.pid)); } catch {} }
+    // Kill all orphaned ciba daemon processes (previous --persist runs that
+    // were never approved or whose parent exited without storing the PID).
+    try {
+      const { execFileSync } = await import('node:child_process');
+      execFileSync('pkill', ['-f', 'ciba login --daemon'], { stdio: 'ignore' });
+    } catch { /* pkill not found or no matching processes */ }
     if (existsSync(SOCKET_PATH)) unlinkSync(SOCKET_PATH);
     const sessionFile = join(CONFIG_DIR, 'session');
     if (existsSync(sessionFile)) unlinkSync(sessionFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiam/ciba",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "OAuth 2.0 Device Authorization Grant CLI with cross-device push approval (Yjs sync, ECDH-encrypted token delivery, persistent device id)",
   "type": "module",
   "bin": {