@prisme.ai/sdk 1.0.1 → 1.0.2

package/lib/fetcher.ts

@@ -1,5 +1,7 @@
+import FormData from 'form-data';
 import ApiError from './ApiError';
 import HTTPError from './HTTPError';
+import { wait } from './utils';
 
 const headersAsObject = (headers: Headers) =>
   Array.from(headers).reduce(
@@ -14,6 +16,12 @@ export type Fetched<T> = T & {
   headers?: Record<string, any>;
 };
 
+function isFormData(data: any): data is FormData {
+  return !!(data.append && typeof data.append === 'function');
+}
+
+const CSRF_TOKEN_HEADER = 'x-prismeai-csrf-token';
+
 export class Fetcher {
   public host: string;
   public token: string | null = null;
@@ -21,6 +29,7 @@ export class Fetcher {
   public overwriteClientId?: string;
   private clientIdHeader?: string;
   protected _apiKey: string | null = null;
+  protected _csrfToken: string | null = null;
   public language: string | undefined;
   public lastReceivedHeaders?: Record<string, any>;
 
@@ -46,6 +55,10 @@ export class Fetcher {
       headers.append('x-prismeai-api-key', this._apiKey);
     }
 
+    if (this._csrfToken && options.method && options.method !== 'GET') {
+      headers.append(CSRF_TOKEN_HEADER, this._csrfToken);
+    }
+
     if (this.language) {
       headers.append('accept-language', this.language);
     }
@@ -66,7 +79,7 @@ export class Fetcher {
         ? url
         : `${this.host}${url}`;
     return global.fetch(fullUrl, {
-      credentials: 'include',
+      credentials: headers.has('Authorization') ? 'omit' : 'include',
       ...options,
       headers,
     });
@@ -74,9 +87,19 @@ export class Fetcher {
 
   protected async _fetch<T>(
     url: string,
-    options: RequestInit = {}
+    options: RequestInit = {},
+    maxRetries: number = 3
   ): Promise<T> {
-    const res = await this.prepareRequest(url, options);
+    let res: Response;
+    try {
+      res = await this.prepareRequest(url, options);
+    } catch (e: any) {
+      if (maxRetries > 0 && e.message === 'Load failed') {
+        await wait(20);
+        return this._fetch(url, options, --maxRetries);
+      }
+      throw e;
+    }
     if (options.redirect === 'manual' && res.status === 0) {
       return { redirected: true } as T;
     }
@@ -85,7 +108,21 @@ export class Fetcher {
     if (this.clientIdHeader && this.lastReceivedHeaders[this.clientIdHeader]) {
       this.overwriteClientId = this.lastReceivedHeaders[this.clientIdHeader];
     }
+    if (this.lastReceivedHeaders[CSRF_TOKEN_HEADER]) {
+      this._csrfToken = this.lastReceivedHeaders[CSRF_TOKEN_HEADER];
+    }
     if (!res.ok) {
+      if (
+        res.statusText?.length &&
+        res.statusText.includes('ECONNRESET') &&
+        maxRetries > 0
+      ) {
+        console.log(
+          `Retrying request towards ${url} as we received ECONNRESET error : ${res.statusText}`
+        );
+        await wait(20);
+        return this._fetch(url, options, --maxRetries);
+      }
       let error;
       try {
         error = new ApiError(await res.json(), res.status);
@@ -130,11 +167,9 @@ export class Fetcher {
     return this._fetch<T>(url, {
       method: 'POST',
       body:
-        body &&
-        !(body instanceof FormData) &&
-        !(body instanceof URLSearchParams)
+        body && !isFormData(body) && !(body instanceof URLSearchParams)
           ? JSON.stringify(body)
-          : body,
+          : (body as BodyInit),
       ...opts,
     });
   }

package/lib/utils.ts

@@ -10,3 +10,42 @@ export const removedUndefinedProperties = (
     }
     return newObject;
   }, {});
+
+export function dataURItoBlob(dataURI: string): [Blob, string] {
+  // convert base64/URLEncoded data component to raw binary data held in a string
+  let byteString;
+  if (dataURI.split(',')[0].indexOf('base64') >= 0)
+    byteString = atob(dataURI.split(',')[1].split(';')[0]);
+  else byteString = unescape(dataURI.split(',')[1]);
+  // separate out the mime component
+  const metadata = dataURI
+    .split(';')
+    .map((v) => v.split(/:/))
+    .filter((pair) => pair.length === 2);
+  const [, mimeString = ''] = metadata.find(([k, v]) => k === 'data') || [];
+  const [, ext] = mimeString.split(/\//);
+  const [, fileName = `file.${ext}`] =
+    metadata.find(([k, v]) => k === 'filename') || [];
+
+  const sanitizedFileName = encodeURIComponent(
+    decodeURIComponent(fileName).replace(/[;,\s]/g, '-')
+  );
+
+  // write the bytes of the string to a typed array
+  let ia = new Uint8Array(byteString.length);
+  for (var i = 0; i < byteString.length; i++) {
+    ia[i] = byteString.charCodeAt(i);
+  }
+
+  return [new Blob([ia], { type: mimeString }), sanitizedFileName];
+}
+
+export function isDataURL(file: any): file is string {
+  return !!(typeof file === 'string' && file.match(/^data\:/));
+}
+
+export async function wait(delay: number = 0) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, delay);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisme.ai/sdk",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Communicate with Prisme.ai API",
   "main": "dist/sdk/index.js",
   "scripts": {
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@prisme.ai/types": "^1.0.9",
+    "form-data": "^4.0.0",
     "pkce-challenge": "^3.1.0",
     "qs": "^6.10.3",
     "socket.io-client": "^4.4.1"