@abtnode/core 1.16.31 → 1.16.32-beta-04a5da00

package/lib/api/node.js

@@ -54,6 +54,7 @@ class NodeAPI {
 
     try {
       const updateResult = await this.state.updateNodeInfo(entity);
+      this.cache.del('info');
       return updateResult;
     } catch (error) {
       logger.error('update node info failed', { error, entity });

package/lib/blocklet/downloader/blocklet-downloader.js

@@ -90,9 +90,10 @@ class BlockletDownloader extends EventEmitter {
    *     set: (key: string, value: any) => Promise
    *     get: (key: string) => Promise<any>
    *   },
+   *   getNodeInfo: () => Promise<{ enableDocker: boolean }>
    * }}
    */
-  constructor({ installDir, downloadDir, cache, logger = defaultLogger }) {
+  constructor({ installDir, downloadDir, cache, logger = defaultLogger, getNodeInfo }) {
     super();
 
     this.installDir = installDir;
@@ -103,6 +104,7 @@ class BlockletDownloader extends EventEmitter {
       installDir,
       downloadDir,
       cache,
+      getNodeInfo,
     });
   }
 

package/lib/blocklet/downloader/bundle-downloader.js

@@ -23,15 +23,17 @@ class BundleDownloader extends EventEmitter {
    *     set: (key: string, value: any) => Promise
    *     get: (key: string) => Promise<any>
    *   }
+   *   getNodeInfo: () => Promise<{ enableDocker: boolean }>
    * }}
    */
