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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/domain-client",
-	"version": "6.0.0-10",
+	"version": "6.0.0-12",
 	"description": "Responsible for fetching data from the Domain API",
 	"main": "index.js",
 	"author": "StudyPortals B.V.",
@@ -21,7 +21,7 @@
 		"publish-major": "npm version major && npm run prepare-dist && npm publish ./bin",
 		"publish-minor": "npm version minor && npm run prepare-dist && npm publish ./bin",
 		"publish-patch": "npm version patch && npm run prepare-dist && npm publish ./bin",
-		"publish-current": "npm run prepare-dist && npm publish ./bin --tag beta"
+		"publish-current": "npm run prepare-dist && npm publish ./bin --tag=beta"
 	},
 	"husky": {
 		"hooks": {
@@ -33,7 +33,6 @@
 		"typescript": "^5.9.2"
 	},
 	"devDependencies": {
-		"@bufbuild/protobuf": "^2.6.2",
 		"@studyportals/code-style": "^2.0.4",
 		"@testdeck/mocha": "^0.3.3",
 		"@types/axios": "^0.14.0",

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

@@ -25,27 +25,27 @@ export class DomainClient {
         }
         try {
             const response = await fetch(url, { headers });
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const data = await response.json();
             if (!response.ok || data.status !== 200) {
                 this.handleErrors(data);
             }
             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 +58,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(atob(compressedData), c => c.charCodeAt(0));
         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) {

package/src/factories/InternalLinkFactory.js

@@ -3,6 +3,7 @@ export class InternalLinkFactory {
     constructor(portalMap) {
         this.portalMap = portalMap;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     create(link, parameters) {
         const getPortalType = link['getPortalType'];
         const portalType = getPortalType ? getPortalType() : null;

package/test.js

@@ -1,5 +1,7 @@
-import { PublicMiniProgrammeCardClient } from "./";
+import { PublicMiniProgrammeCardClient, PublicScholarshipCardClient } from "./";
 const client = new PublicMiniProgrammeCardClient('https://681.domain-api.tst.prtl.co', 1, undefined, new Map());
+const client2 = new PublicScholarshipCardClient('https://681.domain-api.tst.prtl.co', undefined, 1, new Map());
 (async () => {
     console.log(await client.fetch(70942));
+    console.log(await client2.fetch(2842));
 })();