@blocklet/cli 1.16.43-beta-20250505-062139-b156e7da → 1.16.43-beta-20250507-124320-c405ab23

package/lib/commands/blocklet/deploy.js

@@ -4,17 +4,13 @@ require('dotenv-flow').config({ silent: true, node_env: 'development' });
 const fs = require('fs');
 const path = require('path');
 const expandTilde = require('expand-tilde');
-const tar = require('tar');
 const chalk = require('chalk');
-const slugify = require('slugify');
 const { joinURL } = require('ufo');
 
 const { isValid: isValidDid, toAddress } = require('@arcblock/did');
 const Client = require('@abtnode/client');
 const hashFiles = require('@abtnode/util/lib/hash-files');
 const { default: axios } = require('axios');
-const isPathPrefixEqual = require('@abtnode/util/lib/is-path-prefix-equal');
-const getBlockletMeta = require('@blocklet/meta/lib/parse');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const { hasMountPoint } = require('@blocklet/meta/lib/engine');
 const { BLOCKLET_BUNDLE_FOLDER } = require('@blocklet/constant');
@@ -27,6 +23,7 @@ const makeFormData = require('@abtnode/util/lib/make-from-data');
 const { createConnect } = require('@blocklet/store');
 const open = require('open');
 const inquirer = require('inquirer');
+const { createRelease } = require('@abtnode/util/lib/create-blocklet-release');
 
 const Config = require('../../util/blocklet/config');
 const {
@@ -42,10 +39,23 @@ const { wrapSpinner } = require('../../ui');
 const { getNode } = require('../../node');
 const { checkRunning, deployManager } = require('../../manager');
 const { version } = require('../../../package.json');
-const debug = require('../../debug')('blocklet:deploy');
 
 const { signWithAccessKey, validateAccessKey } = Client;
-const { fileFilter, printDeployFileInfo } = deployManager;
+const { printDeployFileInfo } = deployManager;
+
+function getFilename(input) {
+  try {
+    if (input.startsWith('http://') || input.startsWith('https://') || input.startsWith('file://')) {
+      const url = new URL(input);
+      return path.basename(url.pathname);
+    }
+  } catch (err) {
+    // ignore invalid URL parsing
+  }
+
+  // 处理本地路径或文件名
+  return path.basename(input);
+}
 
 async function confirmOpenConnectPage(
   message = 'No access key found, do you need to open the connect page to generate access key?'
@@ -68,6 +78,32 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
     bundleDir = path.join(dir, BLOCKLET_BUNDLE_FOLDER);
   }
 
+  const releaseMetaPath = path.join(bundleDir, '..', 'release', 'blocklet.json');
+  if (!fs.existsSync(releaseMetaPath)) {
+    printInfo('No release found, create release...');
+    await createRelease(path.join(bundleDir, '..'));
+    if (!fs.existsSync(releaseMetaPath)) {
+      throw new Error('Failed to create release meta');
+    }
+  }
+
+  // get local blocklet meta
+  let localMeta;
+  try {
+    localMeta = JSON.parse(fs.readFileSync(releaseMetaPath, 'utf-8'));
+  } catch (error) {
+    throw new Error(`Get blocklet meta failed: ${error.message}`);
+  }
+  // build tarFile
+  const tarFile = path.join(bundleDir, '..', 'release', getFilename(localMeta.dist.tarball));
+  if (!fs.existsSync(tarFile)) {
+    printInfo('No release found, create release...');
+    await createRelease(path.join(bundleDir, '..'));
+    if (!fs.existsSync(releaseMetaPath)) {
+      throw new Error('Failed to create release meta');
+    }
+  }
+
   const rootDid = appDid || appId;
 
   const fullEndpoint = joinURL(endpoint, '/api/gql');
@@ -104,15 +140,6 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
     );
   }
 
-  // get local blocklet meta
-  let localMeta;
-  try {
-    localMeta = getBlockletMeta(bundleDir);
-  } catch (error) {
-    debug('get blocklet error', error);
-    throw new Error(`Get blocklet meta failed: ${error.message}`);
-  }
-
   printInfo(
     `Try to deploy ${chalk.cyan(`${localMeta.title}@${localMeta.version}`)} from`,
     `${chalk.cyan(bundleDir)} to ${chalk.cyan(app.meta.title)} in server ${chalk.cyan(endpoint)}.`
@@ -187,19 +214,7 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
     hasBlocklet: hasDiff,
     version: serverVersion,
   } = blockletDiff.blockletDiff || {};