-  constructor({ installDir, downloadDir, cache, logger = defaultLogger }) {
+  constructor({ installDir, downloadDir, cache, logger = defaultLogger, getNodeInfo }) {
     super();
 
     this.installDir = installDir;
     this.downloadDir = downloadDir;
     this.cache = cache;
     this.logger = logger;
+    this.getNodeInfo = getNodeInfo;
 
     /**
      * { did: Map({ <childDid>: <downloadFile.cancelCtrl> }) }
@@ -51,7 +53,7 @@ class BundleDownloader extends EventEmitter {
    * @param {*} meta
    * @param {*} rootDid
    * @param {*} url
-   * @param {{}} [context={}]
+   * @param {{}} [context={ nodeInfo: { enableDocker: boolean } }]
    * @return {*}
    * @memberof BlockletManager
    */
@@ -67,6 +69,7 @@ class BundleDownloader extends EventEmitter {
     }
 
     const onProgress = context.onProgress || (() => {});
+    const nodeInfo = await this.getNodeInfo();
 
     try {
       await lock.acquire();
@@ -104,6 +107,7 @@ class BundleDownloader extends EventEmitter {
       // resolve tarball and mv tarball to cache after resolved
       await resolveDownload(tarballPath, this.installDir, {
         removeTarFile: false,
+        nodeInfo,
         onProgress: ({ name: _name }) => {
           onProgress({ status: 'extracting', name: _name });
         },

package/lib/blocklet/downloader/resolve-download.js

@@ -19,9 +19,14 @@ const asyncFs = fs.promises;
  * @param {{
  *   removeTarFile: boolean;
  *   logger;
+ *   nodeInfo: { enableDocker: boolean };
  * }} option
  */
-const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = defaultLogger, onProgress } = {}) => {
+const resolveDownload = async (
+  tarFile,
+  dist,
+  { removeTarFile = true, logger = defaultLogger, onProgress, nodeInfo } = {}
+) => {
   const downloadDir = path.join(path.dirname(tarFile), path.basename(tarFile, path.extname(tarFile)));
   const tmp = `${downloadDir}-tmp`;
   try {
@@ -78,7 +83,7 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
 
     await fs.move(downloadDir, installDir, { overwrite: true });
 
-    await installExternalDependencies({ appDir: installDir, forceInstall: true });
+    await installExternalDependencies({ appDir: installDir, forceInstall: true, enableDocker: nodeInfo?.enableDocker });
   } catch (error) {
     fs.removeSync(downloadDir);
     fs.removeSync(tmp);
@@ -91,7 +96,7 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
 const resolveDiffDownload = async (
   tarFile,
   dist,
-  { meta: oldMeta, deleteSet, cwd = '/', logger = defaultLogger } = {}
+  { meta: oldMeta, deleteSet, cwd = '/', logger = defaultLogger, nodeInfo } = {}
 ) => {
   // eslint-disable-next-line no-param-reassign
   tarFile = path.join(cwd, tarFile);
@@ -145,7 +150,7 @@ const resolveDiffDownload = async (
     logger.info('Move downloadDir to installDir', { downloadDir, bundleDir });
     await fs.move(downloadDir, bundleDir, { overwrite: true });
 
-    await installExternalDependencies({ appDir: bundleDir, forceInstall: true });
+    await installExternalDependencies({ appDir: bundleDir, forceInstall: true, enableDocker: nodeInfo?.enableDocker });
 
     return { meta, installDir: bundleDir };
   } catch (error) {

package/lib/blocklet/manager/disk.js

@@ -312,6 +312,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       installDir: this.installDir,
       downloadDir: this.dataDirs.tmp,
       cache: states.cache,
+      getNodeInfo: () => states.node.read(),
     });
 
     this._rollbackCache = new RollbackCache({ dir: this.dataDirs.tmp });

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

@@ -66,10 +66,12 @@ const installComponentFromUpload = async ({
       throw new Error('Blocklet version changed when diff deploying');
     }
 
-    meta = (await resolveDiffDownload(tarFile, manager.installDir, { deleteSet, meta: oldChild.meta })).meta;
+    const nodeInfo = await states.node.read();
+    meta = (await resolveDiffDownload(tarFile, manager.installDir, { deleteSet, meta: oldChild.meta, nodeInfo })).meta;
   } else {
     // full deploy
-    meta = (await resolveDownload(tarFile, manager.installDir)).meta;
+    const nodeInfo = await states.node.read();
+    meta = (await resolveDownload(tarFile, manager.installDir, { nodeInfo })).meta;
   }
 
   if (meta.did === rootDid) {

package/lib/states/node.js

@@ -17,6 +17,7 @@ const {
 const BaseState = require('./base');
 const { validateOwner } = require('../util');
 const { get: getDefaultConfigs } = require('../util/default-node-config');
+const checkDockerInstalled = require('../util/docker/check-docker-installed');
 
 /**
  * @extends BaseState<import('@abtnode/models').ServerState>
@@ -70,7 +71,7 @@ class NodeState extends BaseState {
       if (dek) {
         doc.sk = security.decrypt(doc.sk, doc.did, dek);
       }
-
+      doc.isDockerInstalled = await checkDockerInstalled();
       return doc;
     }
 
@@ -138,6 +139,7 @@ class NodeState extends BaseState {
     if (dek) {
       doc.sk = security.decrypt(doc.sk, doc.did, dek);
     }
+    doc.isDockerInstalled = await checkDockerInstalled();
 
     if (doc.runtimeConfig && !doc.runtimeConfig.proxyMaxMemoryLimit) {
       doc.runtimeConfig.proxyMaxMemoryLimit = PROXY_MAX_MEM_LIMIT_IN_MB;

package/lib/util/blocklet.js

@@ -104,6 +104,8 @@ const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { expandBundle, findInterfacePortByName, prettyURL, templateReplace, getServerDidDomain } = require('./index');
 const { installExternalDependencies } = require('./install-external-dependencies');
+const parseDockerOptionsFromPm2 = require('./docker/parse-docker-options-from-pm2');
+const dockerRemoveByName = require('./docker/docker-remove-by-name');
 
 /**
  * get blocklet engine info, default is node
@@ -586,7 +588,7 @@ const startBlockletProcess = async (
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
 
-      await installExternalDependencies({ appDir: env?.BLOCKLET_APP_DIR });
+      await installExternalDependencies({ appDir: env?.BLOCKLET_APP_DIR, enableDocker: nodeInfo?.enableDocker });
 
       // run hook
       await preFlight(b, { env: { ...env } });
@@ -676,7 +678,8 @@ const startBlockletProcess = async (
         serverSk: nodeEnvironments.ABT_NODE_SK,
       });
 
-      await pm2.startAsync(options);
+      const nextOptions = await parseDockerOptionsFromPm2(options, nodeInfo);
+      await pm2.startAsync(nextOptions);
 
       // eslint-disable-next-line no-use-before-define
       const status = await getProcessState(processId);
@@ -730,7 +733,6 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
       if (!hasStartEngine(b.meta)) {
         return;
       }
-
       await preDelete(b, { ancestors });
       // eslint-disable-next-line no-use-before-define
       await deleteProcess(b.env.processId);
@@ -785,16 +787,18 @@ const getProcessState = async (processId) => {
 const getProcessInfo = (processId, { throwOnNotExist = true } = {}) =>
   getPm2ProcessInfo(processId, { printError: logger.error.bind(logger), throwOnNotExist });
 
-const deleteProcess = (processId) =>
-  new Promise((resolve, reject) => {
-    pm2.delete(processId, (err) => {
+const deleteProcess = (processId) => {
+  return new Promise((resolve, reject) => {
+    pm2.delete(processId, async (err) => {
       if (isUsefulError(err)) {
         logger.error('blocklet process delete failed', { processId, error: err });
         return reject(err);
       }
+      await dockerRemoveByName(processId);
       return resolve(processId);
     });
   });
+};
 
 const reloadProcess = (processId) =>
   new Promise((resolve, reject) => {

package/lib/util/docker/check-docker-installed.js

@@ -0,0 +1,17 @@
+const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
+const promiseSpawn = require('../promise-spawn');
+const promiseOnce = require('../promise-once');
+
+async function checkDockerInstalled() {
+  try {
+    await promiseSpawn('docker --version');
+    const output = await promiseSpawn('docker ps -a');
+    logger.info(`Docker is installed: ${output.trim()}`);
+    return true;
+  } catch (error) {
+    logger.error('Docker is not installed or not available in the PATH or not Permission: ', error);
+    return false;
+  }
+}
+
+module.exports = promiseOnce(checkDockerInstalled);

package/lib/util/docker/create-docker-image.js

@@ -0,0 +1,82 @@
+const fs = require('fs/promises');
+const path = require('path');
+const { execSync } = require('child_process');
+const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
+
+const DOCKER_IMAGE_NAME = 'blocklet-node-app';
+
+let isCreated = false;
+
+async function createDockerImage() {
+  if (isCreated) {
+    return;
+  }
+  isCreated = true;
+
+  const dir = process.env.ABT_NODE_DATA_DIR;
+  if (!dir) {
+    logger.error('ABT_NODE_DATA_DIR is not set');
+    return;
+  }
+  await fs.mkdir(dir, { recursive: true });
+  // 生成 Dockerfile
+  const uid = process.getuid();
+  const gid = process.getgid();
+  const dockerfilePath = path.join(dir, 'Dockerfile');
+  const dockerfilePathDone = path.join(dir, `Dockerfile.done-${uid}-${gid}`);
+  const [accessDone] = await Promise.allSettled([fs.access(`${dockerfilePathDone}`)]);
+  if (accessDone.status === 'fulfilled') {
+    return;
+  }
+  const dockerfileContent = `
+  FROM node:22-alpine
+
+  
+  # RUN apk add --no-cache shadow
+  RUN apk add --no-cache socat
+  
+  RUN node -v
+  RUN npm i -g pnpm
+  RUN npm i -g nr
+  
+  # 使用主机用户的 home 目录
+  WORKDIR /blocklet
+  
+  RUN mkdir -p /blocklet/app
+  RUN mkdir -p /blocklet/data
+  RUN mkdir -p /blocklet/logs
+  RUN mkdir -p /blocklet/cache
+  RUN mkdir -p /data/bin/meilisearch
+  RUN chmod -R 775 /blocklet
+  RUN chown -R ${uid}:${gid} /blocklet
+  RUN chown -R ${uid}:${gid} /data/bin/meilisearch
+  # USER ${uid}:${gid}
+  `;
+
+  try {
+    await fs.access(dockerfilePath);
+    await fs.unlink(dockerfilePath);
+  } catch (_) {
+    // File doesn't exist, no need to remove
+  }
+
+  await fs.writeFile(dockerfilePath, dockerfileContent);
+  try {
+    execSync(`docker build -f ${path.join(dir, 'Dockerfile')} --no-cache -t ${DOCKER_IMAGE_NAME} .`, {
+      stdio: 'inherit',
+      encoding: 'utf-8',
+    });
+  } catch (error) {
+    // 如果 docker 会报错: ERROR: failed to solve: failed to read dockerfile: open /var/snap/docker/common/var-lib-docker/tmp/buildkit-mount875872699/Dockerfile: no such file or directory
+    // 表示 docker 没有权限访问 ABT_NODE_DATA_DIR 目录, 后续的一系列操作也会失败
+    logger.error('Failed to build Docker image. Error:', error.message);
+    throw error;
+  }
+  await fs.rename(dockerfilePath, dockerfilePathDone);
+  logger.info('Success build docker image');
+}
+
+module.exports = {
+  createDockerImage,
+  DOCKER_IMAGE_NAME,
+};

package/lib/util/docker/docker-container-prune.js

@@ -0,0 +1,71 @@
+const pm2 = require('@abtnode/util/lib/async-pm2');
+const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
+
+const checkDockerInstalled = require('./check-docker-installed');
+const parseDockerName = require('./parse-docker-name');
+const promiseSpawn = require('../promise-spawn');
+const promiseDebounce = require('../promise-debounce');
+
+async function dockerContainerPrune() {
+  const isDockerInstalled = await checkDockerInstalled();
+  if (!isDockerInstalled) {
+    return;
+  }
+
+  try {
+    const containerList = await promiseSpawn('docker ps -a --format {{.Names}}');
+    const containerNames = containerList.split('\n').filter((v) => {
+      const name = v.trim().replace(/^"|"$/g, '');
+      return name.startsWith('blocklet-');
+    });
+
+    // 获取 PM2 进程列表
+    const pm2List = await new Promise((resolve, reject) => {
+      pm2.list((err, list) => {
+        if (err) reject(err);
+        else resolve(list.filter((process) => process.pm2_env.status !== 'stopped'));
+      });
+    });
+
+    const pm2Names = new Set(pm2List.map((process) => parseDockerName(process.name)));
+    const containersToStop = containerNames.filter((containerName) => !pm2Names.has(containerName));
+
+    for (const containerName of containersToStop) {
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        await promiseSpawn(`docker rm -f ${containerName}`);
+      } catch (_) {
+        //
+      }
+    }
+  } catch (e) {
+    logger.error('dockerContainerPrune failed', { error: e });
+  }
+}
+
+const debounceDockerContainerPrune = promiseDebounce(dockerContainerPrune, 4000);
+
+// 添加 PM2 事件监听
+pm2.launchBus((err, bus) => {
+  if (err) {
+    logger.error('Failed to launch PM2 bus', { error: err });
+    return;
+  }
+
+  // 监听进程在线状态变更
+  bus.on('process:event', (packet) => {
+    if (['stop', 'exit', 'restart'].includes(packet.event)) {
+      debounceDockerContainerPrune();
+    }
+  });
+
+  // 监听新进程启动
+  bus.on('process:spawn', () => {
+    debounceDockerContainerPrune();
+  });
+
+  logger.info('PM2 listeners set up successfully');
+});
+
+// 初始执行一次清理
+debounceDockerContainerPrune();

package/lib/util/docker/docker-remove-by-name.js

@@ -0,0 +1,20 @@
+const promiseSpawn = require('../promise-spawn');
+const checkDockerInstalled = require('./check-docker-installed');
+const parseDockerName = require('./parse-docker-name');
+
+async function dockerRemoveByName(name) {
+  const isDockerInstalled = await checkDockerInstalled();
+  if (!isDockerInstalled) {
+    return;
+  }
+  const containerName = parseDockerName(name);
+  // const checkContainer = await promiseSpawn(`docker ps -q -f name=${containerName}`);
+  // if (checkContainer) {   // }
+  try {
+    await promiseSpawn(`docker rm -f ${containerName} > /dev/null 2>&1 || true`);
+  } catch (_) {
+    //
+  }
+}
+
+module.exports = dockerRemoveByName;

package/lib/util/docker/parse-docker-name.js

@@ -0,0 +1,10 @@
+function parseDockerName(input) {
+  // docker 容器名称不能包含特殊字符
+  const name = input
+    .replace(/[^a-zA-Z0-9_-]/g, '-')
+    .replace(/^"|"$/g, '')
+    .replace(/^blocklet-/, '');
+  return `blocklet-${name}`;
+}
+
+module.exports = parseDockerName;

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

@@ -0,0 +1,138 @@
+require('./docker-container-prune');
+
+const { stringify: stringifyEnvFile } = require('envfile');
+const path = require('path');
+const fs = require('fs/promises');
+const os = require('os');
+const { existsSync } = require('fs-extra');
+const which = require('which');
+const { NODE_MODES } = require('@abtnode/constant');
+const parseDockerName = require('./parse-docker-name');
+const { DOCKER_IMAGE_NAME, createDockerImage } = require('./create-docker-image');
+
+const meiliSearchPathAlt = '/data/bin/meilisearch';
+
+function findExecutable(executable) {
+  try {
+    const fullPath = which.sync(executable);
+    return fullPath;
+  } catch (error) {
+    return null;
+  }
+}
+
+async function mkdirpWithPermissions(dir, mode = 0o755) {
+  try {
+    await fs.mkdir(dir, { recursive: true, mode });
+  } catch (error) {
+    if (error.code !== 'EEXIST') {
+      throw error;
+    }
+  }
+}
+
+async function parseDockerOptionsFromPm2(input, nodeInfo) {
+  // serverless 模式下，不支持跳过 docker
+  if (input.env.SKIP_DOCKER && nodeInfo.mode !== NODE_MODES.SERVERLESS) {
+    return input;
+  }
+
+  // 环境变量或配置项启用了 docker, 就尝试使用 docker
+  const useDocker = input.env.USE_DOCKER || nodeInfo.enableDocker;
+
+  // 如果 node 没有安装 docker，并且没有指定使用 docker，则不使用 docker
+  if (!useDocker || !nodeInfo.isDockerInstalled) {
+    return input;
+  }
+  await createDockerImage();
+  const options = { ...input };
+  const name = parseDockerName(options.name);
+
+  // 要确保 BLOCKLET_APP_DIR 等环境变量在 docker 容器内正常使用
+  options.env.BLOCKLET_DOCKER_CPUS = options.env.BLOCKLET_DOCKER_CPUS || '2';
+  options.env.BLOCKLET_DOCKER_MEMORY = options.env.BLOCKLET_DOCKER_MEMORY || '2g';
+  options.env.BLOCKLET_DOCKER_DISK_SIZE = options.env.BLOCKLET_DOCKER_DISK_SIZE || '0g';
+  options.env.BLOCKLET_DOCKER_NAME = name;
+  options.env.INTERNAL_HOST = 'host.docker.internal';
+
+  const dockerEnv = { ...options.env };
+  const baseDir = '/blocklet';
+  dockerEnv.BLOCKLET_APP_DIR = path.join(baseDir, 'app');
+  dockerEnv.BLOCKLET_DATA_DIR = path.join(baseDir, options.env.BLOCKLET_REAL_NAME);
+  dockerEnv.BLOCKLET_LOG_DIR = path.join(baseDir, 'logs');
+  dockerEnv.BLOCKLET_CACHE_DIR = path.join(baseDir, 'cache');
+  dockerEnv.BLOCKLET_DOCKER_NAME = name;
+  dockerEnv.BLOCKLET_HOST = 'host.docker.internal';
+  const envVars = stringifyEnvFile(dockerEnv);
+
+  const dockerEnvFile = path.join(options.env.BLOCKLET_DATA_DIR, 'docker-env');
+  await fs.writeFile(dockerEnvFile, envVars);
+  const runScript = /(npm|yarn|pnpm|bun)/g.test(options.script) ? options.script : `node ${options.script}`;
+  const networkHost = os.platform() === 'linux' ? '--network host' : '';
+  const port = os.platform() === 'linux' ? '' : `-p ${options.env.BLOCKLET_PORT}:${options.env.BLOCKLET_PORT}`;
+  const diskSize =
+    options.env.BLOCKLET_DOCKER_DISK_SIZE !== '0g' ? `--storage-opt size=${options.env.BLOCKLET_DOCKER_DISK_SIZE}` : '';
+  const socatCommand =
+    os.platform() === 'linux'
+      ? ''
+      : [options.env.ABT_NODE_SERVICE_PORT, options.env.ABT_NODE_PORT]
+          .concat((process.env.BLOCKLET_DOCKET_SHARE_PORTS || '').split(','))
+          .map((v) => `socat TCP-LISTEN:${v},reuseaddr,fork TCP:host.docker.internal:${v} & `)
+          .join(' ');
+
+  options.args = [];
+
+  const bindMounts = [
+    { source: options.env.BLOCKLET_APP_DIR, target: dockerEnv.BLOCKLET_APP_DIR },
+    { source: options.env.BLOCKLET_DATA_DIR, target: dockerEnv.BLOCKLET_DATA_DIR },
+    { source: options.env.BLOCKLET_LOG_DIR, target: dockerEnv.BLOCKLET_LOG_DIR },
+    { source: options.env.BLOCKLET_CACHE_DIR, target: dockerEnv.BLOCKLET_CACHE_DIR },
+    {
+      source: path.join(options.env.BLOCKLET_APP_DIR, 'docker_node_modules'),
+      target: `${dockerEnv.BLOCKLET_APP_DIR}/node_modules`,
+    },
+  ];
+  let mount = '';
+  for (const bindMount of bindMounts) {
+    if (!existsSync(bindMount.source)) {
+      // eslint-disable-next-line no-await-in-loop
+      await mkdirpWithPermissions(bindMount.source);
+    }
+    // 使用 --mount 需要系统有 mnt 磁盘挂载配置
+    // mount += ` --mount type=bind,source=${bindMount.source},target=${bindMount.target},bind-propagation=rshared`;
+    mount += ` -v ${bindMount.source}:${bindMount.target}:rw `;
+  }
+  if (!existsSync(path.join(options.env.BLOCKLET_APP_DIR, 'node_modules'))) {
+    await mkdirpWithPermissions(path.join(options.env.BLOCKLET_APP_DIR, 'node_modules'));
+  }
+  if (existsSync(meiliSearchPathAlt)) {
+    mount += ` -v ${meiliSearchPathAlt}:${meiliSearchPathAlt}:rw `;
+  } else {
+    const meiliSearchPath = findExecutable('meilisearch');
+    if (meiliSearchPath) {
+      mount += ` -v ${meiliSearchPath}:${meiliSearchPathAlt}:rw `;
+    }
+  }
+
+  options.script = `docker rm -f ${name} > /dev/null 2>&1 || true && docker run -u $(id -u):$(id -g) --name ${name} \
+  ${port} \
+  ${mount} \
+  -v ${path.join(options.env.BLOCKLET_APP_DIR, 'node_modules')} \
+  ${diskSize} \
+  --read-only \
+  --cpus="${dockerEnv.BLOCKLET_DOCKER_CPUS}" \
+  --memory="${dockerEnv.BLOCKLET_DOCKER_MEMORY}" \
+  --env-file ${dockerEnvFile} \
+  --read-only --cap-drop=ALL --security-opt no-new-privileges \
+  ${networkHost} \
+  ${DOCKER_IMAGE_NAME} \
+  sh -c \
+  '${socatCommand} \
+   cd ${dockerEnv.BLOCKLET_APP_DIR} && npm install && ${runScript}'`;
+
+  options.env = {};
+
+  return options;
+}
+
+module.exports = parseDockerOptionsFromPm2;

package/lib/util/docker/shard-network.js

@@ -0,0 +1,10 @@
+const promiseSpawn = require('../spawn-promise');
+const promiseOnce = require('../promise-once');
+
+async function shardNetwork() {
+  await promiseSpawn(
+    'docker network ls | grep -q blocklet-shared-network || docker network create blocklet-shared-network'
+  );
+}
+
+module.exports = promiseOnce(shardNetwork);

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

@@ -6,13 +6,17 @@ function isDependencyInstalled(appDir, dependency) {
   return fs.existsSync(path.resolve(appDir, 'node_modules', dependency));
 }
 
-function installExternalDependencies({ appDir, forceInstall = false } = {}) {
+function installExternalDependencies({ appDir, forceInstall = false, enableDocker } = {}) {
   if (!appDir) {
     throw new Error('appDir is required');
   }
   if (!fs.existsSync(appDir)) {
     throw new Error(`not a correct appDir directory: ${appDir}`);
   }
+  if (enableDocker) {
+    // 暂时注释, 需要等到 prestart 同步迁移到 docker 之后再return
+    // return;
+  }
 
   // 读取 BLOCKLET_APP_DIR 的 package.json
   const packageJsonPath = path.resolve(appDir, 'package.json');

package/lib/util/promise-debounce.js

@@ -0,0 +1,29 @@
+// debounce bing q promise 过程中不会重复执行
+function promiseDebounce(fn, delay = 1000) {
+  let timeoutId = null;
+  let isRunning = false;
+
+  return (...args) => {
+    return new Promise((resolve, reject) => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+
+      timeoutId = setTimeout(async () => {
+        if (isRunning) return;
+
+        isRunning = true;
+        try {
+          const result = await Promise.resolve(fn(...args));
+          resolve(result);
+        } catch (error) {
+          reject(error);
+        } finally {
+          isRunning = false;
+        }
+      }, delay);
+    });
+  };
+}
+
+module.exports = promiseDebounce;

package/lib/util/promise-once.js

@@ -0,0 +1,14 @@
+function promiseOnce(fn) {
+  let executed = false;
+  let result;
+
+  return async (...args) => {
+    if (!executed) {
+      executed = true;
+      result = await fn(...args);
+    }
+    return result;
+  };
+}
+
+module.exports = promiseOnce;

package/lib/util/promise-spawn.js

@@ -0,0 +1,49 @@
+const { spawn } = require('child_process');
+
+/**
+ * 将命令字符串拆分为命令和参数数组
+ * @param {string} commandString - 完整的命令字符串
+ * @returns {{ command: string, args: string[] }} - 拆分后的命令和参数
+ */
+function parseCommand(commandString) {
+  const [command, ...args] = commandString.split(' ');
+  return { command, args };
+}
+
+/**
+ * 通用的命令执行函数，支持字符串输入
+ * @param {string} commandString - 完整的命令字符串
+ * @param {object} [options={}] - 可选的 spawn 配置项
+ * @returns {Promise<string>} - 执行结果
+ */
+function promiseSpawn(commandString, options = {}) {
+  return new Promise((resolve, reject) => {
+    const { command, args } = parseCommand(commandString);
+    const childProcess = spawn(command, args, options);
+
+    let stdoutData = '';
+    let stderrData = '';
+
+    childProcess.stdout.on('data', (data) => {
+      stdoutData += data;
+    });
+
+    childProcess.stderr.on('data', (data) => {
+      stderrData += data;
+    });
+
+    childProcess.on('close', (code) => {
+      if (code === 0) {
+        resolve(stdoutData);
+      } else {
+        reject(new Error(`Command failed with code ${code}: ${stderrData}`));
+      }
+    });
+
+    childProcess.on('error', (err) => {
+      reject(err);
+    });
+  });
+}
+
+module.exports = promiseSpawn;

package/lib/validators/node.js

@@ -38,6 +38,8 @@ const nodeInfoSchema = Joi.object({
       en: { 'string.uriCustomScheme': 'NFT Domain must be a valid URL' },
     }),
   autoUpgrade: Joi.boolean(),
+  enableDocker: Joi.boolean().optional().default(false),
+  isDockerInstalled: Joi.boolean().optional().default(false),
   enableWelcomePage: Joi.boolean(),
   enableFileSystemIsolation: Joi.boolean(),
   diskAlertThreshold: Joi.number()

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.31",
+  "version": "1.16.32-beta-04a5da00",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.31",
-    "@abtnode/auth": "1.16.31",
-    "@abtnode/certificate-manager": "1.16.31",
-    "@abtnode/constant": "1.16.31",
-    "@abtnode/cron": "1.16.31",
-    "@abtnode/logger": "1.16.31",
-    "@abtnode/models": "1.16.31",
-    "@abtnode/queue": "1.16.31",
-    "@abtnode/rbac": "1.16.31",
-    "@abtnode/router-provider": "1.16.31",
-    "@abtnode/static-server": "1.16.31",
-    "@abtnode/timemachine": "1.16.31",
-    "@abtnode/util": "1.16.31",
+    "@abtnode/analytics": "1.16.32-beta-04a5da00",
+    "@abtnode/auth": "1.16.32-beta-04a5da00",
+    "@abtnode/certificate-manager": "1.16.32-beta-04a5da00",
+    "@abtnode/constant": "1.16.32-beta-04a5da00",
+    "@abtnode/cron": "1.16.32-beta-04a5da00",
+    "@abtnode/logger": "1.16.32-beta-04a5da00",
+    "@abtnode/models": "1.16.32-beta-04a5da00",
+    "@abtnode/queue": "1.16.32-beta-04a5da00",
+    "@abtnode/rbac": "1.16.32-beta-04a5da00",
+    "@abtnode/router-provider": "1.16.32-beta-04a5da00",
+    "@abtnode/static-server": "1.16.32-beta-04a5da00",
+    "@abtnode/timemachine": "1.16.32-beta-04a5da00",
+    "@abtnode/util": "1.16.32-beta-04a5da00",
     "@arcblock/did": "1.18.135",
     "@arcblock/did-auth": "1.18.135",
     "@arcblock/did-ext": "^1.18.135",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.135",
     "@arcblock/vc": "1.18.135",
-    "@blocklet/constant": "1.16.31",
-    "@blocklet/env": "1.16.31",
-    "@blocklet/meta": "1.16.31",
-    "@blocklet/resolver": "1.16.31",
-    "@blocklet/sdk": "1.16.31",
-    "@blocklet/store": "1.16.31",
-    "@did-space/client": "^0.5.31",
+    "@blocklet/constant": "1.16.32-beta-04a5da00",
+    "@blocklet/env": "1.16.32-beta-04a5da00",
+    "@blocklet/meta": "1.16.32-beta-04a5da00",
+    "@blocklet/resolver": "1.16.32-beta-04a5da00",
+    "@blocklet/sdk": "1.16.32-beta-04a5da00",
+    "@blocklet/store": "1.16.32-beta-04a5da00",
+    "@did-space/client": "^0.5.32",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.135",
     "@ocap/util": "1.18.135",
@@ -61,6 +61,7 @@
     "cross-spawn": "^7.0.3",
     "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",
@@ -95,6 +96,7 @@
     "ufo": "^1.5.3",
     "uuid": "^9.0.1",
     "valid-url": "^1.0.9",
+    "which": "^2.0.2",
     "xbytes": "^1.8.0"
   },
   "devDependencies": {
@@ -103,5 +105,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "03edde3e617b126c1873caa67b1d828ee1419a70"
+  "gitHead": "f609e3593366aace895c936b00f9623002e29b32"
 }