@swan-admin/swan-ai-measurements 1.1.45 → 1.1.47

package/dist/auth.js

@@ -6,15 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const constants_js_1 = require("./constants.js");
 const utils_js_1 = require("./utils.js");
-const ws_1 = __importDefault(require("ws"));
-// Conditionally import ws for Node.js
-let WebSocketClient;
-if (typeof window !== "undefined" && window.WebSocket) {
-    WebSocketClient = window.WebSocket;
-}
-else {
-    WebSocketClient = ws_1.default;
-}
 class Auth {
     #socketRef;
     #accessKey;
@@ -64,7 +55,7 @@ class Auth {
         }
         if (this.#socketRef)
             this.#socketRef.close();
-        this.#socketRef = new WebSocketClient(`${(0, utils_js_1.getUrl)({ urlName: constants_js_1.APP_BASE_WEBSOCKET_URL, stagingUrl: this.#stagingUrl })}${constants_js_1.API_ENDPOINTS.AUTH}`);
+        this.#socketRef = new WebSocket(`${(0, utils_js_1.getUrl)({ urlName: constants_js_1.APP_BASE_WEBSOCKET_URL, stagingUrl: this.#stagingUrl })}${constants_js_1.API_ENDPOINTS.AUTH}`);
         const detailObj = { email, scanId };
         if (this.#socketRef) {
             this.#socketRef.onopen = () => {

package/dist/esm/auth.js

@@ -13,15 +13,6 @@ var _Auth_socketRef, _Auth_accessKey, _Auth_stagingUrl;
 import axios from "axios";
 import { API_ENDPOINTS, APP_AUTH_BASE_URL, APP_BASE_WEBSOCKET_URL, REQUIRED_MESSAGE } from "./constants.js";
 import { checkParameters, getUrl } from "./utils.js";
-import WS from "ws";
-// Conditionally import ws for Node.js
-let WebSocketClient;
-if (typeof window !== "undefined" && window.WebSocket) {
-    WebSocketClient = window.WebSocket;
-}
-else {
-    WebSocketClient = WS;
-}
 class Auth {
     constructor(accessKey, stagingUrl = false) {
         _Auth_socketRef.set(this, void 0);
@@ -71,7 +62,7 @@ class Auth {
         }
         if (__classPrivateFieldGet(this, _Auth_socketRef, "f"))
             __classPrivateFieldGet(this, _Auth_socketRef, "f").close();
-        __classPrivateFieldSet(this, _Auth_socketRef, new WebSocketClient(`${getUrl({ urlName: APP_BASE_WEBSOCKET_URL, stagingUrl: __classPrivateFieldGet(this, _Auth_stagingUrl, "f") })}${API_ENDPOINTS.AUTH}`), "f");
+        __classPrivateFieldSet(this, _Auth_socketRef, new WebSocket(`${getUrl({ urlName: APP_BASE_WEBSOCKET_URL, stagingUrl: __classPrivateFieldGet(this, _Auth_stagingUrl, "f") })}${API_ENDPOINTS.AUTH}`), "f");
         const detailObj = { email, scanId };
         if (__classPrivateFieldGet(this, _Auth_socketRef, "f")) {
             __classPrivateFieldGet(this, _Auth_socketRef, "f").onopen = () => {

package/dist/esm/measurement.js

@@ -22,14 +22,6 @@ var _Measurement_instances, _Measurement_tryOnSocketRef, _Measurement_measuremen
 import axios from "axios";
 import { API_ENDPOINTS, APP_AUTH_BASE_URL, APP_BASE_WEBSOCKET_URL, REQUIRED_MESSAGE } from "./constants.js";
 import { checkParameters, getUrl } from "./utils.js";
-import WS from "ws";
-let WebSocketClient;
-if (typeof window !== 'undefined' && window.WebSocket) {
-    WebSocketClient = window.WebSocket;
-}
-else {
-    WebSocketClient = WS;
-}
 class Measurement {
     constructor(accessKey, stagingUrl = false) {
         _Measurement_instances.add(this);
@@ -76,7 +68,7 @@ class Measurement {
             urlName: APP_BASE_WEBSOCKET_URL,
             stagingUrl: __classPrivateFieldGet(this, _Measurement_stagingUrl, "f"),
         })}/develop?store_url=${shopDomain}&product_name=${productName}&scan_id=${scanId}`;
-        __classPrivateFieldSet(this, _Measurement_tryOnSocketRef, new WebSocketClient(url), "f");
+        __classPrivateFieldSet(this, _Measurement_tryOnSocketRef, new WebSocket(url), "f");
         if (__classPrivateFieldGet(this, _Measurement_tryOnSocketRef, "f")) {
             __classPrivateFieldGet(this, _Measurement_tryOnSocketRef, "f").onopen = () => {
                 onOpen === null || onOpen === void 0 ? void 0 : onOpen();

package/dist/esm/tryOn.js

@@ -22,14 +22,6 @@ var _TryOn_instances, _TryOn_tryOnSocketRef, _TryOn_timerWaitingRef, _TryOn_acce
 import axios from "axios";
 import { API_ENDPOINTS, APP_AUTH_BASE_URL, APP_BASE_WEBSOCKET_URL, REQUIRED_ERROR_MESSAGE_INVALID_EMAIL, REQUIRED_MESSAGE } from "./constants.js";
 import { checkParameters, getUrl, isValidEmail } from "./utils.js";
-import WS from "ws";
-let WebSocketClient;
-if (typeof window !== 'undefined' && window.WebSocket) {
-    WebSocketClient = window.WebSocket;
-}
-else {
-    WebSocketClient = WS;
-}
 class TryOn {
     constructor(accessKey, stagingUrl = false) {
         _TryOn_instances.add(this);
@@ -59,7 +51,7 @@ class TryOn {
             }
             __classPrivateFieldGet(this, _TryOn_disconnectSocket, "f").call(this);
             const url = `${getUrl({ urlName: APP_BASE_WEBSOCKET_URL, stagingUrl: __classPrivateFieldGet(this, _TryOn_stagingUrl, "f") })}${API_ENDPOINTS.TRY_ON}?tryonId=${tryonId}`;
-            __classPrivateFieldSet(this, _TryOn_tryOnSocketRef, new WebSocketClient(url), "f");
+            __classPrivateFieldSet(this, _TryOn_tryOnSocketRef, new WebSocket(url), "f");
             if (__classPrivateFieldGet(this, _TryOn_tryOnSocketRef, "f")) {
                 __classPrivateFieldGet(this, _TryOn_tryOnSocketRef, "f").onopen = () => __awaiter(this, void 0, void 0, function* () {
                     onOpen === null || onOpen === void 0 ? void 0 : onOpen();

package/dist/measurement.js

@@ -6,14 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const constants_js_1 = require("./constants.js");
 const utils_js_1 = require("./utils.js");
-const ws_1 = __importDefault(require("ws"));
-let WebSocketClient;
-if (typeof window !== 'undefined' && window.WebSocket) {
-    WebSocketClient = window.WebSocket;
-}
-else {
-    WebSocketClient = ws_1.default;
-}
 class Measurement {
     #tryOnSocketRef = null;
     #measurementSocketRef = null;
@@ -58,7 +50,7 @@ class Measurement {
             urlName: constants_js_1.APP_BASE_WEBSOCKET_URL,
             stagingUrl: this.#stagingUrl,
         })}/develop?store_url=${shopDomain}&product_name=${productName}&scan_id=${scanId}`;
-        this.#tryOnSocketRef = new WebSocketClient(url);
+        this.#tryOnSocketRef = new WebSocket(url);
         if (this.#tryOnSocketRef) {
             this.#tryOnSocketRef.onopen = () => {
                 onOpen?.();

package/dist/tryOn.js

@@ -6,14 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const constants_js_1 = require("./constants.js");
 const utils_js_1 = require("./utils.js");
-const ws_1 = __importDefault(require("ws"));
-let WebSocketClient;
-if (typeof window !== 'undefined' && window.WebSocket) {
-    WebSocketClient = window.WebSocket;
-}
-else {
-    WebSocketClient = ws_1.default;
-}
 class TryOn {
     #tryOnSocketRef = null;
     #timerWaitingRef = null;
@@ -126,7 +118,7 @@ class TryOn {
         }
         this.#disconnectSocket();
         const url = `${(0, utils_js_1.getUrl)({ urlName: constants_js_1.APP_BASE_WEBSOCKET_URL, stagingUrl: this.#stagingUrl })}${constants_js_1.API_ENDPOINTS.TRY_ON}?tryonId=${tryonId}`;
-        this.#tryOnSocketRef = new WebSocketClient(url);
+        this.#tryOnSocketRef = new WebSocket(url);
         if (this.#tryOnSocketRef) {
             this.#tryOnSocketRef.onopen = async () => {
                 onOpen?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swan-admin/swan-ai-measurements",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "description": "provides ai measurement suggestion",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",

package/src/constants.ts

@@ -65,3 +65,4 @@ export const requiredMetaData: RequiredMetaDataKeys[] = ["gender", "focal_length
 export const REQUIRED_MESSAGE: string = "Please verify required parameters";
 export const REQUIRED_MESSAGE_FOR_META_DATA: string = "Please verify required parameters in meta data";
 export const REQUIRED_ERROR_MESSAGE_INVALID_EMAIL = "Invalid Email";
+export const CHUNK_SIZE = 5 * 1024 * 1024;

package/src/fileUpload.ts

@@ -1,12 +1,5 @@
 import axios from "axios";
-import {
-	REQUIRED_MESSAGE,
-	REQUIRED_MESSAGE_FOR_META_DATA,
-	FILE_UPLOAD_ENDPOINT,
-	APP_AUTH_BASE_URL,
-	REQUIRED_ERROR_MESSAGE_INVALID_EMAIL,
-	API_ENDPOINTS,
-} from "./constants.js";
+import { REQUIRED_MESSAGE, REQUIRED_MESSAGE_FOR_META_DATA, FILE_UPLOAD_ENDPOINT, APP_AUTH_BASE_URL, REQUIRED_ERROR_MESSAGE_INVALID_EMAIL, API_ENDPOINTS, CHUNK_SIZE } from "./constants.js";
 import { addScanType, checkMetaDataValue, checkParameters, fetchData, getFileChunks, getUrl, isValidEmail } from "./utils.js";
 import Uppy from "@uppy/core";
 import AwsS3Multipart from "@uppy/aws-s3-multipart";
@@ -26,7 +19,7 @@ interface SetDeviceInfo {
 	detection?: string;
 	model?: string;
 	gyro: { alpha?: string; gamma?: string; beta?: string; timestamp?: string }[];
-	scanId:string
+	scanId: string;
 }
 
 interface UploadOptions {
@@ -34,6 +27,7 @@ interface UploadOptions {
 	arrayMetaData: Partial<ObjMetaData>[];
 	scanId: string;
 	email: string;
+	callBack?: (a: { eventName: string; message: string }) => void;
 }
 
 export default class FileUpload {
@@ -46,7 +40,7 @@ export default class FileUpload {
 		this.#stagingUrl = stagingUrl;
 	}
 
-	async uploadFileFrontend({ file, arrayMetaData, scanId, email }: UploadOptions) {
+	async uploadFileFrontend({ file, arrayMetaData, scanId, email, callBack }: UploadOptions) {
 		if (!checkParameters(file, arrayMetaData, scanId, email)) {
 			throw new Error(REQUIRED_MESSAGE);
 		}
@@ -66,8 +60,10 @@ export default class FileUpload {
 				limit: 10,
 				retryDelays: [0, 1000, 3000, 5000],
 				companionUrl: getUrl({ urlName: APP_AUTH_BASE_URL, stagingUrl: this.#stagingUrl }),
-				getChunkSize: () => 5 * 1024 * 1024,
+				getChunkSize: () => CHUNK_SIZE,
 				createMultipartUpload: (file: any) => {
+					const totalChunks = Math.ceil(file.size / CHUNK_SIZE);
+					callBack?.({eventName:"uploading_start",message:`File ${file.name} will be divided into ${totalChunks} chunks`})
 					const objectKey = `${scanId}.${file.extension}`;
 					return fetchData({
 						path: FILE_UPLOAD_ENDPOINT.UPLOAD_START,
@@ -80,8 +76,9 @@ export default class FileUpload {
 						},
 					});
 				},
-				completeMultipartUpload: (file: any, { uploadId, key, parts }: { uploadId: string | number; key: string | number; parts: any }) =>
-					fetchData({
+				completeMultipartUpload: (file: any, { uploadId, key, parts }: { uploadId: string | number; key: string | number; parts: any }) => {
+				   callBack?.({eventName:"uploading_complete_start",message:`${parts.length} chunks of file, uploaded`})	
+					return fetchData({
 						path: FILE_UPLOAD_ENDPOINT.UPLOAD_COMPLETE,
 						apiKey: this.#accessKey,
 						stagingUrl: this.#stagingUrl,
@@ -91,7 +88,11 @@ export default class FileUpload {
 							parts,
 							originalFileName: file.name,
 						},
-					}),
+					}).then((response) => {
+						callBack?.({eventName:"uploading_complete_end",message:`Multipart upload completed successfully`})
+						return response;  
+					});
+				},
 
 				signPart: (file: any, partData: any) =>
 					fetchData({
@@ -114,7 +115,11 @@ export default class FileUpload {
 			});
 
 			this.#uppyIns.on("upload-error", (file: any, error: any, response: any) => {
-				reject(error);
+				if (error.isNetworkError) {
+					this.#uppyIns.retryUpload(file.id);
+				  }else{
+					  reject(error);
+				  }
 			});
 			this.#uppyIns.on("upload-success", () => {
 				resolve({ message: "file uploaded successfully" });
@@ -185,13 +190,17 @@ export default class FileUpload {
 			}
 		});
 	}
-	async setDeviceInfo(data:SetDeviceInfo) {
-		const {scanId,...rest} = data;
+	async setDeviceInfo(data: SetDeviceInfo) {
+		const { scanId, ...rest } = data;
 		if (checkParameters(scanId) === false) {
 			throw new Error(REQUIRED_MESSAGE);
-		  }
-		return axios.post(`${getUrl({ urlName: APP_AUTH_BASE_URL, stagingUrl: this.#stagingUrl })}${API_ENDPOINTS.DEVICE_INFO}/${scanId}`,{device_info:{...rest}} , {
-			headers: { "X-Api-Key": this.#accessKey },
-		  });
+		}
+		return axios.post(
+			`${getUrl({ urlName: APP_AUTH_BASE_URL, stagingUrl: this.#stagingUrl })}${API_ENDPOINTS.DEVICE_INFO}/${scanId}`,
+			{ device_info: { ...rest } },
+			{
+				headers: { "X-Api-Key": this.#accessKey },
+			},
+		);
 	}
 }

package/src/measurement.ts

@@ -3,15 +3,7 @@ import { API_ENDPOINTS, APP_AUTH_BASE_URL, APP_BASE_WEBSOCKET_URL, REQUIRED_MESS
 import { checkParameters, getUrl } from "./utils.js";
 
 
-interface TryOnSocketOptions {
-  shopDomain: string;
-  scanId: string;
-  productName: string;
-  onError?: (error: any) => void;
-  onSuccess?: (data: any) => void;
-  onClose?: () => void;
-  onOpen?: () => void;
-}
+
 
 interface MeasurementRecommendation {
   shopDomain: string;
@@ -45,7 +37,6 @@ interface HandleTimeOutOptions {
 }
 
 class Measurement {
-  #tryOnSocketRef: WebSocket | null = null;
   #measurementSocketRef: WebSocket | null = null;
   #timerPollingRef: NodeJS.Timeout | null = null;
   #timerWaitingRef: NodeJS.Timeout | null = null;
@@ -80,61 +71,7 @@ class Measurement {
     );
   }
 
-  getTryOnMeasurements({ scanId, shopDomain, productName }: TryOnSocketOptions): Promise<AxiosResponse<any>> {
-    if (!checkParameters(scanId, shopDomain, productName)) {
-      throw new Error(REQUIRED_MESSAGE);
-    }
-    const tryOnUrl = `${getUrl({ urlName: APP_AUTH_BASE_URL, stagingUrl: this.#stagingUrl })}${
-      API_ENDPOINTS.TRY_ON_SCAN
-    }/${scanId}/shop/${shopDomain}/product/${productName}`;
-    return axios.get(tryOnUrl, { headers: { "X-Api-Key": this.#accessKey } });
-  }
-
-  handleTryOnSocket(options: TryOnSocketOptions): void {
-    const { shopDomain, scanId, productName, onError, onSuccess, onClose, onOpen } = options;
-
-    if (!checkParameters(shopDomain, scanId, productName)) {
-      throw new Error(REQUIRED_MESSAGE);
-    }
-
-    this.#tryOnSocketRef?.close();
-    const url = `${getUrl({
-      urlName: APP_BASE_WEBSOCKET_URL,
-      stagingUrl: this.#stagingUrl,
-    })}/develop?store_url=${shopDomain}&product_name=${productName}&scan_id=${scanId}`;
-    this.#tryOnSocketRef = new WebSocket(url);
-    if (this.#tryOnSocketRef) {
-      this.#tryOnSocketRef.onopen = () => {
-        onOpen?.();
-      };
-  
-      this.#tryOnSocketRef.onmessage = (event) => {
-        let data;
-				try {
-					data = JSON.parse(event.data);
-				} catch (error) {
-					console.log(data, error, "noy correct format for data");
-
-					return;
-				}
-        if (data?.tryOnProcessStatus === "available") {
-          onSuccess?.(data);
-        } else {
-          onError?.({ message: "failed to get image urls" });
-        }
-      };
   
-      this.#tryOnSocketRef.onclose = () => {
-        onClose?.();
-      };
-  
-      this.#tryOnSocketRef.onerror = (event) => {
-        onError?.(event);
-      };
-    }
-   
-  }
-
   async #getMeasurementsCheck(options: GetMeasurementsCheckOptions): Promise<void> {
     const { scanId, onSuccess, onError } = options;