@blocklet/cli 1.16.54-beta-20251017-133309-7d40faa6 → 1.16.54-beta-20251021-070951-25e3083c

package/lib/commands/blocklet/add.js

@@ -1,9 +1,9 @@
 const chalk = require('chalk');
 const { joinURL } = require('ufo');
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
-const toBlockletDid = require('@blocklet/meta/lib/did');
+const { parse: getBlockletMeta } = require('@blocklet/meta/lib/parse');
+const { toBlockletDid } = require('@blocklet/meta/lib/did');
 const { select: getMetaFile, update: updateMetaFile } = require('@blocklet/meta/lib/file');
-const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
+const { urlPathFriendly } = require('@blocklet/meta/lib/url-path-friendly');
 const { BLOCKLET_STORE_API_BLOCKLET_PREFIX, BLOCKLET_STORE_URL } = require('@abtnode/constant');
 const { getBlockletMetaFromUrl } = require('@blocklet/meta/lib/util-meta');
 

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

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
 const { BLOCKLET_BUNDLE_FOLDER, BLOCKLET_ENTRY_FILE } = require('@blocklet/constant');
-const parseBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: parseBlockletMeta } = require('@blocklet/meta/lib/parse');
 const { installExternalDependencies } = require('@abtnode/core/lib/util/install-external-dependencies');
 
 const { print, printSuccess } = require('../../../../util');

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

@@ -1,8 +1,8 @@
 const path = require('path');
 const chalk = require('chalk');
 const { formatError } = require('@blocklet/error');
-const parseBlockletMeta = require('@blocklet/meta/lib/parse');
-const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
+const { parse: parseBlockletMeta } = require('@blocklet/meta/lib/parse');
+const { hasReservedKey } = require('@blocklet/meta/lib/has-reserved-key');
 const zipBundle = require('./zip');
 const simpleBundle = require('./simple');
 const compactBundle = require('./compact');

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

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
 const { BLOCKLET_BUNDLE_FOLDER, BLOCKLET_ENTRY_FILE } = require('@blocklet/constant');
-const parseBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: parseBlockletMeta } = require('@blocklet/meta/lib/parse');
 
 const { print, printSuccess } = require('../../../../util');
 const { wrapSpinner } = require('../../../../ui');

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

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const chalk = require('chalk');
 const { join, dirname, basename, extname, relative } = require('path');
 const { BLOCKLET_BUNDLE_FOLDER, BLOCKLET_BUNDLE_FILE, BLOCKLET_ENTRY_FILE } = require('@blocklet/constant');
-const parseBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: parseBlockletMeta } = require('@blocklet/meta/lib/parse');
 const detectWorkspace = require('@abtnode/util/lib/detect-workspace');
 
 const { print, printInfo, printSuccess, printError } = require('../../../../util');

package/lib/commands/blocklet/deploy.js

@@ -11,11 +11,11 @@ const { isValid: isValidDid, toAddress } = require('@arcblock/did');
 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');
+const { validateBlockletEntry } = require('@blocklet/meta/lib/entry');
 const { hasMountPoint } = require('@blocklet/meta/lib/engine');
 const { BLOCKLET_BUNDLE_FOLDER } = require('@blocklet/constant');
-const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
-const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
+const { hasReservedKey } = require('@blocklet/meta/lib/has-reserved-key');
+const { urlPathFriendly } = require('@blocklet/meta/lib/url-path-friendly');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, SERVER_ROLES } = require('@abtnode/constant');
 const ensureServerEndpoint = require('@abtnode/util/lib/ensure-server-endpoint');
 const makeFormData = require('@abtnode/util/lib/make-from-data');
@@ -254,6 +254,12 @@ const deploy = async (
         print('Uploading...');
       }
     }, 1000 * 500);
