@studyportals/domain-client 6.0.0-10 → 6.0.0-11

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/domain-client",
-	"version": "6.0.0-10",
+	"version": "6.0.0-11",
 	"description": "Responsible for fetching data from the Domain API",
 	"main": "index.js",
 	"author": "StudyPortals B.V.",

package/src/domain-client.d.ts

@@ -7,7 +7,7 @@ export declare class DomainClient<T> {
     readonly seed: number;
     constructor(baseUrl: string, apiKey: string | undefined, model: string, version: string, isPublic: boolean, seed: number);
     doRequest(ids: number[]): Promise<T[]>;
-    private decompressData;
+    private decompressModelData;
     private handleErrors;
     private buildUrl;
     private shouldAddPublicPrefix;

package/src/domain-client.js

@@ -31,21 +31,20 @@ export class DomainClient {
             }
             const models = [];
             for (const id of ids) {
-                let modelData = data.data[id];
+                const modelData = data.data[id];
+                if (!modelData) {
+                    continue;
+                }
                 if (typeof modelData === 'string') {
                     try {
-                        const bytes = Uint8Array.from(Buffer.from(modelData, 'base64'));
-                        const decompressedBytes = await this.decompressData(bytes);
-                        modelData = JSON.parse(decoder.decode(decompressedBytes));
+                        models.push(await this.decompressModelData(modelData));
+                        continue;
                     }
                     catch (error) {
                         console.error(error);
                         continue;
                     }
                 }
-                if (!modelData) {
-                    continue;
-                }
                 models.push(modelData);
             }
             return models;
@@ -58,11 +57,13 @@ export class DomainClient {
             throw new InternalServerException('Unable to fetch data from the API', error);
         }
     }
-    async decompressData(compressedData) {
+    async decompressModelData(compressedData) {
+        const bytes = Uint8Array.from(Buffer.from(compressedData, 'base64'));
         const stream = new DecompressionStream('deflate');
-        const response = new Response(compressedData);
-        const decompressed = response.body?.pipeThrough(stream);
-        return new Uint8Array(await new Response(decompressed).arrayBuffer());
+        const response = new Response(bytes);
+        const decompressedStream = response.body?.pipeThrough(stream);
+        const decompressedBytes = new Uint8Array(await new Response(decompressedStream).arrayBuffer());
+        return JSON.parse(decoder.decode(decompressedBytes));
     }
     handleErrors(response) {
         if (!response.status) {