@abtnode/core 1.16.44-beta-20250520-104453-912ed737 → 1.16.44-beta-20250524-065731-c62fd374

package/lib/api/team.js

@@ -2098,17 +2098,14 @@ class TeamAPI extends EventEmitter {
         extra,
       });
       logger.info('insert userSession successfully', { userDid, ua, lastLoginIp, appPid, passportId, extra });
-      // HACK: 某些地方，首次新增 userSession 时不会，携带 ua 信息，这个时候不能发通知
-      if (ua) {
-        this.emit(BlockletEvents.addUserSession, {
-          userSession: data,
-          teamDid,
-          userDid,
-          locale,
-          skipNotification,
-          origin,
-        });
-      }
+      this.emit(BlockletEvents.addUserSession, {
+        userSession: data,
+        teamDid,
+        userDid,
+        locale,
+        skipNotification,
+        origin,
+      });
     } else {
       const exist = await state.findOne({ userDid, visitorId, appPid });
       if (exist) {
@@ -2166,16 +2163,14 @@ class TeamAPI extends EventEmitter {
           passportId,
           extra,
         });
-        if (ua) {
-          this.emit(BlockletEvents.addUserSession, {
-            userSession: data,
-            teamDid,
-            userDid,
-            locale,
-            skipNotification,
-            origin,
-          });
-        }
+        this.emit(BlockletEvents.addUserSession, {
+          userSession: data,
+          teamDid,
+          userDid,
+          locale,
+          skipNotification,
+          origin,
+        });
       }
     }
 

package/lib/blocklet/manager/disk.js

@@ -62,6 +62,7 @@ const {
   isGatewayBlocklet,
   hasStartEngine,
   getDisplayName,
+  isExternalBlocklet,
 } = require('@blocklet/meta/lib/util');
 const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
 const { getRequiredComponentsLayers } = require('@blocklet/meta/lib/get-required-components-layers');
