@blocklet/cli 1.16.49-beta-20250819-084933-3bcbd851 → 1.16.49-beta-20250822-070545-6d3344cc

package/lib/commands/blocklet/bundle/bundlers/screenshots.js

@@ -12,7 +12,7 @@ class ScreenshotsBundler {
    * @param {{
    *  blockletDir: string,
    *  bundleDir: string,
-   *  meta: import('@abtnode/client').BlockletMeta
+   *  meta: import('@blocklet/server-js').BlockletMeta
    * }} { blockletDir, bundleDir, meta }
    * @memberof ScreenshotsBundler
    */

package/lib/commands/blocklet/deploy.js

@@ -8,7 +8,7 @@ const chalk = require('chalk');
 const { joinURL } = require('ufo');
 
 const { isValid: isValidDid, toAddress } = require('@arcblock/did');
-const Client = require('@abtnode/client');
+const Client = require('@blocklet/server-js');
 const hashFiles = require('@abtnode/util/lib/hash-files');
 const { default: axios } = require('axios');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');

package/lib/commands/server/command.js

@@ -17,7 +17,6 @@ const cleanup = require('./cleanup');
 const logs = require('./logs');
 const status = require('./status');
 const upgrade = require('./upgrade');
-const rescue = require('./rescue');
 const migrate = require('./migrate');
 const { printVersionTip } = require('../../util');
 
@@ -107,13 +106,6 @@ module.exports = (parentCommand = '') => {
     .description('Stop Blocklet Server and blocklets')
     .action(parseOptions(stop.run));
 
-  program
-    .command('rescue')
-    .option('--stopped-after <datetime>', 'Only start blocklets that are stopped after the specified time')
-    .option('-f --force', 'Force start all blocklets, even if they are already running', false)
-    .description('Start all blocklets in current running server')
-    .action(parseOptions(rescue.run));
-
   program
     .command('info')
     .option('-C --clipboard', 'Automatically copy environment information to clipboard', false)

package/lib/commands/server/info.js

@@ -67,7 +67,7 @@ exports.run = ({ clipboard }) => {
       const correct = await ip.isDnsIpMappingCorrect(config.node.did);
 
       /**
-       * @type {{node: import('@abtnode/client')}}
+       * @type {{node: import('@blocklet/server-js')}}
        */
       const { node } = await getNode({ dir: process.cwd() });
 

package/lib/commands/server/init.js

@@ -20,7 +20,6 @@ const {
   MAX_UPLOAD_FILE_SIZE,
   NODE_MODES,
   DEFAULT_DID_REGISTRY,
-  PROXY_MAX_MEM_LIMIT_IN_MB,
   DEFAULT_DID_DOMAIN,
   DEFAULT_SLP_DOMAIN,
 } = require('@abtnode/constant');
@@ -389,7 +388,6 @@ exports.run = async ({
       },
       runtimeConfig: {
         daemonMaxMemoryLimit: Math.floor(daemonMaxMemoryLimit * 1024),
-        proxyMaxMemoryLimit: PROXY_MAX_MEM_LIMIT_IN_MB,
         blockletMaxMemoryLimit: Math.floor(blockletMaxMemoryLimit * 1024),
       },
       didRegistry: (process.env.ABT_NODE_DID_REGISTRY || didRegistry || DEFAULT_DID_REGISTRY).trim(),

package/lib/commands/server/start.js

@@ -30,7 +30,6 @@ const {
   CONFIG_FOLDER_NAME_OLD,
   MAX_UPLOAD_FILE_SIZE,
   DAEMON_MAX_MEM_LIMIT_IN_MB,
-  PROXY_MAX_MEM_LIMIT_IN_MB,
   BLOCKLET_MAX_MEM_LIMIT_IN_MB,
   EVENTS,
   NODE_MODES,
@@ -100,7 +99,6 @@ const updateVersionInConfigFileAndState = async (config, configFile, node) => {
     runtimeConfig: {
       daemonMaxMemoryLimit: calculatedLimit,
       blockletMaxMemoryLimit: get(info, 'runtimeConfig.blockletMaxMemoryLimit', BLOCKLET_MAX_MEM_LIMIT_IN_MB),
-      proxyMaxMemoryLimit: get(info, 'runtimeConfig.proxyMaxMemoryLimit', DAEMON_MAX_MEM_LIMIT_IN_MB),
     },
   });
   if (semver.neq(config.node.version, version)) {
@@ -151,7 +149,6 @@ const getDifferentAttributes = (dbInfo, config) => {
     { name: 'routing.enableIpServer', type: Boolean, required: false },
     { name: 'mode', type: String, required: false },
     // { name: 'runtimeConfig.daemonMaxMemoryLimit', type: Number, required: false },
-    { name: 'runtimeConfig.proxyMaxMemoryLimit', type: Number, required: false },
     { name: 'runtimeConfig.blockletMaxMemoryLimit', type: Number, required: false },
     { name: 'didRegistry', type: String, required: true },
     { name: 'didDomain', type: String, required: true },
@@ -433,7 +430,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
 
   const configFile = await getConfigFile(workingDir);
 
-  const proxyMaxMemoryLimit = get(config, 'node.runtimeConfig.proxyMaxMemoryLimit', PROXY_MAX_MEM_LIMIT_IN_MB);
+  const blockletMaxMemoryLimit = get(config, 'node.runtimeConfig.blockletMaxMemoryLimit', BLOCKLET_MAX_MEM_LIMIT_IN_MB);
 
   // 如果日志目录不存在，pm2 会启动可能会失败, 测试发现 docker 里的 Ubuntu 18.04.4 LTS 系统会失败,
   // MAC OS 下正常，但是没搞明白为什么
@@ -444,7 +441,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
   const { node, getBaseUrls, publishEvent, wallet } = await nodeLib.getNode({ dir: workingDir });
 
   // start event-hub
-  const [eventHubPort, pm2EventHubPort] = await startEventHub(logDir, proxyMaxMemoryLimit, config.node.sk);
+  const [eventHubPort, pm2EventHubPort] = await startEventHub(logDir, blockletMaxMemoryLimit, config.node.sk);
 
   return new Promise((resolve) => {
     node.onReady(async () => {
@@ -538,7 +535,6 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
                   'node.runtimeConfig.blockletMaxMemoryLimit',
                   BLOCKLET_MAX_MEM_LIMIT_IN_MB
                 ),
-                proxyMaxMemoryLimit: get(latest, 'node.runtimeConfig.proxyMaxMemoryLimit', DAEMON_MAX_MEM_LIMIT_IN_MB),
               },
             };
 

package/lib/util/index.js

@@ -30,12 +30,12 @@ const { isProcessRunningByPm2 } = require('@abtnode/util/lib/pm2/pm2-start-or-re
 
 const {
   PROCESS_NAME_EVENT_HUB,
-  PROXY_MAX_MEM_LIMIT_IN_MB,
   DEFAULT_DESCRIPTION,
   DEFAULT_HTTP_PORT,
   NODE_MODES,
   DEFAULT_HTTPS_PORT,
   PROCESS_NAME_PM2_EVENT_HUB,
+  BLOCKLET_MAX_MEM_LIMIT_IN_MB,
 } = require('@abtnode/constant');
 const gitUserName = require('git-user-name');
 
@@ -228,7 +228,7 @@ const getGitHash = (dir) => git.long(dir);
 
 const getCliCwd = () => path.dirname(path.dirname(__dirname));
 
-const startEventHub = async (logDir, maxMemoryRestart = PROXY_MAX_MEM_LIMIT_IN_MB, ABT_NODE_SK = '') => {
+const startEventHub = async (logDir, maxMemoryRestart = BLOCKLET_MAX_MEM_LIMIT_IN_MB, ABT_NODE_SK = '') => {
   const port = getInternalPort(PROCESS_NAME_EVENT_HUB);
   const pm2EventHubPort = getInternalPort(PROCESS_NAME_PM2_EVENT_HUB);
   debug('start event hub', { port });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.49-beta-20250819-084933-3bcbd851",
+  "version": "1.16.49-beta-20250822-070545-6d3344cc",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,28 +35,28 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/client": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/constant": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/core": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/db-cache": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/logger": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/models": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/router-provider": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/util": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/webapp": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/blocklet-services": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/constant": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/core": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/db-cache": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/logger": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/models": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/router-provider": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/util": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@abtnode/webapp": "1.16.49-beta-20250822-070545-6d3344cc",
     "@arcblock/did": "1.22.2",
     "@arcblock/event-hub": "1.22.2",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "1.22.2",
     "@arcblock/ws": "1.22.2",
-    "@blocklet/constant": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@blocklet/constant": "1.16.49-beta-20250822-070545-6d3344cc",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/meta": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/resolver": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/store": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@blocklet/images": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@blocklet/meta": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@blocklet/resolver": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@blocklet/server-js": "1.16.49-beta-20250822-070545-6d3344cc",
+    "@blocklet/store": "1.16.49-beta-20250822-070545-6d3344cc",
     "@blocklet/theme-builder": "^0.4.6",
     "@ocap/client": "1.22.2",
     "@ocap/mcrypto": "1.22.2",
@@ -154,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "b8bbf2279e9a29bd58eac7b66e1db16e851a183c",
+  "gitHead": "c5560fe749fe495b03003ac7325da29c71f5e62b",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"

package/lib/commands/server/rescue.js

@@ -1,71 +0,0 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-continue */
-
-const trim = require('lodash/trim');
-const { BLOCKLET_MODES, BlockletStatus } = require('@blocklet/constant');
-
-const { getDisplayName } = require('@blocklet/meta/lib/util');
-const { printError, printSuccess, printWarning, printInfo } = require('../../util');
-const { getNode } = require('../../node');
-const { checkRunning } = require('../../manager');
-const { wrapSpinner } = require('../../ui');
-
-const isAfter = (t1, t2) => new Date(t1).getTime() >= new Date(t2).getTime();
-
-exports.run = async ({ force = false, stoppedAfter }) => {
-  const { node } = await getNode({ dir: process.cwd() });
-
-  if (!trim(stoppedAfter) || !new Date(stoppedAfter).getTime()) {
-    printError('Please provide a valid --stopped-after time');
-    process.exit(1);
-  }
-
-  const isRunning = await checkRunning();
-  if (!isRunning) {
-    printWarning('Blocklet Server is not running!');
-    process.exit(0);
-  }
-
-  node.onReady(async () => {
-    let blocklets = [];
-
-    blocklets = await node.getBlocklets({ includeRuntimeInfo: false });
-
-    for (let i = 0; i < blocklets.length; i++) {
-      const blocklet = blocklets[i];
-      const title = getDisplayName(blocklet);
-      if (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT) {
-        printInfo(`Skip development blocklet: ${title}`);
-        continue;
-      }
-
-      if (blocklet.status === BlockletStatus.running && !force) {
-        printInfo(`Skip running blocklet: ${title}`);
-        continue;
-      }
-
-      let minStoppedAt = 0;
-      blocklet.children.forEach((child) => {
-        if (isAfter(child.stoppedAt, minStoppedAt)) {
-          minStoppedAt = child.stoppedAt;
-        }
-      });
-
-      if (!isAfter(minStoppedAt, stoppedAfter)) {
-        printInfo(`Skip blocklet: ${title} because it was not stopped after ${stoppedAfter}`);
-        continue;
-      }
-
-      try {
-        await wrapSpinner(`Starting blocklet: ${title}`, async () => {
-          await node.startBlocklet({ did: blocklet.appDid, checkHealthImmediately: true, throwOnError: true });
-        });
-      } catch (err) {
-        printError(`Failed to start blocklet ${title}`, err.message);
-      }
-    }
-
-    printSuccess('Done!');
-    process.exit(0);
-  });
-};