@blocklet/sdk 1.17.2-beta-20251113-212234-9e640edd → 1.17.2-beta-20251113-233643-ab2254af

package/lib/config.js

@@ -14,11 +14,13 @@ const axios_1 = __importDefault(require("axios"));
 const debug_1 = __importDefault(require("debug"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const throttle_1 = __importDefault(require("lodash/throttle"));
+const constant_1 = require("@abtnode/constant");
 const theme_1 = require("@blocklet/theme");
 const env_1 = require("@blocklet/env");
-const constant_1 = require("@blocklet/constant");
+const constant_2 = require("@blocklet/constant");
 const util_1 = require("@blocklet/env/lib/util");
 const util_2 = require("@blocklet/meta/lib/util");
+const base32_1 = require("@abtnode/util/lib/base32");
 const security_1 = require("./security");
 const version_1 = require("./version");
 const notification_1 = __importDefault(require("./service/notification"));
@@ -80,7 +82,7 @@ let componentsFromDisk;
 let configFile;
 if (appDataDir) {
     try {
-        configFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_FILE_PATH);
+        configFile = path_1.default.join(appDataDir, constant_2.APP_CONFIG_FILE_PATH);
         if (fs_1.default.existsSync(configFile)) {
             let configRaw = fs_1.default.readFileSync(configFile).toString();
             if (process.env.DOCKER_HOST_SERVER_DIR && process.env.DOCKER_CONTAINER_SERVER_DIR) {
@@ -95,7 +97,7 @@ if (appDataDir) {
         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);
+        const envFile = path_1.default.join(appDataDir, constant_2.APP_CONFIG_DIR, process.env.BLOCKLET_COMPONENT_DID, constant_2.COMPONENT_ENV_FILE_NAME);
         envFromDisk = (0, parse_env_file_1.parseEnvFile)(envFile, {
             apiKey: process.env.BLOCKLET_COMPONENT_API_KEY,
             componentDid: process.env.BLOCKLET_COMPONENT_DID,
@@ -223,12 +225,12 @@ const _setUpdatedComponents = (components) => {
     _fillWebEndpoint(list);
     list.forEach((newItem) => {
         const exist = componentStore.find((x) => x.did === newItem.did);
-        newItem.status = exist ? exist.status : constant_1.BlockletStatus.stopped;
+        newItem.status = exist ? exist.status : constant_2.BlockletStatus.stopped;
         if (exist) {
             Object.assign(exist, newItem);
         }
         else {
-            componentStore.push({ ...newItem, status: constant_1.BlockletStatus.stopped });
+            componentStore.push({ ...newItem, status: constant_2.BlockletStatus.stopped });
         }
     });
     updateComponentStoreInDocker(componentStore);
@@ -236,13 +238,13 @@ const _setUpdatedComponents = (components) => {
     return list;
 };
 const _handleComponentStarted = (data) => {
-    const list = _setComponentStatus(data.components, constant_1.BlockletStatus.running);
+    const list = _setComponentStatus(data.components, constant_2.BlockletStatus.running);
     debug('handle component started', data, list);
     events.emit(Events.componentStarted, list);
 };
 exports._handleComponentStarted = _handleComponentStarted;
 const _handleComponentStopped = (data) => {
-    const list = _setComponentStatus(data.components, constant_1.BlockletStatus.stopped);
+    const list = _setComponentStatus(data.components, constant_2.BlockletStatus.stopped);
     debug('handle component stopped', data, list);
     events.emit(Events.componentStopped, list);
 };
@@ -339,9 +341,10 @@ const blockletSettings = {
 };
 const fetchBlockletJs = async (type = 'js') => {
     const componentDid = process.env.BLOCKLET_COMPONENT_DID;
+    const appUrl = `https://${(0, base32_1.encode)(env.appPid)}.${constant_1.DEFAULT_DID_DOMAIN}`;
     try {
         const { mountPoint } = componentStore.find((x) => x.did === componentDid);
-        const url = (0, ufo_1.joinURL)(env.appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?nocache=1&t=${Date.now()}${type === 'json' ? '&type=json' : ''}`);
+        const url = (0, ufo_1.joinURL)(appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?nocache=1&t=${Date.now()}${type === 'json' ? '&type=json' : ''}`);
         const res = await axios_1.default.get(url, {
             timeout: 8000,
             headers: {
@@ -351,7 +354,7 @@ const fetchBlockletJs = async (type = 'js') => {
         if (type === 'js') {
             if (typeof res.data === 'string' && res.data.startsWith('window.blocklet')) {
                 blockletJs = res.data;
-                logger.info(`Fetch blocklet.js succeed: ${env.appPid}/${componentDid}`);
+                logger.info(`Fetch blocklet.${type} succeed: ${componentDid} from ${appUrl}`);
                 return res.data;
             }
             throw new Error('Invalid blocklet.js');
@@ -371,14 +374,14 @@ const fetchBlockletJs = async (type = 'js') => {
                     light: (0, theme_1.merge)(DEFAULT_THEME_SETTINGS.light, data.theme?.light || {}),
                     dark: (0, theme_1.merge)(DEFAULT_THEME_SETTINGS.dark, data.theme?.dark || {}),
                 };
-                logger.info(`Fetch blocklet.json succeed: ${env.appPid}/${componentDid}`);
+                logger.info(`Fetch blocklet.${type} succeed: ${componentDid} from ${appUrl}`);
                 return data;
             }
             throw new Error('Invalid blocklet.json data');
         }
     }
     catch (err) {
-        logger.error(`Fetch blocklet.${type} failed: ${env.appPid}/${componentDid} from ${env.appUrl}`, err.message);
+        logger.error(`Fetch blocklet.${type} failed: ${componentDid} from ${appUrl}`, err.message);
         return type === 'js' ? '' : {};
     }
 };
@@ -437,25 +440,25 @@ const runInServer = (fn, type) =>
 };
 const inRuntimeEnv = !!process.env.BLOCKLET_APP_ASK || !!process.env.BLOCKLET_APP_SK;
 if (inRuntimeEnv && !process.env.BLOCKLET_HOOK_NAME && process.env.BLOCKLET_MODE !== 'test') {
-    notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, _handleAppConfigUpdate);
-    notification_1.default.on(constant_1.BlockletInternalEvents.appSettingChanged, _handleAppSettingUpdate);
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentConfigChanged, _handleComponentConfigUpdate);
+    notification_1.default.on(constant_2.BlockletInternalEvents.appConfigChanged, _handleAppConfigUpdate);
+    notification_1.default.on(constant_2.BlockletInternalEvents.appSettingChanged, _handleAppSettingUpdate);
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentConfigChanged, _handleComponentConfigUpdate);
     // Reactive fetch
-    notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, refreshBlockletContext);
-    notification_1.default.on(constant_1.BlockletInternalEvents.appSettingChanged, refreshBlockletContext);
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentConfigChanged, refreshBlockletContext);
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentInstalled, runInServer(_handleComponentInstalled, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentUpgraded, runInServer(_handleComponentUpdated, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentUpdated, runInServer(_handleComponentUpdated, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentStarted, runInServer(_handleComponentStarted, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentStopped, runInServer(_handleComponentStopped, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentRemoved, runInServer(_handleComponentRemoved, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentInstalled, runInServer(refreshBlockletContext, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentUpgraded, runInServer(refreshBlockletContext, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentUpdated, runInServer(refreshBlockletContext, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentStarted, runInServer(refreshBlockletContext, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentStopped, runInServer(refreshBlockletContext, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentRemoved, runInServer(refreshBlockletContext, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.appConfigChanged, refreshBlockletContext);
+    notification_1.default.on(constant_2.BlockletInternalEvents.appSettingChanged, refreshBlockletContext);
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentConfigChanged, refreshBlockletContext);
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentInstalled, runInServer(_handleComponentInstalled, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentUpgraded, runInServer(_handleComponentUpdated, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentUpdated, runInServer(_handleComponentUpdated, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentStarted, runInServer(_handleComponentStarted, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentStopped, runInServer(_handleComponentStopped, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentRemoved, runInServer(_handleComponentRemoved, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentInstalled, runInServer(refreshBlockletContext, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentUpgraded, runInServer(refreshBlockletContext, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentUpdated, runInServer(refreshBlockletContext, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentStarted, runInServer(refreshBlockletContext, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentStopped, runInServer(refreshBlockletContext, 'new'));
+    notification_1.default.on(constant_2.BlockletInternalEvents.componentRemoved, runInServer(refreshBlockletContext, 'new'));
     // Do an initial fetch
     refreshBlockletContext();
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2-beta-20251113-212234-9e640edd",
+  "version": "1.17.2-beta-20251113-233643-ab2254af",
   "description": "graphql client to read/write data on abt node",
   "homepage": "https://www.arcblock.io/docs/blocklet-sdk-nodejs",
   "main": "lib/index.js",
@@ -26,19 +26,19 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.2-beta-20251113-212234-9e640edd",
-    "@abtnode/db-cache": "1.17.2-beta-20251113-212234-9e640edd",
-    "@abtnode/util": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/constant": "1.17.2-beta-20251113-233643-ab2254af",
+    "@abtnode/db-cache": "1.17.2-beta-20251113-233643-ab2254af",
+    "@abtnode/util": "1.17.2-beta-20251113-233643-ab2254af",
     "@arcblock/did": "^1.27.4",
     "@arcblock/did-connect-js": "^1.27.4",
     "@arcblock/did-ext": "^1.27.4",
     "@arcblock/jwt": "^1.27.4",
     "@arcblock/ws": "^1.27.4",
-    "@blocklet/constant": "1.17.2-beta-20251113-212234-9e640edd",
-    "@blocklet/env": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/constant": "1.17.2-beta-20251113-233643-ab2254af",
+    "@blocklet/env": "1.17.2-beta-20251113-233643-ab2254af",
     "@blocklet/error": "^0.3.2",
-    "@blocklet/meta": "1.17.2-beta-20251113-212234-9e640edd",
-    "@blocklet/server-js": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/meta": "1.17.2-beta-20251113-233643-ab2254af",
+    "@blocklet/server-js": "1.17.2-beta-20251113-233643-ab2254af",
     "@blocklet/theme": "^3.2.3",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
@@ -82,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "ee25481c457076c9c7aa7f094dc1771301065f5a"
+  "gitHead": "b0b39ab22bcee6e5c0e280f1799bcb5df5132e6c"
 }