@abtnode/core 1.16.47-beta-20250715-034905-11207b15 → 1.16.47-beta-20250718-075003-940d2e2a

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -12,6 +12,7 @@ const { INSTALL_ACTIONS } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:install-app-backup');
 
 const { validateBlocklet, checkDuplicateAppSk, getAppDirs } = require('../../../util/blocklet');
+const { dockerRestorePgBlockletDb } = require('../../../util/docker/docker-backup-pg-blocklet-db');
 
 /**
  * backup 目录结构
@@ -213,6 +214,9 @@ const installApplicationFromBackup = async ({
       }
       logger.info(`data is ${moveDir ? 'moved' : 'copied'} successfully`);
     }
+
+    const dbPath = path.join(dataDir, 'blocklet.db');
+    await dockerRestorePgBlockletDb(dbPath);
   } catch (error) {
     logger.error('installFromBackup failed', { did, error });
 

package/lib/blocklet/storage/backup/spaces.js

@@ -41,6 +41,7 @@ const { translate } = require('../../../locales');
 const { getFolderSize, formatMemoryUsage } = require('../utils/disk');
 const { dockerExecChown } = require('../../../util/docker/docker-exec-chown');
 const checkDockerRunHistory = require('../../../util/docker/check-docker-run-history');
+const { dockerBackupPgBlockletDb } = require('../../../util/docker/docker-backup-pg-blocklet-db');
 
 /**
  * @param {{ appDid: string, appPid: string }} params
@@ -169,6 +170,18 @@ class SpacesBackup extends BaseBackup {
     }
   }
 
+  async backupPostgres() {
+    if (!this.blocklet) {
+      return;
+    }
+    const dataDir =
+      this.blocklet.environments?.find((v) => v.key === 'BLOCKLET_APP_DATA_DIR')?.value ||
+      path.join(process.env.ABT_NODE_DATA_DIR, 'data', this.blocklet.appPid || this.blocklet.appDid);
+    const dbPath = path.join(dataDir, 'blocklet.db');
+
+    await dockerBackupPgBlockletDb(dbPath);
+  }
+
   /**
    *
    * @returns {Promise<void>}
@@ -188,6 +201,7 @@ class SpacesBackup extends BaseBackup {
       logger.info(this.input.appPid, 'initialize.after', formatMemoryUsage());
 
       await this.backupChown();
+      await this.backupPostgres();
 
       logger.info(this.input.appPid, 'export.before', formatMemoryUsage());
       await this.export();

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

@@ -32,7 +32,7 @@ async function checkNeedRunDocker(meta = {}, env = {}, nodeInfo = {}, isExternal
   // Ensure Docker is installed
   if (!nodeInfo.isDockerInstalled) {
     if (!(await checkDockerInstalled())) {
-      throw new Error('Docker is not installed');
+      throw new Error('Docker mode is enabled, but the Docker CLI was not found.');
     }
   }
   return true;

package/lib/util/docker/docker-backup-pg-blocklet-db.js

@@ -0,0 +1,157 @@
+const path = require('path');
+const fs = require('fs/promises');
+const { dbPathToDbName } = require('@abtnode/models');
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
+const logger = require('@abtnode/logger')('backup-pg-blocklet-db');
+
+const { POSTGRES_CONTAINER_NAME } = require('./ensure-docker-postgres');
+const { hasPostgres } = require('../migration-sqlite-to-postgres');
+
+// 最长 1 小时, 因为特别大的表, pg_dump 会很久
+const baseSpawnOptions = { timeout: 3600_000, retry: 0 };
+
+function getBlockletDataRoot(dbPath) {
+  return path.dirname(path.dirname(path.dirname(dbPath)));
+}
+const getBackupPath = (dbPath) => {
+  return `${dbPath.replace('.db', '')}_pg_backup.gz`;
+};
+
+const checkDbExists = async (pgUrl, dbName) => {
+  const output = await promiseSpawn(
+    `docker exec ${POSTGRES_CONTAINER_NAME} psql "${pgUrl}" -tAc "SELECT 1 FROM pg_database WHERE datname = '${dbName}';"`,
+    undefined,
+    { timeout: 3_000, retry: 2 }
+  );
+  return output.trim() === '1';
+};
+
+const getPgTempDir = (dbName) => {
+  return `/tmp/${dbName}.sql.gz`;
+};
+
+function buildPgUrl(originalUrl, dbName) {
+  const url = new URL(originalUrl);
+  url.pathname = `/${dbName}`; // 替换路径
+  return url.toString();
+}
+
+function getPgUrl() {
+  const pgUrl = process.env.ABT_NODE_POSTGRES_URL;
+
+  // 如果是当前容器, 使用容器内部 port
+  if (pgUrl.includes('127.0.0.1') || pgUrl.includes('localhost')) {
+    return pgUrl.replace('40408', '5432');
+  }
+
+  return '';
+}
+
+const dockerBackupPgBlockletDb = async (dbPath) => {
+  const dataDir = getBlockletDataRoot(dbPath);
+  if (!hasPostgres(dataDir)) {
+    logger.info('no using postgres, skip backup the pg blocklet db:', dbPath);
+    return {};
+  }
+
+  const pgUrl = getPgUrl();
+  if (!pgUrl) {
+    logger.info('no postgres url, skip backup the pg blocklet db:', dbPath);
+    return {};
+  }
+
+  const dbName = dbPathToDbName(dbPath);
+  const backupPath = getBackupPath(dbPath);
+
+  const isDbExists = await checkDbExists(pgUrl, dbName);
+  if (!isDbExists) {
+    logger.info('no need to backup the pg blocklet db:', dbName);
+    return {};
+  }
+
+  // 替换 pgUrl 的 db 为 dbName
+  const pgUrlForDump = buildPgUrl(pgUrl, dbName);
+
+  logger.info('backup the pg blocklet db start:', dbName);
+  await promiseSpawn(
+    `docker exec ${POSTGRES_CONTAINER_NAME} sh -c 'pg_dump ${pgUrlForDump} | gzip' > ${backupPath}`,
+    {},
+    baseSpawnOptions
+  );
+  logger.info('backup the pg blocklet db cp backup file done:', backupPath);
+  return {
+    backupPath,
+    dbName,
+  };
+};
+
+const dockerRestorePgBlockletDb = async (dbPath) => {
+  const dataDir = getBlockletDataRoot(dbPath);
+  if (!hasPostgres(dataDir)) {
+    logger.info('no using postgres, skip restore the pg blocklet db:', dbPath);
+    return {};
+  }
+
+  const pgUrl = getPgUrl();
+  if (!pgUrl) {
+    logger.info('no postgres url, skip restore the pg blocklet db:', dbPath);
+    return {};
+  }
+
+  const dbName = dbPathToDbName(dbPath);
+  const backupPath = getBackupPath(dbPath);
+
+  try {
+    await fs.access(backupPath);
+  } catch (_) {
+    logger.info('no need to restore the pg blocklet db path at:', backupPath);
+    return {};
+  }
+
+  const containerTmpPath = getPgTempDir(dbName);
+
+  // 替换 pgUrl 的 db 为 dbName
+  const pgUrlForRestore = buildPgUrl(pgUrl, dbName);
+
+  logger.info('restore the pg blocklet db start:', dbName);
+
+  const isDbExists = await checkDbExists(pgUrl, dbName);
+  if (!isDbExists) {
+    // 如果数据库不存在, 创建数据库, 否则一会数据库直连会失败
+    logger.info('creating missing database before restore:', dbName);
+    await promiseSpawn(
+      `docker exec ${POSTGRES_CONTAINER_NAME} psql "${pgUrl}" -c "CREATE DATABASE \\"${dbName}\\";"`,
+      {},
+      baseSpawnOptions
+    );
+  } else {
+    // 如果数据库存在, 清空数据库
+    logger.info('clearing existing schema in db:', dbName);
+    await promiseSpawn(
+      `docker exec ${POSTGRES_CONTAINER_NAME} psql "${pgUrlForRestore}" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"`,
+      {},
+      baseSpawnOptions
+    );
+  }
+
+  logger.info('restore the pg blocklet db drop schema done:', dbName);
+
+  await promiseSpawn(`docker cp ${backupPath} ${POSTGRES_CONTAINER_NAME}:${containerTmpPath}`, {}, baseSpawnOptions);
+  logger.info('restore the pg blocklet db cp backup file done:', backupPath);
+  await promiseSpawn(
+    `docker exec ${POSTGRES_CONTAINER_NAME} sh -c 'gunzip -c ${containerTmpPath} | psql "${pgUrlForRestore}"'`,
+    {},
+    baseSpawnOptions
+  );
+  logger.info('restore the pg blocklet db done:', dbName);
+
+  return {
+    backupPath,
+    dbName,
+  };
+};
+
+module.exports = {
+  dockerBackupPgBlockletDb,
+  dockerRestorePgBlockletDb,
+};

package/lib/util/docker/ensure-docker-postgres.js

@@ -100,7 +100,9 @@ async function _ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port =
 
 let lastUrl = '';
 
-async function ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port = 40408, force = false) {
+const POSTGRES_CONTAINER_NAME = 'abtnode-postgres';
+
+async function ensureDockerPostgres(dataDir, name = POSTGRES_CONTAINER_NAME, port = 40408, force = false) {
   if (lastUrl) {
     return lastUrl;
   }
@@ -109,7 +111,7 @@ async function ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port = 4
 }
 
 // 停止, 并且返回是否 docker 中存在 postgres 容器
-async function stopDockerPostgres(name = 'abtnode-postgres') {
+async function stopDockerPostgres(name = POSTGRES_CONTAINER_NAME) {
   if (!(await checkDockerInstalled())) {
     return false;
   }
@@ -132,4 +134,5 @@ async function stopDockerPostgres(name = 'abtnode-postgres') {
 module.exports = {
   ensureDockerPostgres,
   stopDockerPostgres,
+  POSTGRES_CONTAINER_NAME,
 };

package/lib/util/ensure-bun.js

@@ -1,30 +1,46 @@
+/* eslint-disable no-await-in-loop */
+
 const path = require('path');
 const { spawn } = require('child_process');
 const fsp = require('fs/promises');
 const os = require('os');