+    const signature = await signWithAccessKey({
+      accessKeyId: accessKey,
+      accessKeySecret: accessSecret,
+      message: `${timestamp}-${accessKey}`,
+    });
+
     const res = await wrapSpinner(`Uploading ${localMeta.name}...`, () =>
       axios({
         url: fullEndpoint,
@@ -264,11 +270,7 @@ const deploy = async (
           'user-agent': `BlockletCLI/${version}`,
           'x-access-key-id': accessKey,
           'x-access-stamp': timestamp,
-          'x-access-signature': signWithAccessKey({
-            accessKeyId: accessKey,
-            accessKeySecret: accessSecret,
-            message: `${timestamp}-${accessKey}`,
-          }),
+          'x-access-signature': signature,
           'x-access-blocklet': rootDid,
         },
         timeout: 1000 * 60 * 30, // 30min

package/lib/commands/blocklet/dev.js

@@ -15,7 +15,7 @@ const { isValid: isValidDid, toAddress } = require('@arcblock/did');
 const { evaluateURLs, isDidDomain } = require('@abtnode/util/lib/url-evaluation');
 const isDocker = require('@abtnode/util/lib/is-docker');
 const { toBase58, fromBase58, fromUnitToToken } = require('@ocap/util');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletInfo } = require('@blocklet/meta/lib/info');
 const {
   replaceSlotToIp,
   isInProgress,
@@ -25,8 +25,8 @@ const {
 } = require('@blocklet/meta/lib/util');
 const { getBlockletMetaFromUrls, getSourceUrlsFromConfig } = require('@blocklet/meta/lib/util-meta');
 const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
-const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
+const { parse: getBlockletMeta } = require('@blocklet/meta/lib/parse');
+const { hasReservedKey } = require('@blocklet/meta/lib/has-reserved-key');
 const {
   BLOCKLET_MODES,
   BlockletStatus,
@@ -747,7 +747,7 @@ const getUtil = ({
           joinURL(faucetHost, '/api/claim'),
           {
             userPk: toBase58(wallet.publicKey),
-            userInfo: Jwt.sign(wallet.address, wallet.secretKey, { token: token.address }),
+            userInfo: await Jwt.sign(wallet.address, wallet.secretKey, { token: token.address }),
           },
           { timeout: 8000 }
         );

package/lib/commands/blocklet/exec.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
 const runScript = require('@abtnode/util/lib/run-script');
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: getBlockletMeta } = require('@blocklet/meta/lib/parse');
 const { getSafeEnv } = require('@abtnode/core/lib/util');
 const { isValid: isValidDid, toAddress } = require('@arcblock/did');
 const { getRuntimeEnvironments } = require('@abtnode/core/lib/util/blocklet');

package/lib/commands/blocklet/meta.js

@@ -1,4 +1,4 @@
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: getBlockletMeta } = require('@blocklet/meta/lib/parse');
 
 const { printError, printInfo } = require('../../util');
 const { pretty } = require('../../ui');

package/lib/commands/blocklet/remove.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk');
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: getBlockletMeta } = require('@blocklet/meta/lib/parse');
 const { select: getMetaFile, update: updateMetaFile } = require('@blocklet/meta/lib/file');
 
 const { printSuccess, printError } = require('../../util');

package/lib/commands/blocklet/version.js

@@ -1,7 +1,7 @@
 const semver = require('semver');
 const shell = require('shelljs');
 const chalk = require('chalk');
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
+const { parse: getBlockletMeta } = require('@blocklet/meta/lib/parse');
 const { BLOCKLET_DEFAULT_VERSION, BLOCKLET_LATEST_SPEC_VERSION } = require('@blocklet/constant');
 const { select: getMetaFile, update: updateMetaFile } = require('@blocklet/meta/lib/file');
 

package/lib/commands/server/start.js

@@ -631,6 +631,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
           ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU,
           ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY,
           ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK: process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK,
+          WITH_SK: process.env.WITH_SK,
           ...(config.env || {}),
         };
         if (process.env.DEBUG) {

package/lib/node.js

@@ -159,10 +159,12 @@ async function getWsClient(node) {
     const wallet = util.getWallet(info.sk);
     const timestamp = Date.now().toString();
 
+    const token = await wallet.sign(timestamp);
+
     client = new WsClient(endpoint, {
       silent: true,
       params: () => ({
-        token: wallet.sign(timestamp),
+        token,
         timestamp,
       }),
     });

package/lib/util/blocklet/sign.js

@@ -1,7 +1,7 @@
 const { toBase58 } = require('@ocap/util');
 const stableStringify = require('json-stable-stringify');
 
-const sign = (blockletMeta, wallet) => {
+const sign = async (blockletMeta, wallet) => {
   const walletJSON = wallet.toJSON();
 
   const signatureData = {
@@ -12,7 +12,7 @@ const sign = (blockletMeta, wallet) => {
     created: new Date().toISOString(),
   };
 
-  const signature = wallet.sign(stableStringify({ ...blockletMeta, signatures: [signatureData] }));
+  const signature = await wallet.sign(stableStringify({ ...blockletMeta, signatures: [signatureData] }));
   signatureData.sig = toBase58(signature);
 
   return signatureData;

package/lib/util/restart-running-component.js

@@ -3,7 +3,7 @@ const AsyncQueue = require('async/queue');
 const { BlockletStatus, BLOCKLET_MODES } = require('@blocklet/constant');
 const { getBlockletEngine } = require('@blocklet/meta/lib/engine');
 const { findComponentV2, forEachComponentV2, hasStartEngine, getDisplayName } = require('@blocklet/meta/lib/util');
-const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
+const { getComponentProcessId } = require('@blocklet/meta/lib/get-component-process-id');
 const getPm2ProcessInfo = require('@abtnode/util/lib/get-pm2-process-info');
 const formatContext = require('@abtnode/util/lib/format-context');
 const pAll = require('p-all');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.54-beta-20251017-133309-7d40faa6",
+  "version": "1.16.54-beta-20251021-070951-25e3083c",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://www.arcblock.io/docs/blocklet-cli",
   "bin": {
@@ -12,8 +12,8 @@
   "scripts": {
     "lint": "eslint lib bin",
     "lint:fix": "eslint lib bin --fix",
-    "test": "node tools/jest.js",
-    "coverage": "ABT_NODE_HOST='' npm run test -- --coverage",
+    "test": "bun test",
+    "coverage": "bun test --coverage",
     "postinstall": "node lib/postinstall.js"
   },
   "files": [
@@ -35,33 +35,33 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/constant": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/core": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/db-cache": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/logger": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/models": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/router-provider": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/util": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/webapp": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@arcblock/did": "1.25.6",
-    "@arcblock/event-hub": "1.25.6",
+    "@abtnode/blocklet-services": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/constant": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/core": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/db-cache": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/logger": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/models": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/router-provider": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/util": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/webapp": "1.16.54-beta-20251021-070951-25e3083c",
+    "@arcblock/did": "^1.26.2",
+    "@arcblock/event-hub": "^1.26.2",
     "@arcblock/ipfs-only-hash": "^0.0.2",
-    "@arcblock/jwt": "1.25.6",
-    "@arcblock/ws": "1.25.6",
-    "@blocklet/constant": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@arcblock/jwt": "^1.26.2",
+    "@arcblock/ws": "^1.26.2",
+    "@blocklet/constant": "1.16.54-beta-20251021-070951-25e3083c",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@blocklet/meta": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@blocklet/resolver": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@blocklet/server-js": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@blocklet/store": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/images": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/meta": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/resolver": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/server-js": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/store": "1.16.54-beta-20251021-070951-25e3083c",
     "@blocklet/theme-builder": "^0.4.7",
-    "@ocap/client": "1.25.6",
-    "@ocap/mcrypto": "1.25.6",
-    "@ocap/util": "1.25.6",
-    "@ocap/wallet": "1.25.6",
+    "@ocap/client": "^1.26.2",
+    "@ocap/mcrypto": "^1.26.2",
+    "@ocap/util": "^1.26.2",
+    "@ocap/wallet": "^1.26.2",
     "@vercel/ncc": "^0.38.3",
     "archiver": "^7.0.1",
     "async": "^3.2.4",
@@ -154,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "78c11632ed47a75502a20c257568fc9e1655ca05",
+  "gitHead": "db517e9013dbad744e38883f56e4eba1fa1615c1",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"