@blocklet/js-sdk 1.16.26-beta-351de484 → 1.16.26-beta-cca12425

package/dist/index.cjs

@@ -115,8 +115,11 @@ const sleep = (time = 0) => {
     }, time);
   });
 };
+const getBearerToken = (token) => {
+  return `Bearer ${encodeURIComponent(token)}`;
+};
 
-async function sleepForLoading(config, lazyTime) {
+async function sleepForLoading(config, lazyTime = 300) {
   config.metaData.endTime = +/* @__PURE__ */ new Date();
   const { startTime, endTime } = config.metaData;
   const timeDiff = endTime - startTime;
@@ -124,15 +127,15 @@ async function sleepForLoading(config, lazyTime) {
     await sleep(lazyTime - timeDiff);
   delete config.metaData;
 }
-const createApi = (options = {}, { lazy = false, lazyTime = 300 } = {}) => {
+const createAxios$1 = (options, requestParams) => {
   const instance = axios__default.create({
     ...options,
     headers: {
-      ...options.headers,
+      ...options?.headers,
       "x-blocklet-js-sdk-version": version
     }
   });
-  if (lazy) {
+  if (requestParams?.lazy) {
     instance.interceptors.request.use(
       (config) => {
         config.metaData = { startTime: +/* @__PURE__ */ new Date() };
@@ -142,34 +145,32 @@ const createApi = (options = {}, { lazy = false, lazyTime = 300 } = {}) => {
     );
     instance.interceptors.response.use(
       async (res) => {
-        await sleepForLoading(res.config, lazyTime);
+        await sleepForLoading(res.config, requestParams?.lazyTime);
         return res;
       },
       async (err) => {
-        await sleepForLoading(err.response.config, lazyTime);
+        await sleepForLoading(err.response.config, requestParams?.lazyTime);
         return Promise.reject(err);
       }
     );
   }
   return instance;
 };
-
-const baseURL = constant.WELLKNOWN_SERVICE_PATH_PREFIX;
-async function renewRefreshToken(refreshToken) {
+async function renewRefreshToken$1(refreshToken) {
   if (!refreshToken) {
     throw new Error("Refresh token not found");
   }
-  const refreshApi = createApi({
-    baseURL,
+  const refreshApi = createAxios$1({
+    baseURL: constant.WELLKNOWN_SERVICE_PATH_PREFIX,
     timeout: 10 * 1e3,
     headers: {
-      authorization: `Bearer ${encodeURIComponent(refreshToken)}`
+      authorization: getBearerToken(refreshToken)
     }
   });
-  const { data } = await refreshApi.post("api/did/refreshSession");
+  const { data } = await refreshApi.post("/api/did/refreshSession");
   return data;
 }
-function createRequest({
+function createRequest$1({
   getSessionToken,
   setSessionToken,
   removeSessionToken,
@@ -178,19 +179,21 @@ function createRequest({
   removeRefreshToken,
   onRefreshTokenError,
   onRefreshTokenSuccess
-}, options = {}) {
+}, requestOptions, requestParams) {
   let refreshingTokenRequest = null;
-  const service = createApi({
-    baseURL,
-    timeout: 30 * 1e3,
-    ...options
-  });
+  const service = createAxios$1(
+    {
+      timeout: 30 * 1e3,
+      ...requestOptions
+    },
+    requestParams
+  );
   service.interceptors.request.use(
     async (config) => {
       if (!Cookie__default.get(constant.SESSION_TOKEN_STORAGE_KEY)) {
         const token = getSessionToken();
         if (token) {
-          config.headers.authorization = `Bearer ${encodeURIComponent(token)}`;
+          config.headers.authorization = getBearerToken(token);
         }
       }
       if (refreshingTokenRequest) {
@@ -208,7 +211,7 @@ function createRequest({
       if (error?.response?.status === 401 && !originalRequest._retry) {
         originalRequest._retry = true;
         if (!refreshingTokenRequest) {
-          refreshingTokenRequest = renewRefreshToken(getRefreshToken());
+          refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
         }
         try {
           const tokenData = await refreshingTokenRequest;
@@ -235,6 +238,110 @@ function createRequest({
   return service;
 }
 
+function createFetch$1(globalOptions = {}, requestParams) {
+  return async (input, options) => {
+    const startAt = Date.now();
+    const request = fetch(input, {
+      ...globalOptions,
+      ...options,
+      headers: {
+        ...globalOptions?.headers,
+        ...options?.headers,
+        "x-blocklet-js-sdk-version": version
+      }
+    });
+    try {
+      return request;
+    } catch (error) {
+      throw error;
+    } finally {
+      const endAt = Date.now();
+      if (requestParams?.lazy) {
+        const lazyTime = requestParams?.lazyTime ?? 300;
+        const timeDiff = endAt - startAt;
+        if (timeDiff < lazyTime)
+          await sleep(lazyTime - timeDiff);
+      }
+    }
+  };
+}
+async function renewRefreshToken(refreshToken) {
+  if (!refreshToken) {
+    throw new Error("Refresh token not found");
+  }
+  const refreshApi = createFetch$1();
+  const res = await refreshApi(ufo.joinURL(constant.WELLKNOWN_SERVICE_PATH_PREFIX, "/api/did/refreshSession"), {
+    method: "POST",
+    headers: {
+      authorization: getBearerToken(refreshToken)
+    }
+  });
+  const data = await res.json();
+  return data;
+}
+function createRequest({
+  baseURL,
+  getSessionToken,
+  setSessionToken,
+  removeSessionToken,
+  getRefreshToken,
+  setRefreshToken,
+  removeRefreshToken,
+  onRefreshTokenError,
+  onRefreshTokenSuccess
+}, requestOptions, requestParams) {
+  let refreshingTokenRequest = null;
+  const service = createFetch$1(requestOptions, requestParams);
+  return async (input, options) => {
+    let authorization;
+    const finalUrl = typeof input === "string" ? ufo.joinURL(baseURL, input) : input;
+    if (!Cookie__default.get(constant.SESSION_TOKEN_STORAGE_KEY)) {
+      const token = getSessionToken();
+      if (token) {
+        authorization = getBearerToken(token);
+      }
+    }
+    if (refreshingTokenRequest) {
+      await refreshingTokenRequest;
+    }
+    const res = await service(finalUrl, {
+      ...options,
+      headers: {
+        ...options?.headers,
+        authorization
+      }
+    });
+    if (!res.ok && res.status === 401) {
+      refreshingTokenRequest = renewRefreshToken(getRefreshToken());
+      try {
+        const tokenData = await refreshingTokenRequest;
+        setSessionToken(tokenData.nextToken);
+        setRefreshToken(tokenData.nextRefreshToken);
+        if (typeof onRefreshTokenSuccess === "function") {
+          onRefreshTokenSuccess(tokenData);
+        }
+        return service(finalUrl, {
+          ...options,
+          headers: {
+            ...options?.headers,
+            authorization
+          }
+        });
+      } catch (error) {
+        removeSessionToken();
+        removeRefreshToken();
+        if (typeof onRefreshTokenError === "function") {
+          onRefreshTokenError(error);
+        }
+        return Promise.reject(error);
+      } finally {
+        refreshingTokenRequest = null;
+      }
+    }
+    return res;
+  };
+}
+
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -248,7 +355,34 @@ class BlockletSDK {
     __publicField(this, "userSession");
     __publicField(this, "token");
     const tokenService = new TokenService();
-    const api = createRequest({
+    const internalApi = createRequest$1(
+      {
+        getSessionToken: tokenService.getSessionToken,
+        setSessionToken: tokenService.setSessionToken,
+        removeSessionToken: tokenService.removeSessionToken,
+        getRefreshToken: tokenService.getRefreshToken,
+        setRefreshToken: tokenService.setRefreshToken,
+        removeRefreshToken: tokenService.removeRefreshToken,
+        onRefreshTokenError: () => {
+          console.error("Failed to refresh token");
+        },
+        onRefreshTokenSuccess: () => {
+        }
+      },
+      {
+        baseURL: constant.WELLKNOWN_SERVICE_PATH_PREFIX
+      }
+    );
+    this.user = new AuthService({ api: internalApi });
+    this.userSession = new UserSessionService({ api: internalApi });
+    this.token = tokenService;
+    this.api = internalApi;
+  }
+}
+function createAxios(config, requestParams) {
+  const tokenService = new TokenService();
+  return createRequest$1(
+    {
       getSessionToken: tokenService.getSessionToken,
       setSessionToken: tokenService.setSessionToken,
       removeSessionToken: tokenService.removeSessionToken,
@@ -260,12 +394,32 @@ class BlockletSDK {
       },
       onRefreshTokenSuccess: () => {
       }
-    });
-    this.user = new AuthService({ api });
-    this.userSession = new UserSessionService({ api });
-    this.api = api;
-    this.token = tokenService;
-  }
+    },
+    config,
+    requestParams
+  );
+}
+function createFetch(options, requestParams) {
+  const tokenService = new TokenService();
+  return createRequest(
+    {
+      getSessionToken: tokenService.getSessionToken,
+      setSessionToken: tokenService.setSessionToken,
+      removeSessionToken: tokenService.removeSessionToken,
+      getRefreshToken: tokenService.getRefreshToken,
+      setRefreshToken: tokenService.setRefreshToken,
+      removeRefreshToken: tokenService.removeRefreshToken,
+      onRefreshTokenError: () => {
+        console.error("Failed to refresh token");
+      },
+      onRefreshTokenSuccess: () => {
+      }
+    },
+    options,
+    requestParams
+  );
 }
 
 exports.BlockletSDK = BlockletSDK;
+exports.createAxios = createAxios;
+exports.createFetch = createFetch;

package/dist/index.d.cts

@@ -1,4 +1,5 @@
-import { Axios } from 'axios';
+import * as axios from 'axios';
+import { Axios, AxiosRequestConfig } from 'axios';
 
 type UserPublicInfo = {
     avatar: string;
@@ -94,6 +95,11 @@ declare class UserSessionService {
     }): Promise<UserSession[]>;
 }
 
+type RequestParams = {
+    lazy?: boolean;
+    lazyTime?: number;
+};
+
 declare class BlockletSDK {
     api: Axios;
     user: AuthService;
@@ -101,5 +107,7 @@ declare class BlockletSDK {
     token: TokenService;
     constructor();
 }
+declare function createAxios(config?: AxiosRequestConfig, requestParams?: RequestParams): axios.AxiosInstance;
+declare function createFetch(options?: RequestInit, requestParams?: RequestParams): (input: string | Request | URL, options?: RequestInit) => Promise<Response>;
 
-export { AuthService, BlockletSDK, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook };
+export { AuthService, BlockletSDK, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch };

package/dist/index.d.mts

@@ -1,4 +1,5 @@
-import { Axios } from 'axios';
+import * as axios from 'axios';
+import { Axios, AxiosRequestConfig } from 'axios';
 
 type UserPublicInfo = {
     avatar: string;
@@ -94,6 +95,11 @@ declare class UserSessionService {
     }): Promise<UserSession[]>;
 }
 
+type RequestParams = {
+    lazy?: boolean;
+    lazyTime?: number;
+};
+
 declare class BlockletSDK {
     api: Axios;
     user: AuthService;
@@ -101,5 +107,7 @@ declare class BlockletSDK {
     token: TokenService;
     constructor();
 }
+declare function createAxios(config?: AxiosRequestConfig, requestParams?: RequestParams): axios.AxiosInstance;
+declare function createFetch(options?: RequestInit, requestParams?: RequestParams): (input: string | Request | URL, options?: RequestInit) => Promise<Response>;
 
-export { AuthService, BlockletSDK, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook };
+export { AuthService, BlockletSDK, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Axios } from 'axios';
+import * as axios from 'axios';
+import { Axios, AxiosRequestConfig } from 'axios';
 
 type UserPublicInfo = {
     avatar: string;
@@ -94,6 +95,11 @@ declare class UserSessionService {
     }): Promise<UserSession[]>;
 }
 
+type RequestParams = {
+    lazy?: boolean;
+    lazyTime?: number;
+};
+
 declare class BlockletSDK {
     api: Axios;
     user: AuthService;
@@ -101,5 +107,7 @@ declare class BlockletSDK {
     token: TokenService;
     constructor();
 }
+declare function createAxios(config?: AxiosRequestConfig, requestParams?: RequestParams): axios.AxiosInstance;
+declare function createFetch(options?: RequestInit, requestParams?: RequestParams): (input: string | Request | URL, options?: RequestInit) => Promise<Response>;
 
-export { AuthService, BlockletSDK, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook };
+export { AuthService, BlockletSDK, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { WELLKNOWN_SERVICE_PATH_PREFIX, SESSION_TOKEN_STORAGE_KEY, REFRESH_TOKEN_STORAGE_KEY } from '@abtnode/constant';
-import { withQuery } from 'ufo';
+import { withQuery, joinURL } from 'ufo';
 import Cookie from 'js-cookie';
 import axios from 'axios';
 
@@ -108,8 +108,11 @@ const sleep = (time = 0) => {
     }, time);
   });
 };
+const getBearerToken = (token) => {
+  return `Bearer ${encodeURIComponent(token)}`;
+};
 
-async function sleepForLoading(config, lazyTime) {
+async function sleepForLoading(config, lazyTime = 300) {
   config.metaData.endTime = +/* @__PURE__ */ new Date();
   const { startTime, endTime } = config.metaData;
   const timeDiff = endTime - startTime;
@@ -117,15 +120,15 @@ async function sleepForLoading(config, lazyTime) {
     await sleep(lazyTime - timeDiff);
   delete config.metaData;
 }
-const createApi = (options = {}, { lazy = false, lazyTime = 300 } = {}) => {
+const createAxios$1 = (options, requestParams) => {
   const instance = axios.create({
     ...options,
     headers: {
-      ...options.headers,
+      ...options?.headers,
       "x-blocklet-js-sdk-version": version
     }
   });
-  if (lazy) {
+  if (requestParams?.lazy) {
     instance.interceptors.request.use(
       (config) => {
         config.metaData = { startTime: +/* @__PURE__ */ new Date() };
@@ -135,34 +138,32 @@ const createApi = (options = {}, { lazy = false, lazyTime = 300 } = {}) => {
     );
     instance.interceptors.response.use(
       async (res) => {
-        await sleepForLoading(res.config, lazyTime);
+        await sleepForLoading(res.config, requestParams?.lazyTime);
         return res;
       },
       async (err) => {
-        await sleepForLoading(err.response.config, lazyTime);
+        await sleepForLoading(err.response.config, requestParams?.lazyTime);
         return Promise.reject(err);
       }
     );
   }
   return instance;
 };
-
-const baseURL = WELLKNOWN_SERVICE_PATH_PREFIX;
-async function renewRefreshToken(refreshToken) {
+async function renewRefreshToken$1(refreshToken) {
   if (!refreshToken) {
     throw new Error("Refresh token not found");
   }
-  const refreshApi = createApi({
-    baseURL,
+  const refreshApi = createAxios$1({
+    baseURL: WELLKNOWN_SERVICE_PATH_PREFIX,
     timeout: 10 * 1e3,
     headers: {
-      authorization: `Bearer ${encodeURIComponent(refreshToken)}`
+      authorization: getBearerToken(refreshToken)
     }
   });
-  const { data } = await refreshApi.post("api/did/refreshSession");
+  const { data } = await refreshApi.post("/api/did/refreshSession");
   return data;
 }
-function createRequest({
+function createRequest$1({
   getSessionToken,
   setSessionToken,
   removeSessionToken,
@@ -171,19 +172,21 @@ function createRequest({
   removeRefreshToken,
   onRefreshTokenError,
   onRefreshTokenSuccess
-}, options = {}) {
+}, requestOptions, requestParams) {
   let refreshingTokenRequest = null;
-  const service = createApi({
-    baseURL,
-    timeout: 30 * 1e3,
-    ...options
-  });
+  const service = createAxios$1(
+    {
+      timeout: 30 * 1e3,
+      ...requestOptions
+    },
+    requestParams
+  );
   service.interceptors.request.use(
     async (config) => {
       if (!Cookie.get(SESSION_TOKEN_STORAGE_KEY)) {
         const token = getSessionToken();
         if (token) {
-          config.headers.authorization = `Bearer ${encodeURIComponent(token)}`;
+          config.headers.authorization = getBearerToken(token);
         }
       }
       if (refreshingTokenRequest) {
@@ -201,7 +204,7 @@ function createRequest({
       if (error?.response?.status === 401 && !originalRequest._retry) {
         originalRequest._retry = true;
         if (!refreshingTokenRequest) {
-          refreshingTokenRequest = renewRefreshToken(getRefreshToken());
+          refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
         }
         try {
           const tokenData = await refreshingTokenRequest;
@@ -228,6 +231,110 @@ function createRequest({
   return service;
 }
 
+function createFetch$1(globalOptions = {}, requestParams) {
+  return async (input, options) => {
+    const startAt = Date.now();
+    const request = fetch(input, {
+      ...globalOptions,
+      ...options,
+      headers: {
+        ...globalOptions?.headers,
+        ...options?.headers,
+        "x-blocklet-js-sdk-version": version
+      }
+    });
+    try {
+      return request;
+    } catch (error) {
+      throw error;
+    } finally {
+      const endAt = Date.now();
+      if (requestParams?.lazy) {
+        const lazyTime = requestParams?.lazyTime ?? 300;
+        const timeDiff = endAt - startAt;
+        if (timeDiff < lazyTime)
+          await sleep(lazyTime - timeDiff);
+      }
+    }
+  };
+}
+async function renewRefreshToken(refreshToken) {
+  if (!refreshToken) {
+    throw new Error("Refresh token not found");
+  }
+  const refreshApi = createFetch$1();
+  const res = await refreshApi(joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, "/api/did/refreshSession"), {
+    method: "POST",
+    headers: {
+      authorization: getBearerToken(refreshToken)
+    }
+  });
+  const data = await res.json();
+  return data;
+}
+function createRequest({
+  baseURL,
+  getSessionToken,
+  setSessionToken,
+  removeSessionToken,
+  getRefreshToken,
+  setRefreshToken,
+  removeRefreshToken,
+  onRefreshTokenError,
+  onRefreshTokenSuccess
+}, requestOptions, requestParams) {
+  let refreshingTokenRequest = null;
+  const service = createFetch$1(requestOptions, requestParams);
+  return async (input, options) => {
+    let authorization;
+    const finalUrl = typeof input === "string" ? joinURL(baseURL, input) : input;
+    if (!Cookie.get(SESSION_TOKEN_STORAGE_KEY)) {
+      const token = getSessionToken();
+      if (token) {
+        authorization = getBearerToken(token);
+      }
+    }
+    if (refreshingTokenRequest) {
+      await refreshingTokenRequest;
+    }
+    const res = await service(finalUrl, {
+      ...options,
+      headers: {
+        ...options?.headers,
+        authorization
+      }
+    });
+    if (!res.ok && res.status === 401) {
+      refreshingTokenRequest = renewRefreshToken(getRefreshToken());
+      try {
+        const tokenData = await refreshingTokenRequest;
+        setSessionToken(tokenData.nextToken);
+        setRefreshToken(tokenData.nextRefreshToken);
+        if (typeof onRefreshTokenSuccess === "function") {
+          onRefreshTokenSuccess(tokenData);
+        }
+        return service(finalUrl, {
+          ...options,
+          headers: {
+            ...options?.headers,
+            authorization
+          }
+        });
+      } catch (error) {
+        removeSessionToken();
+        removeRefreshToken();
+        if (typeof onRefreshTokenError === "function") {
+          onRefreshTokenError(error);
+        }
+        return Promise.reject(error);
+      } finally {
+        refreshingTokenRequest = null;
+      }
+    }
+    return res;
+  };
+}
+
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -241,7 +348,34 @@ class BlockletSDK {
     __publicField(this, "userSession");
     __publicField(this, "token");
     const tokenService = new TokenService();
-    const api = createRequest({
+    const internalApi = createRequest$1(
+      {
+        getSessionToken: tokenService.getSessionToken,
+        setSessionToken: tokenService.setSessionToken,
+        removeSessionToken: tokenService.removeSessionToken,
+        getRefreshToken: tokenService.getRefreshToken,
+        setRefreshToken: tokenService.setRefreshToken,
+        removeRefreshToken: tokenService.removeRefreshToken,
+        onRefreshTokenError: () => {
+          console.error("Failed to refresh token");
+        },
+        onRefreshTokenSuccess: () => {
+        }
+      },
+      {
+        baseURL: WELLKNOWN_SERVICE_PATH_PREFIX
+      }
+    );
+    this.user = new AuthService({ api: internalApi });
+    this.userSession = new UserSessionService({ api: internalApi });
+    this.token = tokenService;
+    this.api = internalApi;
+  }
+}
+function createAxios(config, requestParams) {
+  const tokenService = new TokenService();
+  return createRequest$1(
+    {
       getSessionToken: tokenService.getSessionToken,
       setSessionToken: tokenService.setSessionToken,
       removeSessionToken: tokenService.removeSessionToken,
@@ -253,12 +387,30 @@ class BlockletSDK {
       },
       onRefreshTokenSuccess: () => {
       }
-    });
-    this.user = new AuthService({ api });
-    this.userSession = new UserSessionService({ api });
-    this.api = api;
-    this.token = tokenService;
-  }
+    },
+    config,
+    requestParams
+  );
+}
+function createFetch(options, requestParams) {
+  const tokenService = new TokenService();
+  return createRequest(
+    {
+      getSessionToken: tokenService.getSessionToken,
+      setSessionToken: tokenService.setSessionToken,
+      removeSessionToken: tokenService.removeSessionToken,
+      getRefreshToken: tokenService.getRefreshToken,
+      setRefreshToken: tokenService.setRefreshToken,
+      removeRefreshToken: tokenService.removeRefreshToken,
+      onRefreshTokenError: () => {
+        console.error("Failed to refresh token");
+      },
+      onRefreshTokenSuccess: () => {
+      }
+    },
+    options,
+    requestParams
+  );
 }
 
-export { BlockletSDK };
+export { BlockletSDK, createAxios, createFetch };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/js-sdk",
-  "version": "1.16.26-beta-351de484",
+  "version": "1.16.26-beta-cca12425",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -31,7 +31,7 @@
     "build": "unbuild"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.26-beta-351de484",
+    "@abtnode/constant": "1.16.26-beta-cca12425",
     "axios": "^0.27.2",
     "js-cookie": "^3.0.5",
     "ufo": "^1.3.2"
@@ -39,5 +39,5 @@
   "devDependencies": {
     "unbuild": "^2.0.0"
   },
-  "gitHead": "00eba435a21506382c7823ea804abea196390a0f"
+  "gitHead": "fc2804fa8010d4311f1c74e65fb98d117598df2a"
 }