@learncard/learn-cloud-plugin 2.3.51 → 2.3.52

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAc5C,OAAO,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAS7E,cAAc,SAAS,CAAC;AAqCxB;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC5B,kBAAkB,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,gCAAgC,CAAC,EACxE,KAAK,MAAM,EACX,oBAAmB,MAAM,EAAO,EAChC,0BAAyB,MAAM,EAAO,EACtC,oCAAiC,KAClC,OAAO,CAAC,gBAAgB,CAssB1B,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAc5C,OAAO,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAS7E,cAAc,SAAS,CAAC;AAqCxB;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC5B,kBAAkB,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,gCAAgC,CAAC,EACxE,KAAK,MAAM,EACX,oBAAmB,MAAM,EAAO,EAChC,0BAAyB,MAAM,EAAO,EACtC,oCAAiC,KAClC,OAAO,CAAC,gBAAgB,CA+sB1B,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@learncard/learn-cloud-plugin",
-    "version": "2.3.51",
-    "description": "",
+    "version": "2.3.52",
+    "description": "Stores, indexes, and syncs encrypted credentials in LearnCloud.",
     "type": "module",
     "main": "./dist/index.cjs",
     "module": "./dist/learn-cloud-plugin.esm.js",
@@ -39,8 +39,8 @@
         "url": "https://github.com/learningeconomy/LearnCard/issues"
     },
     "devDependencies": {
-        "@learncard/learn-cloud-service": "^2.5.43",
-        "@learncard/types": "5.24.2",
+        "@learncard/learn-cloud-service": "^2.5.44",
+        "@learncard/types": "6.0.0",
         "@types/lodash": "^4.14.191",
         "@types/node": "^17.0.31",
         "aqu": "0.4.3",
@@ -50,10 +50,10 @@
     },
     "types": "./dist/index.d.ts",
     "dependencies": {
-        "@learncard/core": "9.4.43",
-        "@learncard/didkit-plugin": "1.10.9",
-        "@learncard/helpers": "^1.7.3",
-        "@learncard/learn-cloud-client": "1.6.51",
+        "@learncard/core": "9.4.44",
+        "@learncard/didkit-plugin": "1.10.10",
+        "@learncard/helpers": "^1.8.0",
+        "@learncard/learn-cloud-client": "1.6.52",
         "json-stringify-deterministic": "^1.0.8",
         "lodash": "^4.17.21",
         "pbkdf2-hmac": "^1.2.1"

package/src/plugin.ts

@@ -89,7 +89,7 @@ export const getLearnCloudPlugin = async (
     const otherClients = new Map<string, Promise<LearnCloudClient>>();
     const learnCloudDids = new WeakMap<LearnCloudClient, Promise<string>>();
 
-    const getLearnCloudDid = (currentClient: LearnCloudClient): Promise<string> => {
+    const getLearnCloudDid = async (currentClient: LearnCloudClient): Promise<string> => {
         let learnCloudDid = learnCloudDids.get(currentClient);
 
         if (!learnCloudDid) {
@@ -97,7 +97,14 @@ export const getLearnCloudPlugin = async (
             learnCloudDids.set(currentClient, learnCloudDid);
         }
 
-        return learnCloudDid;
+        try {
+            return await learnCloudDid;
+        } catch (error) {
+            if (learnCloudDids.get(currentClient) === learnCloudDid) {
+                learnCloudDids.delete(currentClient);
+            }
+            throw error;
+        }
     };
 
     const getOtherClient = async (
@@ -568,6 +575,8 @@ export const getLearnCloudPlugin = async (
 
                 const options = {
                     ...paginationOptions,
+                    // JSON-persisted infinite-query page parameters may restore as null.
+                    cursor: paginationOptions?.cursor ?? undefined,
                     sort: ['newestFirst', 'oldestFirst'].includes(paginationOptions?.sort ?? '')
                         ? (paginationOptions?.sort as 'newestFirst' | 'oldestFirst')
                         : undefined,

package/src/test/index.test.ts

@@ -15,6 +15,9 @@ const makeMockClient = (learnCloudDid = 'did:key:z6MkLearnCloud') => ({
     storage: {
         batchResolve: { query: vi.fn() },
     },
+    index: {
+        get: { query: vi.fn().mockResolvedValue({ records: [], hasMore: false }) },
+    },
 });
 
 const mockClient = makeMockClient();
@@ -58,6 +61,27 @@ describe('LearnCloud Plugin', () => {
         mockGetClient.mockResolvedValue(mockClient);
     });
 
+    it.each([undefined, { category: 'Achievement' }])(
+        'normalizes a restored null cursor before querying the index with %j',
+        async query => {
+            const learnCard = makeLearnCard();
+            const plugin = await getLearnCloudPlugin(
+                learnCard as never,
+                'https://cloud.example',
+                [],
+                [],
+                false
+            );
+            // Persisted infinite-query page parameters can restore undefined as null.
+            const pagination = JSON.parse('{"cursor":null,"limit":12}');
+            await plugin.index.getPage!(learnCard as never, query, pagination);
+
+            expect(mockClient.index.get.query).toHaveBeenCalledWith(
+                expect.objectContaining({ cursor: undefined, limit: 12 })
+            );
+        }
+    );
+
     it('defers remote identity requests until a method needs them', async () => {
         await getLearnCloudPlugin(makeLearnCard() as never, 'https://cloud.example');
 
@@ -65,6 +89,39 @@ describe('LearnCloud Plugin', () => {
         expect(mockClient.utilities.getDid.query).not.toHaveBeenCalled();
     });
 
+    it('shares discovery in flight, but allows an index read to recover after discovery fails', async () => {
+        let rejectDiscovery!: (reason: Error) => void;
+        const discovery = new Promise<string>((_resolve, reject) => {
+            rejectDiscovery = reject;
+        });
+        const getDid = vi
+            .fn()
+            .mockReturnValueOnce(discovery)
+            .mockResolvedValue('did:key:z6MkLearnCloud');
+        const getPage = vi.fn().mockResolvedValue({ records: [], hasMore: false });
+        mockGetClient.mockResolvedValue({
+            ...mockClient,
+            utilities: { getDid: { query: getDid } },
+            index: { get: { query: getPage } },
+        });
+        const learnCard = makeLearnCard();
+        const plugin = await getLearnCloudPlugin(learnCard as never, 'https://cloud.example');
+        const first = plugin.index!.getPage!(learnCard as never, { category: 'Social Badge' });
+        const second = plugin.index!.getPage!(learnCard as never, { category: 'Achievement' });
+        const failures = Promise.allSettled([first, second]);
+        await vi.waitFor(() => expect(getDid).toHaveBeenCalledTimes(1));
+        rejectDiscovery(new Error('Temporarily offline'));
+        expect((await failures).map(result => result.status)).toEqual(['rejected', 'rejected']);
+        await expect(
+            plugin.index!.getPage!(learnCard as never, { category: 'Social Badge' })
+        ).resolves.toEqual({ records: [], hasMore: false });
+        await expect(
+            plugin.index!.getPage!(learnCard as never, { category: 'Achievement' })
+        ).resolves.toEqual({ records: [], hasMore: false });
+        expect(getDid).toHaveBeenCalledTimes(2);
+        expect(getPage).toHaveBeenCalledTimes(2);
+    });
+
     it('does not load associated DIDs when automatic association is disabled', async () => {
         const learnCard = makeLearnCard();
         const plugin = await getLearnCloudPlugin(