+const logger = require('@abtnode/logger')('@abtnode/core:util:ensure-bun');
+const shelljs = require('shelljs');
+const semver = require('semver');
 
-const BUN_VERSION = '1.2.18';
+const IS_WINDOWS = process.platform === 'win32';
+const BUN_VERSION = IS_WINDOWS ? '1.2.4' : '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');
+  const homeDir = os.homedir();
+  if (homeDir) {
+    return path.join(homeDir, '.blocklet-bun');
+  }
+  return path.join(os.tmpdir(), '.blocklet-bun');
 };
 
 async function _ensureBun() {
-  const bunDir = path.join(getRootDir(), 'core', 'bun_install');
-  try {
-    await fsp.access(bunDir);
-  } catch {
-    await fsp.mkdir(bunDir, { recursive: true });
-  }
-
+  const bunDir = path.join(getRootDir(), 'core', 'bun-install');
+  await fsp.mkdir(bunDir, { recursive: true }).catch(() => {});
   const installDir = path.join(bunDir, BUN_VERSION);
   const binDir = path.join(installDir, 'bin');
-  const bunExec = path.join(binDir, process.platform === 'win32' ? 'bun.exe' : 'bun');
+  const bunExec = path.join(binDir, IS_WINDOWS ? 'bun.exe' : 'bun');
+
+  const whichBun = shelljs.which('bun');
+  // 如果有 bun 且版本大于等于 BUN_VERSION, 则直接使用现有的 bun
+  if (whichBun) {
+    // 检查 bun 版本
+    const bunVersion = shelljs.exec(`${whichBun} --version`).stdout.trim();
+    // 判断 bun 版本是否大于等于 BUN_VERSION, 应该用版本对比库
+    if (semver.gte(bunVersion, BUN_VERSION)) {
+      return whichBun.toString();
+    }
+  }
 
-  // If bun is already installed in this project, return its path
+  // If already installed, return immediately
   try {
     await fsp.access(bunExec);
     return bunExec;
@@ -32,29 +48,20 @@ async function _ensureBun() {
     //
   }
 
-  // Create installation directory
+  logger.info(`Bun not found; installing to: ${installDir}`);
   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, {
+  // Run official Bun installer script
+  await new Promise((resolve, reject) => {
+    const cmd = IS_WINDOWS
+      ? ['-c', 'powershell -c "irm bun.sh/install.ps1 | iex"']
+      : ['-c', 'curl -fsSL https://bun.sh/install | bash'];
+    const installer = spawn('bash', cmd, {
       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);
-    });
+    installer.on('close', (code) => (code === 0 ? resolve() : reject(new Error(`Installer exited with code ${code}`))));
+    installer.on('error', reject);
   });
 
   return bunExec;
@@ -67,7 +74,26 @@ const ensureBun = async () => {
   if (bunPathPromise) {
     return bunPathPromise;
   }
-  bunPathPromise = _ensureBun();
+  bunPathPromise = (async () => {
+    const maxAttempts = 5;
+    let lastError;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        const bunExecPath = await _ensureBun();
+        // Verify executable exists
+        await fsp.access(bunExecPath);
+        logger.info(`Bun installation succeeded: ${bunExecPath}`);
+        return bunExecPath;
+      } catch (err) {
+        lastError = err;
+        logger.error(`Installation attempt ${attempt} failed: ${err.message}`);
+        if (attempt < maxAttempts) {
+          logger.info(`Retrying installation (${attempt + 1}/${maxAttempts})...`);
+        }
+      }
+    }
+    throw new Error(`All ${maxAttempts} installation attempts failed: ${lastError.message}`);
+  })();
   return bunPathPromise;
 };
 
