@blocklet/cli 1.16.43-beta-20250422-042711-c40bec75 → 1.16.43-beta-20250425-130658-8da18f4d

package/lib/commands/blocklet/deploy.js

@@ -5,7 +5,6 @@ const fs = require('fs');
 const path = require('path');
 const expandTilde = require('expand-tilde');
 const tar = require('tar');
-const FormData = require('form-data');
 const chalk = require('chalk');
 const slugify = require('slugify');
 const { joinURL } = require('ufo');
@@ -21,8 +20,9 @@ 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 { ROLES, WELLKNOWN_SERVICE_PATH_PREFIX, WELLKNOWN_DID_RESOLVER_PREFIX } = require('@abtnode/constant');
-const { getDidDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-blocklet');
+const { ROLES, WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const ensureServerEndpoint = require('@abtnode/util/lib/ensure-server-endpoint');
+const makeFormData = require('@abtnode/util/lib/make-from-data');
 
 const { createConnect } = require('@blocklet/store');
 const open = require('open');
@@ -47,8 +47,6 @@ const debug = require('../../debug')('blocklet:deploy');
 const { signWithAccessKey, validateAccessKey } = Client;
 const { fileFilter, printDeployFileInfo } = deployManager;
 
-const BLOCKLET_JSON_PATH = '__blocklet__.js?type=json';
-
 async function confirmOpenConnectPage(
   message = 'No access key found, do you need to open the connect page to generate access key?'
 ) {
@@ -64,64 +62,6 @@ async function confirmOpenConnectPage(
   return isOpenConnectPage;
 }
 
-const makeFormData = ({ tarFile: file, hasDiff, did, serverVersion, deleteSet, rootDid, mountPoint }) => {
-  let varFields = hasDiff
-    ? '$file: Upload!, $did: String, $diffVersion: String, $deleteSet: [String!]'
-    : '$file: Upload!';
-  let inputFields = hasDiff
-    ? 'file: $file, did: $did, diffVersion: $diffVersion, deleteSet: $deleteSet'
-    : 'file: $file';
-
-  varFields = `${varFields}, $rootDid: String, $mountPoint: String`;
-  inputFields = `${inputFields}, rootDid: $rootDid, mountPoint: $mountPoint`;
-
-  const variables = hasDiff
-    ? {
-        file: null,
-        did,
-        diffVersion: serverVersion,
-        deleteSet,
-      }
-    : {
-        file: null,
-      };
-
-  variables.rootDid = rootDid;
-  variables.mountPoint = mountPoint;
-
-  const apiName = 'installComponent';
-  const query = `
-    mutation (${varFields}) {
-      ${apiName}(input: { ${inputFields} } ) {
-        code
-        blocklet {
-          meta {
-            did
-            name
-            title
-            version
-            description
-          }
-          status
-          source
-        }
-      }
-    }
-  `;
-  const gql = {
-    query,
-    variables,
-  };
-  const map = {
-    file0: ['variables.file'],
-  };
-  const form = new FormData();
-  form.append('operations', JSON.stringify(gql));
-  form.append('map', JSON.stringify(map));
-  form.append('file0', fs.createReadStream(file));
-  return { form, apiName };
-};
-
 const deploy = async (dir, { endpoint, accessKey, accessSecret, appDid, appId, mountPoint: inputMountPoint }) => {
   let bundleDir = dir;
   if (fs.existsSync(path.join(dir, BLOCKLET_BUNDLE_FOLDER))) {
@@ -439,7 +379,7 @@ const createConnectForGenerateAccessKey = async (dir, opts) => {
     enableEncrypt: true,
     wrapSpinner,
     openPage: open,
-    source: 'Generate Access Key',
+    source: 'connect to blocklet cli',
     prettyUrl: (url) => chalk.cyan(url),
   });
 
@@ -496,51 +436,6 @@ const checkLocalAccessKey = async (dir, opts) => {
   }
 };
 
-const ensureServerEndpoint = async (endpoint) => {
-  let serverBaseUrl;
-  let appPid;
-
-  const jsonPathUrl = joinURL(new URL(endpoint).origin, BLOCKLET_JSON_PATH);
-
-  const checkEndpoint = await axios(jsonPathUrl).catch(() => null);
-  const contentType = checkEndpoint && checkEndpoint.headers['content-type'];
-  if (contentType?.includes('application/json')) {
-    const url = getDidDomainForBlocklet({ did: checkEndpoint.data.serverDid });
-    // service endpoint
-    serverBaseUrl = new URL(`https://${url}`).origin;
-    appPid = checkEndpoint.data.appPid;
-  } else {
-    // maybe server endpoint
-    serverBaseUrl = new URL(endpoint).origin;
-    appPid = '';
-  }
-
-  if (!serverBaseUrl) {
-    throw new Error('Invalid endpoint');
-  }
-
-  // local debug
-  if (serverBaseUrl.includes('localhost:3000')) {
-    return {
-      endpoint: serverBaseUrl,
-      appPid,
-    };
-  }
-
-  const didJsonUrl = joinURL(serverBaseUrl, WELLKNOWN_DID_RESOLVER_PREFIX);
-  const didJson = await axios(didJsonUrl);
-
-  const didJsonContentType = didJson.headers['content-type'];
-  if (!didJsonContentType.includes('application/json')) {
-    throw new Error('Invalid endpoint');
-  }
-
-  return {
-    endpoint: joinURL(serverBaseUrl, didJson?.data?.services?.[0]?.path),
-    appPid,
-  };
-};
-
 const verifyEndpoint = async (opts) => {
   const { endpoint, appPid } = await ensureServerEndpoint(opts.endpoint);
   opts.connectEndpoint = opts.endpoint;

package/lib/manager/deploy.js

@@ -1,59 +1,8 @@
 const chalk = require('chalk');
-const { minimatch } = require('minimatch');
+const { fileFilter, checkMatch } = require('@abtnode/util/lib/check-file');
 
 const { print, printInfo } = require('../util');
 
-const checkMatch = (file, match) => {
-  let m = match;
-  if (!m.includes('*')) {
-    return false;
-  }
-  if (!m.endsWith('*')) {
-    return minimatch(file, m);
-  }
-  if (!m.endsWith('**')) {
-    m = `${m}*`;
-  }
-
-  return minimatch(file, m);
-};
-
-const checkInclude = (list, f) =>
-  f === '.' ||
-  f === '' || // root folder maybe '.' and ''
-  list.some(
-    (x) =>
-      x.indexOf(f) === 0 || // f is 'website' && x is 'website/public'
-      f.indexOf(x) === 0 || // f is website/public/index.html && x is website/public
-      checkMatch(f, x) // f is hooks/pre-start.js && x is hooks/*
-  );
-
-/**
- * Whether a file should be deployed
- * @param {string} file a file will be deployed
- * @param {object} opts
- * @param {array<string>} opts.diffList
- * @param {BundleType} opts.bundleType
- * @param {array<string>} opts.staticList
- * @return {boolean} Should this file be deployed
- */
-const fileFilter = (file, opts = {}) => {
-  const { diffList, bundleType, staticList } = opts;
-  // only include diffList if has one
-  if (diffList) {
-    return checkInclude(diffList, file);
-  }
-  // only include staticList if bundleType is static
-  if (bundleType === 'static') {
-    if (!staticList) {
-      throw new Error('staticList should not be empty when bundleType is static');
-    }
-    return checkInclude(staticList, file);
-  }
-  // include all files
-  return true;
-};
-
 const printDeployFileInfo = (adds, changes, deletes) => {
   const padLeft = '  - ';
   printInfo(`Added Files: ${chalk.cyan(adds.length)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.43-beta-20250422-042711-c40bec75",
+  "version": "1.16.43-beta-20250425-130658-8da18f4d",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,30 +35,30 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/client": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/constant": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/core": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/logger": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/router-provider": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/util": "1.16.43-beta-20250422-042711-c40bec75",
-    "@abtnode/webapp": "1.16.43-beta-20250422-042711-c40bec75",
-    "@arcblock/did": "1.20.1",
-    "@arcblock/event-hub": "1.20.1",
+    "@abtnode/blocklet-services": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/client": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/constant": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/core": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/logger": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/router-provider": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/util": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@abtnode/webapp": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@arcblock/did": "1.20.2",
+    "@arcblock/event-hub": "1.20.2",
     "@arcblock/ipfs-only-hash": "^0.0.2",
-    "@arcblock/jwt": "1.20.1",
-    "@arcblock/ws": "1.20.1",
-    "@blocklet/constant": "1.16.43-beta-20250422-042711-c40bec75",
+    "@arcblock/jwt": "1.20.2",
+    "@arcblock/ws": "1.20.2",
+    "@blocklet/constant": "1.16.43-beta-20250425-130658-8da18f4d",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.43-beta-20250422-042711-c40bec75",
-    "@blocklet/meta": "1.16.43-beta-20250422-042711-c40bec75",
-    "@blocklet/resolver": "1.16.43-beta-20250422-042711-c40bec75",
-    "@blocklet/store": "1.16.43-beta-20250422-042711-c40bec75",
+    "@blocklet/images": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@blocklet/meta": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@blocklet/resolver": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@blocklet/store": "1.16.43-beta-20250425-130658-8da18f4d",
     "@blocklet/theme-builder": "^0.1.11",
-    "@ocap/client": "1.20.1",
-    "@ocap/mcrypto": "1.20.1",
-    "@ocap/util": "1.20.1",
-    "@ocap/wallet": "1.20.1",
+    "@ocap/client": "1.20.2",
+    "@ocap/mcrypto": "1.20.2",
+    "@ocap/util": "1.20.2",
+    "@ocap/wallet": "1.20.2",
     "@vercel/ncc": "^0.38.3",
     "archiver": "^7.0.1",
     "async": "^3.2.4",
@@ -152,7 +152,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "836a400c1f953f421a8e95dc9a32ba883ac2586d",
+  "gitHead": "b5195a0290d5ced00bb716a709548b1a56356134",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"