@abtnode/core 1.16.29-next-680cf137 → 1.16.29

package/lib/blocklet/hooks.js

@@ -18,6 +18,7 @@ const runUserHook = async (label, hookName, args) => {
     silent = false,
     notification,
     did,
+    timeout,
     output: outputFile,
     error: errorFile,
   } = args;
@@ -40,6 +41,7 @@ const runUserHook = async (label, hookName, args) => {
         NODE_OPTIONS: getSecurityNodeOptions({ environmentObj: env, ...args }, nodeInfo.enableFileSystemIsolation),
       },
       silent,
+      timeout,
       output: outputFile,
       error: errorFile,
     });

package/lib/blocklet/manager/disk.js

@@ -212,9 +212,10 @@ const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
 const statusLock = new Lock('blocklet-status-lock');
 
-const getHooksOutputFiles = (blocklet) => ({
+const getHookArgs = (blocklet) => ({
   output: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'output.log'),
   error: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'error.log'),
+  timeout: (get(blocklet, 'meta.timeout.script') || 120) * 1000,
 });
 
 const pm2StatusMap = {
@@ -766,7 +767,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
             env,
             did, // root blocklet did,
-            ...getHooksOutputFiles(b),
+            ...getHookArgs(b),
           });
 
       // start process
@@ -867,7 +868,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             context,
             exitOnError: false,
             silent,
-            ...getHooksOutputFiles(b),
+            ...getHookArgs(b),
           }),
         componentDids,
       });
@@ -898,11 +899,6 @@ class DiskBlockletManager extends BaseBlockletManager {
           ? componentDids.map((x) => ({ did: x }))
           : blocklet.children.map((x) => ({ did: x.meta.did })),
       });
