@abtnode/core 1.16.47-beta-20250715-034905-11207b15 → 1.16.47-beta-20250717-221700-2d886a18

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/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/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/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.47-beta-20250715-034905-11207b15",
+  "version": "1.16.47-beta-20250717-221700-2d886a18",
   "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-20250717-221700-2d886a18",
+    "@abtnode/auth": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/certificate-manager": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/client": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/constant": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/cron": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/db-cache": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/docker-utils": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/logger": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/models": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/queue": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/rbac": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/router-provider": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/static-server": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/timemachine": "1.16.47-beta-20250717-221700-2d886a18",
+    "@abtnode/util": "1.16.47-beta-20250717-221700-2d886a18",
     "@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-20250717-221700-2d886a18",
     "@blocklet/did-space-js": "^1.1.7",
-    "@blocklet/env": "1.16.47-beta-20250715-034905-11207b15",
+    "@blocklet/env": "1.16.47-beta-20250717-221700-2d886a18",
     "@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-20250717-221700-2d886a18",
+    "@blocklet/resolver": "1.16.47-beta-20250717-221700-2d886a18",
+    "@blocklet/sdk": "1.16.47-beta-20250717-221700-2d886a18",
+    "@blocklet/store": "1.16.47-beta-20250717-221700-2d886a18",
     "@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": "e8c5b883906dd53ba9c288cd5609cf7d023d90b3"
 }