-  const diffList = hasDiff ? [...addSet, ...changeSet] : null;
-
-  // if no diff and mountPoint not changed, stop deploy
-  if (hasDiff && localMeta.version === serverVersion && !addSet.length && !changeSet.length && !deleteSet.length) {
-    let needNotDeploy = true;
-    const child = app.children.find((x) => x.meta.did === localMeta.did);
-    needNotDeploy = isPathPrefixEqual(mountPoint, child.mountPoint);
 
-    if (needNotDeploy) {
-      print(`${localMeta.title}@${localMeta.version} already exists in ${app.meta.title}`);
-      return;
-    }
-  }
   printInfo(`Name: ${chalk.cyan(localMeta.name)}`);
   printInfo(`DID: ${chalk.cyan(localMeta.did)}`);
   printInfo(`Version: ${chalk.cyan(localMeta.version)}`);
@@ -210,22 +225,6 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
     printDeployFileInfo(Object.keys(files));
   }
 
-  // build tarFile
-  const tarFile = path.join(process.cwd(), `${slugify(localMeta.name)}-${localMeta.version}.tgz`);
-
-  await tar.c(
-    {
-      file: tarFile,
-      cwd: bundleDir,
-      filter: (f) =>
-        !diffList ||
-        fileFilter(f.replace(/^\.\//, ''), {
-          diffList,
-        }),
-    },
-    ['.']
-  );
-
   // do upload
   const { form } = makeFormData({
     tarFile,
@@ -235,6 +234,10 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
     deleteSet,
     mountPoint,
     rootDid,
+    dist: {
+      tarball: localMeta.dist.tarball,
+      integrity: localMeta.dist.integrity,
+    },
   });
   try {
     const timestamp = Date.now();
@@ -272,18 +275,12 @@ const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, m
       error.errors = res.data.errors;
       throw error;
     }
-    if (fs.existsSync(tarFile)) {
-      fs.unlinkSync(tarFile);
-    }
     printSuccess(
       `${chalk.cyan(localMeta.title)}@${chalk.cyan(localMeta.version)} was successfully deployed to ${chalk.cyan(
         app.meta.title
       )} in server ${chalk.cyan(endpoint)}.`
     );
   } catch (error) {
-    if (fs.existsSync(tarFile)) {
-      fs.unlinkSync(tarFile);
-    }
     throw new Error(`Blocklet deploy failed when uploading: ${formatGQLError(error)}`);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.43-beta-20250505-062139-b156e7da",
+  "version": "1.16.43-beta-20250507-124320-c405ab23",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,25 +35,25 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/client": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/constant": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/core": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/logger": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/router-provider": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/util": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/webapp": "1.16.43-beta-20250505-062139-b156e7da",
+    "@abtnode/blocklet-services": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/client": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/constant": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/core": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/logger": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/router-provider": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/util": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/webapp": "1.16.43-beta-20250507-124320-c405ab23",
     "@arcblock/did": "1.20.4",
     "@arcblock/event-hub": "1.20.4",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "1.20.4",
     "@arcblock/ws": "1.20.4",
-    "@blocklet/constant": "1.16.43-beta-20250505-062139-b156e7da",
+    "@blocklet/constant": "1.16.43-beta-20250507-124320-c405ab23",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.43-beta-20250505-062139-b156e7da",
-    "@blocklet/meta": "1.16.43-beta-20250505-062139-b156e7da",
-    "@blocklet/resolver": "1.16.43-beta-20250505-062139-b156e7da",
-    "@blocklet/store": "1.16.43-beta-20250505-062139-b156e7da",
+    "@blocklet/images": "1.16.43-beta-20250507-124320-c405ab23",
+    "@blocklet/meta": "1.16.43-beta-20250507-124320-c405ab23",
+    "@blocklet/resolver": "1.16.43-beta-20250507-124320-c405ab23",
+    "@blocklet/store": "1.16.43-beta-20250507-124320-c405ab23",
     "@blocklet/theme-builder": "^0.1.13",
     "@ocap/client": "1.20.4",
     "@ocap/mcrypto": "1.20.4",
@@ -152,7 +152,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "b1056718bbb5c25aef0cacc08d29762ebc420f66",
+  "gitHead": "4e5087dfaa52788676f313d23bfdd3ac68d63503",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"