@blocklet/js-sdk 1.16.33-beta-20241024-064549-2c1ad302 → 1.16.33-beta-20241028-164124-17cf3c21

package/dist/index.d.mts

@@ -112,6 +112,7 @@ type Blocklet = {
     appLogo: string;
     appLogoRect: string;
     appUrl: string;
+    domainAliases?: string[];
     isComponent: boolean;
     prefix: string;
     groupPrefix: string;
@@ -181,8 +182,17 @@ declare class UserSessionService {
         api: Axios;
         blocklet?: BlockletService;
     });
-    getUserSessions({ did }: {
+    getBaseUrl(appUrl?: string): string | undefined;
+    getUserSessions({ did, appUrl }: {
         did: string;
+        appUrl?: string;
+    }): Promise<UserSession[]>;
+    loginByUserSession({ appPid, userDid, visitorId, passportId, appUrl, }: {
+        appPid: string;
+        userDid: string;
+        visitorId: string;
+        passportId: string;
+        appUrl?: string;
     }): Promise<UserSession[]>;
 }
 
@@ -208,5 +218,6 @@ declare class BlockletSDK {
 }
 declare function createAxios(config?: AxiosRequestConfig, requestParams?: RequestParams): axios.AxiosInstance;
 declare function createFetch(options?: RequestInit, requestParams?: RequestParams): (input: string | Request | URL, options?: RequestInit) => Promise<Response>;
+declare const getBlockletSDK: () => BlockletSDK;
 
-export { AuthService, BlockletSDK, BlockletService, ComponentService, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch, getCSRFToken };
+export { AuthService, BlockletSDK, BlockletService, ComponentService, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch, getBlockletSDK, getCSRFToken };

package/dist/index.d.ts

@@ -112,6 +112,7 @@ type Blocklet = {
     appLogo: string;
     appLogoRect: string;
     appUrl: string;
+    domainAliases?: string[];
     isComponent: boolean;
     prefix: string;
     groupPrefix: string;
@@ -181,8 +182,17 @@ declare class UserSessionService {
         api: Axios;
         blocklet?: BlockletService;
     });
-    getUserSessions({ did }: {
+    getBaseUrl(appUrl?: string): string | undefined;
+    getUserSessions({ did, appUrl }: {
         did: string;
+        appUrl?: string;
+    }): Promise<UserSession[]>;
+    loginByUserSession({ appPid, userDid, visitorId, passportId, appUrl, }: {
+        appPid: string;
+        userDid: string;
+        visitorId: string;
+        passportId: string;
+        appUrl?: string;
     }): Promise<UserSession[]>;
 }
 
@@ -208,5 +218,6 @@ declare class BlockletSDK {
 }
 declare function createAxios(config?: AxiosRequestConfig, requestParams?: RequestParams): axios.AxiosInstance;
 declare function createFetch(options?: RequestInit, requestParams?: RequestParams): (input: string | Request | URL, options?: RequestInit) => Promise<Response>;
+declare const getBlockletSDK: () => BlockletSDK;
 
-export { AuthService, BlockletSDK, BlockletService, ComponentService, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch, getCSRFToken };
+export { AuthService, BlockletSDK, BlockletService, ComponentService, type NotificationConfig, type PrivacyConfig, TokenService, type UserPublicInfo, type UserSession, UserSessionService, type UserSessionUser, type Webhook, createAxios, createFetch, getBlockletSDK, getCSRFToken };

package/dist/index.mjs

@@ -163,9 +163,14 @@ class UserSessionService {
     this.api = api;
     this.blocklet = blocklet || new BlockletService();
   }
-  async getUserSessions({ did }) {
+  getBaseUrl(appUrl) {
+    return appUrl ? joinURL(appUrl, WELLKNOWN_SERVICE_PATH_PREFIX) : void 0;
+  }
+  async getUserSessions({ did, appUrl }) {
+    const baseURL = this.getBaseUrl(appUrl);
     const blocklet = await this.blocklet.getBlocklet();
     const { data } = await this.api.get("/api/user-session", {
+      baseURL,
       params: {
         userDid: did,
         appPid: blocklet.appPid
@@ -173,6 +178,26 @@ class UserSessionService {
     });
     return data;
   }
+  async loginByUserSession({
+    appPid,
+    userDid,
+    visitorId,
+    passportId,
+    appUrl
+  }) {
+    const baseURL = this.getBaseUrl(appUrl);
+    const { data } = await this.api.post(
+      "/api/user-session/login",
+      {
+        appPid,
+        userDid,
+        visitorId,
+        passportId
+      },
+      { baseURL }
+    );
+    return data;
+  }
 }
 
 var __defProp$1 = Object.defineProperty;
@@ -255,11 +280,15 @@ const createAxios$1 = (options, requestParams) => {
     );
     instance.interceptors.response.use(
       async (res) => {
-        await sleepForLoading(res.config, requestParams?.lazyTime);
+        if (res.config) {
+          await sleepForLoading(res.config, requestParams?.lazyTime);
+        }
         return res;
       },
       async (err) => {
-        await sleepForLoading(err.response.config, requestParams?.lazyTime);
+        if (err.response) {
+          await sleepForLoading(err.response.config, requestParams?.lazyTime);
+        }
         return Promise.reject(err);
       }
     );
@@ -327,29 +356,31 @@ function createRequest$1({
     (response) => response,
     async (error) => {
       const originalRequest = error.config;
-      originalRequest.headers = { ...originalRequest?.headers };
-      if (error?.response?.status === 401 && !originalRequest._retry) {
-        originalRequest._retry = true;
-        try {
-          if (!refreshingTokenRequest) {
-            refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
-          }
-          const tokenData = await refreshingTokenRequest;
-          setSessionToken(tokenData.nextToken);
-          setRefreshToken(tokenData.nextRefreshToken);
-          if (typeof onRefreshTokenSuccess === "function") {
-            onRefreshTokenSuccess(tokenData);
+      if (originalRequest) {
+        originalRequest.headers = originalRequest?.headers ? { ...originalRequest.headers } : {};
+        if (error?.response?.status === 401 && !originalRequest._retry) {
+          originalRequest._retry = true;
+          try {
+            if (!refreshingTokenRequest) {
+              refreshingTokenRequest = renewRefreshToken$1(getRefreshToken());
+            }
+            const tokenData = await refreshingTokenRequest;
+            setSessionToken(tokenData.nextToken);
+            setRefreshToken(tokenData.nextRefreshToken);
+            if (typeof onRefreshTokenSuccess === "function") {
+              onRefreshTokenSuccess(tokenData);
+            }
+            return service(originalRequest);
+          } catch (refreshTokenError) {
+            removeSessionToken();
+            removeRefreshToken();
+            if (typeof onRefreshTokenError === "function") {
+              onRefreshTokenError(refreshTokenError);
+            }
+            return Promise.reject(error);
+          } finally {
+            refreshingTokenRequest = null;
           }
-          return service(originalRequest);
-        } catch (refreshTokenError) {
-          removeSessionToken();
-          removeRefreshToken();
-          if (typeof onRefreshTokenError === "function") {
-            onRefreshTokenError(refreshTokenError);
-          }
-          return Promise.reject(error);
-        } finally {
-          refreshingTokenRequest = null;
         }
       }
       return Promise.reject(error);
@@ -560,5 +591,14 @@ function createFetch(options, requestParams) {
     requestParams
   );
 }
+const getBlockletSDK = /* @__PURE__ */ (() => {
+  let instance;
+  return () => {
+    if (!instance) {
+      instance = new BlockletSDK();
+    }
+    return instance;
+  };
+})();
 
-export { BlockletSDK, createAxios, createFetch, getCSRFToken };
+export { BlockletSDK, createAxios, createFetch, getBlockletSDK, getCSRFToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/js-sdk",
-  "version": "1.16.33-beta-20241024-064549-2c1ad302",
+  "version": "1.16.33-beta-20241028-164124-17cf3c21",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -32,8 +32,8 @@
     "watch": "nodemon -w src -e ts -x 'npm run build'"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.33-beta-20241024-064549-2c1ad302",
-    "@blocklet/meta": "1.16.33-beta-20241024-064549-2c1ad302",
+    "@abtnode/constant": "1.16.33-beta-20241028-164124-17cf3c21",
+    "@blocklet/meta": "1.16.33-beta-20241028-164124-17cf3c21",
     "axios": "^1.7.5",
     "is-url": "^1.2.4",
     "js-cookie": "^3.0.5",
@@ -45,5 +45,5 @@
     "unbuild": "^2.0.0",
     "vitest": "^2.0.5"
   },
-  "gitHead": "3b0da27501ff0c115335cbf46364c37a754fefdc"
+  "gitHead": "df5cccba1192375274247a8770fe07f9dc248994"
 }