@swan-admin/swan-ai-measurements 1.0.26 → 1.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/auth.js +5 -15
- package/constants.js +0 -1
- package/measurement.js +8 -23
- package/package.json +1 -1
- package/poseDetection.js +4 -10
- package/utils.js +2 -2
package/auth.js
CHANGED
|
@@ -32,9 +32,7 @@ export const getUserDetail = (email, accessKey) =>
|
|
|
32
32
|
axios.get(`${APP_BASE_URL}${API_ENDPOINTS.GET_USER_DETAIL}/${email}`);
|
|
33
33
|
|
|
34
34
|
export const handleAuthSocket = ({ email, scanId, accessKey, onError, onSuccess, onClose, onOpen }) => {
|
|
35
|
-
|
|
36
|
-
socketRef.close();
|
|
37
|
-
}
|
|
35
|
+
socketRef?.close?.();
|
|
38
36
|
|
|
39
37
|
socketRef = new WebSocket(APP_AUTH_WEBSOCKET_URL);
|
|
40
38
|
const detailObj = {
|
|
@@ -43,28 +41,20 @@ export const handleAuthSocket = ({ email, scanId, accessKey, onError, onSuccess,
|
|
|
43
41
|
};
|
|
44
42
|
|
|
45
43
|
socketRef.onopen = () => {
|
|
46
|
-
|
|
47
|
-
onOpen();
|
|
48
|
-
}
|
|
44
|
+
onOpen?.();
|
|
49
45
|
socketRef.send(JSON.stringify(detailObj));
|
|
50
46
|
};
|
|
51
47
|
|
|
52
48
|
socketRef.onmessage = (event) => {
|
|
53
49
|
const data = JSON.parse(event.data);
|
|
54
|
-
|
|
55
|
-
onSuccess(data);
|
|
56
|
-
}
|
|
50
|
+
onSuccess?.(data);
|
|
57
51
|
};
|
|
58
52
|
|
|
59
53
|
socketRef.onclose = () => {
|
|
60
|
-
|
|
61
|
-
onClose();
|
|
62
|
-
}
|
|
54
|
+
onClose?.();
|
|
63
55
|
};
|
|
64
56
|
|
|
65
57
|
socketRef.onerror = (event) => {
|
|
66
|
-
|
|
67
|
-
onError(event);
|
|
68
|
-
}
|
|
58
|
+
onError?.(event);
|
|
69
59
|
};
|
|
70
60
|
};
|
package/constants.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export const FILE_UPLOAD_URL = "https://9xc8mxwlkj.execute-api.us-east-1.amazonaws.com/staging";
|
|
2
1
|
export const FILE_UPLOAD_KEY = "7a8ccc86249849be911b0d7dbc20290e";
|
|
3
2
|
export const APP_BASE_URL = "https://fitview-server-staging.ft2a64raup4pg.us-east-1.cs.amazonlightsail.com";
|
|
4
3
|
export const APP_AUTH_BASE_URL = "https://staging.api.getswan.co";
|
package/measurement.js
CHANGED
|
@@ -5,7 +5,6 @@ import {
|
|
|
5
5
|
APP_RECOMMENDATION_WEBSOCKET_URL,
|
|
6
6
|
APP_TRY_ON_WEBSOCKET_URL,
|
|
7
7
|
FILE_UPLOAD_KEY,
|
|
8
|
-
FILE_UPLOAD_URL,
|
|
9
8
|
} from "./constants.js";
|
|
10
9
|
|
|
11
10
|
let tryOnSocketRef;
|
|
@@ -14,7 +13,7 @@ let timerPollingRef;
|
|
|
14
13
|
let timerWaitingRef;
|
|
15
14
|
|
|
16
15
|
export const getMeasurementStatus = (scanId, accessKey) => {
|
|
17
|
-
const url = `${
|
|
16
|
+
const url = `${APP_AUTH_BASE_URL}/measurements?scanId=${scanId}`;
|
|
18
17
|
return axios.get(url, {
|
|
19
18
|
headers: { "X-Api-Key": FILE_UPLOAD_KEY },
|
|
20
19
|
});
|
|
@@ -77,16 +76,12 @@ const getMeasurementsCheck = async (onSuccess, onError, scanId, accessKey) => {
|
|
|
77
76
|
try {
|
|
78
77
|
const res = await getMeasurementStatus(scanId, accessKey);
|
|
79
78
|
if (res?.data && res?.data?.[0]?.isMeasured === true) {
|
|
80
|
-
|
|
81
|
-
onSuccess(res?.data);
|
|
82
|
-
}
|
|
79
|
+
onSuccess?.(res?.data);
|
|
83
80
|
clearInterval(timerPollingRef);
|
|
84
81
|
}
|
|
85
82
|
} catch (e) {
|
|
86
83
|
clearInterval(timerPollingRef);
|
|
87
|
-
|
|
88
|
-
onError(e);
|
|
89
|
-
}
|
|
84
|
+
onError?.(e);
|
|
90
85
|
}
|
|
91
86
|
};
|
|
92
87
|
|
|
@@ -117,35 +112,25 @@ export const handleMeasurementSocket = ({ scanId, accessKey, onError, onSuccess,
|
|
|
117
112
|
measurementSocketRef = new WebSocket(url);
|
|
118
113
|
|
|
119
114
|
measurementSocketRef.onopen = () => {
|
|
120
|
-
|
|
121
|
-
onOpen();
|
|
122
|
-
}
|
|
115
|
+
onOpen?.();
|
|
123
116
|
handleTimeOut(onSuccess, onError);
|
|
124
117
|
};
|
|
125
118
|
|
|
126
119
|
measurementSocketRef.onmessage = (event) => {
|
|
127
120
|
const data = JSON.parse(event.data);
|
|
128
121
|
if (data?.code === 200 && data?.scanStatus === "success") {
|
|
129
|
-
|
|
130
|
-
onSuccess(data);
|
|
131
|
-
}
|
|
122
|
+
onSuccess?.(data);
|
|
132
123
|
} else {
|
|
133
|
-
|
|
134
|
-
onError(data);
|
|
135
|
-
}
|
|
124
|
+
onError?.(data);
|
|
136
125
|
}
|
|
137
126
|
clearTimeout(timerWaitingRef);
|
|
138
127
|
};
|
|
139
128
|
|
|
140
129
|
measurementSocketRef.onclose = () => {
|
|
141
|
-
|
|
142
|
-
onClose();
|
|
143
|
-
}
|
|
130
|
+
onClose?.();
|
|
144
131
|
};
|
|
145
132
|
|
|
146
133
|
measurementSocketRef.onerror = (event) => {
|
|
147
|
-
|
|
148
|
-
onError(event);
|
|
149
|
-
}
|
|
134
|
+
onError?.(event);
|
|
150
135
|
};
|
|
151
136
|
};
|
package/package.json
CHANGED
package/poseDetection.js
CHANGED
|
@@ -7,10 +7,10 @@ export function handlePoseDetectionSocket() {
|
|
|
7
7
|
connect: function () {
|
|
8
8
|
return new Promise((resolve, reject) => {
|
|
9
9
|
socket = io.connect(APP_POSE_DETECTION_WEbSOCKET_URL);
|
|
10
|
-
socket
|
|
10
|
+
socket?.on("connect", () => {
|
|
11
11
|
resolve(socket.id); // "G5p5..."
|
|
12
12
|
});
|
|
13
|
-
socket
|
|
13
|
+
socket?.on("connect_error", (err) => reject(err));
|
|
14
14
|
});
|
|
15
15
|
},
|
|
16
16
|
|
|
@@ -25,9 +25,7 @@ export function handlePoseDetectionSocket() {
|
|
|
25
25
|
},
|
|
26
26
|
|
|
27
27
|
disconnect: function () {
|
|
28
|
-
|
|
29
|
-
socket.disconnect();
|
|
30
|
-
}
|
|
28
|
+
socket?.disconnect?.();
|
|
31
29
|
},
|
|
32
30
|
|
|
33
31
|
poseStatus: function (callBack) {
|
|
@@ -35,16 +33,12 @@ export function handlePoseDetectionSocket() {
|
|
|
35
33
|
throw new Error("socket is not connected");
|
|
36
34
|
}
|
|
37
35
|
socket.on("pose_status", (data) => {
|
|
38
|
-
console.log(data);
|
|
39
36
|
callBack(data);
|
|
40
37
|
});
|
|
41
38
|
},
|
|
42
39
|
|
|
43
40
|
connected: function () {
|
|
44
|
-
|
|
45
|
-
return false;
|
|
46
|
-
}
|
|
47
|
-
return socket.connected;
|
|
41
|
+
return !!socket?.connected;
|
|
48
42
|
},
|
|
49
43
|
};
|
|
50
44
|
}
|
package/utils.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { APP_AUTH_BASE_URL } from "./constants.js";
|
|
2
2
|
import axios from "axios";
|
|
3
3
|
export async function fetchData({
|
|
4
4
|
path,
|
|
5
5
|
body,
|
|
6
6
|
queryParams,
|
|
7
|
-
baseUrl =
|
|
7
|
+
baseUrl = APP_AUTH_BASE_URL,
|
|
8
8
|
apiKey = "",
|
|
9
9
|
headers = { "X-Api-Key": apiKey, "Content-Type": "application/json" },
|
|
10
10
|
}) {
|