@abtnode/core 1.16.25 → 1.16.26-beta-c724c8e6

package/lib/api/team.js

@@ -1345,6 +1345,13 @@ class TeamAPI extends EventEmitter {
       throw new Error(`Blocklet registry does not exist: ${sanitized}`);
     }
 
+    const settings = await this.states.blockletExtras.getSettings(teamDid);
+
+    if (settings?.connectedStores?.length) {
+      settings.connectedStores = settings.connectedStores.filter((x) => x.storeUrl !== sanitized);
+      await this.states.blockletExtras.setSettings(teamDid, settings);
+    }
+
     return this.teamManager.updateStoreList(
       teamDid,
       storeList.filter((x) => x.url !== sanitized)

package/lib/blocklet/manager/disk.js

@@ -198,6 +198,8 @@ const {
   deleteRelease,
   getSelectedResources,
   updateSelectedResources,
+  connectToStore,
+  publishToStore,
 } = require('../project');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
@@ -2349,6 +2351,14 @@ class DiskBlockletManager extends BaseBlockletManager {
     return deleteRelease({ did, projectId, releaseId, manager: this });
   }
 
+  connectToStore(params) {
+    return connectToStore({ ...params, manager: this, blockletExtras: states.blockletExtras });
+  }
+
+  publishToStore(params) {
+    return publishToStore({ ...params, manager: this, blockletExtras: states.blockletExtras });
+  }
+
   getSelectedResources({ did, projectId, releaseId, componentDid } = {}) {
     return getSelectedResources({ did, projectId, releaseId, componentDid, manager: this });
   }

package/lib/blocklet/manager/helper/migrate-application-to-struct-v2.js

@@ -33,7 +33,7 @@ const {
 } = require('@blocklet/constant');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const getBlockletWallet = require('@blocklet/meta/lib/wallet');
-const { cloneDeep } = require('lodash');
+const cloneDeep = require('lodash/cloneDeep');
 
 const { getBlockletDomainGroupName } = require('../../../util/router');
 const { getIpDnsDomainForBlocklet } = require('../../../util/get-domain-for-blocklet');

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

@@ -0,0 +1,69 @@
+const validUrl = require('valid-url');
+
+const { createConnect } = require('@blocklet/store');
+const { BlockletEvents } = require('@blocklet/constant');
+
+const connectToStore = async ({ did, storeName, storeId, storeUrl, blockletExtras, manager }) => {
+  if (!did) {
+    throw new Error('Invalid did');
+  }
+  // 校验是否为合法的url地址（必须是 http 或 https 协议）,例如：https://store.blocklet.dev/
+  if (!validUrl.isWebUri(storeUrl)) {
+    throw new Error('Invalid store url:', storeUrl);
+  }
+  const settings = await blockletExtras.getSettings(did);
+
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    try {
+      const fetchData = await createConnect({
+        connectUrl: storeUrl,
+        connectAction: 'connect-cli',
+        enableEncrypt: true,
+        openPage: (pageUrl) => {
+          resolve(pageUrl);
+        },
+      });
+      const { secretKey, developerDid, name, email } = fetchData;
+      if (!settings.connectedStores) {
+        settings.connectedStores = [];
+      }
+
+      const nextStore = {
+        storeId,
+        storeName,
+        storeUrl,
+        accessToken: secretKey,
+        developerDid,
+        developerName: name,
+        developerEmail: email,
+      };
+
+      const oldStore = settings.connectedStores.find((x) => x.storeUrl === storeUrl);
+      if (oldStore) {
+        Object.assign(oldStore, nextStore);
+      } else {
+        settings.connectedStores.push(nextStore);
+      }
+
+      await blockletExtras.setSettings(did, settings);
+
+      await manager.teamManager.createNotification({
+        teamDid: did,
+        title: `Connected ${storeName} successfully`,
+        description: `You can publish your blocklet to ${storeName} now`,
+        entityType: 'blocklet',
+        entityId: did,
+        severity: 'success',
+      });
+
+      manager.emit(BlockletEvents.updated, {
+        meta: { did },
+      });
+    } catch (error) {
+      reject(error);
+    }
+  });
+};
+
+module.exports = connectToStore;

package/lib/blocklet/project/create-pack-release.js

