@blocklet/cli 1.16.45 → 1.16.46-beta-20250703-050038-4ba2582f

package/README.md

@@ -28,7 +28,7 @@ Powered By
   / ___ \| | | (__| |_) | | (_) | (__|   < 
  /_/   \_\_|  \___|____/|_|\___/ \___|_|\_\
                                            
-            Blocklet CLI v1.16.44
+            Blocklet CLI v1.16.45
 
 Usage: blocklet server [options] [command]
 

package/lib/commands/server/command.js

@@ -18,6 +18,7 @@ const logs = require('./logs');
 const status = require('./status');
 const upgrade = require('./upgrade');
 const rescue = require('./rescue');
+const migration = require('./migration');
 const { printVersionTip } = require('../../util');
 
 module.exports = (parentCommand = '') => {
@@ -128,6 +129,12 @@ module.exports = (parentCommand = '') => {
     .description('Do some server level cleanup work')
     .action(parseOptions(cleanup.run));
 
+  program
+    .command('migration')
+    .option('--dialect <dialect>', 'Which dialect to migrate, available options: sqlite, postgres')
+    .description('Migrate database from sqlite to postgres')
+    .action(parseOptions(migration.run));
+
   program.command('upgrade').description('Self-Upgrade Blocklet Server').action(parseOptions(upgrade.run));
 
   program.on('--help', () => {

package/lib/commands/server/migration.js

@@ -0,0 +1,55 @@
+const path = require('path');
+const { sequelizeInstances } = require('@abtnode/models');
+const { runSchemaMigrations } = require('@abtnode/core/lib/migrations');
+const { removePostgresLock } = require('@abtnode/core/lib/util/migration-sqlite-to-postgres');
+
+const { printInfo, printSuccess, printError } = require('../../util');
+const { getNode } = require('../../node');
+
+exports.run = async ({ dialect }) => {
+  const allowDialects = {
+    postgres: true,
+    sqlite: true,
+  };
+  if (!allowDialects[dialect]) {
+    printError(`Invalid dialect: ${dialect}, allowed dialects: ${Object.keys(allowDialects).join(', ')}`);
+    process.exit(1);
+  }
+
+  const { node } = await getNode({ dir: process.cwd() });
+  const dataDir = path.join(node.dataDirs.core, '..');
+  removePostgresLock(dataDir);
+  sequelizeInstances.clear();
+
+  const LAST_ABT_NODE_POSTGRES_URL = process.env.ABT_NODE_POSTGRES_URL;
+  process.env.ABT_NODE_POSTGRES_URL = '';
+
+  printInfo('Getting blocklets...');
+  let blocklets = [];
+  try {
+    blocklets = await node.getBlocklets();
+  } catch (err) {
+    if (err.message.includes('dose not exist') || err.message.includes('SQLITE_ERROR: no such table')) {
+      printError(`Failed to get blocklets: ${err.message}, you need ensure blocklet server start once.`);
+      process.exit(1);
+    }
+    printError(`Failed to get blocklets: ${err.message}`);
+    process.exit(1);
+  }
+
+  try {
+    process.env.ABT_NODE_POSTGRES_URL = LAST_ABT_NODE_POSTGRES_URL;
+    await runSchemaMigrations({ dataDir, printInfo, printSuccess, migrationPostgres: true, blocklets });
+  } catch (err) {
+    if (err.message.includes('dose not exist') || err.message.includes('SQLITE_ERROR: no such table')) {
+      printError(`Failed to run migrations: ${err.message}, you need ensure blocklet server start once.`);
+      process.exit(1);
+    }
+    printError(`Failed to run migrations: ${err.message}`);
+    process.exit(1);
+  }
+
+  printSuccess(`Migration ${dialect} completed`);
+  printInfo('Please start server, will use Postgres database: blocklet server start');
+  process.exit(0);
+};

package/lib/commands/server/start.js

@@ -40,6 +40,7 @@ const {
 
 const { canUseFileSystemIsolateApi, SAFE_NODE_VERSION } = require('@abtnode/util/lib/security');
 const { ensureDockerRedis } = require('@abtnode/core/lib/util/docker/ensure-docker-redis');
+const { ensureDockerPostgres } = require('@abtnode/core/lib/util/docker/ensure-docker-postgres');
 
 const { version } = require('../../../package.json');
 const debug = require('../../debug')('start');
@@ -415,6 +416,14 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
     printSuccess(`Using Redis Cache: ${process.env.ABT_NODE_CACHE_REDIS_URL}`);
   }
 
+  if (!process.env.ABT_NODE_POSTGRES_URL) {
+    const postgresUrl = await ensureDockerPostgres(dataDir);
+    process.env.ABT_NODE_POSTGRES_URL = postgresUrl;
+  }
+  if (process.env.ABT_NODE_POSTGRES_URL) {
+    printSuccess(`Using Postgres: ${process.env.ABT_NODE_POSTGRES_URL}`);
+  }
+
   const configFile = await getConfigFile(workingDir);
 
   const proxyMaxMemoryLimit = get(config, 'node.runtimeConfig.proxyMaxMemoryLimit', PROXY_MAX_MEM_LIMIT_IN_MB);
@@ -580,6 +589,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
           ABT_NODE_SESSION_SECRET: config.node.secret,
           ABT_NODE_DATA_DIR: dataDir,
           ABT_NODE_CACHE_REDIS_URL: process.env.ABT_NODE_CACHE_REDIS_URL,
+          ABT_NODE_POSTGRES_URL: process.env.ABT_NODE_POSTGRES_URL,
           ABT_NODE_KERNEL_MODE: process.env.ABT_NODE_KERNEL_MODE,
           ABT_NODE_BLOCKLET_MODE: process.env.ABT_NODE_BLOCKLET_MODE,
           ABT_NODE_CONFIG_FILE: configFile,

package/lib/node.js

@@ -7,6 +7,7 @@ const security = require('@abtnode/util/lib/security');
 const { WsClient } = require('@arcblock/ws');
 const { isFromPublicKey } = require('@arcblock/did');
 const { getBaseUrls } = require('@abtnode/core/lib/util');
+const { ensureDockerPostgres } = require('@abtnode/core/lib/util/docker/ensure-docker-postgres');
 
 const debug = require('./debug')('node');
 const { version } = require('../package.json');
@@ -99,10 +100,16 @@ async function getNode({ dir = process.cwd() } = {}) {
   if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
     process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(dataDir, 'core', 'db-cache.db');
   }
+
   if (typeof config.env?.ABT_NODE_DID_DOCUMENT_UPDATE !== 'undefined') {
     process.env.ABT_NODE_DID_DOCUMENT_UPDATE = config.env.ABT_NODE_DID_DOCUMENT_UPDATE;
   }
 
+  if (!process.env.ABT_NODE_POSTGRES_URL) {
+    const postgresUrl = await ensureDockerPostgres(dataDir);
+    process.env.ABT_NODE_POSTGRES_URL = postgresUrl;
+  }
+
   util.ensurePermission(dataDir);
 
   printInfo('Server config from', chalk.cyan(configFile));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.45",
+  "version": "1.16.46-beta-20250703-050038-4ba2582f",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,27 +35,28 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.45",
-    "@abtnode/client": "1.16.45",
-    "@abtnode/constant": "1.16.45",
-    "@abtnode/core": "1.16.45",
-    "@abtnode/db-cache": "1.16.45",
-    "@abtnode/logger": "1.16.45",
-    "@abtnode/router-provider": "1.16.45",
-    "@abtnode/util": "1.16.45",
-    "@abtnode/webapp": "1.16.45",
+    "@abtnode/blocklet-services": "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/core": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/db-cache": "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/router-provider": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/util": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@abtnode/webapp": "1.16.46-beta-20250703-050038-4ba2582f",
     "@arcblock/did": "1.20.14",
     "@arcblock/event-hub": "1.20.14",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "1.20.14",
     "@arcblock/ws": "1.20.14",
-    "@blocklet/constant": "1.16.45",
+    "@blocklet/constant": "1.16.46-beta-20250703-050038-4ba2582f",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.45",
-    "@blocklet/meta": "1.16.45",
-    "@blocklet/resolver": "1.16.45",
-    "@blocklet/store": "1.16.45",
+    "@blocklet/images": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@blocklet/meta": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@blocklet/resolver": "1.16.46-beta-20250703-050038-4ba2582f",
+    "@blocklet/store": "1.16.46-beta-20250703-050038-4ba2582f",
     "@blocklet/theme-builder": "^0.2.1",
     "@ocap/client": "1.20.14",
     "@ocap/mcrypto": "1.20.14",
@@ -153,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "8e981926c6dd0fc612d5bf716ab6c638791aa5f3",
+  "gitHead": "8d7838277e51ecabae489db51937f6deb51e015f",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"