@abtnode/core 1.16.45-beta-20250620-082630-c0c76051 → 1.16.45-beta-20250624-134945-a23c15fc

package/lib/blocklet/manager/disk.js

@@ -123,6 +123,7 @@ const {
   getUserAvatarUrl,
 } = require('@abtnode/auth/lib/util/federated');
 const toBlockletDid = require('@blocklet/meta/lib/did');
+const { updateComponentDid, removeUploadFile } = require('@abtnode/util/lib/upload-component');
 
 const groupBy = require('lodash/groupBy');
 const { isDidDomain, isCustomDomain } = require('@abtnode/util/lib/url-evaluation');
@@ -155,7 +156,6 @@ const {
   getConfigFromPreferences,
   validateAppConfig,
   checkDuplicateMountPoint,
-  validateStore,
   isRotatingAppSk,
   checkVersionCompatibility,
   updateBlockletFallbackLogo,
@@ -664,9 +664,16 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     if (url) {
-      const info = await states.node.read();
-      if (isInServerlessMode(info)) {
-        validateStore(info, url);
+      // 如果是 file 协议的 URI，那么就认为是上传的文件
+      const isUploadFile = url.startsWith('file://');
+      // 需要判断是否是上传的文件，如果是上传的文件，需要判断是否要更新 did,走升级的逻辑
+      // 不需要阻塞流程，如果失败了，就新建一个组件
+      try {
+        if (isUploadFile && did) {
+          await updateComponentDid(url, did);
+        }
+      } catch (error) {
+        logger.error('update component did failed', { error });
       }
 
       return installComponentFromUrl({
@@ -683,6 +690,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         states,
         manager: this,
         onlyRequired,
+        isUploadFile,
       });
     }
 
@@ -773,7 +781,7 @@ class DiskBlockletManager extends BaseBlockletManager {
               this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: [x] }, context)
           );
           await pAll(tasks, { concurrency: 4 }).catch((err) => {
-            throw new Error(err.errors.join(', '));
+            throw new Error(err.errors ? err.errors.join(', ') : err);
           });
         }
       }
@@ -2946,6 +2954,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       skipCheckStatusBeforeDownload,
       componentDids,
       skipCheckIntegrity,
+      shouldCleanUploadFile,
+      url,
     } = params;
     logger.info('_downloadAndInstall', { did: blocklet?.meta?.did });
     const { meta } = blocklet;
@@ -3131,6 +3141,8 @@ class DiskBlockletManager extends BaseBlockletManager {
             componentDids,
             context,
             action: postAction,
+            shouldCleanUploadFile,
+            url,
           });
 
           const newBlocklet = await this.getBlocklet(did);
@@ -4263,7 +4275,21 @@ class DiskBlockletManager extends BaseBlockletManager {
     logger.info('done migration on upgrading', { did, componentDids });
   }
 
