@learncard/learn-cloud-client 1.2.18 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @learncard/network-brain-client
 
+## 1.3.0
+
+### Minor Changes
+
+-   [#577](https://github.com/learningeconomy/LearnCard/pull/577) [`afd8472f65b27383f426e630e021a65d237e9044`](https://github.com/learningeconomy/LearnCard/commit/afd8472f65b27383f426e630e021a65d237e9044) Thanks [@TaylorBeeston](https://github.com/TaylorBeeston)! - Don't await network calls during init
+
 ## 1.2.18
 
 ### Patch Changes

package/dist/learn-cloud-client.cjs.development.js

@@ -78,7 +78,7 @@ var getClient = /* @__PURE__ */ __name(async (url, didAuthFunction) => {
   const getChallenges = /* @__PURE__ */ __name(async (amount = 95 + Math.round((Math.random() - 0.5) * 5)) => {
     return challengeRequester.utilities.getChallenges.query({ amount });
   }, "getChallenges");
-  challenges = await getChallenges();
+  getChallenges().then((result) => challenges = result);
   const trpc = (0, import_client.createTRPCProxyClient)({
     links: [
       callbackLink(async () => {

package/dist/learn-cloud-client.cjs.development.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts", "../src/callbackLink.ts"],
-  "sourcesContent": ["import { createTRPCProxyClient, CreateTRPCProxyClient, httpBatchLink } from '@trpc/client';\nimport type { inferRouterInputs } from '@trpc/server';\nimport type {\n    JWE,\n    PaginatedEncryptedRecordsType,\n    PaginatedEncryptedCredentialRecordsType,\n} from '@learncard/types';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nimport { callbackLink } from './callbackLink';\n\ntype Inputs = inferRouterInputs<AppRouter>;\n\ntype Client = CreateTRPCProxyClient<AppRouter>;\n\ntype OverriddenClient = Omit<Client, 'index' | 'customStorage'> & {\n    index: Client['index'] & {\n        get: {\n            query: (\n                args: Inputs['index']['get']\n            ) => Promise<PaginatedEncryptedCredentialRecordsType | JWE>;\n        };\n    };\n    customStorage: Omit<Client['customStorage'], 'read'> & {\n        read: {\n            query: (\n                args: Inputs['customStorage']['read']\n            ) => Promise<PaginatedEncryptedRecordsType>;\n        };\n    };\n};\n\nexport type LearnCloudClient = OverriddenClient;\n\nexport const getClient = async (\n    url: string,\n    didAuthFunction: (challenge?: string) => Promise<string>\n) => {\n    let challenges: string[] = [];\n\n    const challengeRequester = createTRPCProxyClient<AppRouter>({\n        links: [\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: { Authorization: `Bearer ${await didAuthFunction()}` },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    const getChallenges = async (\n        amount = 95 + Math.round((Math.random() - 0.5) * 5)\n    ): Promise<string[]> => {\n        return challengeRequester.utilities.getChallenges.query({ amount });\n    };\n\n    challenges = await getChallenges();\n\n    const trpc = createTRPCProxyClient<AppRouter>({\n        links: [\n            callbackLink(async () => {\n                challenges = await getChallenges();\n            }),\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: async () => {\n                    if (challenges.length === 0) challenges.push(...(await getChallenges()));\n\n                    return { Authorization: `Bearer ${await didAuthFunction(challenges.pop())}` };\n                },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    return trpc;\n};\n\nexport default getClient;\n", "import { TRPCLink } from '@trpc/client';\nimport { observable, Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nexport const callbackLink = (callback: () => Promise<void>): TRPCLink<AppRouter> => {\n    return () => {\n        return ({ next, op }) => {\n            return observable(observer => {\n                let request: Unsubscribable | null = null;\n                let attempts = 0;\n                let isDone = false;\n\n                const attempt = () => {\n                    attempts += 1;\n                    request?.unsubscribe();\n                    request = next(op).subscribe({\n                        error: async error => {\n                            if (attempts > 5 || error.data?.httpStatus !== 401) {\n                                return observer.error(error);\n                            }\n\n                            await callback();\n\n                            attempt();\n                        },\n                        next: result => observer.next(result),\n                        complete: () => {\n                            if (isDone) observer.complete();\n                        },\n                    });\n                };\n\n                attempt();\n\n                return () => {\n                    isDone = true;\n                    request?.unsubscribe();\n                };\n            });\n        };\n    };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA4E;;;ACC5E,wBAA2C;AAGpC,IAAM,eAAe,wBAAC,aAAuD;AAChF,SAAO,MAAM;AACT,WAAO,CAAC,EAAE,MAAM,GAAG,MAAM;AACrB,iBAAO,8BAAW,cAAY;AAC1B,YAAI,UAAiC;AACrC,YAAI,WAAW;AACf,YAAI,SAAS;AAEb,cAAM,UAAU,6BAAM;AAClB,sBAAY;AACZ,mBAAS,YAAY;AACrB,oBAAU,KAAK,EAAE,EAAE,UAAU;AAAA,YACzB,OAAO,OAAM,UAAS;AAClB,kBAAI,WAAW,KAAK,MAAM,MAAM,eAAe,KAAK;AAChD,uBAAO,SAAS,MAAM,KAAK;AAAA,cAC/B;AAEA,oBAAM,SAAS;AAEf,sBAAQ;AAAA,YACZ;AAAA,YACA,MAAM,YAAU,SAAS,KAAK,MAAM;AAAA,YACpC,UAAU,MAAM;AACZ,kBAAI;AAAQ,yBAAS,SAAS;AAAA,YAClC;AAAA,UACJ,CAAC;AAAA,QACL,GAlBgB;AAoBhB,gBAAQ;AAER,eAAO,MAAM;AACT,mBAAS;AACT,mBAAS,YAAY;AAAA,QACzB;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ;AACJ,GArC4B;;;AD8BrB,IAAM,YAAY,8BACrB,KACA,oBACC;AACD,MAAI,aAAuB,CAAC;AAE5B,QAAM,yBAAqB,qCAAiC;AAAA,IACxD,OAAO;AAAA,UACH,6BAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,EAAE,eAAe,UAAU,MAAM,gBAAgB,IAAI;AAAA,MAClE,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,QAAM,gBAAgB,8BAClB,SAAS,KAAK,KAAK,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,MAC9B;AACpB,WAAO,mBAAmB,UAAU,cAAc,MAAM,EAAE,OAAO,CAAC;AAAA,EACtE,GAJsB;AAMtB,eAAa,MAAM,cAAc;AAEjC,QAAM,WAAO,qCAAiC;AAAA,IAC1C,OAAO;AAAA,MACH,aAAa,YAAY;AACrB,qBAAa,MAAM,cAAc;AAAA,MACrC,CAAC;AAAA,UACD,6BAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,YAAY;AACjB,cAAI,WAAW,WAAW;AAAG,uBAAW,KAAK,GAAI,MAAM,cAAc,CAAE;AAEvE,iBAAO,EAAE,eAAe,UAAU,MAAM,gBAAgB,WAAW,IAAI,CAAC,IAAI;AAAA,QAChF;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,SAAO;AACX,GA1CyB;AA4CzB,IAAO,cAAQ;",
+  "sourcesContent": ["import { createTRPCProxyClient, CreateTRPCProxyClient, httpBatchLink } from '@trpc/client';\nimport type { inferRouterInputs } from '@trpc/server';\nimport type {\n    JWE,\n    PaginatedEncryptedRecordsType,\n    PaginatedEncryptedCredentialRecordsType,\n} from '@learncard/types';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nimport { callbackLink } from './callbackLink';\n\ntype Inputs = inferRouterInputs<AppRouter>;\n\ntype Client = CreateTRPCProxyClient<AppRouter>;\n\ntype OverriddenClient = Omit<Client, 'index' | 'customStorage'> & {\n    index: Client['index'] & {\n        get: {\n            query: (\n                args: Inputs['index']['get']\n            ) => Promise<PaginatedEncryptedCredentialRecordsType | JWE>;\n        };\n    };\n    customStorage: Omit<Client['customStorage'], 'read'> & {\n        read: {\n            query: (\n                args: Inputs['customStorage']['read']\n            ) => Promise<PaginatedEncryptedRecordsType>;\n        };\n    };\n};\n\nexport type LearnCloudClient = OverriddenClient;\n\nexport const getClient = async (\n    url: string,\n    didAuthFunction: (challenge?: string) => Promise<string>\n) => {\n    let challenges: string[] = [];\n\n    const challengeRequester = createTRPCProxyClient<AppRouter>({\n        links: [\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: { Authorization: `Bearer ${await didAuthFunction()}` },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    const getChallenges = async (\n        amount = 95 + Math.round((Math.random() - 0.5) * 5)\n    ): Promise<string[]> => {\n        return challengeRequester.utilities.getChallenges.query({ amount });\n    };\n\n    getChallenges().then(result => (challenges = result));\n\n    const trpc = createTRPCProxyClient<AppRouter>({\n        links: [\n            callbackLink(async () => {\n                challenges = await getChallenges();\n            }),\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: async () => {\n                    if (challenges.length === 0) challenges.push(...(await getChallenges()));\n\n                    return { Authorization: `Bearer ${await didAuthFunction(challenges.pop())}` };\n                },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    return trpc;\n};\n\nexport default getClient;\n", "import { TRPCLink } from '@trpc/client';\nimport { observable, Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nexport const callbackLink = (callback: () => Promise<void>): TRPCLink<AppRouter> => {\n    return () => {\n        return ({ next, op }) => {\n            return observable(observer => {\n                let request: Unsubscribable | null = null;\n                let attempts = 0;\n                let isDone = false;\n\n                const attempt = () => {\n                    attempts += 1;\n                    request?.unsubscribe();\n                    request = next(op).subscribe({\n                        error: async error => {\n                            if (attempts > 5 || error.data?.httpStatus !== 401) {\n                                return observer.error(error);\n                            }\n\n                            await callback();\n\n                            attempt();\n                        },\n                        next: result => observer.next(result),\n                        complete: () => {\n                            if (isDone) observer.complete();\n                        },\n                    });\n                };\n\n                attempt();\n\n                return () => {\n                    isDone = true;\n                    request?.unsubscribe();\n                };\n            });\n        };\n    };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA4E;;;ACC5E,wBAA2C;AAGpC,IAAM,eAAe,wBAAC,aAAuD;AAChF,SAAO,MAAM;AACT,WAAO,CAAC,EAAE,MAAM,GAAG,MAAM;AACrB,iBAAO,8BAAW,cAAY;AAC1B,YAAI,UAAiC;AACrC,YAAI,WAAW;AACf,YAAI,SAAS;AAEb,cAAM,UAAU,6BAAM;AAClB,sBAAY;AACZ,mBAAS,YAAY;AACrB,oBAAU,KAAK,EAAE,EAAE,UAAU;AAAA,YACzB,OAAO,OAAM,UAAS;AAClB,kBAAI,WAAW,KAAK,MAAM,MAAM,eAAe,KAAK;AAChD,uBAAO,SAAS,MAAM,KAAK;AAAA,cAC/B;AAEA,oBAAM,SAAS;AAEf,sBAAQ;AAAA,YACZ;AAAA,YACA,MAAM,YAAU,SAAS,KAAK,MAAM;AAAA,YACpC,UAAU,MAAM;AACZ,kBAAI;AAAQ,yBAAS,SAAS;AAAA,YAClC;AAAA,UACJ,CAAC;AAAA,QACL,GAlBgB;AAoBhB,gBAAQ;AAER,eAAO,MAAM;AACT,mBAAS;AACT,mBAAS,YAAY;AAAA,QACzB;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ;AACJ,GArC4B;;;AD8BrB,IAAM,YAAY,8BACrB,KACA,oBACC;AACD,MAAI,aAAuB,CAAC;AAE5B,QAAM,yBAAqB,qCAAiC;AAAA,IACxD,OAAO;AAAA,UACH,6BAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,EAAE,eAAe,UAAU,MAAM,gBAAgB,IAAI;AAAA,MAClE,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,QAAM,gBAAgB,8BAClB,SAAS,KAAK,KAAK,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,MAC9B;AACpB,WAAO,mBAAmB,UAAU,cAAc,MAAM,EAAE,OAAO,CAAC;AAAA,EACtE,GAJsB;AAMtB,gBAAc,EAAE,KAAK,YAAW,aAAa,MAAO;AAEpD,QAAM,WAAO,qCAAiC;AAAA,IAC1C,OAAO;AAAA,MACH,aAAa,YAAY;AACrB,qBAAa,MAAM,cAAc;AAAA,MACrC,CAAC;AAAA,UACD,6BAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,YAAY;AACjB,cAAI,WAAW,WAAW;AAAG,uBAAW,KAAK,GAAI,MAAM,cAAc,CAAE;AAEvE,iBAAO,EAAE,eAAe,UAAU,MAAM,gBAAgB,WAAW,IAAI,CAAC,IAAI;AAAA,QAChF;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,SAAO;AACX,GA1CyB;AA4CzB,IAAO,cAAQ;",
   "names": []
 }

package/dist/learn-cloud-client.cjs.production.min.js

@@ -1 +1 @@
-var l=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var R=Object.prototype.hasOwnProperty;var i=(t,e)=>l(t,"name",{value:e,configurable:!0});var h=(t,e)=>{for(var n in e)l(t,n,{get:e[n],enumerable:!0})},P=(t,e,n,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of C(e))!R.call(t,r)&&r!==n&&l(t,r,{get:()=>e[r],enumerable:!(a=y(e,r))||a.enumerable});return t};var f=t=>P(l({},"__esModule",{value:!0}),t);var b={};h(b,{default:()=>x,getClient:()=>g});module.exports=f(b);var o=require("@trpc/client");var d=require("@trpc/server/observable");var m=i(t=>()=>({next:e,op:n})=>(0,d.observable)(a=>{let r=null,c=0,s=!1,u=i(()=>{c+=1,r?.unsubscribe(),r=e(n).subscribe({error:async p=>{if(c>5||p.data?.httpStatus!==401)return a.error(p);await t(),u()},next:p=>a.next(p),complete:()=>{s&&a.complete()}})},"attempt");return u(),()=>{s=!0,r?.unsubscribe()}}),"callbackLink");var g=i(async(t,e)=>{let n=[],a=(0,o.createTRPCProxyClient)({links:[(0,o.httpBatchLink)({url:t,maxURLLength:3072,headers:{Authorization:`Bearer ${await e()}`}})]}),r=i(async(s=95+Math.round((Math.random()-.5)*5))=>a.utilities.getChallenges.query({amount:s}),"getChallenges");return n=await r(),(0,o.createTRPCProxyClient)({links:[m(async()=>{n=await r()}),(0,o.httpBatchLink)({url:t,maxURLLength:3072,headers:async()=>(n.length===0&&n.push(...await r()),{Authorization:`Bearer ${await e(n.pop())}`})})]})},"getClient"),x=g;
+var l=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var R=Object.prototype.hasOwnProperty;var o=(t,e)=>l(t,"name",{value:e,configurable:!0});var h=(t,e)=>{for(var n in e)l(t,n,{get:e[n],enumerable:!0})},P=(t,e,n,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of C(e))!R.call(t,r)&&r!==n&&l(t,r,{get:()=>e[r],enumerable:!(a=y(e,r))||a.enumerable});return t};var f=t=>P(l({},"__esModule",{value:!0}),t);var b={};h(b,{default:()=>x,getClient:()=>g});module.exports=f(b);var s=require("@trpc/client");var d=require("@trpc/server/observable");var m=o(t=>()=>({next:e,op:n})=>(0,d.observable)(a=>{let r=null,c=0,i=!1,u=o(()=>{c+=1,r?.unsubscribe(),r=e(n).subscribe({error:async p=>{if(c>5||p.data?.httpStatus!==401)return a.error(p);await t(),u()},next:p=>a.next(p),complete:()=>{i&&a.complete()}})},"attempt");return u(),()=>{i=!0,r?.unsubscribe()}}),"callbackLink");var g=o(async(t,e)=>{let n=[],a=(0,s.createTRPCProxyClient)({links:[(0,s.httpBatchLink)({url:t,maxURLLength:3072,headers:{Authorization:`Bearer ${await e()}`}})]}),r=o(async(i=95+Math.round((Math.random()-.5)*5))=>a.utilities.getChallenges.query({amount:i}),"getChallenges");return r().then(i=>n=i),(0,s.createTRPCProxyClient)({links:[m(async()=>{n=await r()}),(0,s.httpBatchLink)({url:t,maxURLLength:3072,headers:async()=>(n.length===0&&n.push(...await r()),{Authorization:`Bearer ${await e(n.pop())}`})})]})},"getClient"),x=g;

package/dist/learn-cloud-client.cjs.production.min.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts", "../src/callbackLink.ts"],
-  "sourcesContent": ["import { createTRPCProxyClient, CreateTRPCProxyClient, httpBatchLink } from '@trpc/client';\nimport type { inferRouterInputs } from '@trpc/server';\nimport type {\n    JWE,\n    PaginatedEncryptedRecordsType,\n    PaginatedEncryptedCredentialRecordsType,\n} from '@learncard/types';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nimport { callbackLink } from './callbackLink';\n\ntype Inputs = inferRouterInputs<AppRouter>;\n\ntype Client = CreateTRPCProxyClient<AppRouter>;\n\ntype OverriddenClient = Omit<Client, 'index' | 'customStorage'> & {\n    index: Client['index'] & {\n        get: {\n            query: (\n                args: Inputs['index']['get']\n            ) => Promise<PaginatedEncryptedCredentialRecordsType | JWE>;\n        };\n    };\n    customStorage: Omit<Client['customStorage'], 'read'> & {\n        read: {\n            query: (\n                args: Inputs['customStorage']['read']\n            ) => Promise<PaginatedEncryptedRecordsType>;\n        };\n    };\n};\n\nexport type LearnCloudClient = OverriddenClient;\n\nexport const getClient = async (\n    url: string,\n    didAuthFunction: (challenge?: string) => Promise<string>\n) => {\n    let challenges: string[] = [];\n\n    const challengeRequester = createTRPCProxyClient<AppRouter>({\n        links: [\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: { Authorization: `Bearer ${await didAuthFunction()}` },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    const getChallenges = async (\n        amount = 95 + Math.round((Math.random() - 0.5) * 5)\n    ): Promise<string[]> => {\n        return challengeRequester.utilities.getChallenges.query({ amount });\n    };\n\n    challenges = await getChallenges();\n\n    const trpc = createTRPCProxyClient<AppRouter>({\n        links: [\n            callbackLink(async () => {\n                challenges = await getChallenges();\n            }),\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: async () => {\n                    if (challenges.length === 0) challenges.push(...(await getChallenges()));\n\n                    return { Authorization: `Bearer ${await didAuthFunction(challenges.pop())}` };\n                },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    return trpc;\n};\n\nexport default getClient;\n", "import { TRPCLink } from '@trpc/client';\nimport { observable, Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nexport const callbackLink = (callback: () => Promise<void>): TRPCLink<AppRouter> => {\n    return () => {\n        return ({ next, op }) => {\n            return observable(observer => {\n                let request: Unsubscribable | null = null;\n                let attempts = 0;\n                let isDone = false;\n\n                const attempt = () => {\n                    attempts += 1;\n                    request?.unsubscribe();\n                    request = next(op).subscribe({\n                        error: async error => {\n                            if (attempts > 5 || error.data?.httpStatus !== 401) {\n                                return observer.error(error);\n                            }\n\n                            await callback();\n\n                            attempt();\n                        },\n                        next: result => observer.next(result),\n                        complete: () => {\n                            if (isDone) observer.complete();\n                        },\n                    });\n                };\n\n                attempt();\n\n                return () => {\n                    isDone = true;\n                    request?.unsubscribe();\n                };\n            });\n        };\n    };\n};\n"],
-  "mappings": "+cAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,cAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA4E,wBCC5E,IAAAC,EAA2C,mCAGpC,IAAMC,EAAeC,EAACC,GAClB,IACI,CAAC,CAAE,KAAAC,EAAM,GAAAC,CAAG,OACR,cAAWC,GAAY,CAC1B,IAAIC,EAAiC,KACjCC,EAAW,EACXC,EAAS,GAEPC,EAAUR,EAAA,IAAM,CAClBM,GAAY,EACZD,GAAS,YAAY,EACrBA,EAAUH,EAAKC,CAAE,EAAE,UAAU,CACzB,MAAO,MAAMM,GAAS,CAClB,GAAIH,EAAW,GAAKG,EAAM,MAAM,aAAe,IAC3C,OAAOL,EAAS,MAAMK,CAAK,EAG/B,MAAMR,EAAS,EAEfO,EAAQ,CACZ,EACA,KAAME,GAAUN,EAAS,KAAKM,CAAM,EACpC,SAAU,IAAM,CACRH,GAAQH,EAAS,SAAS,CAClC,CACJ,CAAC,CACL,EAlBgB,WAoBhB,OAAAI,EAAQ,EAED,IAAM,CACTD,EAAS,GACTF,GAAS,YAAY,CACzB,CACJ,CAAC,EAlCe,gBD8BrB,IAAMM,EAAYC,EAAA,MACrBC,EACAC,IACC,CACD,IAAIC,EAAuB,CAAC,EAEtBC,KAAqB,yBAAiC,CACxD,MAAO,IACH,iBAAc,CACV,IAAAH,EACA,aAAc,KACd,QAAS,CAAE,cAAe,UAAU,MAAMC,EAAgB,GAAI,CAClE,CAAC,CACL,CACJ,CAAC,EAEKG,EAAgBL,EAAA,MAClBM,EAAS,GAAK,KAAK,OAAO,KAAK,OAAO,EAAI,IAAO,CAAC,IAE3CF,EAAmB,UAAU,cAAc,MAAM,CAAE,OAAAE,CAAO,CAAC,EAHhD,iBAMtB,OAAAH,EAAa,MAAME,EAAc,KAEpB,yBAAiC,CAC1C,MAAO,CACHE,EAAa,SAAY,CACrBJ,EAAa,MAAME,EAAc,CACrC,CAAC,KACD,iBAAc,CACV,IAAAJ,EACA,aAAc,KACd,QAAS,UACDE,EAAW,SAAW,GAAGA,EAAW,KAAK,GAAI,MAAME,EAAc,CAAE,EAEhE,CAAE,cAAe,UAAU,MAAMH,EAAgBC,EAAW,IAAI,CAAC,GAAI,EAEpF,CAAC,CACL,CACJ,CAAC,CAGL,EA1CyB,aA4ClBK,EAAQT",
-  "names": ["src_exports", "__export", "src_default", "getClient", "__toCommonJS", "import_client", "import_observable", "callbackLink", "__name", "callback", "next", "op", "observer", "request", "attempts", "isDone", "attempt", "error", "result", "getClient", "__name", "url", "didAuthFunction", "challenges", "challengeRequester", "getChallenges", "amount", "callbackLink", "src_default"]
+  "sourcesContent": ["import { createTRPCProxyClient, CreateTRPCProxyClient, httpBatchLink } from '@trpc/client';\nimport type { inferRouterInputs } from '@trpc/server';\nimport type {\n    JWE,\n    PaginatedEncryptedRecordsType,\n    PaginatedEncryptedCredentialRecordsType,\n} from '@learncard/types';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nimport { callbackLink } from './callbackLink';\n\ntype Inputs = inferRouterInputs<AppRouter>;\n\ntype Client = CreateTRPCProxyClient<AppRouter>;\n\ntype OverriddenClient = Omit<Client, 'index' | 'customStorage'> & {\n    index: Client['index'] & {\n        get: {\n            query: (\n                args: Inputs['index']['get']\n            ) => Promise<PaginatedEncryptedCredentialRecordsType | JWE>;\n        };\n    };\n    customStorage: Omit<Client['customStorage'], 'read'> & {\n        read: {\n            query: (\n                args: Inputs['customStorage']['read']\n            ) => Promise<PaginatedEncryptedRecordsType>;\n        };\n    };\n};\n\nexport type LearnCloudClient = OverriddenClient;\n\nexport const getClient = async (\n    url: string,\n    didAuthFunction: (challenge?: string) => Promise<string>\n) => {\n    let challenges: string[] = [];\n\n    const challengeRequester = createTRPCProxyClient<AppRouter>({\n        links: [\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: { Authorization: `Bearer ${await didAuthFunction()}` },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    const getChallenges = async (\n        amount = 95 + Math.round((Math.random() - 0.5) * 5)\n    ): Promise<string[]> => {\n        return challengeRequester.utilities.getChallenges.query({ amount });\n    };\n\n    getChallenges().then(result => (challenges = result));\n\n    const trpc = createTRPCProxyClient<AppRouter>({\n        links: [\n            callbackLink(async () => {\n                challenges = await getChallenges();\n            }),\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: async () => {\n                    if (challenges.length === 0) challenges.push(...(await getChallenges()));\n\n                    return { Authorization: `Bearer ${await didAuthFunction(challenges.pop())}` };\n                },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    return trpc;\n};\n\nexport default getClient;\n", "import { TRPCLink } from '@trpc/client';\nimport { observable, Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nexport const callbackLink = (callback: () => Promise<void>): TRPCLink<AppRouter> => {\n    return () => {\n        return ({ next, op }) => {\n            return observable(observer => {\n                let request: Unsubscribable | null = null;\n                let attempts = 0;\n                let isDone = false;\n\n                const attempt = () => {\n                    attempts += 1;\n                    request?.unsubscribe();\n                    request = next(op).subscribe({\n                        error: async error => {\n                            if (attempts > 5 || error.data?.httpStatus !== 401) {\n                                return observer.error(error);\n                            }\n\n                            await callback();\n\n                            attempt();\n                        },\n                        next: result => observer.next(result),\n                        complete: () => {\n                            if (isDone) observer.complete();\n                        },\n                    });\n                };\n\n                attempt();\n\n                return () => {\n                    isDone = true;\n                    request?.unsubscribe();\n                };\n            });\n        };\n    };\n};\n"],
+  "mappings": "+cAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,cAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA4E,wBCC5E,IAAAC,EAA2C,mCAGpC,IAAMC,EAAeC,EAACC,GAClB,IACI,CAAC,CAAE,KAAAC,EAAM,GAAAC,CAAG,OACR,cAAWC,GAAY,CAC1B,IAAIC,EAAiC,KACjCC,EAAW,EACXC,EAAS,GAEPC,EAAUR,EAAA,IAAM,CAClBM,GAAY,EACZD,GAAS,YAAY,EACrBA,EAAUH,EAAKC,CAAE,EAAE,UAAU,CACzB,MAAO,MAAMM,GAAS,CAClB,GAAIH,EAAW,GAAKG,EAAM,MAAM,aAAe,IAC3C,OAAOL,EAAS,MAAMK,CAAK,EAG/B,MAAMR,EAAS,EAEfO,EAAQ,CACZ,EACA,KAAME,GAAUN,EAAS,KAAKM,CAAM,EACpC,SAAU,IAAM,CACRH,GAAQH,EAAS,SAAS,CAClC,CACJ,CAAC,CACL,EAlBgB,WAoBhB,OAAAI,EAAQ,EAED,IAAM,CACTD,EAAS,GACTF,GAAS,YAAY,CACzB,CACJ,CAAC,EAlCe,gBD8BrB,IAAMM,EAAYC,EAAA,MACrBC,EACAC,IACC,CACD,IAAIC,EAAuB,CAAC,EAEtBC,KAAqB,yBAAiC,CACxD,MAAO,IACH,iBAAc,CACV,IAAAH,EACA,aAAc,KACd,QAAS,CAAE,cAAe,UAAU,MAAMC,EAAgB,GAAI,CAClE,CAAC,CACL,CACJ,CAAC,EAEKG,EAAgBL,EAAA,MAClBM,EAAS,GAAK,KAAK,OAAO,KAAK,OAAO,EAAI,IAAO,CAAC,IAE3CF,EAAmB,UAAU,cAAc,MAAM,CAAE,OAAAE,CAAO,CAAC,EAHhD,iBAMtB,OAAAD,EAAc,EAAE,KAAKE,GAAWJ,EAAaI,CAAO,KAEvC,yBAAiC,CAC1C,MAAO,CACHC,EAAa,SAAY,CACrBL,EAAa,MAAME,EAAc,CACrC,CAAC,KACD,iBAAc,CACV,IAAAJ,EACA,aAAc,KACd,QAAS,UACDE,EAAW,SAAW,GAAGA,EAAW,KAAK,GAAI,MAAME,EAAc,CAAE,EAEhE,CAAE,cAAe,UAAU,MAAMH,EAAgBC,EAAW,IAAI,CAAC,GAAI,EAEpF,CAAC,CACL,CACJ,CAAC,CAGL,EA1CyB,aA4ClBM,EAAQV",
+  "names": ["src_exports", "__export", "src_default", "getClient", "__toCommonJS", "import_client", "import_observable", "callbackLink", "__name", "callback", "next", "op", "observer", "request", "attempts", "isDone", "attempt", "error", "result", "getClient", "__name", "url", "didAuthFunction", "challenges", "challengeRequester", "getChallenges", "amount", "result", "callbackLink", "src_default"]
 }

package/dist/learn-cloud-client.esm.js

@@ -56,7 +56,7 @@ var getClient = /* @__PURE__ */ __name(async (url, didAuthFunction) => {
   const getChallenges = /* @__PURE__ */ __name(async (amount = 95 + Math.round((Math.random() - 0.5) * 5)) => {
     return challengeRequester.utilities.getChallenges.query({ amount });
   }, "getChallenges");
-  challenges = await getChallenges();
+  getChallenges().then((result) => challenges = result);
   const trpc = createTRPCProxyClient({
     links: [
       callbackLink(async () => {

package/dist/learn-cloud-client.esm.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts", "../src/callbackLink.ts"],
-  "sourcesContent": ["import { createTRPCProxyClient, CreateTRPCProxyClient, httpBatchLink } from '@trpc/client';\nimport type { inferRouterInputs } from '@trpc/server';\nimport type {\n    JWE,\n    PaginatedEncryptedRecordsType,\n    PaginatedEncryptedCredentialRecordsType,\n} from '@learncard/types';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nimport { callbackLink } from './callbackLink';\n\ntype Inputs = inferRouterInputs<AppRouter>;\n\ntype Client = CreateTRPCProxyClient<AppRouter>;\n\ntype OverriddenClient = Omit<Client, 'index' | 'customStorage'> & {\n    index: Client['index'] & {\n        get: {\n            query: (\n                args: Inputs['index']['get']\n            ) => Promise<PaginatedEncryptedCredentialRecordsType | JWE>;\n        };\n    };\n    customStorage: Omit<Client['customStorage'], 'read'> & {\n        read: {\n            query: (\n                args: Inputs['customStorage']['read']\n            ) => Promise<PaginatedEncryptedRecordsType>;\n        };\n    };\n};\n\nexport type LearnCloudClient = OverriddenClient;\n\nexport const getClient = async (\n    url: string,\n    didAuthFunction: (challenge?: string) => Promise<string>\n) => {\n    let challenges: string[] = [];\n\n    const challengeRequester = createTRPCProxyClient<AppRouter>({\n        links: [\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: { Authorization: `Bearer ${await didAuthFunction()}` },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    const getChallenges = async (\n        amount = 95 + Math.round((Math.random() - 0.5) * 5)\n    ): Promise<string[]> => {\n        return challengeRequester.utilities.getChallenges.query({ amount });\n    };\n\n    challenges = await getChallenges();\n\n    const trpc = createTRPCProxyClient<AppRouter>({\n        links: [\n            callbackLink(async () => {\n                challenges = await getChallenges();\n            }),\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: async () => {\n                    if (challenges.length === 0) challenges.push(...(await getChallenges()));\n\n                    return { Authorization: `Bearer ${await didAuthFunction(challenges.pop())}` };\n                },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    return trpc;\n};\n\nexport default getClient;\n", "import { TRPCLink } from '@trpc/client';\nimport { observable, Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nexport const callbackLink = (callback: () => Promise<void>): TRPCLink<AppRouter> => {\n    return () => {\n        return ({ next, op }) => {\n            return observable(observer => {\n                let request: Unsubscribable | null = null;\n                let attempts = 0;\n                let isDone = false;\n\n                const attempt = () => {\n                    attempts += 1;\n                    request?.unsubscribe();\n                    request = next(op).subscribe({\n                        error: async error => {\n                            if (attempts > 5 || error.data?.httpStatus !== 401) {\n                                return observer.error(error);\n                            }\n\n                            await callback();\n\n                            attempt();\n                        },\n                        next: result => observer.next(result),\n                        complete: () => {\n                            if (isDone) observer.complete();\n                        },\n                    });\n                };\n\n                attempt();\n\n                return () => {\n                    isDone = true;\n                    request?.unsubscribe();\n                };\n            });\n        };\n    };\n};\n"],
-  "mappings": ";;;;AAAA,SAAS,uBAA8C,qBAAqB;;;ACC5E,SAAS,kBAAkC;AAGpC,IAAM,eAAe,wBAAC,aAAuD;AAChF,SAAO,MAAM;AACT,WAAO,CAAC,EAAE,MAAM,GAAG,MAAM;AACrB,aAAO,WAAW,cAAY;AAC1B,YAAI,UAAiC;AACrC,YAAI,WAAW;AACf,YAAI,SAAS;AAEb,cAAM,UAAU,6BAAM;AAClB,sBAAY;AACZ,mBAAS,YAAY;AACrB,oBAAU,KAAK,EAAE,EAAE,UAAU;AAAA,YACzB,OAAO,OAAM,UAAS;AAClB,kBAAI,WAAW,KAAK,MAAM,MAAM,eAAe,KAAK;AAChD,uBAAO,SAAS,MAAM,KAAK;AAAA,cAC/B;AAEA,oBAAM,SAAS;AAEf,sBAAQ;AAAA,YACZ;AAAA,YACA,MAAM,YAAU,SAAS,KAAK,MAAM;AAAA,YACpC,UAAU,MAAM;AACZ,kBAAI;AAAQ,yBAAS,SAAS;AAAA,YAClC;AAAA,UACJ,CAAC;AAAA,QACL,GAlBgB;AAoBhB,gBAAQ;AAER,eAAO,MAAM;AACT,mBAAS;AACT,mBAAS,YAAY;AAAA,QACzB;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ;AACJ,GArC4B;;;AD8BrB,IAAM,YAAY,8BACrB,KACA,oBACC;AACD,MAAI,aAAuB,CAAC;AAE5B,QAAM,qBAAqB,sBAAiC;AAAA,IACxD,OAAO;AAAA,MACH,cAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,EAAE,eAAe,UAAU,MAAM,gBAAgB,IAAI;AAAA,MAClE,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,QAAM,gBAAgB,8BAClB,SAAS,KAAK,KAAK,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,MAC9B;AACpB,WAAO,mBAAmB,UAAU,cAAc,MAAM,EAAE,OAAO,CAAC;AAAA,EACtE,GAJsB;AAMtB,eAAa,MAAM,cAAc;AAEjC,QAAM,OAAO,sBAAiC;AAAA,IAC1C,OAAO;AAAA,MACH,aAAa,YAAY;AACrB,qBAAa,MAAM,cAAc;AAAA,MACrC,CAAC;AAAA,MACD,cAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,YAAY;AACjB,cAAI,WAAW,WAAW;AAAG,uBAAW,KAAK,GAAI,MAAM,cAAc,CAAE;AAEvE,iBAAO,EAAE,eAAe,UAAU,MAAM,gBAAgB,WAAW,IAAI,CAAC,IAAI;AAAA,QAChF;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,SAAO;AACX,GA1CyB;AA4CzB,IAAO,cAAQ;",
+  "sourcesContent": ["import { createTRPCProxyClient, CreateTRPCProxyClient, httpBatchLink } from '@trpc/client';\nimport type { inferRouterInputs } from '@trpc/server';\nimport type {\n    JWE,\n    PaginatedEncryptedRecordsType,\n    PaginatedEncryptedCredentialRecordsType,\n} from '@learncard/types';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nimport { callbackLink } from './callbackLink';\n\ntype Inputs = inferRouterInputs<AppRouter>;\n\ntype Client = CreateTRPCProxyClient<AppRouter>;\n\ntype OverriddenClient = Omit<Client, 'index' | 'customStorage'> & {\n    index: Client['index'] & {\n        get: {\n            query: (\n                args: Inputs['index']['get']\n            ) => Promise<PaginatedEncryptedCredentialRecordsType | JWE>;\n        };\n    };\n    customStorage: Omit<Client['customStorage'], 'read'> & {\n        read: {\n            query: (\n                args: Inputs['customStorage']['read']\n            ) => Promise<PaginatedEncryptedRecordsType>;\n        };\n    };\n};\n\nexport type LearnCloudClient = OverriddenClient;\n\nexport const getClient = async (\n    url: string,\n    didAuthFunction: (challenge?: string) => Promise<string>\n) => {\n    let challenges: string[] = [];\n\n    const challengeRequester = createTRPCProxyClient<AppRouter>({\n        links: [\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: { Authorization: `Bearer ${await didAuthFunction()}` },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    const getChallenges = async (\n        amount = 95 + Math.round((Math.random() - 0.5) * 5)\n    ): Promise<string[]> => {\n        return challengeRequester.utilities.getChallenges.query({ amount });\n    };\n\n    getChallenges().then(result => (challenges = result));\n\n    const trpc = createTRPCProxyClient<AppRouter>({\n        links: [\n            callbackLink(async () => {\n                challenges = await getChallenges();\n            }),\n            httpBatchLink({\n                url,\n                maxURLLength: 3072,\n                headers: async () => {\n                    if (challenges.length === 0) challenges.push(...(await getChallenges()));\n\n                    return { Authorization: `Bearer ${await didAuthFunction(challenges.pop())}` };\n                },\n            }),\n        ],\n    }) as OverriddenClient;\n\n    return trpc;\n};\n\nexport default getClient;\n", "import { TRPCLink } from '@trpc/client';\nimport { observable, Unsubscribable } from '@trpc/server/observable';\nimport type { AppRouter } from '@learncard/learn-cloud-service';\n\nexport const callbackLink = (callback: () => Promise<void>): TRPCLink<AppRouter> => {\n    return () => {\n        return ({ next, op }) => {\n            return observable(observer => {\n                let request: Unsubscribable | null = null;\n                let attempts = 0;\n                let isDone = false;\n\n                const attempt = () => {\n                    attempts += 1;\n                    request?.unsubscribe();\n                    request = next(op).subscribe({\n                        error: async error => {\n                            if (attempts > 5 || error.data?.httpStatus !== 401) {\n                                return observer.error(error);\n                            }\n\n                            await callback();\n\n                            attempt();\n                        },\n                        next: result => observer.next(result),\n                        complete: () => {\n                            if (isDone) observer.complete();\n                        },\n                    });\n                };\n\n                attempt();\n\n                return () => {\n                    isDone = true;\n                    request?.unsubscribe();\n                };\n            });\n        };\n    };\n};\n"],
+  "mappings": ";;;;AAAA,SAAS,uBAA8C,qBAAqB;;;ACC5E,SAAS,kBAAkC;AAGpC,IAAM,eAAe,wBAAC,aAAuD;AAChF,SAAO,MAAM;AACT,WAAO,CAAC,EAAE,MAAM,GAAG,MAAM;AACrB,aAAO,WAAW,cAAY;AAC1B,YAAI,UAAiC;AACrC,YAAI,WAAW;AACf,YAAI,SAAS;AAEb,cAAM,UAAU,6BAAM;AAClB,sBAAY;AACZ,mBAAS,YAAY;AACrB,oBAAU,KAAK,EAAE,EAAE,UAAU;AAAA,YACzB,OAAO,OAAM,UAAS;AAClB,kBAAI,WAAW,KAAK,MAAM,MAAM,eAAe,KAAK;AAChD,uBAAO,SAAS,MAAM,KAAK;AAAA,cAC/B;AAEA,oBAAM,SAAS;AAEf,sBAAQ;AAAA,YACZ;AAAA,YACA,MAAM,YAAU,SAAS,KAAK,MAAM;AAAA,YACpC,UAAU,MAAM;AACZ,kBAAI;AAAQ,yBAAS,SAAS;AAAA,YAClC;AAAA,UACJ,CAAC;AAAA,QACL,GAlBgB;AAoBhB,gBAAQ;AAER,eAAO,MAAM;AACT,mBAAS;AACT,mBAAS,YAAY;AAAA,QACzB;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ;AACJ,GArC4B;;;AD8BrB,IAAM,YAAY,8BACrB,KACA,oBACC;AACD,MAAI,aAAuB,CAAC;AAE5B,QAAM,qBAAqB,sBAAiC;AAAA,IACxD,OAAO;AAAA,MACH,cAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,EAAE,eAAe,UAAU,MAAM,gBAAgB,IAAI;AAAA,MAClE,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,QAAM,gBAAgB,8BAClB,SAAS,KAAK,KAAK,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,MAC9B;AACpB,WAAO,mBAAmB,UAAU,cAAc,MAAM,EAAE,OAAO,CAAC;AAAA,EACtE,GAJsB;AAMtB,gBAAc,EAAE,KAAK,YAAW,aAAa,MAAO;AAEpD,QAAM,OAAO,sBAAiC;AAAA,IAC1C,OAAO;AAAA,MACH,aAAa,YAAY;AACrB,qBAAa,MAAM,cAAc;AAAA,MACrC,CAAC;AAAA,MACD,cAAc;AAAA,QACV;AAAA,QACA,cAAc;AAAA,QACd,SAAS,YAAY;AACjB,cAAI,WAAW,WAAW;AAAG,uBAAW,KAAK,GAAI,MAAM,cAAc,CAAE;AAEvE,iBAAO,EAAE,eAAe,UAAU,MAAM,gBAAgB,WAAW,IAAI,CAAC,IAAI;AAAA,QAChF;AAAA,MACJ,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AAED,SAAO;AACX,GA1CyB;AA4CzB,IAAO,cAAQ;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@learncard/learn-cloud-client",
-  "version": "1.2.18",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/index.js",
   "module": "./dist/learn-cloud-client.esm.js",

package/src/index.ts

@@ -54,7 +54,7 @@ export const getClient = async (
         return challengeRequester.utilities.getChallenges.query({ amount });
     };
 
-    challenges = await getChallenges();
+    getChallenges().then(result => (challenges = result));
 
     const trpc = createTRPCProxyClient<AppRouter>({
         links: [