@abtnode/core 1.16.45 → 1.16.46-beta-20250703-050038-4ba2582f

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

@@ -955,7 +955,7 @@ const initLogger =
       ),
     });
 
-    if (process.env.NODE_ENV === 'production' || process.env.ABT_LOG_TO_FILE === 'true') {
+    const logToFile = () => {
       logger.level = level || 'info';
       if (!fs.existsSync(logDir)) {
         fs.mkdirSync(logDir, { recursive: true });
@@ -1011,7 +1011,9 @@ const initLogger =
 
         addedRejectionExceptionTransport = true;
       }
-    } else {
+    };
+
+    const logToConsole = () => {
       logger.level = level || 'debug';
       const transport = new transports.Console({
         format: format.combine(format.colorize({ all: true })),
@@ -1024,6 +1026,15 @@ const initLogger =
         logger.exceptions.handle(transport);
         addedRejectionExceptionTransport = true;
       }
+    };
+
+    if (process.env.ABT_LOG_TO_FILE === 'true') {
+      logToFile();
+      logToConsole();
+    } else if (process.env.NODE_ENV === 'production') {
+      logToFile();
+    } else {
+      logToConsole();
     }
 
     return logger;
@@ -38890,7 +38901,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.44","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.44","@abtnode/auth":"1.16.44","@abtnode/certificate-manager":"1.16.44","@abtnode/client":"1.16.44","@abtnode/constant":"1.16.44","@abtnode/cron":"1.16.44","@abtnode/db-cache":"1.16.44","@abtnode/docker-utils":"1.16.44","@abtnode/logger":"1.16.44","@abtnode/models":"1.16.44","@abtnode/queue":"1.16.44","@abtnode/rbac":"1.16.44","@abtnode/router-provider":"1.16.44","@abtnode/static-server":"1.16.44","@abtnode/timemachine":"1.16.44","@abtnode/util":"1.16.44","@arcblock/did":"1.20.14","@arcblock/did-auth":"1.20.14","@arcblock/did-ext":"1.20.14","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.14","@arcblock/event-hub":"1.20.14","@arcblock/jwt":"1.20.14","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.14","@arcblock/vc":"1.20.14","@blocklet/constant":"1.16.44","@blocklet/did-space-js":"^1.0.62","@blocklet/env":"1.16.44","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.44","@blocklet/resolver":"1.16.44","@blocklet/sdk":"1.16.44","@blocklet/store":"1.16.44","@blocklet/theme":"^2.13.70","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.14","@ocap/util":"1.20.14","@ocap/wallet":"1.20.14","@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.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.14","@arcblock/did-auth":"1.20.14","@arcblock/did-ext":"1.20.14","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.14","@arcblock/event-hub":"1.20.14","@arcblock/jwt":"1.20.14","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.14","@arcblock/vc":"1.20.14","@blocklet/constant":"1.16.45","@blocklet/did-space-js":"^1.0.62","@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":"^2.13.70","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.14","@ocap/util":"1.20.14","@ocap/wallet":"1.20.14","@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/blocklet/project/connect-to-store.js

@@ -56,7 +56,7 @@ const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager,
 
       await projectState.updateProject(projectId, project);
     } catch (error) {
-      reject(error);
+      reject(new Error(`Failed to connect to store: ${error.message}`));
     }
   });
 };

package/lib/blocklet/project/index.js

