@abtnode/core 1.16.47-beta-20250731-014139-e860268f → 1.16.47-beta-20250805-095401-14eb156b

package/lib/api/node.js

@@ -10,6 +10,8 @@ const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const { toDelegateAddress } = require('@arcblock/did-util');
 const { MONITOR_RECORD_INTERVAL_SEC, NODE_MODES } = require('@abtnode/constant');
 const { getLauncherInfo } = require('@abtnode/auth/lib/launcher');
+const { getProvider } = require('@abtnode/router-provider/lib');
+const get = require('lodash/get');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -18,6 +20,7 @@ const { validateNodeInfo, validateUpdateGateway } = require('../validators/node'
 const { getAll } = require('../blocklet/manager/engine');
 const { getDelegateState } = require('../util');
 const { NodeRuntimeMonitor } = require('../monitor/node-runtime-monitor');
+const { hasMigratedToPostgres } = require('../util/migration-sqlite-to-postgres');
 const getHistoryList = require('../monitor/get-history-list');
 
 class NodeAPI {
@@ -103,10 +106,33 @@ class NodeAPI {
     return diskInfo;
   }
 
+  async getServerProviders({ dataDir } = {}) {
+    const nodeInfo = await this.state.read();
+    const name = get(nodeInfo, 'routing.provider', null);
+    const Provider = getProvider(name);
+    const routerProvider = [name, Provider.version].join('@');
+    const dataPath = dataDir || process.env.ABT_NODE_DATA_DIR;
+    const postgresVersion = process.env.ABT_NODE_POSTGRES_VERSION || '17.5';
+    let dbProvider = '';
+    if (hasMigratedToPostgres(dataPath)) {
+      dbProvider = `PostgresGQL@${postgresVersion}`;
+    } else {
+      const sqliteVersion = await this.state.getSqliteVersion();
+      dbProvider = sqliteVersion ? `SQLite@${sqliteVersion}` : 'SQLite';
+    }
+
+    return {
+      routerProvider,
+      ...(dbProvider ? { dbProvider } : {}),
+    };
+  }
+
   async getEnv() {
     const info = await IP.get({ timeout: 5000 });
     info.internalV4 = info.internal;
     info.externalV4 = info.external;
+    // get router provider info
+    const providers = await this.getServerProviders();
 
     const res = {
       ip: info,
@@ -116,6 +142,7 @@ class NodeAPI {
       blockletEngines: getAll(),
       gitpod: isGitpod(),
       disk: await this.getDiskInfo(),
+      ...providers,
     };
 
     return res;

package/lib/api/team.js

@@ -7,6 +7,7 @@ const throttle = require('lodash/throttle');
 const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const { joinURL, withoutTrailingSlash } = require('ufo');
 const { Op } = require('sequelize');
+const dayjs = require('@abtnode/util/lib/dayjs');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
 const {
@@ -948,6 +949,10 @@ class TeamAPI extends EventEmitter {
       throw new Error('Role cannot be empty');
     }
 
+    if (passportExpireTime && dayjs(passportExpireTime).isBefore(dayjs())) {
+      throw new Error('Passport expire time must be greater than current time');
+    }
+
     const roles = await this.getRoles({ teamDid });
     const role = roles.find((r) => r.name === roleName);
     if (!role) {
@@ -1640,18 +1645,16 @@ class TeamAPI extends EventEmitter {
 
     const sanitized = withoutTrailingSlash(await StoreUtil.getStoreUrl(url));
     const storeList = await this.teamManager.getStoreList(teamDid);
-    const did = context?.user?.did;
     const exists = storeList.some((x) => {
-      if (x.url !== sanitized) {
-        return false;
-      }
-      if (x.scope && x.scope === did) {
-        return true;
-      }
-      if (!x.scope || x.scope === 'studio') {
-        return true;
+      if (x.url === sanitized) {
+        if (!x.scope) {
+          return true;
+        }
+
+        return x.scope === scope;
       }
-      return x.scope === scope;
+
+      return false;
     });
 
     if (exists) {

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

@@ -38918,7 +38918,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.46","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.46","@abtnode/auth":"1.16.46","@abtnode/certificate-manager":"1.16.46","@abtnode/client":"1.16.46","@abtnode/constant":"1.16.46","@abtnode/cron":"1.16.46","@abtnode/db-cache":"1.16.46","@abtnode/docker-utils":"1.16.46","@abtnode/logger":"1.16.46","@abtnode/models":"1.16.46","@abtnode/queue":"1.16.46","@abtnode/rbac":"1.16.46","@abtnode/router-provider":"1.16.46","@abtnode/static-server":"1.16.46","@abtnode/timemachine":"1.16.46","@abtnode/util":"1.16.46","@aigne/aigne-hub":"^0.2.2","@arcblock/did":"1.21.0","@arcblock/did-auth":"1.21.0","@arcblock/did-ext":"1.21.0","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.21.0","@arcblock/event-hub":"1.21.0","@arcblock/jwt":"1.21.0","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.21.0","@arcblock/vc":"1.21.0","@blocklet/constant":"1.16.46","@blocklet/did-space-js":"^1.1.10","@blocklet/env":"1.16.46","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.46","@blocklet/resolver":"1.16.46","@blocklet/sdk":"1.16.46","@blocklet/store":"1.16.46","@blocklet/theme":"^3.0.36","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.21.0","@ocap/util":"1.21.0","@ocap/wallet":"1.21.0","@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":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.46","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.46","@abtnode/auth":"1.16.46","@abtnode/certificate-manager":"1.16.46","@abtnode/client":"1.16.46","@abtnode/constant":"1.16.46","@abtnode/cron":"1.16.46","@abtnode/db-cache":"1.16.46","@abtnode/docker-utils":"1.16.46","@abtnode/logger":"1.16.46","@abtnode/models":"1.16.46","@abtnode/queue":"1.16.46","@abtnode/rbac":"1.16.46","@abtnode/router-provider":"1.16.46","@abtnode/static-server":"1.16.46","@abtnode/timemachine":"1.16.46","@abtnode/util":"1.16.46","@aigne/aigne-hub":"^0.2.2","@arcblock/did":"1.21.0","@arcblock/did-auth":"1.21.0","@arcblock/did-ext":"1.21.0","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.21.0","@arcblock/event-hub":"1.21.0","@arcblock/jwt":"1.21.0","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.21.0","@arcblock/vc":"1.21.0","@blocklet/constant":"1.16.46","@blocklet/did-space-js":"^1.1.13","@blocklet/env":"1.16.46","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.46","@blocklet/resolver":"1.16.46","@blocklet/sdk":"1.16.46","@blocklet/store":"1.16.46","@blocklet/theme":"^3.0.37","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.21.0","@ocap/util":"1.21.0","@ocap/wallet":"1.21.0","@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":"^11.1.0","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/event/index.js

@@ -22,7 +22,7 @@ const {
 } = require('@abtnode/constant');
 const { joinURL } = require('ufo');
 const { encode } = require('@abtnode/util/lib/base32');
-const dayjs = require('dayjs');
+const dayjs = require('@abtnode/util/lib/dayjs');
 
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const { isCLI } = require('../util');

package/lib/index.js

@@ -461,6 +461,7 @@ function ABTNode(options) {
     // Node State
     getNodeInfo: nodeAPI.getInfo.bind(nodeAPI),
     getNodeEnv: nodeAPI.getEnv.bind(nodeAPI),
+    getServerProviders: nodeAPI.getServerProviders.bind(nodeAPI),
     updateNodeInfo: nodeAPI.updateNodeInfo.bind(nodeAPI),
     getDelegationState: nodeAPI.getDelegationState.bind(nodeAPI),
     cleanupDirtyMaintainState: states.node.cleanupDirtyMaintainState.bind(states.node),

package/lib/states/node.js

@@ -175,6 +175,16 @@ class NodeState extends BaseState {
     return this.cache.autoCache(this.cacheGroup, () => this._read());
   }
 
+  async getSqliteVersion() {
+    try {
+      const [result] = await this.model.sequelize.query('SELECT sqlite_version();');
+      return result[0]['sqlite_version()'];
+    } catch (err) {
+      logger.error('getSqliteVersion failed', { err });
+      return '';
+    }
+  }
+
   // FIXME: 这个接口比较危险，可能会修改一些本不应该修改的字段，后续需要考虑改进
   async updateNodeInfo(entity = {}) {
     await this.deleteCache();

package/lib/states/notification.js

@@ -374,9 +374,9 @@ class NotificationState extends BaseState {
     return {
       list: processedRows,
       paging: {
-        total,
+        total: Number(total),
         pageSize: curPageSize,
-        pageCount: Math.ceil(total / curPageSize),
+        pageCount: Math.ceil(Number(total) / curPageSize),
         page,
       },
     };
@@ -917,8 +917,7 @@ class NotificationState extends BaseState {
       replacements,
       type: Sequelize.QueryTypes.SELECT,
     });
-
-    return countResult.total;
+    return Number(countResult.total);
   }
 }
 

package/lib/team/manager.js

@@ -26,7 +26,7 @@ const {
 const { isActivityIncluded } = require('@abtnode/util/lib/notification-preview/util');
 const { joinURL, withHttps } = require('ufo');
 const { isCustomDomain } = require('@abtnode/util/lib/url-evaluation');
-const dayjs = require('dayjs');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const { getDidDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-blocklet');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { getDomainsByDid } = require('../router/helper');

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

@@ -5,7 +5,7 @@ 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');
+const { hasMigratedToPostgres } = require('../migration-sqlite-to-postgres');
 
 // 最长 1 小时, 因为特别大的表, pg_dump 会很久
 const baseSpawnOptions = { timeout: 3600_000, retry: 0 };
@@ -49,7 +49,7 @@ function getPgUrl() {
 
 const dockerBackupPgBlockletDb = async (dbPath) => {
   const dataDir = getBlockletDataRoot(dbPath);
-  if (!hasPostgres(dataDir)) {
+  if (!hasMigratedToPostgres(dataDir)) {
     logger.info('no using postgres, skip backup the pg blocklet db:', dbPath);
     return {};
   }
@@ -87,7 +87,7 @@ const dockerBackupPgBlockletDb = async (dbPath) => {
 
 const dockerRestorePgBlockletDb = async (dbPath) => {
   const dataDir = getBlockletDataRoot(dbPath);
-  if (!hasPostgres(dataDir)) {
+  if (!hasMigratedToPostgres(dataDir)) {
     logger.info('no using postgres, skip restore the pg blocklet db:', dbPath);
     return {};
   }

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

@@ -6,7 +6,7 @@ const fs = require('fs');
 const { Sequelize } = require('sequelize');
 
 const { checkDockerInstalled } = require('./check-docker-installed');
-const { hasPostgres } = require('../migration-sqlite-to-postgres');
+const { hasMigratedToPostgres } = require('../migration-sqlite-to-postgres');
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
@@ -41,7 +41,7 @@ async function _ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port =
     return '';
   }
 
-  if (!hasPostgres(dataDir) && !force) {
+  if (!hasMigratedToPostgres(dataDir) && !force) {
     return '';
   }
 
@@ -60,6 +60,8 @@ async function _ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port =
     fs.mkdirSync(path.join(dataDir, 'core'), { recursive: true });
   }
 
+  const postgresVersion = process.env.ABT_NODE_POSTGRES_VERSION || '17.5';
+
   const runCmd = [
     'docker run -d',
     `--name ${name}`,
@@ -70,7 +72,7 @@ async function _ensureDockerPostgres(dataDir, name = 'abtnode-postgres', port =
     '-e POSTGRES_PASSWORD=postgres',
     '-e POSTGRES_USER=postgres',
     '-e POSTGRES_DB=postgres',
-    'postgres:17.5',
+    `postgres:${postgresVersion}`,
     '-c max_connections=200',
   ].join(' ');
 

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

@@ -424,7 +424,7 @@ async function findBlockletDbFiles(dataDir) {
   return results;
 }
 
-function hasPostgres(dataDir) {
+function hasMigratedToPostgres(dataDir) {
   const lockPath = path.join(dataDir, 'core', 'sqlite-to-postgres.lock');
   const hasLock = fs.existsSync(lockPath);
   return hasLock;
@@ -487,6 +487,6 @@ async function migrationSqliteToPostgres(dataDir, dbPaths) {
 
 module.exports = {
   migrationSqliteToPostgres,
-  hasPostgres,
+  hasMigratedToPostgres,
   removePostgresLock,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.47-beta-20250731-014139-e860268f",
+  "version": "1.16.47-beta-20250805-095401-14eb156b",
   "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-20250731-014139-e860268f",
-    "@abtnode/auth": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/certificate-manager": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/client": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/constant": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/cron": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/db-cache": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/docker-utils": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/logger": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/models": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/queue": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/rbac": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/router-provider": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/static-server": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/timemachine": "1.16.47-beta-20250731-014139-e860268f",
-    "@abtnode/util": "1.16.47-beta-20250731-014139-e860268f",
+    "@abtnode/analytics": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/auth": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/certificate-manager": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/client": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/constant": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/cron": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/db-cache": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/docker-utils": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/logger": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/models": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/queue": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/rbac": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/router-provider": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/static-server": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/timemachine": "1.16.47-beta-20250805-095401-14eb156b",
+    "@abtnode/util": "1.16.47-beta-20250805-095401-14eb156b",
     "@aigne/aigne-hub": "^0.2.2",
     "@arcblock/did": "1.21.0",
     "@arcblock/did-auth": "1.21.0",
@@ -46,15 +46,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.21.0",
     "@arcblock/vc": "1.21.0",
-    "@blocklet/constant": "1.16.47-beta-20250731-014139-e860268f",
-    "@blocklet/did-space-js": "^1.1.10",
-    "@blocklet/env": "1.16.47-beta-20250731-014139-e860268f",
+    "@blocklet/constant": "1.16.47-beta-20250805-095401-14eb156b",
+    "@blocklet/did-space-js": "^1.1.13",
+    "@blocklet/env": "1.16.47-beta-20250805-095401-14eb156b",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.47-beta-20250731-014139-e860268f",
-    "@blocklet/resolver": "1.16.47-beta-20250731-014139-e860268f",
-    "@blocklet/sdk": "1.16.47-beta-20250731-014139-e860268f",
-    "@blocklet/store": "1.16.47-beta-20250731-014139-e860268f",
-    "@blocklet/theme": "^3.0.36",
+    "@blocklet/meta": "1.16.47-beta-20250805-095401-14eb156b",
+    "@blocklet/resolver": "1.16.47-beta-20250805-095401-14eb156b",
+    "@blocklet/sdk": "1.16.47-beta-20250805-095401-14eb156b",
+    "@blocklet/store": "1.16.47-beta-20250805-095401-14eb156b",
+    "@blocklet/theme": "^3.0.37",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.21.0",
     "@ocap/util": "1.21.0",
@@ -117,5 +117,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "85b5870be6b7a531cd7a86bd132112d68547fde1"
+  "gitHead": "db2c143c5986281db1ae735aac70cbeb8c817773"
 }