@blocklet/js-sdk 1.16.26-beta-cca12425 → 1.16.26-beta-63f52a83

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.
Files changed (6) hide show
  1. package/dist/index.cjs +21 -9
  2. package/dist/index.d.cts +6 -0
  3. package/dist/index.d.mts +6 -0
  4. package/dist/index.d.ts +6 -0
  5. package/dist/index.mjs +21 -9
  6. package/package.json +3 -3
package/dist/index.cjs CHANGED
@@ -56,6 +56,12 @@ class AuthService {
56
56
  locale
57
57
  });
58
58
  }
59
+ /**
60
+ *
61
+ * 指定要退出登录的设备 id
62
+ * @param {{ visitorId: string }} { visitorId }
63
+ * @return {*} {Promise<void>}
64
+ */
59
65
  async logout({ visitorId }) {
60
66
  const { data } = await this.api.post("/api/user/logout", {
61
67
  visitorId
@@ -118,6 +124,10 @@ const sleep = (time = 0) => {
118
124
  const getBearerToken = (token) => {
119
125
  return `Bearer ${encodeURIComponent(token)}`;
120
126
  };
127
+ const visitorIdKey = "__visitor_id";
128
+ const getVisitorId = () => {
129
+ return localStorage.getItem(visitorIdKey);
130
+ };
121
131
 
122
132
  async function sleepForLoading(config, lazyTime = 300) {
123
133
  config.metaData.endTime = +/* @__PURE__ */ new Date();
@@ -132,7 +142,8 @@ const createAxios$1 = (options, requestParams) => {
132
142
  ...options,
133
143
  headers: {
134
144
  ...options?.headers,
135
- "x-blocklet-js-sdk-version": version
145
+ "x-blocklet-js-sdk-version": version,
146
+ "x-blocklet-visitor-id": getVisitorId()
136
147
  }
137
148
  });
138
149
  if (requestParams?.lazy) {
@@ -210,10 +221,10 @@ function createRequest$1({
210
221
  originalRequest.headers = { ...originalRequest?.headers };
211
222
  if (error?.response?.status === 401 && !originalRequest._retry) {
212
223
  originalRequest._retry = true;
213
- if (!refreshingTokenRequest) {
214
- refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
215
- }
216
224
  try {
225
+ if (!refreshingTokenRequest) {
226
+ refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
227
+ }
217
228
  const tokenData = await refreshingTokenRequest;
218
229
  setSessionToken(tokenData.nextToken);
219
230
  setRefreshToken(tokenData.nextRefreshToken);
@@ -221,13 +232,13 @@ function createRequest$1({
221
232
  onRefreshTokenSuccess(tokenData);
222
233
  }
223
234
  return service(originalRequest);
224
- } catch (error2) {
235
+ } catch (refreshTokenError) {
225
236
  removeSessionToken();
226
237
  removeRefreshToken();
227
238
  if (typeof onRefreshTokenError === "function") {
228
- onRefreshTokenError(error2);
239
+ onRefreshTokenError(refreshTokenError);
229
240
  }
230
- return Promise.reject(error2);
241
+ return Promise.reject(error);
231
242
  } finally {
232
243
  refreshingTokenRequest = null;
233
244
  }
@@ -247,7 +258,8 @@ function createFetch$1(globalOptions = {}, requestParams) {
247
258
  headers: {
248
259
  ...globalOptions?.headers,
249
260
  ...options?.headers,
250
- "x-blocklet-js-sdk-version": version
261
+ "x-blocklet-js-sdk-version": version,
262
+ "x-blocklet-visitor-id": getVisitorId()
251
263
  }
252
264
  });
253
265
  try {
@@ -333,7 +345,7 @@ function createRequest({
333
345
  if (typeof onRefreshTokenError === "function") {
334
346
  onRefreshTokenError(error);
335
347
  }
336
- return Promise.reject(error);
348
+ return res;
337
349
  } finally {
338
350
  refreshingTokenRequest = null;
339
351
  }
package/dist/index.d.cts CHANGED
@@ -42,6 +42,12 @@ declare class AuthService {
42
42
  did: string;
43
43
  locale: string;
44
44
  }): Promise<string>;
45
+ /**
46
+ *
47
+ * 指定要退出登录的设备 id
48
+ * @param {{ visitorId: string }} { visitorId }
49
+ * @return {*} {Promise<void>}
50
+ */
45
51
  logout({ visitorId }: {
46
52
  visitorId: string;
47
53
  }): Promise<void>;
package/dist/index.d.mts CHANGED
@@ -42,6 +42,12 @@ declare class AuthService {
42
42
  did: string;
43
43
  locale: string;
44
44
  }): Promise<string>;
45
+ /**
46
+ *
47
+ * 指定要退出登录的设备 id
48
+ * @param {{ visitorId: string }} { visitorId }
49
+ * @return {*} {Promise<void>}
50
+ */
45
51
  logout({ visitorId }: {
46
52
  visitorId: string;
47
53
  }): Promise<void>;
package/dist/index.d.ts CHANGED
@@ -42,6 +42,12 @@ declare class AuthService {
42
42
  did: string;
43
43
  locale: string;
44
44
  }): Promise<string>;
45
+ /**
46
+ *
47
+ * 指定要退出登录的设备 id
48
+ * @param {{ visitorId: string }} { visitorId }
49
+ * @return {*} {Promise<void>}
50
+ */
45
51
  logout({ visitorId }: {
46
52
  visitorId: string;
47
53
  }): Promise<void>;
package/dist/index.mjs CHANGED
@@ -49,6 +49,12 @@ class AuthService {
49
49
  locale
50
50
  });
51
51
  }
52
+ /**
53
+ *
54
+ * 指定要退出登录的设备 id
55
+ * @param {{ visitorId: string }} { visitorId }
56
+ * @return {*} {Promise<void>}
57
+ */
52
58
  async logout({ visitorId }) {
53
59
  const { data } = await this.api.post("/api/user/logout", {
54
60
  visitorId
@@ -111,6 +117,10 @@ const sleep = (time = 0) => {
111
117
  const getBearerToken = (token) => {
112
118
  return `Bearer ${encodeURIComponent(token)}`;
113
119
  };
120
+ const visitorIdKey = "__visitor_id";
121
+ const getVisitorId = () => {
122
+ return localStorage.getItem(visitorIdKey);
123
+ };
114
124
 
115
125
  async function sleepForLoading(config, lazyTime = 300) {
116
126
  config.metaData.endTime = +/* @__PURE__ */ new Date();
@@ -125,7 +135,8 @@ const createAxios$1 = (options, requestParams) => {
125
135
  ...options,
126
136
  headers: {
127
137
  ...options?.headers,
128
- "x-blocklet-js-sdk-version": version
138
+ "x-blocklet-js-sdk-version": version,
139
+ "x-blocklet-visitor-id": getVisitorId()
129
140
  }
130
141
  });
131
142
  if (requestParams?.lazy) {
@@ -203,10 +214,10 @@ function createRequest$1({
203
214
  originalRequest.headers = { ...originalRequest?.headers };
204
215
  if (error?.response?.status === 401 && !originalRequest._retry) {
205
216
  originalRequest._retry = true;
206
- if (!refreshingTokenRequest) {
207
- refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
208
- }
209
217
  try {
218
+ if (!refreshingTokenRequest) {
219
+ refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
220
+ }
210
221
  const tokenData = await refreshingTokenRequest;
211
222
  setSessionToken(tokenData.nextToken);
212
223
  setRefreshToken(tokenData.nextRefreshToken);
@@ -214,13 +225,13 @@ function createRequest$1({
214
225
  onRefreshTokenSuccess(tokenData);
215
226
  }
216
227
  return service(originalRequest);
217
- } catch (error2) {
228
+ } catch (refreshTokenError) {
218
229
  removeSessionToken();
219
230
  removeRefreshToken();
220
231
  if (typeof onRefreshTokenError === "function") {
221
- onRefreshTokenError(error2);
232
+ onRefreshTokenError(refreshTokenError);
222
233
  }
223
- return Promise.reject(error2);
234
+ return Promise.reject(error);
224
235
  } finally {
225
236
  refreshingTokenRequest = null;
226
237
  }
@@ -240,7 +251,8 @@ function createFetch$1(globalOptions = {}, requestParams) {
240
251
  headers: {
241
252
  ...globalOptions?.headers,
242
253
  ...options?.headers,
243
- "x-blocklet-js-sdk-version": version
254
+ "x-blocklet-js-sdk-version": version,
255
+ "x-blocklet-visitor-id": getVisitorId()
244
256
  }
245
257
  });
246
258
  try {
@@ -326,7 +338,7 @@ function createRequest({
326
338
  if (typeof onRefreshTokenError === "function") {
327
339
  onRefreshTokenError(error);
328
340
  }
329
- return Promise.reject(error);
341
+ return res;
330
342
  } finally {
331
343
  refreshingTokenRequest = null;
332
344
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/js-sdk",
3
- "version": "1.16.26-beta-cca12425",
3
+ "version": "1.16.26-beta-63f52a83",
4
4
  "main": "dist/index.cjs",
5
5
  "module": "dist/index.mjs",
6
6
  "types": "./dist/index.d.ts",
@@ -31,7 +31,7 @@
31
31
  "build": "unbuild"
32
32
  },
33
33
  "dependencies": {
34
- "@abtnode/constant": "1.16.26-beta-cca12425",
34
+ "@abtnode/constant": "1.16.26-beta-63f52a83",
35
35
  "axios": "^0.27.2",
36
36
  "js-cookie": "^3.0.5",
37
37
  "ufo": "^1.3.2"
@@ -39,5 +39,5 @@
39
39
  "devDependencies": {
40
40
  "unbuild": "^2.0.0"
41
41
  },
42
- "gitHead": "fc2804fa8010d4311f1c74e65fb98d117598df2a"
42
+ "gitHead": "ce04b1916e531d79d9535111cd370c69c04fcbc1"
43
43
  }