@@ -91,6 +91,7 @@ const createPackRelease = async ({
 
   const release = await releaseState.upsertRelease({
     ...params,
+    publishedStoreIds: [],
     projectId,
     releaseId,
     status,

package/lib/blocklet/project/index.js

@@ -15,6 +15,8 @@ const { createReleaseSchema } = require('../../validators/project');
 
 const { getLogoFile, exportBlockletResources, getResourceList, checkResourceExists } = require('./util');
 const createPackRelease = require('./create-pack-release');
+const connectToStore = require('./connect-to-store');
+const publishToStore = require('./publish-to-store');
 
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
@@ -199,6 +201,7 @@ const createRelease = async ({
 
   const release = await releaseState.upsertRelease({
     ...params,
+    publishedStoreIds: [],
     projectId,
     releaseId,
     status,
@@ -410,4 +413,6 @@ module.exports = {
   deleteRelease,
   getSelectedResources,
   updateSelectedResources,
+  connectToStore,
+  publishToStore,
 };

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

@@ -0,0 +1,78 @@
+const path = require('path');
+const { PROJECT } = require('@blocklet/constant');
+const { upload } = require('@blocklet/store');
+
+function ensureArray(value) {
+  if (!value) {
+    return [];
+  }
+  if (typeof value === 'string') {
+    return JSON.parse(value);
+  }
+  return value;
+}
+
+function getReleaseDir(blocklet, projectId, releaseId) {
+  const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${projectId}`);
+  return path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
+}
+
+const publishToStore = async ({ did, projectId, releaseId, type, storeId, manager, blockletExtras }) => {
+  if (
+    !did ||
+    !projectId ||
+    !releaseId ||
+    !type ||
+    !storeId ||
+    typeof projectId !== 'string' ||
+    typeof releaseId !== 'string'
+  ) {
+    throw new Error('params is failed');
+  }
+
+  const { releaseState } = await manager._getProjectState(did);
+
+  const release = await releaseState.findOne({ projectId, id: releaseId });
+  if (!release) {
+    throw new Error('release not found');
+  }
+
+  const settings = await blockletExtras.getSettings(did);
+
+  if (!settings.connectedStores) {
+    throw new Error('no connected stores');
+  }
+  const store = settings.connectedStores.find((x) => x.storeId === storeId);
+  if (!store) {
+    throw new Error('no connected stores');
+  }
+  const { storeUrl } = store;
+  const { accessToken, developerDid } = store;
+
+  const blocklet = await manager.getBlocklet(did);
+  if (!blocklet) {
+    throw new Error('blocklet not found');
+  }
+
+  const releaseDir = getReleaseDir(blocklet, projectId, releaseId);
+  const metaFile = path.join(releaseDir, '.blocklet', 'release', 'blocklet.json');
+
+  const response = await upload({
+    metaFile,
+    storeUrl,
+    accessToken,
+    developerDid,
+  });
+
+  release.publishedStoreIds = ensureArray(release.publishedStoreIds);
+  release.publishedStoreIds.push(storeId);
+
+  await releaseState.update(
+    { id: releaseId },
+    { $set: { publishedStoreIds: Array.from(new Set(release.publishedStoreIds)) } }
+  );
+
+  return response?.status;
+};
+
+module.exports = publishToStore;

package/lib/blocklet/storage/backup/blocklet-extras.js

@@ -1,5 +1,6 @@
 const { readFileSync, outputJson } = require('fs-extra');
-const { isEmpty, cloneDeep } = require('lodash');
+const isEmpty = require('lodash/isEmpty');
+const cloneDeep = require('lodash/cloneDeep');
 const { join } = require('path');
 const security = require('@abtnode/util/lib/security');
 

package/lib/blocklet/storage/backup/blocklet.js

@@ -1,5 +1,5 @@
 const { outputJson, createWriteStream, createReadStream, ensureDir } = require('fs-extra');
-const { cloneDeep } = require('lodash');
+const cloneDeep = require('lodash/cloneDeep');
 const { join, basename, dirname } = require('path');
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 const isEmpty = require('lodash/isEmpty');

package/lib/blocklet/storage/backup/disk.js

@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
 const { isValid } = require('@arcblock/did');
 const { ensureDirSync } = require('fs-extra');
-const { isEmpty } = require('lodash');
+const isEmpty = require('lodash/isEmpty');
 const { join } = require('path');
 const { getAppName } = require('@blocklet/meta/lib/util');
 

package/lib/blocklet/storage/backup/spaces.js

@@ -21,7 +21,7 @@ const { isValid } = require('@arcblock/did');
 const { BLOCKLET_CONFIGURABLE_KEY, BlockletEvents } = require('@blocklet/constant');
 const { SpaceClient, IncrementalBackupBlockletCommand } = require('@did-space/client');
 const { ensureDirSync, existsSync, remove } = require('fs-extra');
-const { isEmpty } = require('lodash');
+const isEmpty = require('lodash/isEmpty');
 const { join, basename } = require('path');
 const { getAppName, getAppDescription } = require('@blocklet/meta/lib/util');
 

package/lib/blocklet/storage/restore/blocklet-extras.js

@@ -1,5 +1,6 @@
 const { removeSync, outputJsonSync, readJSONSync } = require('fs-extra');
-const { cloneDeep, isEmpty } = require('lodash');
+const isEmpty = require('lodash/isEmpty');
+const cloneDeep = require('lodash/cloneDeep');
 const { join } = require('path');
 const security = require('@abtnode/util/lib/security');
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');

package/lib/blocklet/storage/restore/disk.js

@@ -1,5 +1,5 @@
 const { isValid } = require('@arcblock/did');
-const { isEmpty } = require('lodash');
+const isEmpty = require('lodash/isEmpty');
 const merge = require('lodash/merge');
 const { ensureDirSync, existsSync, rmSync, copy } = require('fs-extra');
 

package/lib/cert.js

@@ -89,17 +89,21 @@ class Cert extends EventEmitter {
     return this.manager
       .issue({ domain, siteId, inBlockletSetup }, { delay, metadata: { inBlockletSetup, blockletDid: did } })
       .then(async (cert) => {
-        const site = await this.states.site.findOne({ id: siteId });
-        for (const d of site.domainAliases) {
-          if (d.value === domain) {
-            d.certificateId = cert.id;
-
-            break;
+        // 在 Blocklet Dashboard 中添加域名时，需要更新 domainAliases 中 certificateId
+        // 直接在 Blocklet Server Dashboard 中添加域名时，不需要更新 domainAliases 中 certificateId
+        if (siteId) {
+          const site = await this.states.site.findOne({ id: siteId });
+          for (const d of site.domainAliases) {
+            if (d.value === domain) {
+              d.certificateId = cert.id;
+
+              break;
+            }
           }
-        }
 
-        await this.states.site.update({ id: siteId }, { $set: { domainAliases: site.domainAliases } });
-        logger.info('updated cert id for domain alias', { domain, did, certId: cert.id });
+          await this.states.site.update({ id: siteId }, { $set: { domainAliases: site.domainAliases } });
+          logger.info('updated cert id for domain alias', { domain, did, certId: cert.id });
+        }
 
         return cert;
       });

package/lib/index.js

@@ -344,6 +344,8 @@ function ABTNode(options) {
     getProject: blockletManager.getProject.bind(blockletManager),
     updateProject: blockletManager.updateProject.bind(blockletManager),
     createRelease: blockletManager.createRelease.bind(blockletManager),
+    connectToStore: blockletManager.connectToStore.bind(blockletManager),
+    publishToStore: blockletManager.publishToStore.bind(blockletManager),
     getReleases: blockletManager.getReleases.bind(blockletManager),
     getRelease: blockletManager.getRelease.bind(blockletManager),
     deleteRelease: blockletManager.deleteRelease.bind(blockletManager),

package/lib/migrations/1.6.9-update-node-info-and-certificate.js

@@ -1,7 +1,8 @@
 /* eslint-disable no-await-in-loop */
 
 const { DEFAULT_DID_REGISTRY, DEFAULT_DID_DOMAIN } = require('@abtnode/constant');
-const { isEmpty, omit } = require('lodash');
+const omit = require('lodash/omit');
+const isEmpty = require('lodash/isEmpty');
 
 const updateNodeInfo = async ({ printInfo, states }) => {
   // add didRegistry and didDomain

package/lib/monitor/node-monit-sender.js

@@ -1,4 +1,4 @@
-const filesize = require('filesize');
+const { filesize } = require('filesize');
 const { sendToAppChannel } = require('@blocklet/sdk/lib/util/send-notification');
 const { getAppPublicChannel } = require('@blocklet/meta/lib/channel');
 
@@ -57,7 +57,7 @@ class NodeMonitSender {
       const cpuContent = `${Math.floor(cpuPercent)}%`;
       const memoryPercent = (usedMem / totalMem) * 100;
       const memoryWanning = memoryPercent > 90;
-      const memContent = `${filesize(Math.floor(usedMem))} (${Math.floor(memoryPercent)}%)`;
+      const memContent = `${filesize(Math.floor(usedMem), { base: 2 })} (${Math.floor(memoryPercent)}%)`;
 
       const sender = await this.getSender();
       const channel = getAppPublicChannel(sender.appDid);

package/lib/states/release.js

@@ -29,6 +29,7 @@ class Release extends BaseState {
       'blockletLogo',
       'blockletIntroduction',
       'blockletScreenshots',
+      'publishedStoreIds',
       'blockletComponents',
       'note',
       'status',

package/lib/team/manager.js

@@ -318,6 +318,7 @@ class TeamManager extends EventEmitter {
     }
 
     const metaDid = await this.states.blocklet.getBlockletMetaDid(did);
+
     await this.states.blockletExtras.setSettings(metaDid, { storeList: list });
     this.emit(BlockletEvents.storeChange, { meta: { did: metaDid } });
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25",
+  "version": "1.16.26-beta-c724c8e6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,41 +19,42 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.25",
-    "@abtnode/auth": "1.16.25",
-    "@abtnode/certificate-manager": "1.16.25",
-    "@abtnode/constant": "1.16.25",
-    "@abtnode/cron": "1.16.25",
-    "@abtnode/logger": "1.16.25",
-    "@abtnode/models": "1.16.25",
-    "@abtnode/queue": "1.16.25",
-    "@abtnode/rbac": "1.16.25",
-    "@abtnode/router-provider": "1.16.25",
-    "@abtnode/static-server": "1.16.25",
-    "@abtnode/timemachine": "1.16.25",
-    "@abtnode/util": "1.16.25",
-    "@arcblock/did": "1.18.113",
-    "@arcblock/did-auth": "1.18.113",
-    "@arcblock/did-ext": "^1.18.113",
+    "@abtnode/analytics": "1.16.26-beta-c724c8e6",
+    "@abtnode/auth": "1.16.26-beta-c724c8e6",
+    "@abtnode/certificate-manager": "1.16.26-beta-c724c8e6",
+    "@abtnode/constant": "1.16.26-beta-c724c8e6",
+    "@abtnode/cron": "1.16.26-beta-c724c8e6",
+    "@abtnode/logger": "1.16.26-beta-c724c8e6",
+    "@abtnode/models": "1.16.26-beta-c724c8e6",
+    "@abtnode/queue": "1.16.26-beta-c724c8e6",
+    "@abtnode/rbac": "1.16.26-beta-c724c8e6",
+    "@abtnode/router-provider": "1.16.26-beta-c724c8e6",
+    "@abtnode/static-server": "1.16.26-beta-c724c8e6",
+    "@abtnode/timemachine": "1.16.26-beta-c724c8e6",
+    "@abtnode/util": "1.16.26-beta-c724c8e6",
+    "@arcblock/did": "1.18.114",
+    "@arcblock/did-auth": "1.18.114",
+    "@arcblock/did-ext": "^1.18.114",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.113",
-    "@arcblock/event-hub": "1.18.113",
-    "@arcblock/jwt": "^1.18.113",
+    "@arcblock/did-util": "1.18.114",
+    "@arcblock/event-hub": "1.18.114",
+    "@arcblock/jwt": "^1.18.114",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.113",
-    "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25",
-    "@blocklet/env": "1.16.25",
-    "@blocklet/meta": "1.16.25",
-    "@blocklet/resolver": "1.16.25",
-    "@blocklet/sdk": "1.16.25",
-    "@did-space/client": "^0.3.73",
+    "@arcblock/validator": "^1.18.114",
+    "@arcblock/vc": "1.18.114",
+    "@blocklet/constant": "1.16.26-beta-c724c8e6",
+    "@blocklet/env": "1.16.26-beta-c724c8e6",
+    "@blocklet/meta": "1.16.26-beta-c724c8e6",
+    "@blocklet/resolver": "1.16.26-beta-c724c8e6",
+    "@blocklet/sdk": "1.16.26-beta-c724c8e6",
+    "@blocklet/store": "1.16.26-beta-c724c8e6",
+    "@did-space/client": "^0.3.75",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.113",
-    "@ocap/util": "1.18.113",
-    "@ocap/wallet": "1.18.113",
+    "@ocap/mcrypto": "1.18.114",
+    "@ocap/util": "1.18.114",
+    "@ocap/wallet": "1.18.114",
     "@slack/webhook": "^5.0.4",
-    "archiver": "^5.3.1",
+    "archiver": "^7.0.1",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
     "chalk": "^4.1.2",
@@ -62,14 +63,14 @@
     "detect-port": "^1.5.1",
     "escape-string-regexp": "^4.0.0",
     "fast-glob": "^3.3.2",
-    "filesize": "^6.4.0",
+    "filesize": "^10.1.1",
     "flat": "^5.0.2",
     "fs-extra": "^11.2.0",
     "get-port": "^5.1.1",
     "hasha": "^5.2.2",
     "is-base64": "^1.1.0",
     "is-url": "^1.2.4",
-    "joi": "17.11.0",
+    "joi": "17.12.2",
     "joi-extension-semver": "^5.0.0",
     "js-yaml": "^4.1.0",
     "kill-port": "^2.0.1",
@@ -102,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "8752b9a0caa8745e16e1de8db4ef696b713ffb4d"
+  "gitHead": "f2b51533d934be041b1cc5b4b2fc8c56f4855a26"
 }