-  async _upgradeBlocklet({ newBlocklet, oldBlocklet, componentDids, action, context = {} }) {
+  _cleanUploadFile(url) {
+    setTimeout(() => {
+      removeUploadFile(url);
+    }, 10000); // 10s 后删除上传的文件
+  }
+
+  async _upgradeBlocklet({
+    newBlocklet,
+    oldBlocklet,
+    componentDids,
+    action,
+    context = {},
+    shouldCleanUploadFile,
+    url,
+  }) {
     const { meta, source, deployedFrom, children } = newBlocklet;
     const { did, version, name } = meta;
     const title = getDisplayName(newBlocklet);
@@ -4386,6 +4412,10 @@ class DiskBlockletManager extends BaseBlockletManager {
           severity: 'success',
         });
 
+        if (shouldCleanUploadFile && url) {
+          this._cleanUploadFile(url);
+        }
+
         if (isInstallAction && process.env.NODE_ENV !== 'test') {
           this.start({ did, componentDids });
         }

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -35,6 +35,7 @@ const installComponentFromUrl = async ({
   manager,
   states,
   onlyRequired,
+  isUploadFile,
 }) => {
   const blocklet = await states.blocklet.getBlocklet(rootDid);
   if (!blocklet) {
@@ -115,6 +116,7 @@ const installComponentFromUrl = async ({
   let newChildren = filterDuplicateComponents(dynamicComponents, blocklet.children).map((x) => ({
     ...x,
     installedAt: x.installedAt || new Date(),
+    ...(isUploadFile ? { bundleSource: null } : {}),
   }));
 
   if (onlyRequired) {
@@ -164,6 +166,8 @@ const installComponentFromUrl = async ({
     addedComponentDids: componentDids,
     context,
     postAction: action,
+    shouldCleanUploadFile: isUploadFile,
+    url,
   };
 
   // backup rollback data

package/lib/blocklet/migration-dist/migration.cjs

@@ -568,7 +568,7 @@ module.exports = Object.freeze({
   DEFAULT_SERVICE_PATH: '/.abtnode/service',
   DEFAULT_HTTP_PORT: 80,
   DEFAULT_HTTPS_PORT: 443,
-  MAX_UPLOAD_FILE_SIZE: 500, // unit: MB
+  MAX_UPLOAD_FILE_SIZE: 100, // unit: MB
   DEFAULT_DAEMON_PORT: 8089,
   MAX_NGINX_WORKER_CONNECTIONS: 10240,
 

package/lib/blocklet/project/util.js

@@ -3,6 +3,7 @@ const fs = require('fs-extra');
 const fg = require('fast-glob');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { PROJECT, BLOCKLET_RESOURCE_DIR, BLOCKLET_META_FILE } = require('@blocklet/constant');
+const { hasHtmlFile } = require('@abtnode/util/lib/upload-component');
 const { expandBundle, APP_CONFIG_IMAGE_KEYS } = require('../../util');
 
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
@@ -206,11 +207,6 @@ const checkUploadExists = async (projectDir, action, releaseId, uploadedResource
     throw new Error('Only zip or gz archives are supported as resources.');
   }
 
-  const hasHtmlFile = (dir) => {
-    const files = ['index.html', 'index.htm'];
-    return files.some((file) => fs.existsSync(path.join(dir, file)));
-  };
-
   if (!hasHtmlFile(resourceDir)) {
     const entries = fs.readdirSync(resourceDir, { withFileTypes: true });
     const dirs = entries.filter((e) => e.isDirectory());

package/lib/blocklet/storage/utils/zip.js

@@ -1,41 +1,4 @@
-const archiver = require('archiver');
-const { ensureDirSync, existsSync, removeSync, createWriteStream } = require('fs-extra');
-const { dirname } = require('path');
-const StreamZip = require('node-stream-zip');
-
-/**
- *
- *
- * @param {string} source ~/abc/ 通常是一个文件夹
- * @param {string} target abc.zip 压缩包的名称
- * @return {*}
- */
-function dirToZip(source, target) {
-  return new Promise((resolve, reject) => {
-    ensureDirSync(dirname(target));
-
-    if (existsSync(target)) {
-      removeSync(target);
-    }
-
-    const output = createWriteStream(target);
-    const archive = archiver('zip', { level: 9 });
-    archive.on('error', (err) => reject(err));
-    output.on('close', () => resolve());
-
-    archive.directory(source, false);
-
-    archive.pipe(output);
-    archive.finalize();
-  });
-}
-
-async function zipToDir(source, target) {
-  // eslint-disable-next-line new-cap
-  const zip = new StreamZip.async({ file: source });
-  await zip.extract(null, target);
-  await zip.close();
-}
+const { dirToZip, zipToDir } = require('@abtnode/util/lib/zip');
 
 module.exports = {
   dirToZip,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.45-beta-20250620-082630-c0c76051",
+  "version": "1.16.45-beta-20250624-134945-a23c15fc",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/auth": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/certificate-manager": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/client": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/constant": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/cron": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/db-cache": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/docker-utils": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/logger": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/models": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/queue": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/rbac": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/router-provider": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/static-server": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/timemachine": "1.16.45-beta-20250620-082630-c0c76051",
-    "@abtnode/util": "1.16.45-beta-20250620-082630-c0c76051",
+    "@abtnode/analytics": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/auth": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/certificate-manager": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/client": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/constant": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/cron": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/db-cache": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/docker-utils": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/logger": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/models": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/queue": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/rbac": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/router-provider": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/static-server": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/timemachine": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@abtnode/util": "1.16.45-beta-20250624-134945-a23c15fc",
     "@arcblock/did": "1.20.14",
     "@arcblock/did-auth": "1.20.14",
     "@arcblock/did-ext": "1.20.14",
@@ -45,14 +45,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.14",
     "@arcblock/vc": "1.20.14",
-    "@blocklet/constant": "1.16.45-beta-20250620-082630-c0c76051",
+    "@blocklet/constant": "1.16.45-beta-20250624-134945-a23c15fc",
     "@blocklet/did-space-js": "^1.0.62",
-    "@blocklet/env": "1.16.45-beta-20250620-082630-c0c76051",
+    "@blocklet/env": "1.16.45-beta-20250624-134945-a23c15fc",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.45-beta-20250620-082630-c0c76051",
-    "@blocklet/resolver": "1.16.45-beta-20250620-082630-c0c76051",
-    "@blocklet/sdk": "1.16.45-beta-20250620-082630-c0c76051",
-    "@blocklet/store": "1.16.45-beta-20250620-082630-c0c76051",
+    "@blocklet/meta": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@blocklet/resolver": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@blocklet/sdk": "1.16.45-beta-20250624-134945-a23c15fc",
+    "@blocklet/store": "1.16.45-beta-20250624-134945-a23c15fc",
     "@blocklet/theme": "^2.13.70",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.14",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "70151f84be54392ce491a1f40976e533286d06b8"
+  "gitHead": "3b56a1dbe3fea9df0d6b644a1821afae9b376ee8"
 }