@aiam/ciba 0.9.2 → 0.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiam/ciba",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "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": {

package/token.mjs

@@ -106,38 +106,15 @@ function decrypt(map) {
 // ─── tryGet ───────────────────────────────────────────────────────────────────
 
 function tryGet(resourcesMap, deviceDoc, res) {
-  // Try the exact key first, then try known aliases.
-  const aliases = res ? [res] : [];
-  // If short name, also try known URN forms.
-  if (res && !res.includes(':')) {
-    // Read aliases from options if available (future: server can provide)
-    const opts = deviceDoc.getMap('options').get('resources') ?? {};
-    const meta = opts[res] ?? {};
-    if (meta.urn) aliases.push(meta.urn);
-    // Common fallbacks for known short names
-    if (res === 'webagents') aliases.push('urn:sap:destination:WEBAGENTS_BACKEND', 'urn:sap:destination:web_agents_gateway');
-    if (res === 'a2a') aliases.push('urn:sap:identity:application:provider:name:agent-gateway');
-  }
-  // No resource = try first entry
-  if (!res) {
-    const first = [...resourcesMap.values()][0];
-    if (!first) return null;
-    const map = deviceDoc.getMap(first);
-    const expiresAt = map.get('expires_at');
-    if (expiresAt && expiresAt < Date.now()) return null;
-    if (!map.get('ciphertext')) return null;
-    return map;
-  }
-  for (const alias of aliases) {
-    const key = resourcesMap.get(alias);
-    if (!key) continue;
-    const map = deviceDoc.getMap(key);
-    const expiresAt = map.get('expires_at');
-    if (expiresAt && expiresAt < Date.now()) continue;
-    if (!map.get('ciphertext')) continue;
-    return map;
-  }
-  return null;
+  const key = res
+    ? resourcesMap.get(res)
+    : [...resourcesMap.values()][0];
+  if (!key) return null;
+  const map = deviceDoc.getMap(key);
+  const expiresAt = map.get('expires_at');
+  if (expiresAt && expiresAt < Date.now()) return null; // expired
+  if (!map.get('ciphertext')) return null;
+  return map;
 }
 
 // ─── Output ───────────────────────────────────────────────────────────────────
@@ -247,6 +224,7 @@ log('→ waiting for token...');
 const token = await new Promise((resolve, reject) => {
   const timer = setTimeout(() => {
     resourcesMap.unobserve(observer);
+    log(`→ timeout — resources at that point: ${JSON.stringify([...resourcesMap.entries()])}`);
     reject(new Error('Timeout waiting for token'));
   }, 30_000);
 
@@ -260,6 +238,16 @@ const token = await new Promise((resolve, reject) => {
     }
   };
   resourcesMap.observe(observer);
+  // Also observe provider synced events in case doc re-syncs
+  provider.on('synced', () => {
+    log(`→ re-synced — resources: ${JSON.stringify([...resourcesMap.entries()])}`);
+    const found = tryGet(resourcesMap, deviceDoc, resolvedResource);
+    if (found) {
+      clearTimeout(timer);
+      resourcesMap.unobserve(observer);
+      resolve(decrypt(found));
+    }
+  });
 });
 
 provider.destroy();