@blocklet/cli 1.16.44-beta-20250513-030435-c2d99062 → 1.16.44-beta-20250516-225119-c0b5ec8d

package/lib/commands/blocklet/bundle/index.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const chalk = require('chalk');
-const formatError = require('@abtnode/util/lib/format-error');
+const { formatError } = require('@blocklet/error');
 const parseBlockletMeta = require('@blocklet/meta/lib/parse');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 const zipBundle = require('./zip');

package/lib/commands/blocklet/component.js

@@ -21,11 +21,15 @@ exports.run = () => {
     childProcess.execSync(npxCommand, { stdio: 'inherit' });
     process.exit(0);
   } catch (error) {
-    console.error(error);
+    if (error?.stderr) {
+      print('');
 
-    print('');
-    printWarning(`There was a problem executing ${chalk.cyan(npxCommand)}`);
-    print(`You can try running the command directly: ${chalk.cyan(npxCommand)}\n`);
+      console.error(error);
+
+      print('');
+      printWarning(`There was a problem executing ${chalk.cyan(npxCommand)}`);
+      print(`You can try running the command directly: ${chalk.cyan(npxCommand)}\n`);
+    }
 
     process.exit(error.status || 1);
   }

package/lib/commands/blocklet/deploy.js

@@ -72,7 +72,10 @@ async function confirmOpenConnectPage(
   return isOpenConnectPage;
 }
 
-const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, mountPoint: inputMountPoint }) => {
+const deploy = async (
+  dir,
+  { endpoint, accessKey, accessSecret, appDid, appId, mountPoint: inputMountPoint, incremental = false }
+) => {
   let bundleDir = dir;
   if (fs.existsSync(path.join(dir, BLOCKLET_BUNDLE_FOLDER))) {
     bundleDir = path.join(dir, BLOCKLET_BUNDLE_FOLDER);
@@ -188,23 +191,26 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
   }
 
   let blockletDiff;
-  try {
-    blockletDiff = await client.getBlockletDiff(
-      {
-        input: {
-          did: localMeta.did,
-          hashFiles: Object.entries(files).map(([file, hash]) => ({ file, hash })),
-          rootDid: rootDid || '',
-        },
-      },
-      {
-        headers: {
-          'x-access-blocklet': rootDid,
+  if (incremental) {
+    printInfo('Incremental mode, fetching blocklet diff...');
+    try {
+      blockletDiff = await client.getBlockletDiff(
+        {
+          input: {
+            did: localMeta.did,
+            hashFiles: Object.entries(files).map(([file, hash]) => ({ file, hash })),
+            rootDid: rootDid || '',
+          },
         },
-      }
-    );
-  } catch (error) {
-    throw new Error(`Blocklet deploy failed when fetching diff: ${formatGQLError(error)}`);
+        {
+          headers: {
+            'x-access-blocklet': rootDid,
+          },
+        }
+      );
+    } catch (error) {
+      throw new Error(`Blocklet deploy failed when fetching diff: ${formatGQLError(error)}`);
+    }
   }
 
   const {
@@ -213,7 +219,7 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
     deleteSet = [],
     hasBlocklet: hasDiff,
     version: serverVersion,
-  } = blockletDiff.blockletDiff || {};
+  } = blockletDiff?.blockletDiff || {};
 
   printInfo(`Name: ${chalk.cyan(localMeta.name)}`);
   printInfo(`DID: ${chalk.cyan(localMeta.did)}`);
@@ -239,6 +245,7 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
       integrity: localMeta.dist.integrity,
     },
   });
+
   try {
     const timestamp = Date.now();
     const timer = setInterval(() => {

package/lib/commands/index.js

@@ -155,6 +155,7 @@ program
   .option('--app-id <did>', 'Which app to mount to when deploy a component')
   .option('--app-did <did>', '[Deprecated] Alias of --app-id')
   .option('--mount-point <mountPoint>', 'Mount point to the app when deploy a component')
+  .option('--incremental', 'Deploy only changed files compared to the previous version', false)
   .description('Deploy blocklet from local directory to Blocklet Server')
   .action(parseArgsAndOptions(deploy.run));
 

package/lib/commands/server/command.js

@@ -121,7 +121,10 @@ module.exports = (parentCommand = '') => {
 
   program
     .command('cleanup')
-    .option('--target <target>', 'Which target to cleanup, available options: cache, maintenance-status')
+    .option(
+      '--target <target>',
+      'Which target to cleanup, available options: cache, maintenance-status, blacklist, blacklist-expired'
+    )
     .description('Do some server level cleanup work')
     .action(parseOptions(cleanup.run));
 

package/lib/util/blocklet/meta.js

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const { parseComponents } = require('@blocklet/resolver');
-const formatError = require('@abtnode/util/lib/format-error');
+const { formatError } = require('@blocklet/error');
 
 const { printSuccess, printError, printInfo } = require('../index');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.44-beta-20250513-030435-c2d99062",
+  "version": "1.16.44-beta-20250516-225119-c0b5ec8d",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,30 +35,31 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/client": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/constant": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/core": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/logger": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/router-provider": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/util": "1.16.44-beta-20250513-030435-c2d99062",
-    "@abtnode/webapp": "1.16.44-beta-20250513-030435-c2d99062",
-    "@arcblock/did": "1.20.8",
-    "@arcblock/event-hub": "1.20.8",
+    "@abtnode/blocklet-services": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/client": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/core": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/logger": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/router-provider": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/util": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/webapp": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@arcblock/did": "1.20.11",
+    "@arcblock/event-hub": "1.20.11",
     "@arcblock/ipfs-only-hash": "^0.0.2",
-    "@arcblock/jwt": "1.20.8",
-    "@arcblock/ws": "1.20.8",
-    "@blocklet/constant": "1.16.44-beta-20250513-030435-c2d99062",
+    "@arcblock/jwt": "1.20.11",
+    "@arcblock/ws": "1.20.11",
+    "@blocklet/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/error": "^0.2.4",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.44-beta-20250513-030435-c2d99062",
-    "@blocklet/meta": "1.16.44-beta-20250513-030435-c2d99062",
-    "@blocklet/resolver": "1.16.44-beta-20250513-030435-c2d99062",
-    "@blocklet/store": "1.16.44-beta-20250513-030435-c2d99062",
-    "@blocklet/theme-builder": "^0.1.15",
-    "@ocap/client": "1.20.8",
-    "@ocap/mcrypto": "1.20.8",
-    "@ocap/util": "1.20.8",
-    "@ocap/wallet": "1.20.8",
+    "@blocklet/images": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/meta": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/resolver": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/store": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/theme-builder": "^0.1.17",
+    "@ocap/client": "1.20.11",
+    "@ocap/mcrypto": "1.20.11",
+    "@ocap/util": "1.20.11",
+    "@ocap/wallet": "1.20.11",
     "@vercel/ncc": "^0.38.3",
     "archiver": "^7.0.1",
     "async": "^3.2.4",
@@ -152,7 +153,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "c3a3efef44ccf08705abb47875edba6169e76faa",
+  "gitHead": "eb15dee761c0ea273981c848992e5f29b94a69dc",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"