@@ -891,7 +892,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         (hookName) =>
         async (b, { env }) => {
           const hookArgs = getHookArgs(b);
-          const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo);
+          const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
           if (needRunDocker) {
             if (hookName === 'postStart' && b.meta.scripts?.postStart) {
               return dockerExec({
@@ -1005,7 +1006,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       await stopBlockletProcess(blocklet, {
         preStop: async (b, { ancestors }) => {
           const nextEnv = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
-          const needRunDocker = await checkNeedRunDocker(b.meta, nextEnv, nodeInfo);
+          const needRunDocker = await checkNeedRunDocker(b.meta, nextEnv, nodeInfo, isExternalBlocklet(blocklet));
           const hookArgs = getHookArgs(b);
           if (needRunDocker) {
             const script = b.meta.scripts?.preStop;
@@ -1233,7 +1234,8 @@ class DiskBlockletManager extends BaseBlockletManager {
           const needRunDocker = await checkNeedRunDocker(
             b.meta,
             getRuntimeEnvironments(b, nodeEnvironments, ancestors),
-            nodeInfo
+            nodeInfo,
+            isExternalBlocklet(blocklet)
           );
           const hookArgs = getHookArgs(b);
           const nextEnv = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
@@ -1722,7 +1724,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       // FIXME: we should also call preConfig for child blocklets
       const nodeInfo = await states.node.read();
       const nextEnv = { ...getRuntimeEnvironments(blocklet, nodeEnvironments, ancestors), ...configObj };
-      const needRunDocker = await checkNeedRunDocker(blocklet.meta, nextEnv, nodeInfo);
+      const needRunDocker = await checkNeedRunDocker(blocklet.meta, nextEnv, nodeInfo, isExternalBlocklet(blocklet));
       const hookArgs = getHookArgs(blocklet);
       if (needRunDocker) {
         if (blocklet.meta.scripts?.preConfig) {
@@ -2354,7 +2356,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         }
 
         const cert = await this.certManager.manager.getByDomain(alias.value);
-        logger.info('cron check dns certificate', { cert });
+        logger.info('cron check dns certificate', { status: cert?.status, domain: alias.value });
         if (cert?.status === 'error') {
           await issueCert(alias);
         }
@@ -4119,7 +4121,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         return;
       }
       const nextEnv = getRuntimeEnvironments(b, nodeEnvironments, [blocklet]);
-      const subNeedRunDocker = await checkNeedRunDocker(b.meta, nextEnv, nodeInfo);
+      const subNeedRunDocker = await checkNeedRunDocker(b.meta, nextEnv, nodeInfo, isExternalBlocklet(blocklet));
       const hookArgs = getHookArgs(b);
 
       const scriptsDir = path.join(b.env.appDir, 'migration');
@@ -4215,7 +4217,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       const nodeEnvironments = await states.node.getEnvironments();
       const nodeInfo = await states.node.read();
       const env = getRuntimeEnvironments(blocklet, nodeEnvironments, {});
-      const needRunDocker = await checkNeedRunDocker(blocklet.meta, env, nodeInfo);
+      const needRunDocker = await checkNeedRunDocker(blocklet.meta, env, nodeInfo, isExternalBlocklet(blocklet));
 
       if (!needRunDocker) {
         // pre install
@@ -4594,7 +4596,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     const nodeInfo = await states.node.read();
     const hookFn = async (b, { ancestors }) => {
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
-      const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo);
+      const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
       const hookArgs = getHookArgs(b);
       if (needRunDocker) {
         const script = b.meta.scripts?.[name];
@@ -5113,6 +5115,21 @@ class DiskBlockletManager extends BaseBlockletManager {
     const isExpired = await launcher.isBlockletExpired(blocklet.meta.did, blocklet.controller);
 
     if (isExpired) {
+      if (blocklet.controller.status?.value !== BLOCKLET_CONTROLLER_STATUS.suspended) {
+        await states.blockletExtras.updateByDid(blocklet.meta.did, {
+          controller: {
+            ...blocklet.controller,
+            status: {
+              value: BLOCKLET_CONTROLLER_STATUS.suspended,
+              reason: SUSPENDED_REASON.expired,
+            },
+          },
+        });
+        logger.info('update blocklet controller status to suspended', {
+          did: blocklet.meta.did,
+          nftId: blocklet.controller?.nftId,
+        });
+      }
       logger.error(`try to ${action} an expired blocklet`, {
         did: blocklet.meta.did,
         nftId: blocklet.controller?.nftId,

package/lib/blocklet/manager/ensure-blocklet-running.js

@@ -6,7 +6,6 @@ const { getDisplayName } = require('@blocklet/meta/lib/util');
 
 const states = require('../../states');
 const { isBlockletPortHealthy, shouldCheckHealthy } = require('../../util/blocklet');
-const { shouldJobBackoff } = require('../../util/env');
 
 const inProgressStatuses = [BlockletStatus.stopping, BlockletStatus.restarting, BlockletStatus.waiting];
 
@@ -28,11 +27,11 @@ class EnsureBlockletRunning {
 
   fakeRunningToWaitingOnce = false;
 
-  highLoadCpu = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU || 0.7;
+  highLoadCpu = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU || 0.85;
 
-  highLoadMemory = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY || 0.8;
+  highLoadMemory = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY || 0.85;
 
-  highLoadDisk = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK || 0.8;
+  highLoadDisk = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK || 0.95;
 
   runningBlocklets = {};
 
@@ -51,9 +50,6 @@ class EnsureBlockletRunning {
   // Ease to mock
   isBlockletPortHealthy = isBlockletPortHealthy;
 
-  // Ease to mock
-  shouldJobBackoff = shouldJobBackoff;
-
   isBlockletPortHealthyWithRetries = async (blocklet, isDoing = false) => {
     let error;
     for (let attempt = 0; attempt < 10; attempt++) {
@@ -88,15 +84,17 @@ class EnsureBlockletRunning {
     this.notification = notification;
     this.createAuditLog = createAuditLog;
     this.checkSystemHighLoad = checkSystemHighLoad;
+    logger.info('check and fix blocklet status interval', this.checkInterval);
     const task = async () => {
-      if (this.stopped) {
-        return;
-      }
-      await this.checkAndFix();
       await sleep(this.checkInterval);
+      try {
+        await this.checkAndFix();
+      } catch (e) {
+        logger.error('check and fix blocklet status failed', e);
+      }
       task();
     };
-    setTimeout(task, this.deferredTime);
+    task();
   };
 
   getDisplayNameByRootDid = (rootDid) => {
@@ -112,20 +110,18 @@ class EnsureBlockletRunning {
   };
 
   checkAndFix = async () => {
+    logger.info('check and fix blocklet status');
     if (process.env.ABT_NODE_RESTART_RUNNING_COMPONENT === '1') {
+      logger.info('skip check and fix blocklet status because ABT_NODE_RESTART_RUNNING_COMPONENT is 1');
       return;
     }
 
-    if (!this.shouldJobBackoff()) {
-      return;
-    }
     const systemHighLoad = this.checkSystemHighLoad({
       maxCpus: this.highLoadCpu,
       maxMem: this.highLoadMemory,
       maxDisk: this.highLoadDisk,
     });
 
-    logger.info('Check ensure blocklet running', systemHighLoad);
     if (systemHighLoad.isHighLoad) {
       logger.warn('Skip once ensure blocklet running because system high load', systemHighLoad);
       return;
@@ -191,49 +187,58 @@ class EnsureBlockletRunning {
         }
       }
     }
+    logger.info('get running blocklets', Object.keys(this.runningBlocklets).length);
   };
 
   getFakeRunningBlocklets = async () => {
     this.fakeRunningBlocklets = {};
     const blockletDids = Object.keys(this.runningBlocklets);
-    for (const did of blockletDids) {
-      const blocklets = this.runningBlocklets[did];
-
-      // eslint-disable-next-line
-      await pAll(
-        blocklets.map((blocklet) => {
-          return async () => {
-            if (!shouldCheckHealthy(blocklet)) {
-              // 如果 blocklet 是不需要启动的，并且不是 running，则设置为 running 状态
-              if (blocklet.status !== BlockletStatus.running) {
-                await this.states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
-                  componentDids: [blocklet.meta.did],
-                });
-              }
-              return;
-            }
+    await pAll(
+      blockletDids.map((did) => {
+        return async () => {
+          const blocklets = this.runningBlocklets[did];
+          // eslint-disable-next-line
+          await pAll(
+            blocklets.map((blocklet) => {
+              return async () => {
+                if (!shouldCheckHealthy(blocklet)) {
+                  // 如果 blocklet 是不需要启动的，并且不是 running，则设置为 running 状态
+                  if (blocklet.status !== BlockletStatus.running) {
+                    await this.states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
+                      componentDids: [blocklet.meta.did],
+                    });
+                  }
+                  return;
+                }
 
-            const health = await this.isBlockletPortHealthyWithRetries(
-              blocklet,
-              inProgressStatuses.includes(blocklet.status)
-            );
+                const health = await this.isBlockletPortHealthyWithRetries(
+                  blocklet,
+                  inProgressStatuses.includes(blocklet.status)
+                );
 
-            if (health) {
-              return;
-            }
+                if (health) {
+                  return;
+                }
 
-            if (!this.fakeRunningBlocklets[did]) {
-              this.fakeRunningBlocklets[did] = [];
-            }
-            if (this.fakeRunningBlocklets[did].find((b) => b.meta.did === blocklet.meta.did)) {
-              return;
-            }
-            this.fakeRunningBlocklets[did].push(blocklet);
-          };
-        }),
-        { concurrency: 10 }
-      );
-    }
+                logger.warn('check blocklet port healthy', did, blocklet.meta.did, 'no healthy');
+
+                if (!this.fakeRunningBlocklets[did]) {
+                  this.fakeRunningBlocklets[did] = [];
+                }
+                if (this.fakeRunningBlocklets[did].find((b) => b.meta.did === blocklet.meta.did)) {
+                  return;
+                }
+                this.fakeRunningBlocklets[did].push(blocklet);
+              };
+            }),
+            { concurrency: 10 }
+          );
+        };
+      }),
+      { concurrency: 3 }
+    );
+
+    logger.info('get fake running blocklets', Object.keys(this.fakeRunningBlocklets).length);
   };
 
   setFakeRunningToWaiting = async () => {

package/lib/blocklet/migration-dist/migration.cjs

@@ -31210,6 +31210,9 @@ function configure (options) {
 /***/ 9379:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const ANY = Symbol('SemVer ANY')
 // hoisted class for cyclic dependency
 class Comparator {
@@ -31358,6 +31361,9 @@ const Range = __nccwpck_require__(6782)
 /***/ 6782:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SPACE_CHARACTERS = /\s+/g
 
 // hoisted class for cyclic dependency
@@ -31919,9 +31925,12 @@ const testSet = (set, version, options) => {
 /***/ 7163:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const debug = __nccwpck_require__(1159)
 const { MAX_LENGTH, MAX_SAFE_INTEGER } = __nccwpck_require__(5101)
-const { safeRe: re, safeSrc: src, t } = __nccwpck_require__(5471)
+const { safeRe: re, t } = __nccwpck_require__(5471)
 
 const parseOptions = __nccwpck_require__(356)
 const { compareIdentifiers } = __nccwpck_require__(3348)
@@ -32103,8 +32112,7 @@ class SemVer {
       }
       // Avoid an invalid semver results
       if (identifier) {
-        const r = new RegExp(`^${this.options.loose ? src[t.PRERELEASELOOSE] : src[t.PRERELEASE]}$`)
-        const match = `-${identifier}`.match(r)
+        const match = `-${identifier}`.match(this.options.loose ? re[t.PRERELEASELOOSE] : re[t.PRERELEASE])
         if (!match || match[1] !== identifier) {
           throw new Error(`invalid identifier: ${identifier}`)
         }
@@ -32244,6 +32252,9 @@ module.exports = SemVer
 /***/ 1799:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const parse = __nccwpck_require__(6353)
 const clean = (version, options) => {
   const s = parse(version.trim().replace(/^[=v]+/, ''), options)
@@ -32257,6 +32268,9 @@ module.exports = clean
 /***/ 8646:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const eq = __nccwpck_require__(5082)
 const neq = __nccwpck_require__(4974)
 const gt = __nccwpck_require__(6599)
@@ -32316,6 +32330,9 @@ module.exports = cmp
 /***/ 5385:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const parse = __nccwpck_require__(6353)
 const { safeRe: re, t } = __nccwpck_require__(5471)
@@ -32383,6 +32400,9 @@ module.exports = coerce
 /***/ 7648:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const compareBuild = (a, b, loose) => {
   const versionA = new SemVer(a, loose)
@@ -32397,6 +32417,9 @@ module.exports = compareBuild
 /***/ 6874:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const compareLoose = (a, b) => compare(a, b, true)
 module.exports = compareLoose
@@ -32407,6 +32430,9 @@ module.exports = compareLoose
 /***/ 8469:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const compare = (a, b, loose) =>
   new SemVer(a, loose).compare(new SemVer(b, loose))
@@ -32419,6 +32445,9 @@ module.exports = compare
 /***/ 711:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const parse = __nccwpck_require__(6353)
 
 const diff = (version1, version2) => {
@@ -32484,6 +32513,9 @@ module.exports = diff
 /***/ 5082:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const eq = (a, b, loose) => compare(a, b, loose) === 0
 module.exports = eq
@@ -32494,6 +32526,9 @@ module.exports = eq
 /***/ 6599:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const gt = (a, b, loose) => compare(a, b, loose) > 0
 module.exports = gt
@@ -32504,6 +32539,9 @@ module.exports = gt
 /***/ 1236:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const gte = (a, b, loose) => compare(a, b, loose) >= 0
 module.exports = gte
@@ -32514,6 +32552,9 @@ module.exports = gte
 /***/ 2338:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 
 const inc = (version, release, options, identifier, identifierBase) => {
@@ -32540,6 +32581,9 @@ module.exports = inc
 /***/ 3872:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const lt = (a, b, loose) => compare(a, b, loose) < 0
 module.exports = lt
@@ -32550,6 +32594,9 @@ module.exports = lt
 /***/ 6717:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const lte = (a, b, loose) => compare(a, b, loose) <= 0
 module.exports = lte
@@ -32560,6 +32607,9 @@ module.exports = lte
 /***/ 8511:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const major = (a, loose) => new SemVer(a, loose).major
 module.exports = major
@@ -32570,6 +32620,9 @@ module.exports = major
 /***/ 2603:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const minor = (a, loose) => new SemVer(a, loose).minor
 module.exports = minor
@@ -32580,6 +32633,9 @@ module.exports = minor
 /***/ 4974:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const neq = (a, b, loose) => compare(a, b, loose) !== 0
 module.exports = neq
@@ -32590,6 +32646,9 @@ module.exports = neq
 /***/ 6353:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const parse = (version, options, throwErrors = false) => {
   if (version instanceof SemVer) {
@@ -32613,6 +32672,9 @@ module.exports = parse
 /***/ 8756:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const patch = (a, loose) => new SemVer(a, loose).patch
 module.exports = patch
@@ -32623,6 +32685,9 @@ module.exports = patch
 /***/ 5714:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const parse = __nccwpck_require__(6353)
 const prerelease = (version, options) => {
   const parsed = parse(version, options)
@@ -32636,6 +32701,9 @@ module.exports = prerelease
 /***/ 2173:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compare = __nccwpck_require__(8469)
 const rcompare = (a, b, loose) => compare(b, a, loose)
 module.exports = rcompare
@@ -32646,6 +32714,9 @@ module.exports = rcompare
 /***/ 7192:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compareBuild = __nccwpck_require__(7648)
 const rsort = (list, loose) => list.sort((a, b) => compareBuild(b, a, loose))
 module.exports = rsort
@@ -32656,6 +32727,9 @@ module.exports = rsort
 /***/ 8011:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const Range = __nccwpck_require__(6782)
 const satisfies = (version, range, options) => {
   try {
@@ -32673,6 +32747,9 @@ module.exports = satisfies
 /***/ 9872:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const compareBuild = __nccwpck_require__(7648)
 const sort = (list, loose) => list.sort((a, b) => compareBuild(a, b, loose))
 module.exports = sort
@@ -32683,6 +32760,9 @@ module.exports = sort
 /***/ 8780:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const parse = __nccwpck_require__(6353)
 const valid = (version, options) => {
   const v = parse(version, options)
@@ -32696,6 +32776,9 @@ module.exports = valid
 /***/ 2088:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 // just pre-load all the stuff that index.js lazily exports
 const internalRe = __nccwpck_require__(5471)
 const constants = __nccwpck_require__(5101)
@@ -32792,6 +32875,9 @@ module.exports = {
 /***/ 5101:
 /***/ ((module) => {
 
+"use strict";
+
+
 // Note: this is the semver.org version of the spec that it implements
 // Not necessarily the package version of this code.
 const SEMVER_SPEC_VERSION = '2.0.0'
@@ -32834,6 +32920,9 @@ module.exports = {
 /***/ 1159:
 /***/ ((module) => {
 
+"use strict";
+
+
 const debug = (
   typeof process === 'object' &&
   process.env &&
@@ -32850,6 +32939,9 @@ module.exports = debug
 /***/ 3348:
 /***/ ((module) => {
 
+"use strict";
+
+
 const numeric = /^[0-9]+$/
 const compareIdentifiers = (a, b) => {
   const anum = numeric.test(a)
@@ -32880,6 +32972,9 @@ module.exports = {
 /***/ 1383:
 /***/ ((module) => {
 
+"use strict";
+
+
 class LRUCache {
   constructor () {
     this.max = 1000
@@ -32927,6 +33022,9 @@ module.exports = LRUCache
 /***/ 356:
 /***/ ((module) => {
 
+"use strict";
+
+
 // parse out just the options we care about
 const looseOption = Object.freeze({ loose: true })
 const emptyOpts = Object.freeze({ })
@@ -32949,6 +33047,9 @@ module.exports = parseOptions
 /***/ 5471:
 /***/ ((module, exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const {
   MAX_SAFE_COMPONENT_LENGTH,
   MAX_SAFE_BUILD_LENGTH,
@@ -33027,12 +33128,14 @@ createToken('MAINVERSIONLOOSE', `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` +
 
 // ## Pre-release Version Identifier
 // A numeric identifier, or a non-numeric identifier.
+// Non-numberic identifiers include numberic identifiers but can be longer.
+// Therefore non-numberic identifiers must go first.
 
-createToken('PRERELEASEIDENTIFIER', `(?:${src[t.NUMERICIDENTIFIER]
-}|${src[t.NONNUMERICIDENTIFIER]})`)
+createToken('PRERELEASEIDENTIFIER', `(?:${src[t.NONNUMERICIDENTIFIER]
+}|${src[t.NUMERICIDENTIFIER]})`)
 
-createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NUMERICIDENTIFIERLOOSE]
-}|${src[t.NONNUMERICIDENTIFIER]})`)
+createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NONNUMERICIDENTIFIER]
+}|${src[t.NUMERICIDENTIFIERLOOSE]})`)
 
 // ## Pre-release Version
 // Hyphen, followed by one or more dot-separated pre-release version
@@ -33175,6 +33278,9 @@ createToken('GTE0PRE', '^\\s*>=\\s*0\\.0\\.0-0\\s*$')
 /***/ 2276:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 // Determine if version is greater than all the versions possible in the range.
 const outside = __nccwpck_require__(280)
 const gtr = (version, range, options) => outside(version, range, '>', options)
@@ -33186,6 +33292,9 @@ module.exports = gtr
 /***/ 3465:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const Range = __nccwpck_require__(6782)
 const intersects = (r1, r2, options) => {
   r1 = new Range(r1, options)
@@ -33200,6 +33309,9 @@ module.exports = intersects
 /***/ 5213:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const outside = __nccwpck_require__(280)
 // Determine if version is less than all the versions possible in the range
 const ltr = (version, range, options) => outside(version, range, '<', options)
@@ -33211,6 +33323,9 @@ module.exports = ltr
 /***/ 3193:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const Range = __nccwpck_require__(6782)
 
@@ -33243,6 +33358,9 @@ module.exports = maxSatisfying
 /***/ 8595:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const Range = __nccwpck_require__(6782)
 const minSatisfying = (versions, range, options) => {
@@ -33274,6 +33392,9 @@ module.exports = minSatisfying
 /***/ 1866:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const Range = __nccwpck_require__(6782)
 const gt = __nccwpck_require__(6599)
@@ -33342,6 +33463,9 @@ module.exports = minVersion
 /***/ 280:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const SemVer = __nccwpck_require__(7163)
 const Comparator = __nccwpck_require__(9379)
 const { ANY } = Comparator
@@ -33429,6 +33553,9 @@ module.exports = outside
 /***/ 2028:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 // given a set of versions and a range, create a "simplified" range
 // that includes the same versions that the original range does
 // If the original range is shorter than the simplified one, return that.
@@ -33483,6 +33610,9 @@ module.exports = (versions, range, options) => {
 /***/ 1489:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const Range = __nccwpck_require__(6782)
 const Comparator = __nccwpck_require__(9379)
 const { ANY } = Comparator
@@ -33737,6 +33867,9 @@ module.exports = subset
 /***/ 4750:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const Range = __nccwpck_require__(6782)
 
 // Mostly just for testing and legacy API reasons
@@ -33752,6 +33885,9 @@ module.exports = toComparators
 /***/ 4737:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
+"use strict";
+
+
 const Range = __nccwpck_require__(6782)
 const validRange = (range, options) => {
   try {
@@ -38744,7 +38880,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.53","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.4","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.41","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.11","@ocap/util":"1.20.11","@ocap/wallet":"1.20.11","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.56","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.4","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.47","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.11","@ocap/util":"1.20.11","@ocap/wallet":"1.20.11","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/event/index.js

@@ -630,9 +630,9 @@ module.exports = ({
 
   // 更新会话时，暂不做任何操作
   // listen(teamAPI, BlockletEvents.updateUserSession, noop);
-  listen(teamAPI, BlockletEvents.addUserSession, (eventName, eventData) => {
+  listen(teamAPI, BlockletEvents.addUserSession, async (eventName, eventData) => {
     const { teamDid, userDid, userSession, locale = 'en', skipNotification = false, origin } = eventData;
-    if (skipNotification) {
+    if (skipNotification || !userSession.ua) {
       return;
     }
     const translations = {
@@ -693,15 +693,26 @@ module.exports = ({
       ],
     };
     logger.info(`create notification on ${eventName}`, { teamDid, receiver: userDid, notification });
-    teamManager.createNotification({
+    const { count: userSessionCount } = await teamAPI.getUserSessionsCount({
       teamDid,
-      receiver: userDid,
-      // NOTICE: createNotification 如果传递 notification 对象，就必须加上 pushOnly 选项，否则会调用失败
-      // 目前先改为使用 payload 的形式传递通知内容
-      // notification,
-      ...notification,
-      source: 'component',
+      query: {
+        userDid,
+        appPid: teamDid,
+        status: null, // 查询所有 userSession 的总数
+      },
     });
+    // 如果只有一个,代表是刚创建的账户,此时不发送新设备通知
+    if (userSessionCount > 1) {
+      teamManager.createNotification({
+        teamDid,
+        receiver: userDid,
+        // NOTICE: createNotification 如果传递 notification 对象，就必须加上 pushOnly 选项，否则会调用失败
+        // 目前先改为使用 payload 的形式传递通知内容
+        // notification,
+        ...notification,
+        source: 'component',
+      });
+    }
   });
 
   return events;

package/lib/monitor/blocklet-runtime-monitor.js

@@ -221,10 +221,6 @@ class BlockletRuntimeMonitor extends EventEmitter {
   }
 
   async getBlockletRuntimeInfo(blockletDid) {
-    if (this.getRuntimeInfo(blockletDid)) {
-      return this.getRuntimeInfo(blockletDid);
-    }
-
     const blocklets = await this.states.blocklet.getBlocklets();
     const blocklet = blocklets.find((x) => x.meta.did === blockletDid);
 

package/lib/monitor/node-runtime-monitor.js

@@ -231,11 +231,10 @@ class NodeRuntimeMonitor extends EventEmitter {
   checkSystemHighLoad({ maxCpus, maxMem, maxDisk }) {
     const { cpus, memory, disks } = this.calculateUtilization();
     let highType = '';
-    if (cpus.some((v) => v > maxCpus)) {
-      highType = 'cpu';
-    } else if (memory > maxMem) {
-      highType = 'memory';
-    } else if (disks.some((v) => v > maxDisk)) {
+    if (cpus.some((v) => v > maxCpus) && memory > maxMem) {
+      highType = 'cpu and memory';
+    }
+    if (disks.some((v) => v > maxDisk)) {
       highType = 'disk';
     }
     if (highType) {

package/lib/states/access-key.js

@@ -4,7 +4,6 @@ const { isValid } = require('@arcblock/did');
 const { fromRandom, fromPublicKey } = require('@ocap/wallet');
 const { toBase58, fromBase58 } = require('@ocap/util');
 const { CustomError } = require('@blocklet/error');
-
 const logger = require('@abtnode/logger')('@abtnode/core:states:access-key');
 const BaseState = require('./base');
 const { accessKeySchema, REMARK_MAX_LENGTH } = require('../validators/access-key');
@@ -33,7 +32,7 @@ const getOperator = (context) => get(context, 'user.did', '') || get(context, 'u
  * @extends BaseState<import('@abtnode/models').AccessKeyState>
  */
 class AccessKeyState extends BaseState {
-  async create(input, context) {
+  async create(input, context, newWallet) {
     const {
       remark,
       passport,
@@ -50,7 +49,7 @@ class AccessKeyState extends BaseState {
     validatePassport(passport);
     validateExpireAt(expireAt);
 
-    const wallet = fromRandom();
+    const wallet = newWallet || fromRandom();
     const data = {
       accessKeyId: wallet.address,
       accessKeyPublic: wallet.publicKey,

package/lib/states/notification.js

@@ -221,7 +221,8 @@ class NotificationState extends BaseState {
     const offset = (page - 1) * curPageSize;
 
     // 构建基础查询条件
-    const conditions = [];
+    // FIXME: 这里需要对历史数据做出过滤，避免有非 notification 类型的数据
+    const conditions = ['n.type = "notification"'];
     const replacements = { receiver };
 
     if (typeof read === 'boolean') {
@@ -518,16 +519,12 @@ class NotificationState extends BaseState {
   /**
    * 获取当前用户未读消息数量
    */
-  async getUnreadCount({ receiver }) {
+  getUnreadCount({ receiver }) {
     if (!receiver) {
       throw new Error('receiver is not allow empty');
     }
 
-    const count = await this.notificationReceivers.count({
-      receiver,
-      read: false,
-    });
-    return count;
+    return this.getUnreadNotificationCount({ receiver });
   }
 
   /**
@@ -837,14 +834,18 @@ class NotificationState extends BaseState {
    * @param {Object} context 上下文
    * @returns {Promise<number>} 未读通知数量
    */
-  async getUnreadCountByConditions({ receiver, severity, componentDid, entityId, source } = {}, context) {
+  getUnreadCountByConditions({ receiver, ...rest } = {}, context) {
     const errorMsg = receiverDidValidation(receiver, context);
     if (errorMsg) {
       throw new Error(errorMsg);
     }
 
+    return this.getUnreadNotificationCount({ receiver, ...rest });
+  }
+
+  async getUnreadNotificationCount({ receiver, severity, componentDid, entityId, source } = {}) {
     // 构建基础查询条件
-    const conditions = [];
+    const conditions = ['n.type = "notification"'];
     const replacements = { receiver };
 
     // 强制将read设为false，只计算未读消息
@@ -884,12 +885,12 @@ class NotificationState extends BaseState {
     const whereClause = conditions.length ? `WHERE ${conditions.join(' AND ')}` : '';
 
     const countQuery = `
-      SELECT COUNT(DISTINCT n.id) as total
-      FROM notifications n
-      INNER JOIN notification_receivers nr ON n.id = nr.notificationId
-      ${whereClause}
-      AND nr.receiver = :receiver
-    `;
+       SELECT COUNT(DISTINCT n.id) as total
+       FROM notifications n
+       INNER JOIN notification_receivers nr ON n.id = nr.notificationId
+       ${whereClause}
+       AND nr.receiver = :receiver
+     `;
 
     const [countResult] = await this.model.sequelize.query(countQuery, {
       replacements,

package/lib/util/blocklet.js

@@ -102,6 +102,7 @@ const {
   isRunning,
   hasStartEngine,
   isEnvShareable,
+  isExternalBlocklet,
 } = require('@blocklet/meta/lib/util');
 const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
@@ -651,7 +652,7 @@ const startBlockletProcess = async (
     // get env
     const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
     const startedAt = Date.now();
-    const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo);
+    const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
 
     if (!needRunDocker) {
       await installExternalDependencies({ appDir: env?.BLOCKLET_APP_DIR });
@@ -749,6 +750,7 @@ const startBlockletProcess = async (
         : await parseDockerOptionsFromPm2({
             options,
             nodeInfo,
+            isExternal: isExternalBlocklet(b),
             meta: b.meta,
             ports: b.ports,
             onlyStart,

package/lib/util/docker/blocklet-custom-dockerfile.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const md5 = require('@abtnode/util/lib/md5');
-const { dockerArgsToCamelCase } = require('@abtnode/docker-utils');
+const { dockerArgsToCamelCase, isVolumePath } = require('@abtnode/docker-utils');
 const debianDockerfile = require('./debian-dockerfile');
 const debianChmodDockerfile = require('./debian-chmod-dockerfile');
 
@@ -50,6 +50,9 @@ function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports, env, doChow
 
   const volumes = (dockerMeta.volume || [])
     .map((volume) => {
+      if (!isVolumePath(volume)) {
+        return ` -v ${dataDir}/${volume} `;
+      }
       const [a, b] = volume.split(':');
       const hostDir = a.replace('$BLOCKLET_DATA_DIR', dataDir).replace('$BLOCKLET_APP_DIR', appDir);
       return ` -v ${hostDir}:${b} `;
@@ -115,6 +118,7 @@ function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports, env, doChow
     script: dockerMeta.script || dockerMeta.installNodeModules ? '' : 'tail -f /dev/null',
     installNodeModules: !!dockerMeta.installNodeModules,
     runParamString,
+    dockerMeta,
   };
 }
 

package/lib/util/docker/check-need-run-docker.js

@@ -2,7 +2,7 @@ const { NODE_MODES } = require('@abtnode/constant');
 const { BLOCKLET_MODES } = require('@blocklet/constant');
 const { checkDockerInstalled } = require('./check-docker-installed');
 
-async function checkNeedRunDocker(meta = {}, env = {}, nodeInfo = {}) {
+async function checkNeedRunDocker(meta = {}, env = {}, nodeInfo = {}, isExternal) {
   if (!process.env.ABT_NODE_DATA_DIR) {
     return false;
   }
@@ -15,7 +15,11 @@ async function checkNeedRunDocker(meta = {}, env = {}, nodeInfo = {}) {
   }
 
   // Serverless mode does not support skipping Docker
-  if (env.SKIP_DOCKER && nodeInfo.mode !== NODE_MODES.SERVERLESS) {
+  let isSkipDocker = !!env.SKIP_DOCKER;
+  if (nodeInfo.mode === NODE_MODES.SERVERLESS && isExternal) {
+    isSkipDocker = false;
+  }
+  if (isSkipDocker) {
     return false;
   }
 

package/lib/util/docker/parse-docker-cp-volume.js

@@ -0,0 +1,66 @@
+/* eslint-disable no-await-in-loop */
+const { isVolumePath } = require('@abtnode/docker-utils');
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
+const fs = require('fs/promises');
+const path = require('path');
+
+/**
+ * Generate and execute a docker workflow that:
+ * @param {string} appDataDir - Absolute path on host where container volumes should be mounted
+ * @param {object} dockerInfo - Metadata describing image, mounts, ports, and network
+ * @returns {Promise} resolves when all docker commands have executed
+ */
+async function parseDockerCpVolume(dockerName, appDataDir, dockerInfo) {
+  const { image, volume = [] } = dockerInfo?.dockerMeta || {};
+
+  try {
+    await fs.access(appDataDir);
+  } catch (error) {
+    await fs.mkdir(appDataDir, { recursive: true });
+  }
+
+  const tmpContainer = `${dockerName}_cp`;
+
+  const needCopyVolumes = volume.filter((vol) => {
+    return !isVolumePath(vol);
+  });
+
+  if (needCopyVolumes.length === 0) {
+    return;
+  }
+
+  const copySteps = [];
+  for (const vol of needCopyVolumes) {
+    const [dir, dest] = vol.split(':');
+    const destPath = path.join(appDataDir, dir);
+    try {
+      await fs.access(destPath);
+    } catch (_) {
+      await fs.mkdir(destPath, { recursive: true });
+    }
+    // 判断路径下是否存在文件, 如果已经有文件了，就跳过
+    const files = await fs.readdir(destPath);
+    if (files.length > 0) {
+      continue;
+    }
+
+    copySteps.push(`docker cp ${tmpContainer}:${dest}/. ${destPath} || true`);
+  }
+
+  if (copySteps.length === 0) {
+    return;
+  }
+
+  const deleteContainerCmd = `docker rm -f ${tmpContainer} || true`;
+  const createContainerCmd = `docker create --name ${tmpContainer} ${image}`;
+
+  try {
+    await promiseSpawn([deleteContainerCmd, createContainerCmd, ...copySteps].join(' && '));
+  } catch (error) {
+    throw new Error(`Failed to create container ${tmpContainer}: ${error.message}`);
+  } finally {
+    await promiseSpawn(deleteContainerCmd);
+  }
+}
+
+module.exports = parseDockerCpVolume;

package/lib/util/docker/parse-docker-options-from-pm2.js

@@ -13,10 +13,12 @@ const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const getLocalIPAddress = require('@abtnode/util/lib/get-local-ip-address');
 const { dockerCmdValidator } = require('@abtnode/docker-utils');
 
+const { isExternalBlocklet } = require('@blocklet/meta/lib/util');
 const parseDockerName = require('./parse-docker-name');
 const { createDockerImage } = require('./create-docker-image');
 const checkNeedRunDocker = require('./check-need-run-docker');
 const replaceEnvValue = require('./replace-env-value');
+const parseDockerCpVolume = require('./parse-docker-cp-volume');
 
 const getSystemResources = (() => {
   let cachedResources = null;
@@ -47,12 +49,23 @@ async function parseDockerOptionsFromPm2({
   eventName,
   dockerNetworkName,
 }) {
-  if (!(await checkNeedRunDocker(meta, options.env, nodeInfo))) {
+  const isExternal = isExternalBlocklet(rootBlocklet);
+  if (!(await checkNeedRunDocker(meta, options.env, nodeInfo, isExternal))) {
     return options;
   }
+  const nextOptions = { ...options };
 
   const isServerless = nodeInfo.mode === NODE_MODES.SERVERLESS;
 
+  if (isServerless && isExternal) {
+    if (nextOptions.env.SKIP_DOCKER_NETWORK) {
+      throw new Error('Serverless mode does not support skipping Docker network');
+    }
+    if (nextOptions.env.ALLOW_DOCKER_HOST_ACCESS) {
+      throw new Error('Serverless mode does not support allowing Docker host access');
+    }
+  }
+
   const dockerInfo = {
     ...(await createDockerImage({
       appDir: options.env.BLOCKLET_APP_DIR,
@@ -63,7 +76,6 @@ async function parseDockerOptionsFromPm2({
     })),
   };
 
-  const nextOptions = { ...options };
   nextOptions.env = { ...nextOptions.env };
   const name = parseDockerName(options.name, dockerNamePrefix);
 
@@ -141,15 +153,6 @@ async function parseDockerOptionsFromPm2({
   dockerEnv.USING_DOCKER = 'true';
   dockerEnv.LOCAL_USER_ID = process.getuid();
 
-  if (nodeInfo.mode === NODE_MODES.SERVERLESS) {
-    if (nextOptions.env.SKIP_DOCKER_NETWORK) {
-      throw new Error('Serverless mode does not support skipping Docker network');
-    }
-    if (nextOptions.env.ALLOW_DOCKER_HOST_ACCESS) {
-      throw new Error('Serverless mode does not support allowing Docker host access');
-    }
-  }
-
   if (meta.egress === undefined) {
     meta.egress = true;
   }
@@ -332,6 +335,8 @@ async function parseDockerOptionsFromPm2({
     .map(({ source, target, canEdit }) => `-v ${source}:${target}:${canEdit ? 'rw' : 'ro'}`)
     .join(' ');
 
+  await parseDockerCpVolume(name, nextOptions.env.BLOCKLET_DATA_DIR, dockerInfo);
+
   createScripts({
     rootCommands: [
       `echo "start ${meta.name} in docker: ${dockerInfo.network}, ${eventName || 'start'}"`,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250520-104453-912ed737",
+  "version": "1.16.44-beta-20250524-065731-c62fd374",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/auth": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/certificate-manager": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/client": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/constant": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/cron": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/docker-utils": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/logger": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/models": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/queue": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/rbac": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/router-provider": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/static-server": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/timemachine": "1.16.44-beta-20250520-104453-912ed737",
-    "@abtnode/util": "1.16.44-beta-20250520-104453-912ed737",
+    "@abtnode/analytics": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/auth": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/certificate-manager": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/client": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/constant": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/cron": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/docker-utils": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/logger": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/models": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/queue": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/rbac": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/router-provider": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/static-server": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/timemachine": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/util": "1.16.44-beta-20250524-065731-c62fd374",
     "@arcblock/did": "1.20.11",
     "@arcblock/did-auth": "1.20.11",
     "@arcblock/did-ext": "1.20.11",
@@ -44,15 +44,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.11",
     "@arcblock/vc": "1.20.11",
-    "@blocklet/constant": "1.16.44-beta-20250520-104453-912ed737",
-    "@blocklet/did-space-js": "^1.0.53",
-    "@blocklet/env": "1.16.44-beta-20250520-104453-912ed737",
+    "@blocklet/constant": "1.16.44-beta-20250524-065731-c62fd374",
+    "@blocklet/did-space-js": "^1.0.56",
+    "@blocklet/env": "1.16.44-beta-20250524-065731-c62fd374",
     "@blocklet/error": "^0.2.4",
-    "@blocklet/meta": "1.16.44-beta-20250520-104453-912ed737",
-    "@blocklet/resolver": "1.16.44-beta-20250520-104453-912ed737",
-    "@blocklet/sdk": "1.16.44-beta-20250520-104453-912ed737",
-    "@blocklet/store": "1.16.44-beta-20250520-104453-912ed737",
-    "@blocklet/theme": "^2.13.41",
+    "@blocklet/meta": "1.16.44-beta-20250524-065731-c62fd374",
+    "@blocklet/resolver": "1.16.44-beta-20250524-065731-c62fd374",
+    "@blocklet/sdk": "1.16.44-beta-20250524-065731-c62fd374",
+    "@blocklet/store": "1.16.44-beta-20250524-065731-c62fd374",
+    "@blocklet/theme": "^2.13.47",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.11",
     "@ocap/util": "1.20.11",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "b2f2e6a8fe20634cf4d034a26c4c388d687a7f55"
+  "gitHead": "812c62f29aefa6760946a0c3e8c3e3181b6d2f3f"
 }