update for stacked contexts

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

src/gptscript.ts

@@ -320,7 +320,7 @@ export class GPTScript {
         return this._load({toolDefs, disableCache, subTool})
     }
 
-    async listCredentials(context: string, allContexts: boolean): Promise<Array<Credential>> {
+    async listCredentials(context: Array<string>, allContexts: boolean): Promise<Array<Credential>> {
         if (!this.ready) {
             this.ready = await this.testGPTScriptURL(20)
         }
@@ -353,7 +353,7 @@ export class GPTScript {
         }
     }
 
-    async revealCredential(context: string, name: string): Promise<Credential> {
+    async revealCredential(context: Array<string>, name: string): Promise<Credential> {
         if (!this.ready) {
             this.ready = await this.testGPTScriptURL(20)
         }
@@ -367,7 +367,7 @@ export class GPTScript {
         }
 
         const r = await resp.json()
-        return r["stdout"] as Credential
+        return jsonToCredential(JSON.stringify(r["stdout"]))
     }
 
     async deleteCredential(context: string, name: string): Promise<void> {
@@ -376,7 +376,7 @@ export class GPTScript {
         }
         const resp = await fetch(`${GPTScript.serverURL}/credentials/delete`, {
             method: "POST",
-            body: JSON.stringify({context, name})
+            body: JSON.stringify({context: [context], name})
         })
 
         if (resp.status < 200 || resp.status >= 400) {

tests/gptscript.test.ts

@@ -813,23 +813,28 @@ describe("gptscript module", () => {
                 context: "default",
                 env: {"TEST": value},
                 ephemeral: false,
+                expiresAt: new Date(Date.now() + 5000), // 5 seconds from now
                 type: CredentialType.Tool,
             })
         } catch (e) {
             throw new Error("failed to create credential: " + e)
         }
 
+        // Wait 5 seconds
+        await new Promise(resolve => setTimeout(resolve, 5000))
+
         // Reveal
         try {
-            const result = await g.revealCredential("default", name)
+            const result = await g.revealCredential(["default"], name)
             expect(result.env["TEST"]).toEqual(value)
+            expect(result.expiresAt!.valueOf()).toBeLessThan(new Date().valueOf())
         } catch (e) {
             throw new Error("failed to reveal credential: " + e)
         }
 
         // List
         try {
-            const result = await g.listCredentials("default", false)
+            const result = await g.listCredentials(["default"], false)
             expect(result.length).toBeGreaterThan(0)
             expect(result.map(c => c.name)).toContain(name)
         } catch (e) {
@@ -845,10 +850,10 @@ describe("gptscript module", () => {
 
         // Verify deletion
         try {
-            const result = await g.listCredentials("default", false)
+            const result = await g.listCredentials(["default"], false)
             expect(result.map(c => c.name)).not.toContain(name)
         } catch (e) {
             throw new Error("failed to verify deletion: " + e)
         }
-    })
+    }, 20000)
 })