@blocklet/js-sdk 1.16.32-beta-5463e017 → 1.16.32-beta-93e1a798

package/dist/index.d.mts

@@ -75,6 +75,7 @@ declare class TokenService {
 type RequestParams = {
     lazy?: boolean;
     lazyTime?: number;
+    componentDid?: string;
 };
 type BlockletComponent = TComponentInternalInfo;
 type BlockletSettings = {
@@ -187,8 +188,8 @@ declare class UserSessionService {
 
 declare class ComponentService {
     private blocklet;
-    constructor({ blocklet }: {
-        blocklet: Blocklet;
+    constructor({ blocklet }?: {
+        blocklet?: Blocklet;
     });
     getComponent(name: string): _blocklet_meta_lib_blocklet.TComponentInternalInfo;
     getComponentMountPoint(name?: string): string;

package/dist/index.d.ts

@@ -75,6 +75,7 @@ declare class TokenService {
 type RequestParams = {
     lazy?: boolean;
     lazyTime?: number;
+    componentDid?: string;
 };
 type BlockletComponent = TComponentInternalInfo;
 type BlockletSettings = {
@@ -187,8 +188,8 @@ declare class UserSessionService {
 
 declare class ComponentService {
     private blocklet;
-    constructor({ blocklet }: {
-        blocklet: Blocklet;
+    constructor({ blocklet }?: {
+        blocklet?: Blocklet;
     });
     getComponent(name: string): _blocklet_meta_lib_blocklet.TComponentInternalInfo;
     getComponentMountPoint(name?: string): string;

package/dist/index.mjs

@@ -3,16 +3,17 @@ import { withQuery, joinURL } from 'ufo';
 import Cookie from 'js-cookie';
 import QuickLRU from 'quick-lru';
 import axios from 'axios';
+import isUrl from 'is-url';
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => {
-  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$3 = Object.defineProperty;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$3 = (obj, key, value) => {
+  __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 class AuthService {
   constructor({ api }) {
-    __publicField$2(this, "api");
+    __publicField$3(this, "api");
     this.api = api;
   }
   async getUserPublicInfo({ did }) {
@@ -149,16 +150,16 @@ class BlockletService {
   }
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => {
-  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$2 = Object.defineProperty;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => {
+  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 class UserSessionService {
   constructor({ api, blocklet }) {
-    __publicField$1(this, "api");
-    __publicField$1(this, "blocklet");
+    __publicField$2(this, "api");
+    __publicField$2(this, "blocklet");
     this.api = api;
     this.blocklet = blocklet || new BlockletService();
   }
@@ -174,6 +175,33 @@ class UserSessionService {
   }
 }
 
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class ComponentService {
+  constructor({ blocklet = window.blocklet } = {}) {
+    __publicField$1(this, "blocklet");
+    this.blocklet = blocklet;
+  }
+  getComponent(name) {
+    const componentMountPoints = this.blocklet?.componentMountPoints || [];
+    const item = componentMountPoints.find((x) => [x.title, x.name, x.did].includes(name));
+    return item;
+  }
+  getComponentMountPoint(name) {
+    const component = this.getComponent(name);
+    return component?.mountPoint || "";
+  }
+  getUrl(name, ...parts) {
+    const mountPoint = this.getComponentMountPoint(name);
+    const appUrl = this.blocklet?.appUrl || "";
+    return joinURL(appUrl, mountPoint, ...parts);
+  }
+}
+
 const version = "1.16.31";
 
 const sleep = (time = 0) => {
@@ -191,6 +219,10 @@ const getVisitorId = () => {
   return localStorage.getItem(visitorIdKey);
 };
 
+function getCSRFToken() {
+  return Cookie.get("x-csrf-token");
+}
+
 async function sleepForLoading(config, lazyTime = 300) {
   config.metaData.endTime = +/* @__PURE__ */ new Date();
   const { startTime, endTime } = config.metaData;
@@ -204,6 +236,7 @@ const createAxios$1 = (options, requestParams) => {
     ...options?.headers,
     "x-blocklet-js-sdk-version": version
   };
+  const componentService = new ComponentService();
   const visitorId = getVisitorId();
   if (![void 0, null].includes(visitorId)) {
     headers["x-blocklet-visitor-id"] = visitorId;
@@ -231,6 +264,16 @@ const createAxios$1 = (options, requestParams) => {
       }
     );
   }
+  instance.interceptors.request.use(
+    (config) => {
+      const componentDid = requestParams?.componentDid ?? window.blocklet?.componentId?.split("/").pop();
+      config.baseURL = config.baseURL || componentService.getComponentMountPoint(componentDid);
+      config.timeout = config.timeout || 20 * 1e3;
+      config.headers["x-csrf-token"] = getCSRFToken();
+      return config;
+    },
+    (error) => Promise.reject(error)
+  );
   return instance;
 };
 async function renewRefreshToken$1(refreshToken) {
@@ -321,6 +364,7 @@ function createFetch$1(globalOptions = {}, requestParams) {
     const headers = {
       ...globalOptions?.headers,
       ...options?.headers,
+      "x-csrf-token": getCSRFToken(),
       "x-blocklet-js-sdk-version": version
     };
     const visitorId = getVisitorId();
@@ -374,9 +418,21 @@ function createRequest({
 }, requestOptions, requestParams) {
   let refreshingTokenRequest = null;
   const service = createFetch$1(requestOptions, requestParams);
+  const componentService = new ComponentService();
   return async (input, options) => {
     let authorization;
-    const finalUrl = typeof input === "string" ? joinURL(baseURL, input) : input;
+    let finalUrl = input;
+    if (typeof input === "string") {
+      if (!isUrl(input)) {
+        if (baseURL) {
+          finalUrl = joinURL(baseURL, input);
+        } else {
+          const componentDid = requestParams?.componentDid ?? window.blocklet?.componentId?.split("/").pop();
+          const mountPoint = componentService.getComponentMountPoint(componentDid);
+          finalUrl = joinURL(mountPoint, input);
+        }
+      }
+    }
     if (!Cookie.get(SESSION_TOKEN_STORAGE_KEY)) {
       const token = getSessionToken();
       if (token) {
@@ -466,10 +522,6 @@ class BlockletSDK {
 }
 function createAxios(config = {}, requestParams = {}) {
   const tokenService = new TokenService();
-  const blockletService = new BlockletService();
-  if (config.baseURL === void 0) {
-    config.baseURL = blockletService.getPrefix();
-  }
   return createRequest$1(
     {
       getSessionToken: tokenService.getSessionToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/js-sdk",
-  "version": "1.16.32-beta-5463e017",
+  "version": "1.16.32-beta-93e1a798",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -28,18 +28,22 @@
   },
   "scripts": {
     "build:blocklet-js-sdk": "npm run build",
-    "build": "unbuild"
+    "build": "unbuild",
+    "watch": "nodemon -w src -e ts -x 'npm run build'"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.32-beta-5463e017",
-    "@blocklet/meta": "1.16.32-beta-5463e017",
+    "@abtnode/constant": "1.16.32-beta-93e1a798",
+    "@blocklet/meta": "1.16.32-beta-93e1a798",
     "axios": "^1.7.5",
+    "is-url": "^1.2.4",
     "js-cookie": "^3.0.5",
     "quick-lru": "^7.0.0",
     "ufo": "^1.5.3"
   },
   "devDependencies": {
-    "unbuild": "^2.0.0"
+    "@types/is-url": "^1.2.32",
+    "unbuild": "^2.0.0",
+    "vitest": "^2.0.5"
   },
-  "gitHead": "aff2d89d663ccd842757ff664fb80e1d7ae05029"
+  "gitHead": "608fab914e6ee5cb5659c11ab3d0713945ab99a0"
 }