@@ -76,18 +102,13 @@ const bunOptions = {
 };
 
 const getBunCacheDir = async (isDocker = false) => {
-  const abtNodeDir = getRootDir();
-  // 如果不是linux, 缓存的目录区分 docker 和非 docker
+  const bunDir = getRootDir();
   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 });
-  }
+  const bunCacheDir = path.join(bunDir, 'tmp', cacheDir);
+  await fsp.mkdir(bunCacheDir, { recursive: true }).catch(() => {});
   return bunCacheDir;
 };
 

package/lib/util/env.js

@@ -3,6 +3,9 @@ const serverJobBackoffSeconds = process.env.ABT_NODE_JOB_BACKOFF_SECONDS
   : 600;
 
 const shouldJobBackoff = () => {
+  if (process.env.ABT_NODE_JOB_BACKOFF_SECONDS === '0') {
+    return false;
+  }
   const uptime = process.uptime();
   return uptime <= serverJobBackoffSeconds;
 };

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

@@ -55,7 +55,7 @@ async function installExternalDependencies({ appDir, forceInstall = false, nodeI
     await new Promise((resolve, reject) => {
       const child = spawn(bunPath, ['install'], {
         cwd: appDir,
-        stdio: 'pipe',
+        stdio: 'inherit',
         shell: true,
         env: {
           ...process.env,
@@ -64,14 +64,9 @@ async function installExternalDependencies({ appDir, forceInstall = false, nodeI
         },
       });
 
-      let errorOutput = '';
-      child.stderr.on('data', (data) => {
-        errorOutput += data.toString();
-      });
-
       child.on('close', (code) => {
-        if (code !== 0 && errorOutput.trim()) {
-          reject(new Error(errorOutput));
+        if (code !== 0) {
+          reject(new Error(`exit code ${code}`));
         } else {
           resolve();
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.47-beta-20250715-034905-11207b15",
+  "version": "1.16.47-beta-20250718-075003-940d2e2a",
   "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.47-beta-20250715-034905-11207b15",
-    "@abtnode/auth": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/certificate-manager": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/client": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/constant": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/cron": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/db-cache": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/docker-utils": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/logger": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/models": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/queue": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/rbac": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/router-provider": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/static-server": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/timemachine": "1.16.47-beta-20250715-034905-11207b15",
-    "@abtnode/util": "1.16.47-beta-20250715-034905-11207b15",
+    "@abtnode/analytics": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/auth": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/certificate-manager": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/client": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/constant": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/cron": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/db-cache": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/docker-utils": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/logger": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/models": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/queue": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/rbac": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/router-provider": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/static-server": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/timemachine": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@abtnode/util": "1.16.47-beta-20250718-075003-940d2e2a",
     "@arcblock/did": "1.20.16",
     "@arcblock/did-auth": "1.20.16",
     "@arcblock/did-ext": "1.20.16",
@@ -45,14 +45,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.16",
     "@arcblock/vc": "1.20.16",
-    "@blocklet/constant": "1.16.47-beta-20250715-034905-11207b15",
+    "@blocklet/constant": "1.16.47-beta-20250718-075003-940d2e2a",
     "@blocklet/did-space-js": "^1.1.7",
-    "@blocklet/env": "1.16.47-beta-20250715-034905-11207b15",
+    "@blocklet/env": "1.16.47-beta-20250718-075003-940d2e2a",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.47-beta-20250715-034905-11207b15",
-    "@blocklet/resolver": "1.16.47-beta-20250715-034905-11207b15",
-    "@blocklet/sdk": "1.16.47-beta-20250715-034905-11207b15",
-    "@blocklet/store": "1.16.47-beta-20250715-034905-11207b15",
+    "@blocklet/meta": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@blocklet/resolver": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@blocklet/sdk": "1.16.47-beta-20250718-075003-940d2e2a",
+    "@blocklet/store": "1.16.47-beta-20250718-075003-940d2e2a",
     "@blocklet/theme": "^3.0.26",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.16",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "f08ee3ac63c808c93967db43445042b3050a015e"
+  "gitHead": "740ffa603c1de73ccf1bd4d0be497c9a9c7ce936"
 }