@@ -110,16 +110,18 @@ const getProjects = async ({ did, manager, componentDid, showAccessToken, tenant
 const getProject = async ({ did, projectId, messageId, showAccessToken, manager }) => {
   const { projectState } = await manager._getProjectState(did);
   const project = await projectState.findOne(messageId ? { messageId } : { id: projectId });
-  if (!showAccessToken) {
-    project.connectedStores?.forEach((store) => {
-      store.accessToken = store.accessToken ? '__encrypted__' : '';
-    });
-  }
+  if (project) {
+    if (!showAccessToken) {
+      project.connectedStores?.forEach((store) => {
+        store.accessToken = store.accessToken ? '__encrypted__' : '';
+      });
+    }
 
-  if (!showAccessToken) {
-    project.connectedEndpoints?.forEach((endpoint) => {
-      endpoint.accessKeySecret = endpoint.accessKeySecret ? '__encrypted__' : '';
-    });
+    if (!showAccessToken) {
+      project.connectedEndpoints?.forEach((endpoint) => {
+        endpoint.accessKeySecret = endpoint.accessKeySecret ? '__encrypted__' : '';
+      });
+    }
   }
 
   return project;

package/lib/index.js

@@ -327,7 +327,7 @@ function ABTNode(options) {
   blockletManager.resetSiteByDid = resetSiteByDid;
 
   // Generate an on node ready callback
-  const onStatesReady = createStateReadyQueue({ states, options, dataDirs });
+  const onStatesReady = createStateReadyQueue({ states: states.allStates, options, dataDirs });
   onStatesReady(createStateReadyHandler(routingSnapshot));
   const domainStatus = new DomainStatus({ routerManager, states });
 

package/lib/migrations/index.js

@@ -7,6 +7,8 @@ const logger = require('@abtnode/logger')('@abtnode/core:migration');
 const { doSchemaMigration, createSequelize } = require('@abtnode/models');
 const { getDbFilePath } = require('../util');
 const getMigrationScripts = require('../util/get-migration-scripts');
+const { ensureDockerPostgres } = require('../util/docker/ensure-docker-postgres');
+const { migrationSqliteToPostgres } = require('../util/migration-sqlite-to-postgres');
 
 const BACKUP_FILE_DB = 'server.db';
 const BACKUP_FILE_CONFIG = 'config.yml';
@@ -146,27 +148,41 @@ const runSchemaMigrations = async ({
   blocklets = [],
   printInfo = console.info, // eslint-disable-line
   printSuccess = console.info, // eslint-disable-line
+  migrationPostgres = false,
 }) => {
   if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
     process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(dataDir, 'core', 'db-cache.db');
   }
+  if (!process.env.ABT_NODE_POSTGRES_URL) {
+    const postgresUrl = await ensureDockerPostgres(dataDir, 'abtnode-postgres', 40408, migrationPostgres);
+    process.env.ABT_NODE_POSTGRES_URL = postgresUrl;
+  }
+  if (migrationPostgres && !process.env.ABT_NODE_POSTGRES_URL) {
+    throw new Error('Postgres URL is not set, please set env ABT_NODE_POSTGRES_URL or ensure docker is running');
+  }
+  const dbPaths = {
+    server: getDbFilePath(path.join(dataDir, 'core/server.db')),
+    service: getDbFilePath(path.join(dataDir, 'services/service.db')),
+    certificateManagers: [],
+    blocklets: [],
+  };
 
   // migrate server schema
-  let filePath = getDbFilePath(path.join(dataDir, 'core/server.db'));
-  await doSchemaMigration(filePath, 'server');
-  printSuccess(`Server schema successfully migrated: ${filePath}`);
-
+  dbPaths.server = getDbFilePath(path.join(dataDir, 'core/server.db'));
+  await doSchemaMigration(dbPaths.server, 'server');
+  printSuccess(`Server schema successfully migrated: ${dbPaths.server}`);
   // migrate service schema
-  filePath = getDbFilePath(path.join(dataDir, 'services/service.db'));
-  await doSchemaMigration(filePath, 'service');
-  printSuccess(`Service schema successfully migrated: ${filePath}`);
+  dbPaths.service = getDbFilePath(path.join(dataDir, 'services/service.db'));
+  await doSchemaMigration(dbPaths.service, 'service');
+  printSuccess(`Service schema successfully migrated: ${dbPaths.service}`);
 
   // migrate blocklet schema
   for (let i = 0; i < blocklets.length; i++) {
     const blocklet = blocklets[i];
     const env = blocklet.environments.find((x) => x.key === 'BLOCKLET_DATA_DIR');
     if (env) {
-      filePath = getDbFilePath(path.join(env.value, 'blocklet.db'));
+      const filePath = getDbFilePath(path.join(env.value, 'blocklet.db'));
+      dbPaths.blocklets.push(filePath);
       await doSchemaMigration(filePath, 'blocklet');
       printSuccess(`Blocklet schema successfully migrated: ${blocklet.appPid}: ${filePath}`);
     } else {
@@ -176,17 +192,26 @@ const runSchemaMigrations = async ({
 
   // migrate certificate manager schema
   for (let i = 0; i < MODULES.length; i++) {
-    filePath = getDbFilePath(path.join(dataDir, `modules/${MODULES[i]}/module.db`));
+    const filePath = getDbFilePath(path.join(dataDir, `modules/${MODULES[i]}/module.db`));
     await doSchemaMigration(filePath, MODULES[i]);
+    dbPaths.certificateManagers.push(filePath);
     printSuccess(`${MODULES[i]} schema successfully migrated: ${filePath}`);
   }
+
+  if (migrationPostgres) {
+    await migrationSqliteToPostgres(dataDir, dbPaths);
+  }
 };
 
-const closeDatabaseConnections = ({
+const closeDatabaseConnections = async ({
   dataDir,
   blocklets = [],
   printInfo = console.info, // eslint-disable-line
 }) => {
+  if (!process.env.ABT_NODE_POSTGRES_URL) {
+    const postgresUrl = await ensureDockerPostgres(dataDir);
+    process.env.ABT_NODE_POSTGRES_URL = postgresUrl;
+  }
   const dataFiles = [
     getDbFilePath(path.join(dataDir, 'core/server.db')),
     getDbFilePath(path.join(dataDir, 'services/service.db')),
@@ -204,8 +229,14 @@ const closeDatabaseConnections = ({
 
   const connections = dataFiles.map((x) => createSequelize(x));
   connections.forEach((x) => {
-    x.close();
-    printInfo(`Closed database connection: ${x}`);
+    try {
+      x.close();
+    } catch (err) {
+      if (err.message.includes('was closed!')) {
+        return;
+      }
+      throw new Error(`Failed to close database connection: ${x}, error: ${err.message}`);
+    }
   });
 };
 

package/lib/states/backup.js

@@ -184,20 +184,26 @@ class BackupState extends BaseState {
    * @param {{ did: string, startTime: string, endTime: string }} options
    * @return {Promise<Array<{date: string, successCount: number, errorCount: number}>>}
    */
-  async getBlockletBackupSummary({ did, startTime, endTime, timezone }) {
-    const localTime = dayjs.tz(dayjs.utc(), timezone); // 获取指定时区的当前时间
-    // 计算时差
-    const offset = localTime.utcOffset(); // 返回与 UTC 的偏移，单位：分钟
-
-    // 在 Sequelize 查询中应用时区差
-    const dateColumn = this.model.sequelize.fn(
-      'strftime',
-      '%Y-%m-%d', // 提取年月日
-      this.model.sequelize.fn('datetime', this.model.sequelize.col('createdAt'), `${offset} minutes`)
-    );
-    /**
-     * @type {import('sequelize').WhereOptions<import('@abtnode/models').BackupState>}
-     */
+  getBlockletBackupSummary({ did, startTime, endTime, timezone }) {
+    const { sequelize } = this.model;
+    const dialect = sequelize.getDialect(); // 'postgres' 或者 'sqlite'
+    let dateExpr;
+    let groupExpr;
+
+    if (dialect === 'postgres') {
+      const tzTs = sequelize.fn('timezone', timezone, sequelize.col('createdAt'));
+      const dayTs = sequelize.fn('date_trunc', 'day', tzTs);
+      dateExpr = sequelize.fn('to_char', dayTs, 'YYYY-MM-DD');
+      groupExpr = dayTs;
+    } else {
+      // SQLite：datetime + strftime
+      // SQLite 的 datetime(col, '+X minutes') already returns text in UTC+offset
+      const offset = dayjs.tz(dayjs.utc(), timezone).utcOffset();
+      const dt = sequelize.fn('datetime', sequelize.col('createdAt'), `${offset} minutes`);
+      dateExpr = sequelize.fn('strftime', '%Y-%m-%d', dt);
+      groupExpr = dt;
+    }
+
     const options = {
       where: {
         appPid: did,
@@ -205,25 +211,16 @@ class BackupState extends BaseState {
         status: { [Op.in]: [BACKUPS.STATUS.SUCCEEDED, BACKUPS.STATUS.FAILED] },
       },
       attributes: [
-        [this.model.sequelize.fn('strftime', '%Y-%m-%d', dateColumn), 'date'],
-        [
-          this.model.sequelize.fn('sum', this.model.sequelize.literal('CASE WHEN status = 0 THEN 1 ELSE 0 END')),
-          'successCount',
-        ],
-        [
-          this.model.sequelize.fn('sum', this.model.sequelize.literal('CASE WHEN status != 0 THEN 1 ELSE 0 END')),
-          'errorCount',
-        ],
+        [dateExpr, 'date'],
+        [sequelize.fn('sum', sequelize.literal('CASE WHEN status = 0 THEN 1 ELSE 0 END')), 'successCount'],
+        [sequelize.fn('sum', sequelize.literal('CASE WHEN status != 0 THEN 1 ELSE 0 END')), 'errorCount'],
       ],
-      group: [dateColumn],
-      order: [[dateColumn, 'DESC']],
+      group: [groupExpr],
+      order: [[groupExpr, 'DESC']],
       raw: true,
     };
 
-    const results = await this.model.findAll(options);
-
-    // 将结果转换为更友好的格式
-    return results;
+    return this.model.findAll(options);
   }
 }
 

package/lib/states/index.js

@@ -66,18 +66,5 @@ const init = (dataDirs, config = {}) => {
     blacklist: blacklistState,
   };
 };
-/**
- * @type {{
- *  backup: import('./backup'),
- *  blocklet: import('./blocklet'),
- *  blockletExtras: import('./blocklet-extras'),
- *  notification: import('./notification'),
- *  notificationReceiver: import('./notification-receiver'),
- *  job: import('./job'),
- *  node: import('./node'),
- *  blacklist: import('./blacklist'),
- *  runtimeInsight: import('./runtime-insight'),
- *  [key: string]: any
- * }}
- */
+
 module.exports = createStateFactory(init, models);

package/lib/states/notification.js

@@ -24,6 +24,13 @@ const readUnreadInputValidation = ({ notificationIds, receiver }, context) => {
   return receiverDidValidation(receiver, context);
 };
 
+const safeJsonParse = (json) => {
+  if (typeof json !== 'string') {
+    return json;
+  }
+  return JSON.parse(json);
+};
+
 /**
  * @extends BaseState<import('@abtnode/models').NotificationState>
  */
@@ -222,12 +229,12 @@ class NotificationState extends BaseState {
 
     // 构建基础查询条件
     // FIXME: 这里需要对历史数据做出过滤，避免有非 notification 类型的数据
-    const conditions = ['n.type = "notification"'];
+    const conditions = ["n.type = 'notification'"];
     const replacements = { receiver };
 
     if (typeof read === 'boolean') {
       conditions.push('nr.read = :read');
-      replacements.read = read ? 1 : 0;
+      replacements.read = read;
     }
 
     if (severity && severity.length) {
@@ -236,7 +243,7 @@ class NotificationState extends BaseState {
     }
 
     if (entityId && entityId.length) {
-      conditions.push('n.entityId IN (:entityId)');
+      conditions.push('n."entityId" IN (:entityId)');
       replacements.entityId = entityId;
     }
 
@@ -261,7 +268,7 @@ class NotificationState extends BaseState {
     const countQuery = `
       SELECT COUNT(DISTINCT n.id) as total
       FROM notifications n
-      INNER JOIN notification_receivers nr ON n.id = nr.notificationId
+      INNER JOIN notification_receivers nr ON n.id = nr."notificationId"
       ${whereClause}
       AND nr.receiver = :receiver
     `;
@@ -270,32 +277,32 @@ class NotificationState extends BaseState {
       SELECT DISTINCT 
         n.*,
         nr.id as receiver_id,
-        nr.notificationId as receiver_notificationId,
-        nr.receiver as receiver_receiver,
-        nr.read as receiver_read,
-        nr.readAt as receiver_readAt,
-        nr.walletSendStatus as receiver_walletSendStatus,
-        nr.walletSendAt as receiver_walletSendAt,
-        nr.pushKitSendStatus as receiver_pushKitSendStatus,
-        nr.pushKitSendAt as receiver_pushKitSendAt,
-        nr.emailSendStatus as receiver_emailSendStatus,
-        nr.emailSendAt as receiver_emailSendAt,
-        nr.createdAt as receiver_createdAt,
-        nr.walletSendFailedReason as receiver_walletSendFailedReason,
-        nr.walletSendRecord as receiver_walletSendRecord,
-        nr.pushKitSendFailedReason as receiver_pushKitSendFailedReason,
-        nr.pushKitSendRecord as receiver_pushKitSendRecord,
-        nr.emailSendFailedReason as receiver_emailSendFailedReason,
-        nr.emailSendRecord as receiver_emailSendRecord,
-        nr.webhook as receiver_webhook,
-        nr.email as receiver_email,
-        nr.webhookUrls as receiver_webhookUrls,
-        nr.deviceId as receiver_deviceId
+        nr."notificationId" as receiver_notificationId,
+        nr."receiver" as receiver_receiver,
+        nr."read" as receiver_read,
+        nr."readAt" as receiver_readAt,
+        nr."walletSendStatus" as receiver_walletSendStatus,
+        nr."walletSendAt" as receiver_walletSendAt,
+        nr."pushKitSendStatus" as receiver_pushKitSendStatus,
+        nr."pushKitSendAt" as receiver_pushKitSendAt,
+        nr."emailSendStatus" as receiver_emailSendStatus,
+        nr."emailSendAt" as receiver_emailSendAt,
+        nr."createdAt" as receiver_createdAt,
+        nr."walletSendFailedReason" as receiver_walletSendFailedReason,
+        nr."walletSendRecord" as receiver_walletSendRecord,
+        nr."pushKitSendFailedReason" as receiver_pushKitSendFailedReason,
+        nr."pushKitSendRecord" as receiver_pushKitSendRecord,
+        nr."emailSendFailedReason" as receiver_emailSendFailedReason,
+        nr."emailSendRecord" as receiver_emailSendRecord,
+        nr."webhook" as receiver_webhook,
+        nr."email" as receiver_email,
+        nr."webhookUrls" as receiver_webhookUrls,
+        nr."deviceId" as receiver_deviceId
       FROM notifications n
-      INNER JOIN notification_receivers nr ON n.id = nr.notificationId
+      INNER JOIN notification_receivers nr ON n.id = nr."notificationId"
       ${whereClause}
       AND nr.receiver = :receiver
-      ORDER BY n.createdAt DESC
+      ORDER BY n."createdAt" DESC
       LIMIT :limit OFFSET :offset
     `;
 
@@ -327,25 +334,25 @@ class NotificationState extends BaseState {
 
       // 处理 receiver 的 JSON 字段
       if (receiverFields.walletSendRecord) {
-        receiverFields.walletSendRecord = JSON.parse(receiverFields.walletSendRecord);
+        receiverFields.walletSendRecord = safeJsonParse(receiverFields.walletSendRecord);
       }
       if (receiverFields.pushKitSendRecord) {
-        receiverFields.pushKitSendRecord = JSON.parse(receiverFields.pushKitSendRecord);
+        receiverFields.pushKitSendRecord = safeJsonParse(receiverFields.pushKitSendRecord);
       }
       if (receiverFields.emailSendRecord) {
-        receiverFields.emailSendRecord = JSON.parse(receiverFields.emailSendRecord);
+        receiverFields.emailSendRecord = safeJsonParse(receiverFields.emailSendRecord);
       }
       if (receiverFields.webhook) {
-        receiverFields.webhook = JSON.parse(receiverFields.webhook);
+        receiverFields.webhook = safeJsonParse(receiverFields.webhook);
       }
 
       return {
         ...row,
-        attachments: row.attachments ? JSON.parse(row.attachments) : [],
-        actions: row.actions ? JSON.parse(row.actions) : [],
-        blocks: row.blocks ? JSON.parse(row.blocks) : [],
-        data: row.data ? JSON.parse(row.data) : {},
-        activity: row.activity ? JSON.parse(row.activity) : {},
+        attachments: row.attachments ? safeJsonParse(row.attachments) : [],
+        actions: row.actions ? safeJsonParse(row.actions) : [],
+        blocks: row.blocks ? safeJsonParse(row.blocks) : [],
+        data: row.data ? safeJsonParse(row.data) : {},
+        activity: row.activity ? safeJsonParse(row.activity) : {},
         read: Boolean(row.read),
         receivers: [receiverFields], // 将 receiver 数据作为数组
       };
@@ -845,12 +852,12 @@ class NotificationState extends BaseState {
 
   async getUnreadNotificationCount({ receiver, severity, componentDid, entityId, source } = {}) {
     // 构建基础查询条件
-    const conditions = ['n.type = "notification"'];
+    const conditions = ["n.type = 'notification'"];
     const replacements = { receiver };
 
     // 强制将read设为false，只计算未读消息
     conditions.push('nr.read = :read');
-    replacements.read = 0;
+    replacements.read = false;
 
     if (severity && severity.length) {
       conditions.push('n.severity IN (:severity)');
@@ -858,12 +865,12 @@ class NotificationState extends BaseState {
     }
 
     if (componentDid && componentDid.length) {
-      conditions.push('n.componentDid IN (:componentDid)');
+      conditions.push('n."componentDid" IN (:componentDid)');
       replacements.componentDid = componentDid;
     }
 
     if (entityId && entityId.length) {
-      conditions.push('n.entityId IN (:entityId)');
+      conditions.push('n."entityId" IN (:entityId)');
       replacements.entityId = entityId;
     }
 
@@ -887,7 +894,7 @@ class NotificationState extends BaseState {
     const countQuery = `
        SELECT COUNT(DISTINCT n.id) as total
        FROM notifications n
-       INNER JOIN notification_receivers nr ON n.id = nr.notificationId
+       INNER JOIN notification_receivers nr ON n.id = nr."notificationId"
        ${whereClause}
        AND nr.receiver = :receiver
      `;

package/lib/states/user.js

@@ -300,9 +300,9 @@ class User extends ExtendBase {
           //   LIMIT ${pageSize} OFFSET ${offset}
           const subQuery = `
 WITH RECURSIVE UserTree(did,inviter,generation,createdAt) AS (
-  SELECT did,inviter,generation,createdAt FROM users WHERE inviter="${exist.did}"
+  SELECT did,inviter,generation,"createdAt" FROM users WHERE inviter="${exist.did}"
   UNION ALL
-	SELECT child.did,child.inviter,child.generation,child.createdAt FROM users AS child INNER JOIN UserTree AS parent ON (child.inviter=parent.did) ORDER BY child.createdAt DESC
+	SELECT child.did,child.inviter,child.generation,child."createdAt" FROM users AS child INNER JOIN UserTree AS parent ON (child.inviter=parent.did) ORDER BY child."createdAt" DESC
 )
 SELECT did,inviter,generation FROM UserTree ${generation > 0 ? `WHERE generation=${(exist.generation > 0 ? exist.generation : 0) + generation}` : ''}`.trim();
           const children = await this.query(subQuery);
@@ -350,7 +350,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
         replacements.status = PASSPORT_STATUS.VALID;
         if (role === '$none') {
           where.did = {
-            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports WHERE status = :status)'),
+            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT "userDid" FROM passports WHERE status = :status)'),
           };
         } else if (role === '$blocked') {
           where.approved = false;
@@ -358,7 +358,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
           replacements.role = role;
           where.did = {
             [Op.in]: Sequelize.literal(
-              '(SELECT DISTINCT userDid FROM passports WHERE name = :role AND status = :status)'
+              '(SELECT DISTINCT "userDid" FROM passports WHERE name = :role AND status = :status)'
             ),
           };
         }
@@ -426,7 +426,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       return this.count({
         where: {
           did: {
-            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports WHERE status = :status)'),
+            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT "userDid" FROM passports WHERE status = :status)'),
           },
         },
         replacements: { status: PASSPORT_STATUS.VALID },
@@ -447,7 +447,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       where: {
         did: {
           [Op.in]: Sequelize.literal(
-            '(SELECT DISTINCT userDid FROM passports WHERE name = :name AND status = :status)'
+            '(SELECT DISTINCT "userDid" FROM passports WHERE name = :name AND status = :status)'
           ),
         },
       },
@@ -457,7 +457,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
 
   async getOwnerDids() {
     const result = await this.passport.query(
-      `SELECT DISTINCT(userDid) FROM passports WHERE name='${ROLES.OWNER}' AND status = '${PASSPORT_STATUS.VALID}' ORDER BY issuanceDate ASC LIMIT 1`
+      `SELECT DISTINCT"userDid" FROM passports WHERE name='${ROLES.OWNER}' AND status = '${PASSPORT_STATUS.VALID}' ORDER BY "issuanceDate" ASC LIMIT 1`
     );
     return result.map((x) => x.userDid);
   }
@@ -784,7 +784,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       approved: true,
       did: {
         [Op.in]: Sequelize.literal(
-          '(SELECT DISTINCT userDid FROM passports WHERE name IN (:roles) AND status = :status)'
+          '(SELECT DISTINCT "userDid" FROM passports WHERE name IN (:roles) AND status = :status)'
         ),
       },
     };

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

@@ -74,8 +74,9 @@ async function removeDockerNetwork(dockerNetworkName) {
       await promiseSpawn(`docker network rm ${dockerNetworkName}-internal`);
     }
     logger.info(`docker remove network ${dockerNetworkName} done`);
-  } catch (error) {
-    logger.error(`Error remove network ${dockerNetworkName}:`, error);
+  } catch (_) {
+    // 不需要打印, 因为上面的删除也是尝试性的, 在没有启用 docker 的情况, 不会有 docker network 存在
+    // logger.error(`Error remove network ${dockerNetworkName}:`, error);
   }
 }
 

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

@@ -0,0 +1,135 @@
+/* eslint-disable no-await-in-loop */
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
+const logger = require('@abtnode/logger')('@abtnode/ensure-docker-postgres');
+const path = require('path');
+const fs = require('fs');
+const { Sequelize } = require('sequelize');
+
+const { checkDockerInstalled } = require('./check-docker-installed');
+const { hasPostgres } = require('../migration-sqlite-to-postgres');
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+async function waitForPostgresReady(url, timeoutMs = 30_000) {
+  const start = Date.now();
+  let lastError = null;
+
+  while (Date.now() - start < timeoutMs) {
+    const sequelize = new Sequelize(url, { logging: false });
+    try {
+      await sequelize.authenticate();
+      await sequelize.close();
+      return true;
+    } catch (err) {
+      lastError = err;
+      await new Promise((r) => setTimeout(r, 500));
+    }
+  }
+
+  throw new Error(`Postgres did not become ready in time:\n${lastError?.message ?? 'Unknown error'}`);
+}
+async function _ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port = 40408, force = false) {
+  if (!dataDir) {
+    return '';
+  }
+
+  if (process.env.ABT_NODE_IGNORE_USE_POSTGRES === 'true') {
+    return '';
+  }
+
+  if (!(await checkDockerInstalled())) {
+    return '';
+  }
+
+  if (!hasPostgres(dataDir) && !force) {
+    return '';
+  }
+
+  if (process.env.ABT_NODE_IGNORE_RESTART_POSTGRES !== 'true') {
+    await stopDockerPostgres(name);
+    await sleep(1000);
+  }
+
+  // 1. 检查是否有正在运行的同名容器
+  const checkRunningCmd = `docker ps --filter "name=${name}" --format "{{.Names}}"`;
+  // 2. 如果没有运行，再检查是否存在已停止的同名容器
+  const checkAllCmd = `docker ps -a --filter "name=${name}" --format "{{.Names}}"`;
+  // 3. 如果既没运行也不存在，则创建新的容器，设置内存限制和基本配置
+  const dbPath = path.join(dataDir, 'core', 'postgres');
+  if (!fs.existsSync(path.join(dataDir, 'core'))) {
+    fs.mkdirSync(path.join(dataDir, 'core'), { recursive: true });
+  }
+
+  const runCmd = [
+    'docker run -d',
+    `--name ${name}`,
+    `-p 127.0.0.1:${port}:5432`,
+    `-v ${dbPath}:/var/lib/postgresql/data`,
+    '--memory 2g',
+    '--memory-swap 2g',
+    '-e POSTGRES_PASSWORD=postgres',
+    '-e POSTGRES_USER=postgres',
+    '-e POSTGRES_DB=postgres',
+    'postgres:17.5',
+  ].join(' ');
+
+  const url = `postgresql://postgres:postgres@localhost:${port}/postgres`;
+
+  const running = (await promiseSpawn(checkRunningCmd)).trim();
+  if (running === name) {
+    // 已经在运行，直接返回
+    logger.info('postgres is already running', name);
+    return url;
+  }
+
+  // 查看是否有已停止的同名容器
+  const all = (await promiseSpawn(checkAllCmd)).trim();
+  if (all === name) {
+    // 容器存在，但可能是 stopped，直接启动它
+    await promiseSpawn(`docker start ${name}`);
+    await waitForPostgresReady(url);
+    logger.info('postgres is started', name);
+    return url;
+  }
+
+  await promiseSpawn(runCmd);
+  await waitForPostgresReady(url);
+  logger.info('postgres is started', name);
+  return url;
+}
+
+let lastUrl = '';
+
+async function ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port = 40408, force = false) {
+  if (lastUrl) {
+    return lastUrl;
+  }
+  lastUrl = await _ensureDockerPostgres(dataDir, name, port, force);
+  return lastUrl;
+}
+
+// 停止, 并且返回是否 docker 中存在 postgres 容器
+async function stopDockerPostgres(name = 'abtnode-postgres') {
+  if (!(await checkDockerInstalled())) {
+    return false;
+  }
+  const checkRunningCmd = `docker ps --filter "name=${name}" --format "{{.Names}}"`;
+  const running = (await promiseSpawn(checkRunningCmd)).trim();
+  if (running === name) {
+    // 已经在运行，直接返回
+    logger.info('postgres is already running', name);
+    try {
+      await promiseSpawn(`docker rm -f ${name}`, { mute: true });
+    } catch (_) {
+      // 不需要打印日志, 因为 postgres 可能本来就没有运行
+    }
+    return true;
+  }
+
+  return false;
+}
+
+module.exports = {
+  ensureDockerPostgres,
+  stopDockerPostgres,
+};

package/lib/util/migration-sqlite-to-postgres.js

@@ -0,0 +1,372 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-console */
+/* eslint-disable prefer-destructuring */
+
+const { dbPathToPostgresUrl } = require('@abtnode/models');
+const { QueryTypes, Sequelize } = require('sequelize');
+const fs = require('fs');
+const fsp = require('fs/promises');
+const path = require('path');
+
+function sortTableNames(tableNames, sort) {
+  return [...tableNames].sort((a, b) => {
+    const indexA = sort.indexOf(a);
+    const indexB = sort.indexOf(b);
+
+    const scoreA = indexA === -1 ? Infinity : indexA;
+    const scoreB = indexB === -1 ? Infinity : indexB;
+
+    return scoreA - scoreB;
+  });
+}
+
+async function migrateAllTablesNoModels(dbPath) {
+  // Initialize SQLite connection
+  const connectUrl = process.env.ABT_NODE_POSTGRES_URL;
+  const sqliteDb = new Sequelize({ dialect: 'sqlite', storage: dbPath, logging: false });
+  const postgresUrl = dbPathToPostgresUrl(dbPath, connectUrl);
+  const pgDb = new Sequelize(postgresUrl, {
+    dialect: 'postgres',
+    pool: { max: 10, min: 0, idle: 10000 },
+    logging: false,
+  });
+
+  if (pgDb.getDialect() !== 'postgres') {
+    throw new Error(`PG_CONNECTION_STRING is not a valid Postgres connection string: ${pgDb.getDialect()}`);
+  }
+
+  const sqliteQI = sqliteDb.getQueryInterface();
+  const pgQI = pgDb.getQueryInterface();
+
+  let tableNames = await sqliteQI.showAllTables();
+  tableNames = tableNames
+    .map((t) => (typeof t === 'string' ? t : t.tableName || t.name))
+    .filter((name) => !/^(sqlite|sequelize)/.test(name.toLowerCase()) && name !== 'runtime_insights');
+
+  // 把 tableNames 排序, 把被依赖的表放前面
+  tableNames = sortTableNames(tableNames, ['users', 'notification_receivers']);
+
+  console.log('Start migration database: ', dbPath);
+
+  for (const tableName of tableNames) {
+    console.log(`\n➡️ Starting migration for table: ${tableName}`);
+
+    const colInfos = await sqliteDb.query(`PRAGMA TABLE_INFO("${tableName}")`, { type: QueryTypes.SELECT });
+    const sqliteSchema = {};
+    for (const col of colInfos) {
+      sqliteSchema[col.name] = {
+        type: col.type,
+        allowNull: col.notnull === 0,
+        defaultValue: col.dflt_value,
+        primaryKey: col.pk === 1,
+      };
+    }
+
+    let allCols = Object.keys(sqliteSchema);
+    // 删除 server.db 的 blocklets 表中的 controller 列, 属于历史遗留数据
+    if (dbPath.includes('server.db') && tableName === 'blocklets') {
+      allCols = allCols.filter((c) => c !== 'controller');
+    }
+    let pkCols = allCols.filter((c) => sqliteSchema[c].primaryKey);
+    if (!pkCols.length) {
+      pkCols = [allCols[0]];
+      console.warn(`   ⚠️ Table ${tableName} has no primary key; using "${pkCols[0]}"`);
+    }
+    const nonPkCols = allCols.filter((c) => !pkCols.includes(c));
+
+    // Describe PG table to detect JSON/auto-inc
+    const pgSchema = await pgQI.describeTable(tableName);
+
+    // find JSON/JSONB
+    const jsonCols = Object.entries(pgSchema)
+      .filter(([, def]) => def.type && ['JSON', 'JSONB'].includes(def.type.toUpperCase()))
+      .map(([col, def]) => ({ name: col, type: def.type.toUpperCase() }));
+
+    // find auto-increment columns (nextval default)
+    const autoIncCols = Object.entries(pgSchema)
+      .filter(([, def]) => typeof def.defaultValue === 'string' && def.defaultValue.startsWith('nextval('))
+      .map(([col]) => col);
+
+    // Build the column list we actually INSERT
+    const insertCols = allCols.filter((c) => !autoIncCols.includes(c));
+
+    const insertColsList = insertCols.map((c) => `"${c}"`).join(', ');
+
+    const placeholders = insertCols
+      .map((c, i) => {
+        const jc = jsonCols.find((j) => j.name === c);
+        return jc ? `$${i + 1}::${jc.type.toLowerCase()}` : `$${i + 1}`;
+      })
+      .join(', ');
+
+    // if all PKs are auto-inc, we do a plain insert
+    const userPkCols = pkCols.filter((c) => !autoIncCols.includes(c));
+    const useUpsert = userPkCols.length > 0;
+
+    let upsertSQL = '';
+    if (useUpsert) {
+      const conflictKeys = userPkCols.map((c) => `"${c}"`).join(',');
+      const updateSet = nonPkCols
+        .map((c) => {
+          const jc = jsonCols.find((j) => j.name === c);
+          return jc ? `"${c}" = EXCLUDED."${c}"::${jc.type.toLowerCase()}` : `"${c}" = EXCLUDED."${c}"`;
+        })
+        .join(',');
+      upsertSQL = `
+        INSERT INTO "${tableName}" (${insertColsList})
+        VALUES (${placeholders})
+        ON CONFLICT (${conflictKeys})
+        DO UPDATE SET ${updateSet};
+      `;
+    } else {
+      upsertSQL = `
+        INSERT INTO "${tableName}" (${insertColsList})
+        VALUES (${placeholders});
+      `;
+    }
+
+    // Batch‐migrate rows
+    const batchSize = 1000;
+    let offset = 0;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      const rows = await sqliteDb.query(`SELECT * FROM "${tableName}" LIMIT ${batchSize} OFFSET ${offset}`, {
+        type: QueryTypes.SELECT,
+      });
+      if (!rows.length) break;
+
+      console.log(`   Migrating rows ${offset + 1}-${offset + rows.length}`);
+
+      for (const row of rows) {
+        // 如果有 createdAt 或 updatedAt 列, 并且值是不合法的 Date, 就改成当前时间
+        if (row.createdAt && Number.isNaN(new Date(row.createdAt).getTime())) {
+          row.createdAt = new Date();
+        }
+        if (row.updatedAt && Number.isNaN(new Date(row.updatedAt).getTime())) {
+          row.updatedAt = new Date();
+        }
+
+        // 修复不合格的旧数据
+        if (tableName === 'notifications' && row.feedType === 'gallery') {
+          row.feedType = '';
+        }
+
+        for (const jc of jsonCols) {
+          const raw = row[jc.name];
+          let parsed = null;
+          if (raw == null) {
+            parsed = null;
+          } else if (typeof raw === 'string') {
+            try {
+              parsed = JSON.parse(raw);
+            } catch {
+              //
+            }
+          } else if (Buffer.isBuffer(raw)) {
+            try {
+              parsed = JSON.parse(raw.toString('utf8'));
+            } catch {
+              //
+            }
+          } else if (typeof raw === 'object') {
+            parsed = raw;
+          }
+          row[jc.name] = parsed != null ? JSON.stringify(parsed) : null;
+        }
+
+        // build bind values for ONLY the non-autoInc cols
+        const bindVals = insertCols.map((c) => row[c]);
+
+        try {
+          await pgDb.query(upsertSQL, { bind: bindVals });
+        } catch (err) {
+          if (err.name === 'SequelizeUniqueConstraintError') {
+            const uniqField = err.errors[0].path;
+            console.warn(`   ⚠️ ${tableName}: unique conflict on ${uniqField}, fallback to UPDATE`);
+            const updateCols = nonPkCols.map((c, i) => `"${c}" = $${i + 1}`).join(', ');
+            const updateBind = nonPkCols.map((c) => row[c]).concat([row[uniqField]]);
+            const updateSQL = `
+              UPDATE "${tableName}"
+              SET ${updateCols}
+              WHERE "${uniqField}" = $${updateBind.length};
+            `;
+            await pgDb.query(updateSQL, { bind: updateBind });
+            continue;
+          }
+          const varcharErr = err.message.match(/value too long for type character varying\((\d+)\)/i);
+          if (varcharErr) {
+            const badCols = [];
+            for (const col of allCols) {
+              const def = pgSchema[col];
+              const lenMatch = def.type.match(/varying\((\d+)\)/i);
+              const val = row[col];
+              if (lenMatch && typeof val === 'string') {
+                const limit = parseInt(lenMatch[1], 10);
+                if (val.length > limit) badCols.push({ column: col, length: val.length, limit });
+              }
+            }
+            console.error(`   ❌ ${tableName}: string too long for VARCHAR columns:`, badCols);
+            continue;
+          }
+          console.error(`   ❌ Upsert failed for ${tableName} : ${err.message}`);
+          throw err;
+        }
+      }
+
+      offset += rows.length;
+    }
+
+    console.log(`   ✅ Finished migrating table ${tableName}`);
+  }
+
+  await sqliteDb.close();
+  await pgDb.close();
+}
+
+async function validateTableRowCounts(dbPath) {
+  // Initialize SQLite connection
+  const sqliteDb = new Sequelize({
+    dialect: 'sqlite',
+    storage: dbPath,
+    logging: false,
+  });
+
+  // Build Postgres URL from env var and sqlite path
+  const postgresUrl = dbPathToPostgresUrl(dbPath, process.env.ABT_NODE_POSTGRES_URL);
+  const pgDb = new Sequelize(postgresUrl, {
+    dialect: 'postgres',
+    pool: { max: 10, min: 0, idle: 10000 },
+    logging: false,
+  });
+
+  if (pgDb.getDialect() !== 'postgres') {
+    throw new Error(`PG_CONNECTION_STRING is not a valid Postgres connection string: ${pgDb.getDialect()}`);
+  }
+
+  const sqliteQI = sqliteDb.getQueryInterface();
+
+  // 1. List all table names
+  let tableNames = await sqliteQI.showAllTables();
+  tableNames = tableNames
+    .map((t) => (typeof t === 'string' ? t : t.tableName || t.name))
+    .filter((name) => !/^(sqlite_|SequelizeMeta$)/i.test(name) && name !== 'runtime_insights');
+
+  const results = [];
+
+  // 2. For each table, compare counts
+  for (const tableName of tableNames) {
+    // count in SQLite
+    const [{ cnt: sqliteCount }] = await sqliteDb.query(`SELECT COUNT(*) AS cnt FROM "${tableName}"`, {
+      type: QueryTypes.SELECT,
+    });
+
+    // count in Postgres
+    const [{ count: pgCountStr }] = await pgDb.query(`SELECT COUNT(*) AS count FROM "${tableName}"`, {
+      type: QueryTypes.SELECT,
+    });
+    const pgCount = parseInt(pgCountStr, 10);
+
+    const match = sqliteCount === pgCount;
+    results.push({ table: tableName, sqliteCount, pgCount, match });
+
+    console.log(`${match ? '✅' : '❌'} Table "${tableName}": SQLite=${sqliteCount}, Postgres=${pgCount}`);
+  }
+
+  // Close connections
+  await sqliteDb.close();
+  await pgDb.close();
+
+  return results;
+}
+
+async function findBlockletDbFiles(dataDir) {
+  const results = [];
+  const coreDir = path.join(dataDir, 'data');
+
+  async function traverse(dir) {
+    let entries;
+    try {
+      entries = await fsp.readdir(dir, { withFileTypes: true });
+    } catch (err) {
+      console.error(`Failed to read directory ${dir}:`, err);
+      return;
+    }
+
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+
+      // Skip any paths containing "_abtnode"
+      if (fullPath.includes('_abtnode')) continue;
+
+      if (entry.isDirectory()) {
+        await traverse(fullPath);
+      } else if (entry.isFile() && entry.name === 'blocklet.db') {
+        results.push(fullPath);
+      }
+    }
+  }
+
+  await traverse(coreDir);
+  return results;
+}
+
+function hasPostgres(dataDir) {
+  const lockPath = path.join(dataDir, 'core', 'sqlite-to-postgres.lock');
+  const hasLock = fs.existsSync(lockPath);
+  return hasLock;
+}
+
+function savePostgresLock(dataDir) {
+  const lockPath = path.join(dataDir, 'core', 'sqlite-to-postgres.lock');
+  fs.writeFileSync(lockPath, new Date().toISOString());
+}
+
+function removePostgresLock(dataDir) {
+  const lockPath = path.join(dataDir, 'core', 'sqlite-to-postgres.lock');
+  if (fs.existsSync(lockPath)) {
+    fs.unlinkSync(lockPath);
+  }
+}
+
+async function migrationSqliteToPostgres(dataDir, dbPaths) {
+  const postgresUrl = process.env.ABT_NODE_POSTGRES_URL;
+
+  if (!postgresUrl) {
+    return;
+  }
+
+  console.log('Start Migration Sqlite data to Postgres...');
+
+  if (dbPaths.blocklets.length === 0) {
+    const blockletDbFiles = await findBlockletDbFiles(dataDir);
+    dbPaths.blocklets.push(...blockletDbFiles);
+  }
+
+  const allPaths = [];
+
+  for (const dbPath of Object.values(dbPaths)) {
+    if (Array.isArray(dbPath)) {
+      allPaths.push(...dbPath);
+      continue;
+    }
+    allPaths.push(dbPath);
+  }
+
+  const filterPaths = Array.from(new Set(allPaths));
+
+  for (const dbPath of filterPaths) {
+    await migrateAllTablesNoModels(dbPath);
+  }
+
+  for (const dbPath of allPaths) {
+    await validateTableRowCounts(dbPath);
+  }
+
+  savePostgresLock(dataDir);
+}
+
+module.exports = {
+  migrationSqliteToPostgres,
+  hasPostgres,
+  removePostgresLock,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.45",
+  "version": "1.16.46-beta-20250703-050038-4ba2582f",
   "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.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",
+    "@abtnode/analytics": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/auth": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/certificate-manager": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/client": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/constant": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/cron": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/db-cache": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/docker-utils": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/logger": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/models": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/queue": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/rbac": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/router-provider": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/static-server": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/timemachine": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/util": "1.16.46-beta-20250703-050038-4ba2582f",
     "@arcblock/did": "1.20.14",
     "@arcblock/did-auth": "1.20.14",
     "@arcblock/did-ext": "1.20.14",
@@ -45,14 +45,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.14",
     "@arcblock/vc": "1.20.14",
-    "@blocklet/constant": "1.16.45",
+    "@blocklet/constant": "1.16.46-beta-20250703-050038-4ba2582f",
     "@blocklet/did-space-js": "^1.0.62",
-    "@blocklet/env": "1.16.45",
+    "@blocklet/env": "1.16.46-beta-20250703-050038-4ba2582f",
     "@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/meta": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@blocklet/resolver": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@blocklet/sdk": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@blocklet/store": "1.16.46-beta-20250703-050038-4ba2582f",
     "@blocklet/theme": "^2.13.70",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.14",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "8e981926c6dd0fc612d5bf716ab6c638791aa5f3"
+  "gitHead": "8d7838277e51ecabae489db51937f6deb51e015f"
 }