@abtnode/core 1.16.46 → 1.16.47-beta-20250710-123505-c50a3bdc

package/lib/blocklet/manager/disk.js

@@ -908,21 +908,21 @@ class DiskBlockletManager extends BaseBlockletManager {
         async (b, { env }) => {
           const hookArgs = getHookArgs(b);
           const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
-          if (needRunDocker) {
-            if (hookName === 'postStart' && b.meta.scripts?.postStart) {
-              return dockerExec({
-                blocklet,
-                meta: b.meta,
-                script: b.meta.scripts?.postStart,
-                hookName,
-                nodeInfo,
-                env,
-                ...hookArgs,
-                timeout: 20000,
-              });
-            }
+          if (!b.meta.scripts?.[hookName]) {
             return null;
           }
+          if (needRunDocker) {
+            return dockerExec({
+              blocklet,
+              meta: b.meta,
+              script: b.meta.scripts?.[hookName],
+              hookName,
+              nodeInfo,
+              env,
+              ...hookArgs,
+              timeout: 20000,
+            });
+          }
           return hooks[hookName](b, {
             appDir: b.env.appDir,
             hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
@@ -4225,14 +4225,7 @@ class DiskBlockletManager extends BaseBlockletManager {
               blocklet,
               meta: b.meta,
               env: nextEnv,
-              script: [
-                b.meta.scripts?.preInstall,
-                'export NODE_OPTIONS=--no-experimental-permission && pnpm config set store-dir /var/lib/blocklet/.pnpm-store --global && pnpm config set update-notifier false --global && pnpm install --shamefully-hoist --unsafe-perm --fetch-timeout=90000 --fetch-retries=5 || (echo "PNPM install Error, Retry with --force" && pnpm install --shamefully-hoist --unsafe-perm --fetch-timeout=90000 --fetch-retries=5 --force)',
-                b.meta.scripts?.preFlight,
-                'node docker-exec/run-script.cjs',
-              ]
-                .filter(Boolean)
-                .join(' && '),
+              script: ['node docker-exec/run-script.cjs'].filter(Boolean).join(' && '),
               hookName: 'migration',
               nodeInfo,
               runScriptDir: path.join(__dirname, '../migration-dist'),
@@ -4322,18 +4315,11 @@ class DiskBlockletManager extends BaseBlockletManager {
       const env = getRuntimeEnvironments(blocklet, nodeEnvironments, {});
       const needRunDocker = await checkNeedRunDocker(blocklet.meta, env, nodeInfo, isExternalBlocklet(blocklet));
 
-      if (!needRunDocker) {
-        // pre install
-        await this._runUserHook('preInstall', blocklet, context);
-      }
-
+      await this._runUserHook('preInstall', blocklet, context);
       // post install
       await this._runUserHook('postInstall', blocklet, context);
 
-      if (!needRunDocker) {
-        // pre flight
-        await this._runUserHook('preFlight', blocklet, context);
-      }
+      await this._runUserHook('preFlight', blocklet, context);
 
       await this._runMigration({ needRunDocker, did, blocklet, oldBlocklet, componentDids });
 
@@ -4705,6 +4691,14 @@ class DiskBlockletManager extends BaseBlockletManager {
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
       const hookArgs = getHookArgs(b);
+
+      if (name === 'preInstall') {
+        await installExternalDependencies({
+          appDir: b.env.appDir,
+          nodeInfo,
+        });
+      }
+
       if (needRunDocker) {
         const script = b.meta.scripts?.[name];
         if (script && afterRunScripts.has(name)) {
@@ -4720,11 +4714,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         }
         return null;
       }
-      if (name === 'preInstall') {
-        await installExternalDependencies({
-          appDir: b.env.appDir,
-        });
-      }
 
       return hooks[name](b.meta.title, {
         hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),

package/lib/blocklet/manager/engine.js

@@ -2,6 +2,7 @@ const shelljs = require('shelljs');
 const semver = require('semver');
 const { ABT_NODE_KERNEL_OR_BLOCKLET_MODE } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:engine');
+const { BUN_VERSION } = require('../../util/ensure-bun');
 
 // eslint-disable-next-line no-underscore-dangle
 const _getVersion = (fn, name) => {
@@ -41,44 +42,55 @@ function describe() {
   };
 }
 
-const engineMap = new Map([
-  [
-    'node',
-    {
-      name: 'node',
-      displayName: 'Node.js',
-      interpreter: 'node',
-      description: 'Powered by Node.js',
-      args:
-        process.env.ABT_NODE_KERNEL_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT
-          ? '--max-http-header-size=16384'
-          : '--max-http-header-size=16384 --optimize_for_size',
-      visible: true,
-      version() {
-        return _getVersion(() => process.version, this.name);
-      },
-      describe,
-      isAvailable() {
-        return _isAvailable(this.name);
-      },
-    },
-  ],
-  [
-    'binary',
-    {
-      name: 'binary',
-      visible: false,
-      displayName: 'Executable binary',
-      interpreter: 'none',
-      description: 'Executable binary',
-      version() {
-        return '';
-      },
-      describe,
-      isAvailable: () => true,
-    },
-  ],
-]);
+const engineMap = new Map();
+
+engineMap.set('node', {
+  name: 'node',
+  displayName: 'Node.js',
+  interpreter: 'node',
+  description: 'Powered by Node.js',
+  args:
+    process.env.ABT_NODE_KERNEL_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT
+      ? '--max-http-header-size=16384'
+      : '--max-http-header-size=16384 --optimize_for_size',
+  visible: true,
+  version() {
+    return _getVersion(() => process.version, this.name);
+  },
+  describe,
+  isAvailable() {
+    return _isAvailable(this.name);
+  },
+});
+
+engineMap.set('bun', {
+  name: 'bun',
+  displayName: 'Bun',
+  interpreter: 'bun',
+  description: 'Powered by Bun',
+  args: '',
+  visible: true,
+  version() {
+    return BUN_VERSION;
+  },
+  describe,
+  isAvailable() {
+    return _isAvailable(this.name);
+  },
+});
+
+engineMap.set('binary', {
+  name: 'binary',
+  visible: false,
+  displayName: 'Executable binary',
+  interpreter: 'none',
+  description: 'Executable binary',
+  version() {
+    return '';
+  },
+  describe,
+  isAvailable: () => true,
+});
 
 const engineNames = [...engineMap.keys()];
 

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

@@ -38902,7 +38902,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.45","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.45","@abtnode/auth":"1.16.45","@abtnode/certificate-manager":"1.16.45","@abtnode/client":"1.16.45","@abtnode/constant":"1.16.45","@abtnode/cron":"1.16.45","@abtnode/db-cache":"1.16.45","@abtnode/docker-utils":"1.16.45","@abtnode/logger":"1.16.45","@abtnode/models":"1.16.45","@abtnode/queue":"1.16.45","@abtnode/rbac":"1.16.45","@abtnode/router-provider":"1.16.45","@abtnode/static-server":"1.16.45","@abtnode/timemachine":"1.16.45","@abtnode/util":"1.16.45","@arcblock/did":"1.20.15","@arcblock/did-auth":"1.20.15","@arcblock/did-ext":"1.20.15","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.20.15","@arcblock/event-hub":"1.20.15","@arcblock/jwt":"1.20.15","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.15","@arcblock/vc":"1.20.15","@blocklet/constant":"1.16.45","@blocklet/did-space-js":"^1.1.5","@blocklet/env":"1.16.45","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.45","@blocklet/resolver":"1.16.45","@blocklet/sdk":"1.16.45","@blocklet/store":"1.16.45","@blocklet/theme":"^3.0.23","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.15","@ocap/util":"1.20.15","@ocap/wallet":"1.20.15","@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","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.46","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.46","@abtnode/auth":"1.16.46","@abtnode/certificate-manager":"1.16.46","@abtnode/client":"1.16.46","@abtnode/constant":"1.16.46","@abtnode/cron":"1.16.46","@abtnode/db-cache":"1.16.46","@abtnode/docker-utils":"1.16.46","@abtnode/logger":"1.16.46","@abtnode/models":"1.16.46","@abtnode/queue":"1.16.46","@abtnode/rbac":"1.16.46","@abtnode/router-provider":"1.16.46","@abtnode/static-server":"1.16.46","@abtnode/timemachine":"1.16.46","@abtnode/util":"1.16.46","@arcblock/did":"1.20.15","@arcblock/did-auth":"1.20.15","@arcblock/did-ext":"1.20.15","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.20.15","@arcblock/event-hub":"1.20.15","@arcblock/jwt":"1.20.15","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.15","@arcblock/vc":"1.20.15","@blocklet/constant":"1.16.46","@blocklet/did-space-js":"^1.1.5","@blocklet/env":"1.16.46","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.46","@blocklet/resolver":"1.16.46","@blocklet/sdk":"1.16.46","@blocklet/store":"1.16.46","@blocklet/theme":"^3.0.23","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.15","@ocap/util":"1.20.15","@ocap/wallet":"1.20.15","@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","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/monitor/blocklet-runtime-monitor.js

@@ -152,7 +152,6 @@ class BlockletRuntimeMonitor extends EventEmitter {
             appMem += runtimeInfo.memoryUsage || 0;
             runningDocker = runningDocker || runtimeInfo.runningDocker;
           } catch (err) {
-            console.error(err);
             // component status in db may not sync with pm2 when server has just started
             if (err.code !== 'BLOCKLET_PROCESS_404') {
               this.logger.error('failed to get blocklet runtime info', { processId, error: err });

package/lib/util/blocklet.js

@@ -128,10 +128,10 @@ const {
 const { installExternalDependencies } = require('./install-external-dependencies');
 const parseDockerOptionsFromPm2 = require('./docker/parse-docker-options-from-pm2');
 const dockerRemoveByName = require('./docker/docker-remove-by-name');
-const checkNeedRunDocker = require('./docker/check-need-run-docker');
 const getDockerRuntimeInfo = require('./docker/get-docker-runtime-info');
 const parseDockerName = require('./docker/parse-docker-name');
 const { createDockerNetwork } = require('./docker/docker-network');
+const { ensureBun } = require('./ensure-bun');
 
 /**
  * get blocklet engine info, default is node
@@ -656,14 +656,10 @@ const startBlockletProcess = async (
     // get env
     const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
     const startedAt = Date.now();
-    const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
 
-    if (!needRunDocker) {
-      await installExternalDependencies({ appDir: env?.BLOCKLET_APP_DIR });
-      // run hook
-      await preFlight(b, { env: { ...env } });
-      await preStart(b, { env: { ...env } });
-    }
+    await installExternalDependencies({ appDir: env?.BLOCKLET_APP_DIR, nodeInfo });
+    await preFlight(b, { env: { ...env } });
+    await preStart(b, { env: { ...env } });
 
     // kill process if port is occupied
     try {
@@ -748,6 +744,13 @@ const startBlockletProcess = async (
       serverSk: nodeEnvironments.ABT_NODE_SK,
     });
 
+    if (options.interpreter === 'bun') {
+      options.exec_interpreter = await ensureBun();
+      options.exec_mode = 'fork';
+      delete options.instances;
+      delete options.mergeLogs;
+    }
+
     const nextOptions =
       b.mode === BLOCKLET_MODES.DEVELOPMENT
         ? options

package/lib/util/docker/debian-dockerfile.js

@@ -1,11 +1,11 @@
 const debianWrapDockerfile = require('./debian-wrap-dockerfile');
 
 // Define Dockerfile with dynamic UID/GID mapping
-const dockerfile = debianWrapDockerfile('arcblock/blocklet-base:0.0.1');
+const dockerfile = debianWrapDockerfile('arcblock/blocklet-base:0.0.2');
 
 module.exports = {
   dockerfile,
-  image: 'debian_node_v3',
+  image: 'debian_node_v4',
   shell: 'sh',
   network: '--network host',
   baseDir: '/var/lib/blocklet',

package/lib/util/docker/docker-install-dependenices.js

@@ -0,0 +1,85 @@
+const path = require('path');
+const fs = require('fs/promises');
+const os = require('os');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
+const logger = require('@abtnode/logger')('@abtnode/docker-exec-chown');
+const parseDockerName = require('./parse-docker-name');
+const { checkDockerHasImage } = require('./check-docker-has-image');
+const { createDockerImage } = require('./create-docker-image');
+const debianDockerfile = require('./debian-dockerfile');
+const { getBunCacheDir } = require('../ensure-bun');
+
+const lockFile = new DBCache(() => ({
+  prefix: 'docker-exec-chown-locks',
+  ttl: 1000 * 60 * 2,
+  ...getAbtNodeRedisAndSQLiteUrl(),
+}));
+
+const LAST_INSTALL_NODE_MODULES_OS = 'node_modules_os_lock';
+
+const saveLastInstallOs = async (installDir, isDocker = false) => {
+  const lastInstallOsLockPath = path.join(installDir, LAST_INSTALL_NODE_MODULES_OS);
+  await fs.writeFile(lastInstallOsLockPath, isDocker ? 'Linux' : os.type());
+};
+
+const loadLastInstallOs = async (installDir) => {
+  const lastInstallOsLockPath = path.join(installDir, LAST_INSTALL_NODE_MODULES_OS);
+  try {
+    await fs.access(lastInstallOsLockPath);
+    const lastInstallOs = await fs.readFile(lastInstallOsLockPath, 'utf-8');
+    return lastInstallOs.trim();
+  } catch (_) {
+    return '';
+  }
+};
+
+const isSameOs = async (installDir, isDocker = false) => {
+  const lastInstallOs = await loadLastInstallOs(installDir);
+  if (!lastInstallOs) {
+    return false;
+  }
+  return lastInstallOs === (isDocker ? 'Linux' : os.type());
+};
+
+async function dockerInstallDependencies({ name, installDir }) {
+  const { image, baseDir } = debianDockerfile;
+
+  if (!(await checkDockerHasImage(image))) {
+    await createDockerImage({
+      appDir: path.join(process.env.ABT_NODE_DATA_DIR, 'tmp', 'docker'),
+      dataDir: path.join(process.env.ABT_NODE_DATA_DIR, 'tmp', 'docker'),
+      meta: {},
+      ports: [],
+      env: {},
+      doChown: false,
+    });
+  }
+
+  const bunCacheDir = await getBunCacheDir(true);
+
+  const needChangeDir = [
+    { source: installDir, target: `${baseDir}/blocklet` },
+    { source: bunCacheDir, target: `${baseDir}/bun-cache` },
+  ];
+
+  const volumes = needChangeDir.map((dir) => `-v ${dir.source}:${dir.target}:rw`).join(' ');
+
+  const realName = parseDockerName(name, 'docker-install-dependencies');
+  const startTime = Date.now();
+
+  await lockFile.acquire(realName);
+  try {
+    await promiseSpawn(
+      `docker rm -fv ${realName} > /dev/null 2>&1 || true && docker run --rm --name ${realName} ${volumes} --env BUN_INSTALL_CACHE_DIR=${needChangeDir[1].target} ${image} sh -c 'cd ${needChangeDir[0].target} && bun install'`,
+      {},
+      { timeout: 1000 * 120, retry: 3 }
+    );
+  } finally {
+    await lockFile.releaseLock(realName);
+  }
+
+  logger.info(`docker-install-dependencies ${name} cost time: ${Date.now() - startTime}ms`);
+}
+
+module.exports = { dockerInstallDependencies, isSameOs, saveLastInstallOs, loadLastInstallOs };

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

@@ -12,8 +12,9 @@ const { NODE_MODES } = require('@abtnode/constant');
 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 { getBlockletEngine } = require('@blocklet/meta/lib/engine');
 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');
@@ -122,6 +123,7 @@ async function parseDockerOptionsFromPm2({
     NODE_MODES: options.env.NODE_MODES || (isServerless ? NODE_MODES.SERVERLESS : NODE_MODES.PRODUCTION),
     HTTP_PROXY: process.env.DOCKER_HTTP_PROXY || '',
     HTTPS_PROXY: process.env.DOCKER_HTTPS_PROXY || '',
+    BUN_INSTALL_CACHE_DIR: '/var/lib/blocklet/bun-cache',
   };
 
   nextOptions.env = { ...nextOptions.env, ...envDefaults };
@@ -185,21 +187,6 @@ async function parseDockerOptionsFromPm2({
 
   replaceEnvValue(dockerEnv, rootBlocklet, dockerNamePrefix);
 
-  let nodeModulesName = 'node_modules';
-  let installScript = '';
-  const appDir = nextOptions.env.BLOCKLET_APP_DIR;
-  const packageJsonPath = path.join(appDir, 'package.json');
-  const compactJsPath = path.join(appDir, 'blocklet-compact.js');
-
-  if (dockerInfo.installNodeModules && existsSync(packageJsonPath) && existsSync(compactJsPath)) {
-    const packageJson = JSON.parse(await fsp.readFile(packageJsonPath, 'utf-8'));
-    if (packageJson.dependencies || packageJson.devDependencies) {
-      nodeModulesName = 'docker_node_modules_v4';
-
-      installScript = `export NODE_OPTIONS=--no-experimental-permission && pnpm config set store-dir ${dockerInfo.pnpmStore || '/var/lib/blocklet/.pnpm-store'} --global && pnpm config set update-notifier false --global && pnpm install --shamefully-hoist --unsafe-perm --fetch-timeout=90000 --fetch-retries=5 || (echo "PNPM install Error, Retry with --force" && pnpm install --shamefully-hoist --unsafe-perm --fetch-timeout=90000 --fetch-retries=5 --force)`;
-    }
-  }
-
   // Replace all occurrences of serverDir with baseDir in dockerEnv
   let dockerEnvString = JSON.stringify(dockerEnv).replace(new RegExp(serverDir, 'g'), baseDir);
   if (dockerEnv.BLOCKLET_DOCKER_NETWORK) {
@@ -220,12 +207,14 @@ async function parseDockerOptionsFromPm2({
   let runScript = dockerInfo.script || '';
   if (!runScript && dockerInfo.installNodeModules) {
     const maxOldSpaceSize = Math.floor(Number(dockerEnv.BLOCKLET_DOCKER_MEMORY.replace('g', '')) * 0.85 * 1024);
-    runScript = /(npm|yarn|pnpm|bun)/g.test(nextOptions.script)
-      ? nextOptions.script
-      : `node ${process.env.ABT_NODE_BLOCKLET_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT ? '' : '--optimize_for_size'} --max-old-space-size=${maxOldSpaceSize} --max-http-header-size=16384 ${nextOptions.script} -- BLOCKLET_NAME=${options.name}`;
+    const nodeInterpreter = `node ${process.env.ABT_NODE_BLOCKLET_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT ? '' : '--optimize_for_size'} --max-old-space-size=${maxOldSpaceSize} --max-http-header-size=16384 ${nextOptions.script} -- BLOCKLET_NAME=${options.name}`;
+    const bunInterpreter = `bun run ${nextOptions.script} -- BLOCKLET_NAME=${options.name}`;
+    const engine = getBlockletEngine(meta);
+    const runCommand = engine.interpreter === 'bun' ? bunInterpreter : nodeInterpreter;
+    runScript = /(npm|yarn|pnpm|bun)/g.test(nextOptions.script) ? nextOptions.script : runCommand;
   }
 
-  const runScripts = ['preInstall', '--installScript--', 'postInstall', 'preFlight', 'preStart', '--runScript--']
+  const runScripts = ['preInstall', 'postInstall', 'preFlight', 'preStart', '--runScript--']
     .map((key) => {
       if (key === '--runScript--') {
         return overrideScript || runScript;
@@ -233,9 +222,6 @@ async function parseDockerOptionsFromPm2({
       if (overrideScript) {
         return '';
       }
-      if (key === '--installScript--') {
-        return installScript;
-      }
       return meta.scripts?.[key] || '';
     })
     .filter(Boolean);
@@ -283,9 +269,11 @@ async function parseDockerOptionsFromPm2({
     { source: nextOptions.env.BLOCKLET_LOG_DIR, target: dockerEnv.BLOCKLET_LOG_DIR, canEdit: true },
     { source: nextOptions.env.BLOCKLET_CACHE_DIR, target: dockerEnv.BLOCKLET_CACHE_DIR, canEdit: true },
     {
-      source: path.join(nextOptions.env.BLOCKLET_APP_DIR, nodeModulesName),
+      source: path.join(nextOptions.env.BLOCKLET_APP_DIR, 'node_modules'),
       target: path.join(dockerEnv.BLOCKLET_APP_DIR, 'node_modules'),
-      canEdit: true,
+      // 因为要共享 node_modules，而每个 node_modules 在 bin 和 pnpm 里都是硬链接, 编辑会有安全问题
+      // 上个版本能编辑是因为每个组件的 pnpm-store 都是独立的, 但是这样也使得每个组件首次安装的时间无法得到优化, 只有二次启动时才能用到缓存
+      canEdit: false,
     },
     {
       source: path.join(nextOptions.env.BLOCKLET_APP_DATA_DIR, '.projects'),
@@ -297,20 +285,6 @@ async function parseDockerOptionsFromPm2({
       target: dockerEnv.BLOCKLET_SHARE_DIR,
       canEdit: true,
     },
-    dockerInfo.pnpmStore && nextOptions.env.BLOCKLET_REAL_NAME && nextOptions.env.BLOCKLET_COMPONENT_DID
-      ? {
-          source: path.join(
-            serverDir,
-            'tmp',
-            'pnpm-stores',
-            nextOptions.env.BLOCKLET_REAL_NAME.split('/')[1],
-            nextOptions.env.BLOCKLET_COMPONENT_DID,
-            '.pnpm-store'
-          ),
-          target: dockerInfo.pnpmStore,
-          canEdit: true,
-        }
-      : null,
   ].filter((v) => {
     if (!v) {
       return false;

package/lib/util/ensure-bun.js

@@ -0,0 +1,94 @@
+const path = require('path');
+const { spawn } = require('child_process');
+const fsp = require('fs/promises');
+const os = require('os');
+
+const BUN_VERSION = '1.2.18';
+
+const getRootDir = () => {
+  if (process.env.ABT_NODE_DATA_DIR) {
+    return process.env.ABT_NODE_DATA_DIR;
+  }
+  return path.join(os.tmpdir(), 'bun_install');
+};
+
+async function _ensureBun() {
+  const bunDir = path.join(getRootDir(), 'core', 'bun_install');
+  try {
+    await fsp.access(bunDir);
+  } catch {
+    await fsp.mkdir(bunDir, { recursive: true });
+  }
+
+  const installDir = path.join(bunDir, BUN_VERSION);
+  const binDir = path.join(installDir, 'bin');
+  const bunExec = path.join(binDir, process.platform === 'win32' ? 'bun.exe' : 'bun');
+
+  // If bun is already installed in this project, return its path
+  try {
+    await fsp.access(bunExec);
+    return bunExec;
+  } catch (_) {
+    //
+  }
+
+  // Create installation directory
+  await fsp.mkdir(installDir, { recursive: true });
+
+  // Run the official Bun installer script with BUN_INSTALL overridden
+  await new Promise((resolvePromise, reject) => {
+    const linuxInstall = ['-c', 'curl -fsSL https://bun.sh/install | bash'];
+    const windowsInstall = ['-c', 'powershell -c "irm bun.sh/install.ps1 | iex"'];
+    const installer = spawn('bash', process.platform === 'win32' ? windowsInstall : linuxInstall, {
+      env: { ...process.env, BUN_INSTALL: installDir, BUN_VERSION, SHELL: '/dev/null', HOME: installDir },
+      stdio: 'inherit',
+    });
+
+    installer.on('close', (code) => {
+      if (code !== 0) {
+        reject(new Error(`Bun installation failed with exit code ${code}`));
+      } else {
+        resolvePromise();
+      }
+    });
+
+    installer.on('error', (err) => {
+      reject(err);
+    });
+  });
+
+  return bunExec;
+}
+
+let bunPathPromise = null;
+
+// eslint-disable-next-line require-await
+const ensureBun = async () => {
+  if (bunPathPromise) {
+    return bunPathPromise;
+  }
+  bunPathPromise = _ensureBun();
+  return bunPathPromise;
+};
+
+const bunOptions = {
+  baseDockerOs: 'Linux',
+};
+
+const getBunCacheDir = async (isDocker = false) => {
+  const abtNodeDir = getRootDir();
+  // 如果不是linux, 缓存的目录区分 docker 和非 docker
+  let cacheDir = isDocker ? 'bun-cache-docker' : 'bun-cache';
+  if (os.type() === bunOptions.baseDockerOs) {
+    cacheDir = 'bun-cache';
+  }
+  const bunCacheDir = path.join(abtNodeDir, 'tmp', cacheDir);
+  try {
+    await fsp.access(bunCacheDir);
+  } catch (_) {
+    await fsp.mkdir(bunCacheDir, { recursive: true });
+  }
+  return bunCacheDir;
+};
+
+module.exports = { ensureBun, getBunCacheDir, BUN_VERSION, bunOptions };

package/lib/util/install-external-dependencies.js

@@ -1,12 +1,15 @@
 const { spawn } = require('child_process');
 const fs = require('fs-extra');
 const path = require('path');
+const { ensureBun, getBunCacheDir } = require('./ensure-bun');
+const checkDockerRunHistory = require('./docker/check-docker-run-history');
+const { dockerInstallDependencies, saveLastInstallOs, isSameOs } = require('./docker/docker-install-dependenices');
 
 function isDependencyInstalled(appDir, dependency) {
   return fs.existsSync(path.resolve(appDir, 'node_modules', dependency));
 }
 
-function installExternalDependencies({ appDir, forceInstall = false } = {}) {
+async function installExternalDependencies({ appDir, forceInstall = false, nodeInfo } = {}) {
   if (!appDir) {
     throw new Error('appDir is required');
   }
@@ -14,6 +17,12 @@ function installExternalDependencies({ appDir, forceInstall = false } = {}) {
     throw new Error(`not a correct appDir directory: ${appDir}`);
   }
 
+  const isUseDocker = checkDockerRunHistory(nodeInfo);
+
+  if (!(await isSameOs(appDir, isUseDocker))) {
+    fs.removeSync(path.join(appDir, 'node_modules'));
+  }
+
   // 读取 BLOCKLET_APP_DIR 的 package.json
   const packageJsonPath = path.resolve(appDir, 'package.json');
 
@@ -23,7 +32,7 @@ function installExternalDependencies({ appDir, forceInstall = false } = {}) {
 
   const packageJson = fs.readJsonSync(packageJsonPath);
 
-  const { blockletExternalDependencies: externals = [], externalManager = 'npm' } = packageJson;
+  const { blockletExternalDependencies: externals = [] } = packageJson;
   if (!Array.isArray(externals) || !externals.length) {
     return;
   }
@@ -33,35 +42,48 @@ function installExternalDependencies({ appDir, forceInstall = false } = {}) {
     return;
   }
 
-  // eslint-disable-next-line consistent-return
-  return new Promise((resolve, reject) => {
-    const child = spawn(externalManager, ['install'], {
-      cwd: appDir,
-      stdio: 'pipe',
-      shell: true,
-      env: {
-        ...process.env,
-        NODE_ENV: 'production',
-      },
-    });
+  const bunPath = await ensureBun();
+  const bunCacheDir = await getBunCacheDir();
 
-    let errorOutput = '';
-    child.stderr.on('data', (data) => {
-      errorOutput += data.toString();
+  if (isUseDocker) {
+    await dockerInstallDependencies({
+      // 用 appDir 后两个路径作为 docker name
+      name: appDir.split(path.sep).slice(-2).join(path.sep),
+      installDir: appDir,
     });
+  } else {
+    await new Promise((resolve, reject) => {
+      const child = spawn(bunPath, ['install'], {
+        cwd: appDir,
+        stdio: 'pipe',
+        shell: true,
+        env: {
+          ...process.env,
+          NODE_ENV: 'production',
+          BUN_INSTALL_CACHE_DIR: bunCacheDir,
+        },
+      });
 
-    child.on('close', (code) => {
-      if (code !== 0 && errorOutput.trim()) {
-        reject(new Error(errorOutput));
-      } else {
-        resolve();
-      }
-    });
+      let errorOutput = '';
+      child.stderr.on('data', (data) => {
+        errorOutput += data.toString();
+      });
+
+      child.on('close', (code) => {
+        if (code !== 0 && errorOutput.trim()) {
+          reject(new Error(errorOutput));
+        } else {
+          resolve();
+        }
+      });
 
-    child.on('error', (err) => {
-      reject(err);
+      child.on('error', (err) => {
+        reject(err);
+      });
     });
-  });
+  }
+
+  await saveLastInstallOs(appDir, isUseDocker);
 }
 
 module.exports = { installExternalDependencies };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.46",
+  "version": "1.16.47-beta-20250710-123505-c50a3bdc",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.46",
-    "@abtnode/auth": "1.16.46",
-    "@abtnode/certificate-manager": "1.16.46",
-    "@abtnode/client": "1.16.46",
-    "@abtnode/constant": "1.16.46",
-    "@abtnode/cron": "1.16.46",
-    "@abtnode/db-cache": "1.16.46",
-    "@abtnode/docker-utils": "1.16.46",
-    "@abtnode/logger": "1.16.46",
-    "@abtnode/models": "1.16.46",
-    "@abtnode/queue": "1.16.46",
-    "@abtnode/rbac": "1.16.46",
-    "@abtnode/router-provider": "1.16.46",
-    "@abtnode/static-server": "1.16.46",
-    "@abtnode/timemachine": "1.16.46",
-    "@abtnode/util": "1.16.46",
+    "@abtnode/analytics": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/auth": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/certificate-manager": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/client": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/constant": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/cron": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/db-cache": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/docker-utils": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/logger": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/models": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/queue": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/rbac": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/router-provider": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/static-server": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/timemachine": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@abtnode/util": "1.16.47-beta-20250710-123505-c50a3bdc",
     "@arcblock/did": "1.20.15",
     "@arcblock/did-auth": "1.20.15",
     "@arcblock/did-ext": "1.20.15",
@@ -45,14 +45,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.15",
     "@arcblock/vc": "1.20.15",
-    "@blocklet/constant": "1.16.46",
+    "@blocklet/constant": "1.16.47-beta-20250710-123505-c50a3bdc",
     "@blocklet/did-space-js": "^1.1.5",
-    "@blocklet/env": "1.16.46",
+    "@blocklet/env": "1.16.47-beta-20250710-123505-c50a3bdc",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.46",
-    "@blocklet/resolver": "1.16.46",
-    "@blocklet/sdk": "1.16.46",
-    "@blocklet/store": "1.16.46",
+    "@blocklet/meta": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@blocklet/resolver": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@blocklet/sdk": "1.16.47-beta-20250710-123505-c50a3bdc",
+    "@blocklet/store": "1.16.47-beta-20250710-123505-c50a3bdc",
     "@blocklet/theme": "^3.0.23",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.15",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "7539a231d36a17026dc7066b1d79e1e026337beb"
+  "gitHead": "91504e15ebe43ae5f2c12e6090783412d10e320d"
 }