@abtnode/core 1.17.6-beta-20251219-223941-3837ecdf → 1.17.6

package/lib/blocklet/downloader/resolve-download.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs-extra');
 const { Throttle } = require('stream-throttle');
-
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const { BLOCKLET_BUNDLE_FOLDER } = require('@blocklet/constant');
 
 const defaultLogger = require('@abtnode/logger')('@abtnode/core:resolve-download');
@@ -12,6 +12,12 @@ const { ensureBlockletExpanded, expandTarball, getBundleDir } = require('../../u
 
 const asyncFs = fs.promises;
 
+const removeLock = new DBCache(() => ({
+  prefix: 'resolve-download-lock',
+  ttl: 1000 * 60 * 5,
+  ...getAbtNodeRedisAndSQLiteUrl(),
+}));
+
 /**
  * decompress file, format dir and move to installDir
  * @param {string} src file
@@ -73,22 +79,28 @@ const resolveDownload = async (
     if (typeof onProgress === 'function') {
       onProgress({ name: 'blocklet.zip' });
     }
+    installDir = getBundleDir(distDir, meta);
+    await removeLock.acquire(installDir);
+
     await ensureBlockletExpanded(meta, downloadDir);
 
-    installDir = getBundleDir(distDir, meta);
     if (fs.existsSync(installDir)) {
-      fs.removeSync(installDir);
+      await fs.remove(installDir);
       logger.info('cleanup blocklet upgrade dir', { name, version, installDir });
     }
 
-    fs.mkdirSync(installDir, { recursive: true });
-
+    // 确保父目录存在，但不创建目标目录本身
+    await fs.ensureDir(path.dirname(installDir));
     logger.info('Move downloadDir to installDir with full', { downloadDir, installDir, dist: meta.dist });
-    await fs.move(downloadDir, installDir, { overwrite: true });
+    await fs.move(downloadDir, installDir, { overwrite: true, recursive: true });
   } catch (error) {
-    fs.removeSync(downloadDir);
-    fs.removeSync(tmp);
+    await fs.remove(downloadDir);
+    await fs.remove(tmp);
     throw error;
+  } finally {
+    if (installDir) {
+      await removeLock.releaseLock(installDir);
+    }
   }
 
   return { meta, installDir };
@@ -124,6 +136,7 @@ const resolveDiffDownload = async (
   }
   logger.info('Copy installDir to downloadDir', { installDir: distDir, downloadDir });
   await fs.copy(getBundleDir(distDir, oldMeta), downloadDir);
+  let installDir;
   try {
     // delete
     logger.info('Delete files from downloadDir', { fileNum: deleteSet.length });
@@ -148,23 +161,26 @@ const resolveDiffDownload = async (
       }
     };
     await walkDiff(diffDir);
-    fs.removeSync(baseDiffDir);
+    await fs.remove(baseDiffDir);
     const meta = getBlockletMeta(downloadDir);
     if (dist?.integrity) {
       meta.dist = dist;
     }
 
+    installDir = getBundleDir(distDir, meta);
+    await removeLock.acquire(installDir);
     await ensureBlockletExpanded(meta, downloadDir);
-
     // move to installDir
-    const installDir = getBundleDir(distDir, meta);
     logger.info('Move downloadDir to installDir with diff', { downloadDir, installDir });
-    await fs.move(downloadDir, installDir, { overwrite: true });
+    await fs.move(downloadDir, installDir, { overwrite: true, recursive: true });
 
     return { meta, installDir };
   } catch (error) {
-    fs.removeSync(downloadDir);
-    fs.removeSync(diffDir);
+    if (installDir) {
+      await removeLock.releaseLock(installDir);
+    }
+    await fs.remove(downloadDir);
+    await fs.remove(diffDir);
     throw error;
   }
 };

package/lib/util/blocklet.js

@@ -602,10 +602,10 @@ const ensureBlockletExpanded = async (_meta, appDir) => {
     try {
       const nodeModulesPath = path.join(appDir, 'node_modules');
       if (fs.existsSync(nodeModulesPath)) {
-        fs.removeSync(nodeModulesPath);
+        await fs.remove(nodeModulesPath);
       }
       await expandBundle(bundlePath, appDir);
-      fs.removeSync(bundlePath);
+      await fs.remove(bundlePath);
     } catch (err) {
       throw new Error(`Failed to expand blocklet bundle: ${err.message}`);
     }

package/lib/util/install-external-dependencies.js

@@ -33,7 +33,7 @@ async function installExternalDependencies({ appDir, forceInstall = false, nodeI
   }
 
   if (!(await isSameOs(appDir, isUseDocker))) {
-    fs.removeSync(path.join(appDir, 'node_modules'), { recursive: true, force: true });
+    await fs.remove(path.join(appDir, 'node_modules'));
   }
 
   const isNeedInstall = forceInstall || externals.some((dependency) => !isDependencyInstalled(appDir, dependency));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.6-beta-20251219-223941-3837ecdf",
+  "version": "1.17.6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/auth": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/certificate-manager": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/constant": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/cron": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/db-cache": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/docker-utils": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/logger": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/models": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/queue": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/rbac": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/router-provider": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/static-server": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/timemachine": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@abtnode/util": "1.17.6-beta-20251219-223941-3837ecdf",
+    "@abtnode/analytics": "1.17.6",
+    "@abtnode/auth": "1.17.6",
+    "@abtnode/certificate-manager": "1.17.6",
+    "@abtnode/constant": "1.17.6",
+    "@abtnode/cron": "1.17.6",
+    "@abtnode/db-cache": "1.17.6",
+    "@abtnode/docker-utils": "1.17.6",
+    "@abtnode/logger": "1.17.6",
+    "@abtnode/models": "1.17.6",
+    "@abtnode/queue": "1.17.6",
+    "@abtnode/rbac": "1.17.6",
+    "@abtnode/router-provider": "1.17.6",
+    "@abtnode/static-server": "1.17.6",
+    "@abtnode/timemachine": "1.17.6",
+    "@abtnode/util": "1.17.6",
     "@aigne/aigne-hub": "^0.10.15",
     "@arcblock/did": "^1.27.15",
     "@arcblock/did-connect-js": "^1.27.15",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.15",
     "@arcblock/vc": "^1.27.15",
-    "@blocklet/constant": "1.17.6-beta-20251219-223941-3837ecdf",
+    "@blocklet/constant": "1.17.6",
     "@blocklet/did-space-js": "^1.2.11",
-    "@blocklet/env": "1.17.6-beta-20251219-223941-3837ecdf",
+    "@blocklet/env": "1.17.6",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/meta": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@blocklet/resolver": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@blocklet/sdk": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@blocklet/server-js": "1.17.6-beta-20251219-223941-3837ecdf",
-    "@blocklet/store": "1.17.6-beta-20251219-223941-3837ecdf",
+    "@blocklet/meta": "1.17.6",
+    "@blocklet/resolver": "1.17.6",
+    "@blocklet/sdk": "1.17.6",
+    "@blocklet/server-js": "1.17.6",
+    "@blocklet/store": "1.17.6",
     "@blocklet/theme": "^3.2.19",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.15",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6013a0f60801a19241c950b9705bfd14d038df74"
+  "gitHead": "3366c1dcc98d15a6ceff0502f65bf809d7880fb4"
 }