-      // for backward compatibility
-      this.emit(BlockletInternalEvents.componentsUpdated, {
-        appDid: blocklet.appDid,
-        components: getComponentsInternalInfo(res),
-      });
       this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
       let description = `${
@@ -1068,7 +1064,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             notification: states.notification,
             context,
             exitOnError: false,
-            ...getHooksOutputFiles(b),
+            ...getHookArgs(b),
           }),
       });
 
@@ -1265,11 +1261,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       appDid: app.appDid,
       components: [{ did: child.meta.did }],
     });
-    // for backward compatibility
-    this.emit(BlockletInternalEvents.componentsUpdated, {
-      appDid: app.appDid,
-      components: getComponentsInternalInfo(newBlocklet),
-    });
     this.configSynchronizer.throttledSyncAppConfig(app.meta.did);
 
     return { ...newBlocklet, deletedComponent: child };
@@ -1349,17 +1340,31 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async deleteProcess({ did, componentDids }, context) {
+  /**
+   *
+   * @param {object} param - params
+   * @param {string} param.did - blocklet did
+   * @param {string[]} param.componentDids - component dids
+   * @param {boolean} param.shouldUpdateBlockletStatus - should update blocklet status
+   * @param {*} context
+   * @returns
+   */
+  async deleteProcess({ did, componentDids, shouldUpdateBlockletStatus = true }, context) {
     const blocklet = await this.getBlocklet(did);
 
     logger.info('delete blocklet process', { did, componentDids });
 
     await deleteBlockletProcess(blocklet, { ...context, componentDids });
-
-    const result = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
     logger.info('blocklet process deleted successfully', { did, componentDids });
-    return result;
+
+    // 有些情况不需要更新 blocklet 状态, 比如下载完成，安装之前清理 process 时, 不需要更新 blocklet 状态
+    if (shouldUpdateBlockletStatus) {
+      const result = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
+      logger.info('blocklet status updated to stopped after deleted processes', { did, componentDids });
+      return result;
+    }
+
+    return blocklet;
   }
 
   // Get blocklet by blockletDid or appDid
@@ -1490,7 +1495,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments, ancestors), ...configObj },
         did,
         context,
-        ...getHooksOutputFiles(blocklet),
+        ...getHookArgs(blocklet),
       });
     }
 
@@ -1566,7 +1571,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
       }
 
-      this.emit(BlockletEvents.updated, { ...newState, context });
       const serverSk = (await states.node.read()).sk;
       if (childDid) {
         const configs = JSON.stringify(finalConfigs.map((x) => ({ key: x.key, value: x.value })));
@@ -1579,6 +1583,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         this.configSynchronizer.syncComponentConfig(childDid, rootDid, { serverSk });
       }
 
+      this.emit(BlockletEvents.updated, { ...newState, context });
+
       try {
         const observableConfigs = [
           BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL,
@@ -1853,11 +1859,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       appDid: blocklet.appDid,
       components: getComponentsInternalInfo(blocklet).filter((x) => x.did === component.meta.did),
     });
-    // for backward compatibility
-    this.emit(BlockletInternalEvents.componentsUpdated, {
-      appDid: blocklet.appDid,
-      components: getComponentsInternalInfo(blocklet),
-    });
     this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
     return this.getBlocklet(rootDid);
@@ -2709,11 +2710,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         appDid: blocklet.appDid,
         components: (componentDids || []).map((x) => ({ did: x })),
       });
-      // for backward compatibility
-      this.emit(BlockletInternalEvents.componentsUpdated, {
-        appDid: blocklet.appDid,
-        components: getComponentsInternalInfo(res),
-      });
       this.configSynchronizer.throttledSyncAppConfig(res);
 
       this.emit(BlockletEvents.statusChange, res);
@@ -3259,7 +3255,9 @@ class DiskBlockletManager extends BaseBlockletManager {
         return null;
       }
 
-      blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
+      if (blocklet.site) {
+        blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
+      }
 
       // app runtime info, app status
       blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
@@ -3449,7 +3447,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       // ensure delete process
       try {
-        await this.deleteProcess({ did }, context);
+        await this.deleteProcess({ did, shouldUpdateBlockletStatus: false }, context);
         logger.info('ensure delete blocklet process for installing', { did, name: meta.name });
       } catch (err) {
         logger.error('ensure delete blocklet process failed for installing', { did, name: meta.name, error: err });
@@ -3642,7 +3640,7 @@ class DiskBlockletManager extends BaseBlockletManager {
               env: getRuntimeEnvironments(b, nodeEnvironments, [blocklet]),
               oldVersion: oldVersions[b.meta.did],
               newVersion: b.meta.version,
-              ...getHooksOutputFiles(b),
+              ...getHookArgs(b),
             });
           } catch (error) {
             logger.error('Failed to run migration scripts', { appDid: did, title: b.meta.title, error });
@@ -3693,7 +3691,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         }
       }
       if (stoppedDids.length) {
-        await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids: stoppedDids });
+        const status = action === INSTALL_ACTIONS.INSTALL_COMPONENT ? BlockletStatus.installed : BlockletStatus.stopped;
+        await states.blocklet.setBlockletStatus(did, status, { componentDids: stoppedDids });
       }
 
       blocklet = await this.getBlocklet(did, context);
@@ -3747,11 +3746,6 @@ class DiskBlockletManager extends BaseBlockletManager {
           }
         );
       }
-      // for backward compatibility
-      this.emit(BlockletInternalEvents.componentsUpdated, {
-        appDid: blocklet.appDid,
-        components: getComponentsInternalInfo(blocklet),
-      });
       this.configSynchronizer.throttledSyncAppConfig(blocklet);
 
       return blocklet;
@@ -4040,7 +4034,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         did: blocklet.meta.did, // root blocklet did
         notification: states.notification,
         context,
-        ...getHooksOutputFiles(b),
+        ...getHookArgs(b),
       });
 
     await forEachBlocklet(blocklet, hookFn, { parallel: true, concurrencyLimit: 4 });

package/lib/blocklet/manager/helper/install-component-from-dev.js

@@ -13,7 +13,10 @@ const { formatName } = require('../../../util/get-domain-for-blocklet');
 
 const needParseDependents = (meta, app) => {
   const dependents = (meta.components || []).map((x) => x.source.name);
-  return !dependents.every((name) => app.children.some((x) => x.meta.name === name));
+  if (meta.engine?.interpreter === 'blocklet') {
+    dependents.push(meta.engine.source.name);
+  }
+  return !dependents.filter(Boolean).every((name) => app.children.some((x) => x.meta.name === name));
 };
 
 const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, manager, states, skipParseDependents }) => {

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -30,18 +30,24 @@ const check = async ({ did, states }) => {
     const bundleSource = getFixedBundleSource(child);
 
     if (bundleSource) {
-      const { dynamicComponents } = await parseComponents({
-        meta: {
-          components: [
-            {
-              source: bundleSource,
-              name: child.meta.name,
-              mountPoint: child.mountPoint,
-            },
-          ],
+      const { dynamicComponents } = await parseComponents(
+        {
+          meta: {
+            components: [
+              {
+                source: bundleSource,
+                name: child.meta.name,
+                mountPoint: child.mountPoint,
+              },
+            ],
+          },
         },
-      });
+        { continueOnError: true }
+      );
       const newChild = dynamicComponents.find((x) => x.meta.name === child.meta.name);
+      if (!newChild) {
+        continue;
+      }
       newChild._dynamicComponents = dynamicComponents.filter((x) => x.meta.name !== child.meta.name);
       newChildren.push(newChild);
     } else {

package/lib/blocklet/migration.js

@@ -22,6 +22,7 @@ async function runScripts({
   printError,
   output,
   error,
+  timeout,
 }) {
   // 获取所有待执行的脚本
   let scripts = [];
@@ -61,6 +62,7 @@ async function runScripts({
         silent: false,
         output,
         error,
+        timeout,
       });
       printInfo(`Migration script executed: ${scriptPath}`);
     } catch (migrationErr) {
@@ -107,6 +109,7 @@ module.exports = async ({
   printError = logger.error,
   output,
   error,
+  timeout,
 }) => {
   if (!oldVersion) {
     return;
@@ -136,6 +139,7 @@ module.exports = async ({
     printSuccess,
     output,
     error,
+    timeout,
   });
 
   fs.removeSync(backupDir);

package/lib/blocklet/project/publish-to-store.js

@@ -2,6 +2,7 @@ const path = require('path');
 const { PROJECT } = require('@blocklet/constant');
 const { upload } = require('@blocklet/store');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
+const fs = require('fs/promises');
 
 function ensureArray(value) {
   if (!value) {
@@ -18,6 +19,37 @@ function getReleaseDir(blocklet, projectId, releaseId) {
   return path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
 }
 
+const MAX_RETRIES = 5;
+const RETRY_DELAY = 100;
+
+// 利用乐观锁, 去更新字段, 如果连续5次都失败, 就算更新失败
+async function updateReleaseWithRetry(releaseState, releaseId, projectId, storeId) {
+  // eslint-disable-next-line no-unused-vars
+  for (const _ of Array(MAX_RETRIES).fill(0)) {
+    // eslint-disable-next-line no-await-in-loop
+    const release = await releaseState.findOne({ projectId, id: releaseId });
+    release.publishedStoreIds = ensureArray(release.publishedStoreIds);
+    release.publishedStoreIds.push(storeId);
+
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const result = await releaseState.update(
+        { id: releaseId, updatedAt: release.updatedAt },
+        { $set: { publishedStoreIds: Array.from(new Set(release.publishedStoreIds)) } }
+      );
+      if (result?.[0] > 0) {
+        return true;
+      }
+      // eslint-disable-next-line no-await-in-loop
+      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY));
+    } catch (error) {
+      throw new Error(`Failed to update release: ${error.message}`);
+    }
+  }
+
+  throw new Error('Failed to update release after maximum retries');
+}
+
 const publishToStore = async ({ did, projectId, releaseId, type, storeId, manager }) => {
   if (
     !did ||
@@ -42,6 +74,7 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
   if (!store) {
     throw new Error('no find connected store');
   }
+
   const { storeUrl } = store;
   const { accessToken, developerDid } = store;
 
@@ -50,7 +83,12 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     throw new Error('blocklet not found');
   }
 
-  const releaseDir = getReleaseDir(blocklet, projectId, releaseId);
+  const project = await projectState.findOne({ id: projectId });
+  let releaseDir = getReleaseDir(blocklet, projectId, releaseId);
+  if (project.possibleSameStore) {
+    await fs.cp(releaseDir, `${releaseDir}-${storeId}`, { recursive: true });
+    releaseDir = `${releaseDir}-${storeId}`;
+  }
   const metaFile = path.join(releaseDir, '.blocklet', 'release', 'blocklet.json');
 
   const response = await upload({
@@ -58,16 +96,11 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     storeUrl,
     accessToken,
     developerDid,
+    possibleSameStore: project.possibleSameStore,
     source: `Blocklet Studio (${getDisplayName(blocklet)})`,
   });
 
-  release.publishedStoreIds = ensureArray(release.publishedStoreIds);
-  release.publishedStoreIds.push(storeId);
-
-  await releaseState.update(
-    { id: releaseId },
-    { $set: { publishedStoreIds: Array.from(new Set(release.publishedStoreIds)) } }
-  );
+  await updateReleaseWithRetry(releaseState, releaseId, projectId, storeId);
 
   return response?.status;
 };

package/lib/crons/monitor-disk-usage.js

@@ -11,14 +11,14 @@ const check = async (threshold) => {
   for (const disk of disks) {
     const usageRatio = (disk.used / disk.total) * 100;
     if (Number.isNaN(usageRatio)) {
-      return;
+      continue;
     }
 
     const usageRatioPercent = `${usageRatio.toFixed(2)}%`;
     logger.info('check disk usage', { usage: usageRatioPercent, threshold });
 
     if (usageRatio < threshold) {
-      return;
+      continue;
     }
 
     // eslint-disable-next-line no-await-in-loop

package/lib/event/index.js

@@ -357,11 +357,7 @@ module.exports = ({
       }
     }
 
-    if (
-      [BlockletEvents.started, BlockletEvents.startFailed, BlockletEvents.stopped, BlockletEvents.reloaded].includes(
-        eventName
-      )
-    ) {
+    if ([BlockletEvents.started, BlockletEvents.startFailed, BlockletEvents.stopped].includes(eventName)) {
       try {
         await blockletManager.runtimeMonitor.monit(blocklet.meta.did);
       } catch (error) {

package/lib/states/project.js

@@ -79,6 +79,8 @@ class Project extends BaseState {
         'lastReleaseId',
         'lastReleaseFiles',
         'connectedStores',
+        'autoUpload',
+        'possibleSameStore',
       ]),
       (x) => !isUndefinedOrNull(x)
     );

package/lib/util/index.js

@@ -7,6 +7,7 @@ const shell = require('shelljs');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');
 const pickBy = require('lodash/pickBy');
+const uniq = require('lodash/uniq');
 const { isFromPublicKey } = require('@arcblock/did');
 const { joinURL } = require('ufo');
 const { Certificate } = require('@fidm/x509');
@@ -195,7 +196,7 @@ const getBaseUrls = async (node, ips) => {
   const info = await node.getNodeInfo();
   const { https, httpPort, httpsPort } = info.routing;
   const getPort = (port, defaultPort) => (port && port !== defaultPort ? `:${port}` : '');
-  const availableIps = ips.filter(Boolean);
+  const availableIps = uniq(ips.filter(Boolean));
 
   const getHttpInfo = async (domain) => {
     const certificate = https ? await node.certManager.getNormalByDomain(domain) : null;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-next-680cf137",
+  "version": "1.16.29",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,40 +19,40 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.29-next-680cf137",
-    "@abtnode/auth": "1.16.29-next-680cf137",
-    "@abtnode/certificate-manager": "1.16.29-next-680cf137",
-    "@abtnode/constant": "1.16.29-next-680cf137",
-    "@abtnode/cron": "1.16.29-next-680cf137",
-    "@abtnode/logger": "1.16.29-next-680cf137",
-    "@abtnode/models": "1.16.29-next-680cf137",
-    "@abtnode/queue": "1.16.29-next-680cf137",
-    "@abtnode/rbac": "1.16.29-next-680cf137",
-    "@abtnode/router-provider": "1.16.29-next-680cf137",
-    "@abtnode/static-server": "1.16.29-next-680cf137",
-    "@abtnode/timemachine": "1.16.29-next-680cf137",
-    "@abtnode/util": "1.16.29-next-680cf137",
-    "@arcblock/did": "1.18.126",
-    "@arcblock/did-auth": "1.18.126",
-    "@arcblock/did-ext": "^1.18.126",
+    "@abtnode/analytics": "1.16.29",
+    "@abtnode/auth": "1.16.29",
+    "@abtnode/certificate-manager": "1.16.29",
+    "@abtnode/constant": "1.16.29",
+    "@abtnode/cron": "1.16.29",
+    "@abtnode/logger": "1.16.29",
+    "@abtnode/models": "1.16.29",
+    "@abtnode/queue": "1.16.29",
+    "@abtnode/rbac": "1.16.29",
+    "@abtnode/router-provider": "1.16.29",
+    "@abtnode/static-server": "1.16.29",
+    "@abtnode/timemachine": "1.16.29",
+    "@abtnode/util": "1.16.29",
+    "@arcblock/did": "1.18.128",
+    "@arcblock/did-auth": "1.18.128",
+    "@arcblock/did-ext": "^1.18.128",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.126",
-    "@arcblock/event-hub": "1.18.126",
-    "@arcblock/jwt": "^1.18.126",
+    "@arcblock/did-util": "1.18.128",
+    "@arcblock/event-hub": "1.18.128",
+    "@arcblock/jwt": "^1.18.128",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.126",
-    "@arcblock/vc": "1.18.126",
-    "@blocklet/constant": "1.16.29-next-680cf137",
-    "@blocklet/env": "1.16.29-next-680cf137",
-    "@blocklet/meta": "1.16.29-next-680cf137",
-    "@blocklet/resolver": "1.16.29-next-680cf137",
-    "@blocklet/sdk": "1.16.29-next-680cf137",
-    "@blocklet/store": "1.16.29-next-680cf137",
-    "@did-space/client": "^0.5.7",
+    "@arcblock/validator": "^1.18.128",
+    "@arcblock/vc": "1.18.128",
+    "@blocklet/constant": "1.16.29",
+    "@blocklet/env": "1.16.29",
+    "@blocklet/meta": "1.16.29",
+    "@blocklet/resolver": "1.16.29",
+    "@blocklet/sdk": "1.16.29",
+    "@blocklet/store": "1.16.29",
+    "@did-space/client": "^0.5.16",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.126",
-    "@ocap/util": "1.18.126",
-    "@ocap/wallet": "1.18.126",
+    "@ocap/mcrypto": "1.18.128",
+    "@ocap/util": "1.18.128",
+    "@ocap/wallet": "1.18.128",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.2",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "17b7e7c5e43c497980d4fe6b5bb20609328041bd"
+  "gitHead": "6c49cffcab4fd0dffc6bed261a5eddf733280ae7"
 }