@swan-admin/swan-ai-measurements 1.0.39 → 1.0.41

package/auth.js

@@ -9,13 +9,10 @@ import {
 import { checkParameters } from "./utils.js";
 
 class Auth {
-  #accessKey;
   #socketRef;
-  constructor(key) {
-    this.#accessKey = key;
-  }
-  registerUser({ email, appVerifyUrl, gender, height, username }) {
-    if (checkParameters(email, appVerifyUrl) === false) {
+
+  registerUser({ email, appVerifyUrl, gender, height, username, accessKey }) {
+    if (checkParameters(email, appVerifyUrl, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     let body = {
@@ -26,40 +23,49 @@ class Auth {
     if (gender && height) {
       body = { ...body, attributes: { gender, height } };
     }
-    return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.REGISTER_USER}`, body);
+    return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.REGISTER_USER}`, body, {
+      headers: { "X-Api-Key": accessKey },
+    });
   }
 
-  verifyToken = (token) => {
-    if (!token) {
+  verifyToken = (token, accessKey) => {
+    if (checkParameters(token, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.VERIFY_USER}`, null, {
       params: { token },
+      headers: { "X-Api-Key": accessKey },
     });
   };
 
-  addUser = ({ scanId, email, name, height, gender, offsetMarketingConsent }) => {
-    if (checkParameters(scanId, email, height, gender) === false) {
+  addUser = ({ scanId, email, name, height, gender, offsetMarketingConsent, accessKey }) => {
+    if (checkParameters(scanId, email, height, gender, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
-    return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.ADD_USER}`, {
-      scan_id: scanId,
-      email,
-      name,
-      offsetMarketingConsent,
-      attributes: JSON.stringify({ height, gender }),
-    });
+    return axios.post(
+      `${APP_AUTH_BASE_URL}${API_ENDPOINTS.ADD_USER}`,
+      {
+        scan_id: scanId,
+        email,
+        name,
+        offsetMarketingConsent,
+        attributes: JSON.stringify({ height, gender }),
+      },
+      { headers: { "X-Api-Key": accessKey } }
+    );
   };
 
-  getUserDetail = (email) => {
-    if (!email) {
+  getUserDetail = (email, accessKey) => {
+    if (checkParameters(email, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
-    return axios.get(`${APP_BASE_URL}${API_ENDPOINTS.GET_USER_DETAIL}/${email}`);
+    return axios.get(`${APP_BASE_URL}${API_ENDPOINTS.GET_USER_DETAIL}/${email}`, {
+      headers: { "X-Api-Key": accessKey },
+    });
   };
 
-  handleAuthSocket = ({ email, scanId, onError, onSuccess, onClose, onOpen }) => {
-    if (checkParameters(email, scanId) === false) {
+  handleAuthSocket = ({ email, scanId, onError, onSuccess, onClose, onOpen, accessKey }) => {
+    if (checkParameters(email, scanId, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     this.#socketRef?.close?.();

package/constants.js

@@ -1,4 +1,3 @@
-export const FILE_UPLOAD_KEY = "7a8ccc86249849be911b0d7dbc20290e";
 export const APP_BASE_URL = "https://fitview-server-staging.ft2a64raup4pg.us-east-1.cs.amazonlightsail.com";
 export const APP_AUTH_BASE_URL = "https://staging.api.getswan.co";
 export const APP_AUTH_WEBSOCKET_URL = "wss://staging.wsnotify.api.getswan.co";

package/custom.js

@@ -1,22 +1,22 @@
 import axios from "axios";
 import { API_ENDPOINTS, APP_AUTH_BASE_URL, REQUIRED_MESSAGE } from "./constants.js";
+import { checkParameters } from "./utils.js";
 
 export default class Custom {
-  #accessKey;
-  constructor(key) {
-    this.#accessKey = key;
-  }
-  getCustomCustomerConfig = (store_url) => {
-    if (!store_url) {
+  getCustomCustomerConfig = (store_url, accessKey) => {
+    if (checkParameters(store_url, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
-    return axios.get(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.CUSTOM_CUSTOMER}`, { params: { store_url } });
+    return axios.get(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.CUSTOM_CUSTOMER}`, {
+      params: { store_url },
+      headers: { "X-Api-Key": accessKey },
+    });
   };
 
-  getModelUrl = (id) => {
-    if (!id) {
+  getModelUrl = (id, accessKey) => {
+    if (checkParameters(id, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
-    return axios.get(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.MODEL}/${id}`);
+    return axios.get(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.MODEL}/${id}`, { headers: { "X-Api-Key": accessKey } });
   };
 }

package/fileUpload.js

@@ -1,16 +1,13 @@
 import AwsS3Multipart from "@uppy/aws-s3-multipart";
 import Uppy from "@uppy/core";
-import { FILE_UPLOAD_KEY, REQUIRED_MESSAGE, UPPY_FILE_UPLOAD_ENDPOINT } from "./constants.js";
+import { REQUIRED_MESSAGE, UPPY_FILE_UPLOAD_ENDPOINT } from "./constants.js";
 import { checkParameters, fetchData } from "./utils.js";
 
 export default class FileUpload {
-  #accessKey;
   #uppyIns;
-  constructor(key) {
-    this.#accessKey = key;
-  }
-  uploadFile({ file, objMetaData, scanId }) {
-    if (checkParameters(file, objMetaData, scanId) === false) {
+
+  uploadFile({ file, objMetaData, scanId, accessKey }) {
+    if (checkParameters(file, objMetaData, scanId, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     return new Promise((resolve, reject) => {
@@ -26,7 +23,7 @@ export default class FileUpload {
           const objectKey = `${scanId}.${file.extension}`;
           return fetchData({
             path: UPPY_FILE_UPLOAD_ENDPOINT.UPLOAD_START,
-            apiKey: FILE_UPLOAD_KEY,
+            apiKey: accessKey,
             body: {
               objectKey,
               contentType: file.type,
@@ -37,7 +34,7 @@ export default class FileUpload {
         completeMultipartUpload: (file, { uploadId, key, parts }) =>
           fetchData({
             path: UPPY_FILE_UPLOAD_ENDPOINT.UPLOAD_COMPLETE,
-            apiKey: FILE_UPLOAD_KEY,
+            apiKey: accessKey,
             body: {
               uploadId,
               objectKey: key,
@@ -49,7 +46,7 @@ export default class FileUpload {
         signPart: (file, partData) =>
           fetchData({
             path: UPPY_FILE_UPLOAD_ENDPOINT.UPLOAD_SIGN_PART,
-            apiKey: FILE_UPLOAD_KEY,
+            apiKey: accessKey,
             body: {
               objectKey: partData.key,
               uploadId: partData.uploadId,
@@ -60,7 +57,7 @@ export default class FileUpload {
         abortMultipartUpload: (file, { uploadId, key }) =>
           fetchData({
             path: UPPY_FILE_UPLOAD_ENDPOINT.UPLOAD_ABORT,
-            apiKey: FILE_UPLOAD_KEY,
+            apiKey: accessKey,
             body: {
               uploadId,
               objectKey: key,

package/index.js

@@ -5,23 +5,15 @@ import Measurement from "./measurement.js";
 import PoseDetection from "./poseDetection.js";
 import TryOn from "./tryOn.js";
 export default class Swan {
-  #accessKey;
-  constructor(key) {
-    if (key !== 9876543210) {
-      throw new Error("wrong access key");
-    }
-    this.#accessKey = key;
-  }
+  auth = new Auth();
 
-  auth = new Auth(this.#accessKey);
+  custom = new Custom();
 
-  custom = new Custom(this.#accessKey);
+  fileUpload = new FileUpload();
 
-  fileUpload = new FileUpload(this.#accessKey);
+  measurement = new Measurement();
 
-  measurement = new Measurement(this.#accessKey);
+  poseDetection = new PoseDetection();
 
-  poseDetection = new PoseDetection(this.#accessKey);
-
-  tryOn = new TryOn(this.#accessKey);
+  tryOn = new TryOn();
 }

package/measurement.js

@@ -4,45 +4,39 @@ import {
   APP_AUTH_BASE_URL,
   APP_RECOMMENDATION_WEBSOCKET_URL,
   APP_TRY_ON_WEBSOCKET_URL,
-  FILE_UPLOAD_KEY,
   REQUIRED_MESSAGE,
 } from "./constants.js";
 import { checkParameters } from "./utils.js";
 
 export default class Measurement {
-  #accessKey;
   #tryOnSocketRef = null;
   #measurementSocketRef = null;
   #timerPollingRef = null;
   #timerWaitingRef = null;
-  constructor(key) {
-    this.#accessKey = key;
-  }
 
-  getMeasurementStatus(scanId) {
-    if (!scanId) {
+  getMeasurementStatus(scanId, accessKey) {
+    if (checkParameters(scanId, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     const url = `${APP_AUTH_BASE_URL}/measurements?scanId=${scanId}`;
     return axios.get(url, {
-      headers: { "X-Api-Key": FILE_UPLOAD_KEY },
+      headers: { "X-Api-Key": accessKey },
     });
   }
 
-  getTryOnMeasurements({ scanId, shopDomain, productName }) {
-    if (checkParameters(scanId, shopDomain, productName) === false) {
+  getTryOnMeasurements({ scanId, shopDomain, productName, accessKey }) {
+    if (checkParameters(scanId, shopDomain, productName, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     const tryOnUrl = `${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_SCAN}/${scanId}/shop/${shopDomain}/product/${productName}`;
-    return axios.get(tryOnUrl);
+    return axios.get(tryOnUrl, { headers: { "X-Api-Key": accessKey } });
   }
 
-  handleTryOnSocket({ shopDomain, scanId, productName, onError, onSuccess, onClose, onOpen }) {
-    if (checkParameters(shopDomain, scanId, productName) === false) {
+  handleTryOnSocket({ shopDomain, scanId, productName, onError, onSuccess, onClose, onOpen, accessKey }) {
+    if (checkParameters(shopDomain, scanId, productName, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     this.#tryOnSocketRef?.close();
-
     const url = `${APP_TRY_ON_WEBSOCKET_URL}/develop?store_url=${shopDomain}&product_name=${productName}&scan_id=${scanId}`;
     this.#tryOnSocketRef = new WebSocket(url);
 
@@ -68,9 +62,9 @@ export default class Measurement {
     };
   }
 
-  #getMeasurementsCheck = async (onSuccess, onError, scanId) => {
+  #getMeasurementsCheck = async ({ scanId, onSuccess, onError, accessKey }) => {
     try {
-      const res = await this.getMeasurementStatus(scanId);
+      const res = await this.getMeasurementStatus(scanId, accessKey);
       if (res?.data && res?.data?.[0]?.isMeasured === true) {
         onSuccess?.(res?.data);
         clearInterval(this.#timerPollingRef);
@@ -81,10 +75,10 @@ export default class Measurement {
     }
   };
 
-  #handlePolling(onSuccess, onError) {
+  #handlePolling({ scanId, onSuccess, onError, accessKey }) {
     clearInterval(this.#timerPollingRef);
     this.#timerPollingRef = setInterval(() => {
-      this.#getMeasurementsCheck(onSuccess, onError);
+      this.#getMeasurementsCheck({ scanId, onSuccess, onError, accessKey });
     }, 5000);
   }
 
@@ -93,42 +87,44 @@ export default class Measurement {
     clearTimeout(this.#timerWaitingRef);
   };
 
-  #handleTimeOut = (onSuccess, onError) => {
+  #handleTimeOut = ({ scanId, onSuccess, onError, accessKey }) => {
     this.#timerWaitingRef = setTimeout(() => {
-      this.#handlePolling(onSuccess, onError);
+      this.#handlePolling({ scanId, onSuccess, onError, accessKey });
       this.#disconnectSocket();
     }, 2 * 60000);
   };
 
-  handleMeasurementSocket = ({ scanId, onError, onSuccess, onClose, onOpen }) => {
-    if (!scanId) {
+  handleMeasurementSocket = ({ scanId, onError, onSuccess, onClose, onOpen, accessKey }) => {
+    if (checkParameters(scanId, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
-    this.#disconnectSocket();
-    const url = `${APP_RECOMMENDATION_WEBSOCKET_URL}?scanId=${scanId}`;
-    this.#measurementSocketRef = new WebSocket(url);
-
-    this.#measurementSocketRef.onopen = () => {
-      onOpen?.();
-      this.#handleTimeOut(onSuccess, onError);
-    };
-
-    this.#measurementSocketRef.onmessage = (event) => {
-      const data = JSON.parse(event.data);
-      if (data?.code === 200 && data?.scanStatus === "success") {
-        onSuccess?.(data);
-      } else {
-        onError?.(data);
-      }
-      clearTimeout(this.#timerWaitingRef);
-    };
-
-    this.#measurementSocketRef.onclose = () => {
-      onClose?.();
-    };
-
-    this.#measurementSocketRef.onerror = (event) => {
-      onError?.(event);
-    };
+    setTimeout(() => {
+      this.#disconnectSocket();
+      const url = `${APP_RECOMMENDATION_WEBSOCKET_URL}?scanId=${scanId}`;
+      this.#measurementSocketRef = new WebSocket(url);
+
+      this.#measurementSocketRef.onopen = () => {
+        onOpen?.();
+        this.#handleTimeOut({ scanId, onSuccess, onError, accessKey });
+      };
+
+      this.#measurementSocketRef.onmessage = (event) => {
+        const data = JSON.parse(event.data);
+        if (data?.code === 200 && data?.scanStatus === "success") {
+          onSuccess?.(data);
+        } else {
+          onError?.(data);
+        }
+        clearTimeout(this.#timerWaitingRef);
+      };
+
+      this.#measurementSocketRef.onclose = () => {
+        onClose?.();
+      };
+
+      this.#measurementSocketRef.onerror = (event) => {
+        onError?.(event);
+      };
+    }, 5000);
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swan-admin/swan-ai-measurements",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "provides ai measurement suggestion",
   "main": "index.js",
   "type": "module",

package/poseDetection.js

@@ -1,13 +1,13 @@
-import { APP_POSE_DETECTION_WEbSOCKET_URL } from "./constants.js";
+import { APP_POSE_DETECTION_WEbSOCKET_URL, REQUIRED_MESSAGE } from "./constants.js";
 import { io } from "socket.io-client";
 
 export default class PoseDetection {
   #socketRef = null;
-  #accessKey;
-  constructor(key) {
-    this.#accessKey = key;
-  }
-  connect() {
+
+  connect(accessKey) {
+    if (!accessKey) {
+      throw new Error(REQUIRED_MESSAGE);
+    }
     return new Promise((resolve, reject) => {
       this.#socketRef = io.connect(APP_POSE_DETECTION_WEbSOCKET_URL);
       this.#socketRef?.on("connect", () => {
@@ -17,7 +17,11 @@ export default class PoseDetection {
     });
   }
 
-  videoEmit({ image, scanId }) {
+  videoEmit({ image, scanId, accessKey }) {
+    if (!accessKey) {
+      throw new Error(REQUIRED_MESSAGE);
+    }
+
     if (!this.#socketRef) {
       throw new Error("socket is not connected");
     }
@@ -31,7 +35,10 @@ export default class PoseDetection {
     this.#socketRef?.disconnect?.();
   }
 
-  poseStatus(callBack) {
+  poseStatus(accessKey, callBack) {
+    if (!accessKey) {
+      throw new Error(REQUIRED_MESSAGE);
+    }
     if (!this.#socketRef) {
       throw new Error("socket is not connected");
     }

package/tryOn.js

@@ -3,14 +3,13 @@ import { API_ENDPOINTS, APP_AUTH_BASE_URL, APP_AUTH_WEBSOCKET_URL, REQUIRED_MESS
 import { checkParameters } from "./utils.js";
 
 class TryOn {
-  #accessKey = null;
   #tryOnSocketRef = null;
   #timerWaitingRef = null;
-  constructor(accessKey) {
-    this.#accessKey = accessKey;
-  }
 
-  uploadFile(files, userId) {
+  uploadFile(files, userId, accessKey) {
+    if (!accessKey) {
+      throw new Error(REQUIRED_MESSAGE);
+    }
     return new Promise(async (resolve, reject) => {
       try {
         const payload = {
@@ -31,10 +30,11 @@ class TryOn {
     });
   }
 
-  #getSignedUrl(payload) {
+  #getSignedUrl(payload, accessKey) {
     return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_IMAGE_UPLOAD}`, payload, {
       headers: {
         "Content-Type": "application/json",
+        "X-Api-Key": accessKey,
       },
     });
   }
@@ -47,12 +47,22 @@ class TryOn {
     });
   }
 
-  getUploadedFiles(userId) {
-    return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_IMAGE_DOWNLOAD}?userId=${userId}`);
+  getUploadedFiles(userId, accessKey) {
+    if (checkParameters(userId, accessKey) === false) {
+      throw new Error(REQUIRED_MESSAGE);
+    }
+    return axios.post(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_IMAGE_DOWNLOAD}?userId=${userId}`, {
+      headers: { "X-Api-Key": accessKey },
+    });
   }
 
-  deleteImage(userId, name) {
-    return axios.delete(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_IMAGE_URLS}?userId=${userId}&file=${name}`);
+  deleteImage({ userId, fileName, accessKey }) {
+    if (checkParameters(userId, fileName, accessKey) === false) {
+      throw new Error(REQUIRED_MESSAGE);
+    }
+    return axios.delete(`${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_IMAGE_URLS}?userId=${userId}&file=${fileName}`, {
+      headers: { "X-Api-Key": accessKey },
+    });
   }
 
   #disconnectSocket = () => {
@@ -60,15 +70,15 @@ class TryOn {
     clearTimeout(this.#timerWaitingRef);
   };
 
-  #handleTimeOut = ({ onSuccess, onError, shopDomain, userId, productName }) => {
+  #handleTimeOut = ({ onSuccess, onError, shopDomain, userId, productName, accessKey }) => {
     this.#timerWaitingRef = setTimeout(() => {
-      this.#handleGetTryOnResult({ shopDomain, userId, productName, onSuccess, onError });
+      this.#handleGetTryOnResult({ shopDomain, userId, productName, onSuccess, onError, accessKey });
       this.#disconnectSocket();
     }, 78000);
   };
 
-  handleTryOnWebSocket = ({ shopDomain, userId, productName, onError, onSuccess, onClose, onOpen }) => {
-    if (checkParameters(shopDomain, userId, productName) === false) {
+  handleTryOnWebSocket = ({ shopDomain, userId, productName, onError, onSuccess, onClose, onOpen, accessKey }) => {
+    if (checkParameters(shopDomain, userId, productName, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     this.#disconnectSocket();
@@ -76,9 +86,9 @@ class TryOn {
     this.#tryOnSocketRef = new WebSocket(url);
     this.#tryOnSocketRef.onopen = async () => {
       onOpen?.();
-      this.#handleTimeOut({ onSuccess, onError, shopDomain, userId, productName });
+      this.#handleTimeOut({ onSuccess, onError, shopDomain, userId, productName, accessKey });
       try {
-        await this.handleForLatestImage({ shopDomain, userId, productName });
+        await this.handleForLatestImage({ shopDomain, userId, productName, accessKey });
       } catch (error) {
         onError?.(error);
       }
@@ -86,7 +96,7 @@ class TryOn {
     this.#tryOnSocketRef.onmessage = (event) => {
       const data = JSON.parse(event.data);
       if (data?.status === "success") {
-        this.#handleGetTryOnResult({ shopDomain, userId, productName, onError, onSuccess });
+        this.#handleGetTryOnResult({ shopDomain, userId, productName, onError, onSuccess, accessKey });
       } else {
         onError?.(data);
       }
@@ -101,14 +111,16 @@ class TryOn {
     };
   };
 
-  handleForLatestImage = async ({ userId, shopDomain, productName, onError }) => {
-    if (checkParameters(shopDomain, userId, productName) === false) {
+  handleForLatestImage = async ({ userId, shopDomain, productName, onError, accessKey }) => {
+    if (checkParameters(shopDomain, userId, productName, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     return new Promise(async (resolve, reject) => {
       try {
         const url = `${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON}/?scan_id=${userId}&store_url=${shopDomain}&product_name=${productName}`;
-        const res = await axios.post(url);
+        const res = await axios.post(url, {
+          headers: { "X-Api-Key": accessKey },
+        });
         if (res?.data?.tryOnProcessStatus === "failed") {
           this.#disconnectSocket();
           reject(res?.data);
@@ -123,21 +135,23 @@ class TryOn {
     });
   };
 
-  #handleGetTryOnResult = async ({ onSuccess, onError, shopDomain, userId, productName }) => {
+  #handleGetTryOnResult = async ({ onSuccess, onError, shopDomain, userId, productName, accessKey }) => {
     try {
-      const data = await this.getTryOnResult({ shopDomain, userId, productName });
+      const data = await this.getTryOnResult({ shopDomain, userId, productName, accessKey });
       onSuccess?.(data?.data);
     } catch (error) {
       onError?.(error);
     }
   };
 
-  getTryOnResult = ({ userId, shopDomain, productName }) => {
-    if (checkParameters(shopDomain, userId, productName) === false) {
+  getTryOnResult = ({ userId, shopDomain, productName, accessKey }) => {
+    if (checkParameters(shopDomain, userId, productName, accessKey) === false) {
       throw new Error(REQUIRED_MESSAGE);
     }
     const url = `${APP_AUTH_BASE_URL}${API_ENDPOINTS.TRY_ON_RESULT_IMAGE_DOWNLOAD}?scan_id=${userId}&store_url=${shopDomain}&product_name=${productName}`;
-    return axios.post(url);
+    return axios.post(url, {
+      headers: { "X-Api-Key": accessKey },
+    });
   };
 }