agent-messenger 2.9.0 → 2.10.0

package/src/platforms/webex/token-extractor.test.ts

@@ -216,12 +216,41 @@ describe('WebexTokenExtractor', () => {
       expect(result).not.toBeNull()
     })
 
-    test('returns first valid token and stops scanning', async () => {
+    test('prefers token with latest expiry across profiles', async () => {
       const dir1 = createLevelDBDir(tempDir, 'Default')
       const dir2 = createLevelDBDir(tempDir, 'Profile 1')
 
-      const token1 = makeWebexStorageJson({ accessToken: 'first-valid-token-longer-than-twenty-chars' })
-      const token2 = makeWebexStorageJson({ accessToken: 'second-valid-token-longer-than-twenty-chars' })
+      const expiredToken = makeWebexStorageJson({
+        accessToken: 'expired-token-longer-than-twenty-chars-xx',
+        expires: Date.now() - 3600000,
+      })
+      const freshToken = makeWebexStorageJson({
+        accessToken: 'fresh-token-longer-than-twenty-chars-xxx',
+        expires: Date.now() + 3600000,
+      })
+
+      writeFileSync(join(dir1, '000003.log'), expiredToken)
+      writeFileSync(join(dir2, '000003.log'), freshToken)
+
+      const extractor = new WebexTokenExtractor('darwin', undefined, tempDir)
+      const result = await extractor.extract()
+
+      expect(result!.accessToken).toBe('fresh-token-longer-than-twenty-chars-xxx')
+    })
+
+    test('returns first token when all have same expiry', async () => {
+      const dir1 = createLevelDBDir(tempDir, 'Default')
+      const dir2 = createLevelDBDir(tempDir, 'Profile 1')
+
+      const expires = Date.now() + 3600000
+      const token1 = makeWebexStorageJson({
+        accessToken: 'first-valid-token-longer-than-twenty-chars',
+        expires,
+      })
+      const token2 = makeWebexStorageJson({
+        accessToken: 'second-valid-token-longer-than-twenty-chars',
+        expires,
+      })
 
       writeFileSync(join(dir1, '000003.log'), token1)
       writeFileSync(join(dir2, '000003.log'), token2)

package/src/platforms/webex/token-extractor.ts

@@ -160,25 +160,46 @@ export class WebexTokenExtractor {
       return null
     }
 
+    let best: { token: ExtractedWebexToken; source: string } | null = null
+
     for (const leveldbDir of profileDirs) {
       this.debug(`Scanning: ${leveldbDir}`)
 
       const result = (await this.scanViaClassicLevelCopy(leveldbDir)) ?? this.scanRawFiles(leveldbDir)
 
       if (result?.token) {
-        this.debug(`Found token in: ${leveldbDir}`)
-
         const token = result.token
         if (result.encryptionKeys.size > 0) {
           token.encryptionKeys = result.encryptionKeys
         }
 
-        return token
+        this.debug(
+          `Found token in: ${leveldbDir} (expires: ${token.expiresAt ? new Date(token.expiresAt).toISOString() : 'unknown'}, length: ${token.accessToken.length})`,
+        )
+
+        if (!best || this.isTokenFresher(token, best.token)) {
+          best = { token, source: leveldbDir }
+        }
       }
     }
 
-    this.debug('No Webex tokens found in any browser profile')
-    return null
+    if (!best) {
+      this.debug('No Webex tokens found in any browser profile')
+      return null
+    }
+
+    this.debug(`Selected token from: ${best.source}`)
+    return best.token
+  }
+
+  private isTokenFresher(candidate: ExtractedWebexToken, current: ExtractedWebexToken): boolean {
+    const candidateExpiry = candidate.expiresAt ?? 0
+    const currentExpiry = current.expiresAt ?? 0
+    if (candidateExpiry > 0 && currentExpiry > 0) {
+      return candidateExpiry > currentExpiry
+    }
+    if (candidateExpiry > 0 && currentExpiry === 0) return true
+    return false
   }
 
   private async scanViaClassicLevelCopy(dbPath: string): Promise<ScanResult | null> {