@jackle.dev/zalox-plugin 1.0.27 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackle.dev/zalox-plugin",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "OpenClaw channel plugin for Zalo via zca-js (in-process, single login)",
   "type": "module",
   "main": "./src/index.ts",

package/src/client.ts

@@ -60,72 +60,52 @@ export async function getOrCreateApi(profile: string): Promise<CachedApiEntry> {
   const zalo = new Zalo({ logging: false, imageMetadataGetter } as any);
   const api = await zalo.login(credentials);
 
-  // Get own user info
-  let ownId = '';
+  // Get own user info with robust fallback
+  let ownId = String((credentials as any).uid || (credentials as any).id || (credentials as any).userId || '');
   let displayName: string | undefined;
   let avatar: string | undefined;
-  try {
-    const info = await api.fetchAccountInfo();
-    ownId = String((info as any).userId || '');
-    displayName = (info as any).displayName || (info as any).zaloName;
-    avatar = (info as any).avatar;
-  } catch {
-    // Try to get from context
-    try {
-      const ctx = await api.getContext();
-      ownId = String((ctx as any).uid || '');
-    } catch {}
-  }
-
-  const entry: CachedApiEntry = {
-    api,
-    ownId,
-    displayName,
-    avatar,
-    connectedAt: Date.now(),
-  };
-
-  apiCache.set(profile, entry);
-  return entry;
-}
-
-/**
- * Get cached API instance (no login if not cached)
- */
-export function getCachedApi(profile: string): CachedApiEntry | undefined {
-  return apiCache.get(profile);
-}
-
-/**
- * Check if credentials exist for a profile (offline, no login)
- */
-export function hasCredentials(profile: string): boolean {
-  return existsSync(resolveCredentialsPath(profile));
-}
 
-/**
- * Clear cached API instance
- */
-export function clearApi(profile: string): void {
-  apiCache.delete(profile);
-}
-
-function resolveOpenClawDir(): string {
-  return process.env.OPENCLAW_DIR || join(homedir(), '.openclaw');
-}
+  // Try API if credentials didn't have ID
+  if (!ownId || ownId === 'undefined') {
+      try {
+        if (typeof (api as any).getOwnId === 'function') {
+            const id = await (api as any).getOwnId();
+            if (id) ownId = String(id);
+        }
+      } catch (e) {
+          console.warn('[ZaloX] Failed to getOwnId from API:', e);
+      }
+  }
 
-export function resolveCredentialsPath(profile: string): string {
-  // 1. Persistent path inside .openclaw (survives container restarts)
-  const openclawPath = join(resolveOpenClawDir(), 'zalox', 'profiles', `${profile}.json`);
-  if (existsSync(openclawPath)) return openclawPath;
+  // Try Context if still missing
+  if (!ownId || ownId === 'undefined') {
+      try {
+          const ctx = (api as any).context || (api as any).ctx || (zalo as any).context;
+          if (ctx && (ctx.uid || ctx.userId)) {
+              ownId = String(ctx.uid || ctx.userId);
+          }
+      } catch {}
+  }
+  
+  // Try to parse from Cookie as last resort
+  if ((!ownId || ownId === 'undefined') && credentials.cookie) {
+      const c = typeof credentials.cookie === 'string' ? credentials.cookie : JSON.stringify(credentials.cookie);
+      const match = c.match(/uid=([0-9]+)/) || c.match(/z_uuid=([a-zA-Z0-9]+)/);
+      if (match) ownId = match[1];
+  }
 
-  // 2. Legacy ZaloX config path
-  const zaloxPath = join(homedir(), '.config', 'zalox', 'profiles', `${profile}.json`);
-  if (existsSync(zaloxPath)) return zaloxPath;
+  // Get display name
+  try {
+    if (typeof (api as any).fetchAccountInfo === 'function') {
+        const info = await (api as any).fetchAccountInfo();
+        if (info) {
+            displayName = (info as any).displayName || (info as any).zaloName;
+            avatar = (info as any).avatar;
+            if (!ownId) ownId = String((info as any).userId || '');
+        }
+    }
+  } catch {}
 
-  // 3. Legacy zca-cli path
-  const zcaPath = join(homedir(), '.config', 'zca-cli-nodejs', 'profiles', `${profile}.json`);
-  if (existsSync(zcaPath)) return zcaPath;
+  console.log(`[ZaloX] Logged in profile=${profile} ownId=${ownId}`);
 
-  return openclawPath; // Default to persistent .openclaw path
-}
+  const entry: CachedApiEntry = {\n    api,\n    ownId,\n    displayName,\n    avatar,\n    connectedAt: Date.now(),\n  };\n\n  apiCache.set(profile, entry);\n  return entry;\n}\n\n/**\n * Get cached API instance (no login if not cached)\n */\nexport function getCachedApi(profile: string): CachedApiEntry | undefined {\n  return apiCache.get(profile);\n}\n\n/**\n * Check if credentials exist for a profile (offline, no login)\n */\nexport function hasCredentials(profile: string): boolean {\n  return existsSync(resolveCredentialsPath(profile));\n}\n\n/**\n * Clear cached API instance\n */\nexport function clearApi(profile: string): void {\n  apiCache.delete(profile);\n}\n\nfunction resolveOpenClawDir(): string {\n  return process.env.OPENCLAW_DIR || join(homedir(), '.openclaw');\n}\n\nexport function resolveCredentialsPath(profile: string): string {\n  // 1. Persistent path inside .openclaw (survives container restarts)\n  const openclawPath = join(resolveOpenClawDir(), 'zalox', 'profiles', `${profile}.json`);\n  if (existsSync(openclawPath)) return openclawPath;\n\n  // 2. Legacy ZaloX config path\n  const zaloxPath = join(homedir(), '.config', 'zalox', 'profiles', `${profile}.json`);\n  if (existsSync(zaloxPath)) return zaloxPath;\n\n  // 3. Legacy zca-cli path\n  const zcaPath = join(homedir(), '.config', 'zca-cli-nodejs', 'profiles', `${profile}.json`);\n  if (existsSync(zcaPath)) return zcaPath;\n\n  return openclawPath; // Default to persistent .openclaw path\n}\n