@aiam/ciba 0.8.3 → 0.8.5

package/ciba.mjs

@@ -12,7 +12,7 @@
  *   ciba status              Show session state
  */
 import { createECDH, createHash, createDecipheriv, createSign, createPrivateKey, randomBytes } from 'node:crypto';
-import { exec, spawn } from 'node:child_process';
+import { exec, execFileSync, spawn } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from 'node:fs';
 import { createServer, createConnection } from 'node:net';
 import { homedir, hostname } from 'node:os';
@@ -496,6 +496,7 @@ 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() });
 
+          dlog(`resources map: ${JSON.stringify([...resourcesMap.entries()])} requested=${requestedResource}`);
           const prevTokenMapName = resourcesMap.get(requestedResource);
           const newTokenMap = deviceDoc.getMap(`token:${newRid}`);
 
@@ -512,24 +513,9 @@ function startDaemon(provider, deviceDoc, privateKey, serverUrl) {
               .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}`);
@@ -763,13 +749,10 @@ const stopCmd = defineCommand({
   meta: { description: 'Stop daemon and clear session' },
   args: {},
   async run() {
+    const cfg = loadConfig();
     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 */ }
+    // Kill all orphaned ciba daemon processes.
+    try { execFileSync('pkill', ['-f', 'ciba login --daemon'], { stdio: 'ignore' }); } catch {}
     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.3",
+  "version": "0.8.5",
   "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": {