@abtnode/core 1.16.29-beta-8671c2cf → 1.16.29-beta-1fb308f8

package/lib/blocklet/project/publish-to-store.js

@@ -2,6 +2,7 @@ const path = require('path');
 const { PROJECT } = require('@blocklet/constant');
 const { upload } = require('@blocklet/store');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
+const fs = require('fs/promises');
 
 function ensureArray(value) {
   if (!value) {
@@ -18,6 +19,37 @@ function getReleaseDir(blocklet, projectId, releaseId) {
   return path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
 }
 
+const MAX_RETRIES = 5;
+const RETRY_DELAY = 100;
+
+// 利用乐观锁, 去更新字段, 如果连续5次都失败, 就算更新失败
+async function updateReleaseWithRetry(releaseState, releaseId, projectId, storeId) {
+  // eslint-disable-next-line no-unused-vars
+  for (const _ of Array(MAX_RETRIES).fill(0)) {
+    // eslint-disable-next-line no-await-in-loop
+    const release = await releaseState.findOne({ projectId, id: releaseId });
+    release.publishedStoreIds = ensureArray(release.publishedStoreIds);
+    release.publishedStoreIds.push(storeId);
+
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const result = await releaseState.update(
+        { id: releaseId, updatedAt: release.updatedAt },
+        { $set: { publishedStoreIds: Array.from(new Set(release.publishedStoreIds)) } }
+      );
+      if (result?.[0] > 0) {
+        return true;
+      }
+      // eslint-disable-next-line no-await-in-loop
+      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY));
+    } catch (error) {
+      throw new Error(`Failed to update release: ${error.message}`);
+    }
+  }
+
+  throw new Error('Failed to update release after maximum retries');
+}
+
 const publishToStore = async ({ did, projectId, releaseId, type, storeId, manager }) => {
   if (
     !did ||
@@ -42,6 +74,7 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
   if (!store) {
     throw new Error('no find connected store');
   }
+
   const { storeUrl } = store;
   const { accessToken, developerDid } = store;
 
@@ -50,7 +83,12 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     throw new Error('blocklet not found');
   }
 
-  const releaseDir = getReleaseDir(blocklet, projectId, releaseId);
+  const project = await projectState.findOne({ id: projectId });
+  let releaseDir = getReleaseDir(blocklet, projectId, releaseId);
+  if (project.possibleSameStore) {
+    await fs.cp(releaseDir, `${releaseDir}-${storeId}`, { recursive: true });
+    releaseDir = `${releaseDir}-${storeId}`;
+  }
   const metaFile = path.join(releaseDir, '.blocklet', 'release', 'blocklet.json');
 
   const response = await upload({
@@ -58,16 +96,11 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     storeUrl,
     accessToken,
     developerDid,
+    possibleSameStore: project.possibleSameStore,
     source: `Blocklet Studio (${getDisplayName(blocklet)})`,
   });
 
-  release.publishedStoreIds = ensureArray(release.publishedStoreIds);
-  release.publishedStoreIds.push(storeId);
-
-  await releaseState.update(
-    { id: releaseId },
-    { $set: { publishedStoreIds: Array.from(new Set(release.publishedStoreIds)) } }
-  );
+  await updateReleaseWithRetry(releaseState, releaseId, projectId, storeId);
 
   return response?.status;
 };

package/lib/crons/monitor-disk-usage.js

@@ -11,14 +11,14 @@ const check = async (threshold) => {
   for (const disk of disks) {
     const usageRatio = (disk.used / disk.total) * 100;
     if (Number.isNaN(usageRatio)) {
-      return;
+      continue;
     }
 
     const usageRatioPercent = `${usageRatio.toFixed(2)}%`;
     logger.info('check disk usage', { usage: usageRatioPercent, threshold });
 
     if (usageRatio < threshold) {
-      return;
+      continue;
     }
 
     // eslint-disable-next-line no-await-in-loop

package/lib/states/project.js

@@ -79,6 +79,8 @@ class Project extends BaseState {
         'lastReleaseId',
         'lastReleaseFiles',
         'connectedStores',
+        'autoUpload',
+        'possibleSameStore',
       ]),
       (x) => !isUndefinedOrNull(x)
     );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-8671c2cf",
+  "version": "1.16.29-beta-1fb308f8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.29-beta-8671c2cf",
-    "@abtnode/auth": "1.16.29-beta-8671c2cf",
-    "@abtnode/certificate-manager": "1.16.29-beta-8671c2cf",
-    "@abtnode/constant": "1.16.29-beta-8671c2cf",
-    "@abtnode/cron": "1.16.29-beta-8671c2cf",
-    "@abtnode/logger": "1.16.29-beta-8671c2cf",
-    "@abtnode/models": "1.16.29-beta-8671c2cf",
-    "@abtnode/queue": "1.16.29-beta-8671c2cf",
-    "@abtnode/rbac": "1.16.29-beta-8671c2cf",
-    "@abtnode/router-provider": "1.16.29-beta-8671c2cf",
-    "@abtnode/static-server": "1.16.29-beta-8671c2cf",
-    "@abtnode/timemachine": "1.16.29-beta-8671c2cf",
-    "@abtnode/util": "1.16.29-beta-8671c2cf",
+    "@abtnode/analytics": "1.16.29-beta-1fb308f8",
+    "@abtnode/auth": "1.16.29-beta-1fb308f8",
+    "@abtnode/certificate-manager": "1.16.29-beta-1fb308f8",
+    "@abtnode/constant": "1.16.29-beta-1fb308f8",
+    "@abtnode/cron": "1.16.29-beta-1fb308f8",
+    "@abtnode/logger": "1.16.29-beta-1fb308f8",
+    "@abtnode/models": "1.16.29-beta-1fb308f8",
+    "@abtnode/queue": "1.16.29-beta-1fb308f8",
+    "@abtnode/rbac": "1.16.29-beta-1fb308f8",
+    "@abtnode/router-provider": "1.16.29-beta-1fb308f8",
+    "@abtnode/static-server": "1.16.29-beta-1fb308f8",
+    "@abtnode/timemachine": "1.16.29-beta-1fb308f8",
+    "@abtnode/util": "1.16.29-beta-1fb308f8",
     "@arcblock/did": "1.18.126",
     "@arcblock/did-auth": "1.18.126",
     "@arcblock/did-ext": "^1.18.126",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.126",
     "@arcblock/vc": "1.18.126",
-    "@blocklet/constant": "1.16.29-beta-8671c2cf",
-    "@blocklet/env": "1.16.29-beta-8671c2cf",
-    "@blocklet/meta": "1.16.29-beta-8671c2cf",
-    "@blocklet/resolver": "1.16.29-beta-8671c2cf",
-    "@blocklet/sdk": "1.16.29-beta-8671c2cf",
-    "@blocklet/store": "1.16.29-beta-8671c2cf",
-    "@did-space/client": "^0.5.8",
+    "@blocklet/constant": "1.16.29-beta-1fb308f8",
+    "@blocklet/env": "1.16.29-beta-1fb308f8",
+    "@blocklet/meta": "1.16.29-beta-1fb308f8",
+    "@blocklet/resolver": "1.16.29-beta-1fb308f8",
+    "@blocklet/sdk": "1.16.29-beta-1fb308f8",
+    "@blocklet/store": "1.16.29-beta-1fb308f8",
+    "@did-space/client": "^0.5.12",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.126",
     "@ocap/util": "1.18.126",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "67207cc32f2cdf4ab8af39d4083ad61fba9711e2"
+  "gitHead": "1bf1d605a02f4df2789215e6e9518a62b1c3f806"
 }