@blocklet/sdk 1.16.16 → 1.16.17-beta-8cacb9b3

package/lib/component/index.d.ts

@@ -20,10 +20,15 @@ type CallComponent = {
 declare const call: CallComponent;
 declare const getComponentMountPoint: (keyword: string) => string;
 declare const getUrl: (...parts: string[]) => string;
+declare const getResourceExportDir: ({ projectId, releaseId }?: {
+    projectId: string;
+    releaseId?: string;
+}) => string;
 export { call };
 export { getUrl };
 export { getComponentMountPoint };
 export { getComponentWebEndpoint };
+export { getResourceExportDir };
 export { getChildWebEndpoint };
 export { getParentWebEndpoint };
 declare const _default: {
@@ -31,6 +36,10 @@ declare const _default: {
     getUrl: (...parts: string[]) => string;
     getComponentMountPoint: (keyword: string) => string;
     getComponentWebEndpoint: (keyword: string) => string;
+    getResourceExportDir: ({ projectId, releaseId }?: {
+        projectId: string;
+        releaseId?: string;
+    }) => string;
     getChildWebEndpoint: (name: string) => string;
     getParentWebEndpoint: () => string;
 };

package/lib/component/index.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParentWebEndpoint = exports.getChildWebEndpoint = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getUrl = exports.call = void 0;
+exports.getParentWebEndpoint = exports.getChildWebEndpoint = exports.getResourceExportDir = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getUrl = exports.call = void 0;
+const path_1 = require("path");
 const util_1 = require("@blocklet/meta/lib/util");
 const axios_1 = __importDefault(require("axios"));
 const get_1 = __importDefault(require("lodash/get"));
@@ -99,11 +100,25 @@ const getUrl = (...parts) => {
     return (0, url_join_1.default)(BLOCKLET_APP_URL, mountPoint === '/' ? '' : mountPoint, ...parts);
 };
 exports.getUrl = getUrl;
+const getResourceExportDir = ({ projectId, releaseId } = { projectId: '' }) => {
+    if (!projectId) {
+        throw new Error('projectId is required');
+    }
+    const dirArr = [process.env.BLOCKLET_APP_DATA_DIR, constant_1.PROJECT.DIR, projectId || '/'];
+    if (releaseId) {
+        dirArr.push(constant_1.PROJECT.RELEASE_DIR, releaseId || '/');
+    }
+    dirArr.push(constant_1.PROJECT.RESOURCE_DIR);
+    const dir = (0, path_1.join)(...dirArr);
+    return dir;
+};
+exports.getResourceExportDir = getResourceExportDir;
 exports.default = {
     call,
     getUrl,
     getComponentMountPoint,
     getComponentWebEndpoint,
+    getResourceExportDir,
     getChildWebEndpoint,
     getParentWebEndpoint, // deprecated
 };

package/lib/config.js

@@ -66,7 +66,7 @@ if (appDataDir) {
         }
     }
     catch (error) {
-        console.error(error);
+        logger.error(error);
     }
     try {
         const envFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_DIR, process.env.BLOCKLET_COMPONENT_DID, constant_1.COMPONENT_ENV_FILE_NAME);
@@ -84,7 +84,7 @@ if (appDataDir) {
         }
     }
     catch (error) {
-        console.error(error);
+        logger.error(error);
     }
 }
 const env = {
@@ -234,7 +234,7 @@ const fetchBlockletJs = async () => {
     const componentDid = process.env.BLOCKLET_COMPONENT_DID;
     try {
         const { mountPoint } = componentStore.find((x) => x.did === componentDid);
-        const res = await axios_1.default.get((0, url_join_1.default)(env.appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?t=${Date.now()}`), {
+        const res = await axios_1.default.get((0, url_join_1.default)(env.appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?force=1&t=${Date.now()}`), {
             timeout: 8000,
             headers: {
                 'User-Agent': `BlockletSDK/${version_1.version}`,
@@ -252,19 +252,19 @@ const fetchBlockletJs = async () => {
 // Page group is dynamic, so we need to create it on the fly
 const normalize = (prefix) => `/${prefix}/`.replace(/\/+/g, '/');
 const getBlockletJs = (pageGroup = '', pathPrefix = '', source = blockletJs) => {
-    let copy = source;
+    let copy = source.slice(0);
     if (pageGroup) {
         copy = copy.replace('pageGroup: "",', `pageGroup: "${pageGroup}",`);
     }
     if (pathPrefix) {
         const componentDid = process.env.BLOCKLET_COMPONENT_DID;
         const { mountPoint } = componentStore.find((x) => x.did === componentDid);
-        copy = copy.replace(`prefix: "${normalize(mountPoint)}",`, `prefix: "${normalize(pathPrefix)}",`);
+        copy = copy.replace(`prefix: "${normalize(mountPoint)}",`, `prefix: "${normalize(pathPrefix)}",`).replace('prefix: "/",', `prefix: "${normalize(pathPrefix)}",`);
     }
     return copy;
 };
 exports.getBlockletJs = getBlockletJs;
-const refreshBlockletJs = (0, throttle_1.default)(fetchBlockletJs, 8000);
+const refreshBlockletJs = (0, throttle_1.default)(fetchBlockletJs, 3000, { trailing: true });
 const runInServer = (fn, type) => 
 // eslint-disable-next-line consistent-return
 (...args) => {

package/lib/middlewares/fallback.js

@@ -18,6 +18,7 @@ const fallback = (file, options = {}) => {
         if ((req.method === 'GET' || req.method === 'HEAD') && req.accepts('html') && !resourcePattern.test(req.path)) {
             res.type('html');
             const pageGroup = req.headers['x-page-group'] || '';
+            const pathPrefix = req.headers['x-path-prefix'] || '';
             const pageData = typeof options.getPageData === 'function' ? await options.getPageData(req) : {};
             pageData.title = (0, escape_1.default)(pageData.title || config_1.env.appName);
             pageData.description = (0, escape_1.default)(pageData.description || config_1.env.appDescription);
@@ -49,7 +50,7 @@ const fallback = (file, options = {}) => {
                 source = source.replace('</head>', `${og}</head>`);
             }
             // inline blocklet.js
-            const blockletJs = (0, config_1.getBlockletJs)(pageGroup);
+            const blockletJs = (0, config_1.getBlockletJs)(pageGroup, pathPrefix);
             if (blockletJs) {
                 source = source
                     .replace('<script src="__blocklet__.js"></script>', `<script>${blockletJs}</script>`)

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.16.16";
+declare const version = "1.16.17";
 export { version };
 declare const _default: {
     version: string;

package/lib/version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-const version = '1.16.16';
+const version = '1.16.17';
 exports.version = version;
 exports.default = { version };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16",
+  "version": "1.16.17-beta-8cacb9b3",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,20 +26,20 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.16",
-    "@abtnode/constant": "1.16.16",
-    "@arcblock/did": "1.18.90",
-    "@arcblock/did-auth": "1.18.90",
-    "@arcblock/jwt": "1.18.90",
-    "@arcblock/ws": "1.18.90",
-    "@blocklet/constant": "1.16.16",
-    "@blocklet/env": "1.16.16",
-    "@blocklet/meta": "1.16.16",
+    "@abtnode/client": "1.16.17-beta-8cacb9b3",
+    "@abtnode/constant": "1.16.17-beta-8cacb9b3",
+    "@arcblock/did": "1.18.91",
+    "@arcblock/did-auth": "1.18.91",
+    "@arcblock/jwt": "1.18.91",
+    "@arcblock/ws": "1.18.91",
+    "@blocklet/constant": "1.16.17-beta-8cacb9b3",
+    "@blocklet/env": "1.16.17-beta-8cacb9b3",
+    "@blocklet/meta": "1.16.17-beta-8cacb9b3",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/handler": "^2.2.0",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.90",
-    "@ocap/wallet": "1.18.90",
+    "@ocap/mcrypto": "1.18.91",
+    "@ocap/wallet": "1.18.91",
     "axios": "^0.27.2",
     "cheerio": "^1.0.0-rc.12",
     "fs-extra": "^10.1.0",
@@ -74,5 +74,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "2de4f6dbad086bd861273a4fc9ca8a87ddda4778"
+  "gitHead": "0e3266f543b6d419a004ca94ee9efb572e3d9809"
 }