@abtnode/core 1.16.23-beta-f85576a6 → 1.16.23-beta-aeb9f5bd

package/lib/api/team.js

@@ -8,7 +8,6 @@ const logger = require('@abtnode/logger')('@abtnode/core:api:team');
 const {
   ROLES,
   genPermissionName,
-  EVENTS,
   WHO_CAN_ACCESS,
   PASSPORT_STATUS,
   WELLKNOWN_SERVICE_PATH_PREFIX,
@@ -18,7 +17,7 @@ const {
   USER_AVATAR_URL_PREFIX,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
-const { BlockletEvents } = require('@blocklet/constant');
+const { BlockletEvents, TeamEvents } = require('@blocklet/constant');
 const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
 const {
   createPassportVC,
@@ -177,7 +176,7 @@ class TeamAPI extends EventEmitter {
     const { _action, ...doc } = await state.loginUser(user);
     if (_action === 'update') {
       logger.info('user updated successfully', { teamDid, userDid: user.did });
-      this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+      this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
     } else if (_action === 'add') {
       if (teamDid === nodeInfo.did && nodeInfo.nodeOwner && user.did !== nodeInfo.nodeOwner.did) {
         await this.notification.create({
@@ -191,7 +190,7 @@ class TeamAPI extends EventEmitter {
       }
 
       logger.info('user added successfully', { teamDid, userDid: user.did, userPk: user.pk, userName: user.fullName });
-      this.emit(EVENTS.USER_ADDED, { teamDid, user: doc });
+      this.emit(TeamEvents.userAdded, { teamDid, user: doc });
     }
     return doc;
   }
@@ -227,7 +226,7 @@ class TeamAPI extends EventEmitter {
       });
     }
 
-    this.emit(EVENTS.USER_ADDED, { teamDid, user: doc });
+    this.emit(TeamEvents.userAdded, { teamDid, user: doc });
 
     return doc;
   }
@@ -351,7 +350,7 @@ class TeamAPI extends EventEmitter {
     const state = await this.getUserState(teamDid);
     const doc = await state.updateUser(user.did, user);
     logger.info('user updated successfully', { teamDid, userDid: user.did });
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
     return doc;
   }
 
@@ -371,7 +370,7 @@ class TeamAPI extends EventEmitter {
     const state = await this.getUserState(teamDid);
     const doc = await state.updateTags(did, tags);
     logger.info('user tags updated successfully', { teamDid, userDid: did, tags });
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
     return doc;
   }
 
@@ -390,7 +389,7 @@ class TeamAPI extends EventEmitter {
 
     await state.remove({ did });
     logger.info('user removed successfully', { teamDid, userDid: did });
-    this.emit(EVENTS.USER_REMOVED, { teamDid, user: { did } });
+    this.emit(TeamEvents.userRemoved, { teamDid, user: { did } });
 
     return { did };
   }
@@ -411,31 +410,12 @@ class TeamAPI extends EventEmitter {
 
     logger.info('user approval updated successfully', { teamDid, userDid: user.did, approved: user.approved });
 
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc2 });
-    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc2 });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc2 });
+    this.emit(TeamEvents.userPermissionUpdated, { teamDid, user: doc2 });
 
     return doc2;
   }
 
-  /**
-   * @deprecated to be removed after passportNFT is ready
-   */
-  async updateUserRole({ teamDid, user }) {
-    if (user.role === ROLES.OWNER) {
-      throw new Error('Cannot update owner\'s role'); // prettier-ignore
-    }
-
-    const state = await this.getUserState(teamDid);
-
-    const doc = await state.updateRole(pick(user, ['did', 'role']));
-
-    logger.info('user role updated successfully', { teamDid, userDid: user.did, role: user.role });
-
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
-
-    return doc;
-  }
-
   async issuePassportToUser({ teamDid, userDid, role: roleName, notify = true }, context = {}) {
     const { locale = 'en' } = context;
 
@@ -515,8 +495,8 @@ class TeamAPI extends EventEmitter {
 
     logger.info('user passport revoked successfully', { teamDid, userDid, passportId });
 
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
-    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
+    this.emit(TeamEvents.userPermissionUpdated, { teamDid, user: doc });
 
     return doc;
   }
@@ -532,8 +512,8 @@ class TeamAPI extends EventEmitter {
 
     logger.info('user passport enabled successfully', { teamDid, userDid, passportId });
 
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
-    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
+    this.emit(TeamEvents.userPermissionUpdated, { teamDid, user: doc });
 
     return doc;
   }
@@ -549,8 +529,8 @@ class TeamAPI extends EventEmitter {
 
     logger.info('user passport remove successfully', { teamDid, userDid, passportId });
 
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
-    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
+    this.emit(TeamEvents.userPermissionUpdated, { teamDid, user: doc });
 
     return doc;
   }
@@ -596,7 +576,8 @@ class TeamAPI extends EventEmitter {
     }
     const doc = await state.updateUser(userDid, mergeData);
     logger.info('User switch-profile successfully', { teamDid, userDid });
-    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    this.emit(TeamEvents.userUpdated, { teamDid, user: doc });
+    this.emit(TeamEvents.userProfileUpdated, { teamDid, user: doc });
     return doc;
   }
 

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

@@ -16,22 +16,11 @@ const asyncFs = fs.promises;
  * decompress file, format dir and move to installDir
  * @param {string} src file
  * @param {{
- *   cwd: string;
  *   removeTarFile: boolean;
- *   originalMeta; // for verification
  *   logger;
  * }} option
  */
-const resolveDownload = async (
-  tarFile,
-  dist,
-  { cwd = '/', removeTarFile = true, logger = defaultLogger, originalMeta, onProgress } = {}
-) => {
-  // eslint-disable-next-line no-param-reassign
-  tarFile = path.join(cwd, tarFile);
-  // eslint-disable-next-line no-param-reassign
-  dist = path.join(cwd, dist);
-
+const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = defaultLogger, onProgress } = {}) => {
   const downloadDir = path.join(path.dirname(tarFile), path.basename(tarFile, path.extname(tarFile)));
   const tmp = `${downloadDir}-tmp`;
   try {
@@ -71,13 +60,7 @@ const resolveDownload = async (
     fs.removeSync(tmp);
 
     meta = getBlockletMeta(downloadDir);
-    const { did, name, version } = meta;
-
-    // validate
-    if (originalMeta && (originalMeta.did !== did || originalMeta.name !== name || originalMeta.version !== version)) {
-      logger.error('Meta has differences', { originalMeta, meta });
-      throw new Error('There are differences between the meta from tarball file and the original meta');
-    }
+    const { name, version } = meta;
 
     if (typeof onProgress === 'function') {
       onProgress({ name: 'blocklet.zip' });

package/lib/blocklet/manager/disk.js

@@ -145,6 +145,7 @@ const {
   removeAppConfigsFromComponent,
   getConfigsFromInput,
   getPackConfig,
+  filterRequiredComponents,
 } = require('../../util/blocklet');
 const { getDidDomainForBlocklet } = require('../../util/get-domain-for-blocklet');
 const states = require('../../states');
@@ -394,6 +395,7 @@ class DiskBlockletManager extends BaseBlockletManager {
    *  downloadTokenList: Array<{did: string, token: string}>;
    *  startImmediately: boolean;
    *  controller: Controller
+   *  onlyRequired: boolean;
    *  type: BLOCKLET_INSTALL_TYPE
    * }} params
    * @param {{
@@ -463,13 +465,27 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @param {String} name custom component name
    *
    * @param {ConfigEntry} configs pre configs
+   * @param {Boolean} onlyRequired only install required components
    */
   async installComponent(
-    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, sync, downloadTokenList },
+    {
+      rootDid,
+      mountPoint,
+      url,
+      file,
+      did,
+      diffVersion,
+      deleteSet,
+      title,
+      name,
+      configs,
+      sync,
+      downloadTokenList,
+      onlyRequired,
+    },
     context = {}
   ) {
     logger.debug('start install component', { rootDid, mountPoint, url });
-
     if (file) {
       // TODO: 如何触发这种场景？
       const info = await states.node.read();
@@ -509,6 +525,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         downloadTokenList,
         states,
         manager: this,
+        onlyRequired,
       });
     }
 
@@ -2376,7 +2393,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     const { meta } = blocklet;
     const { did, version } = meta;
     logger.info('do install blocklet', { did, version });
-
     try {
       const installedBlocklet = await this._installBlocklet({
         did,
@@ -2995,6 +3011,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     description,
     skSource = '',
     folder,
+    onlyRequired,
   }) {
     const environments = component?.meta?.environments || [];
 
@@ -3027,6 +3044,9 @@ class DiskBlockletManager extends BaseBlockletManager {
       children = isGatewayBlocklet(component.meta) ? [] : [component];
     } else {
       children = component ? await this._getChildrenForInstallation(component) : [];
+      if (onlyRequired) {
+        children = filterRequiredComponents(component, children);
+      }
     }
 
     // FIXME @linchen

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -32,6 +32,7 @@ const installApplicationFromGeneral = async ({
   context = {},
   states,
   manager,
+  onlyRequired,
 } = {}) => {
   const nodeInfo = await states.node.read();
 
@@ -103,7 +104,7 @@ const installApplicationFromGeneral = async ({
   }
 
   // create app
-  const blocklet = await manager._addBlocklet({ component, name, did, title, description, skSource });
+  const blocklet = await manager._addBlocklet({ component, name, did, title, description, skSource, onlyRequired });
   logger.info('blocklet added to database', { did: blocklet.meta.did });
 
   // create config

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

@@ -16,6 +16,7 @@ const {
   checkStructVersion,
   checkVersionCompatibility,
   validateBlocklet,
+  filterRequiredComponents,
   getComponentNamesWithVersion,
 } = require('../../../util/blocklet');
 const StoreUtil = require('../../../util/store');
@@ -32,6 +33,7 @@ const installComponentFromUrl = async ({
   sync,
   manager,
   states,
+  onlyRequired,
 }) => {
   const blocklet = await states.blocklet.getBlocklet(rootDid);
   if (!blocklet) {
@@ -103,11 +105,15 @@ const installComponentFromUrl = async ({
     dynamicComponents.unshift(newChild);
   }
 
-  const newChildren = filterDuplicateComponents(dynamicComponents, blocklet.children).map((x) => ({
+  let newChildren = filterDuplicateComponents(dynamicComponents, blocklet.children).map((x) => ({
     ...x,
     installedAt: new Date(),
   }));
 
+  if (onlyRequired) {
+    newChildren = filterRequiredComponents(newChild, newChildren);
+  }
+
   blocklet.children.push(...newChildren);
 
   checkVersionCompatibility(blocklet.children);

package/lib/event/index.js

@@ -9,6 +9,7 @@ const {
   BlockletSource,
   BlockletEvents,
   BlockletInternalEvents,
+  TeamEvents,
   BLOCKLET_CONFIGURABLE_KEY,
 } = require('@blocklet/constant');
 const { EVENTS, BACKUPS } = require('@abtnode/constant');
@@ -494,10 +495,10 @@ module.exports = ({
     });
   });
 
-  listen(teamAPI, EVENTS.USER_ADDED, onEvent);
-  listen(teamAPI, EVENTS.USER_REMOVED, onEvent);
-  listen(teamAPI, EVENTS.USER_UPDATED, onEvent);
-  listen(teamAPI, EVENTS.USER_PERMISSION_UPDATED, onEvent);
+  Object.keys(TeamEvents).forEach((key) => {
+    listen(teamAPI, TeamEvents[key], onEvent);
+  });
+
   listen(teamAPI, BlockletEvents.updated, onEvent);
   listen(teamManager, BlockletEvents.storeChange, onEvent);
   listen(teamManager, EVENTS.NOTIFICATION_BLOCKLET_CREATE, onEvent);

package/lib/index.js

@@ -39,6 +39,7 @@ const { createDataArchive } = require('./util/blocklet');
 const { toStatus, fromStatus, ensureDataDirs, getQueueConcurrencyByMem, getStateCrons } = require('./util');
 const { clearCache } = require('./util/cache');
 const getMetaFromUrl = require('./util/get-meta-from-url');
+const getDynamicComponents = require('./util/get-dynamic-components');
 
 /**
  * @param {object} options
@@ -411,7 +412,6 @@ function ABTNode(options) {
     updateUserTags: teamAPI.updateUserTags.bind(teamAPI),
     updateUserExtra: teamAPI.updateUserExtra.bind(teamAPI),
     updateUserApproval: teamAPI.updateUserApproval.bind(teamAPI),
-    updateUserRole: teamAPI.updateUserRole.bind(teamAPI),
     getUserByDid: teamAPI.getUserByDid.bind(teamAPI),
     isPassportValid: teamAPI.isPassportValid.bind(teamAPI),
     isConnectedAccount: teamAPI.isConnectedAccount.bind(teamAPI),
@@ -580,6 +580,7 @@ function ABTNode(options) {
 
     // public utils used in launch workflow
     getBlockletMetaFromUrl: getMetaFromUrl,
+    getDynamicComponents,
     getLauncherSession,
     isLauncherSessionConsumed,
     setupAppOwner,

package/lib/util/blocklet.js

@@ -47,6 +47,8 @@ const {
   filterDuplicateComponents,
   validateBlockletMeta,
   getComponentConfig,
+  parseOptionalComponents,
+  filterRequiredComponents,
 } = require('@blocklet/resolver');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const { isPortsOccupiedByOtherProcess, killProcessOccupiedPorts } = require('@abtnode/util/lib/port');
@@ -591,6 +593,7 @@ const startBlockletProcess = async (
         listen_timeout: 3000,
         max_memory_restart: `${maxMemoryRestart}M`,
         max_restarts: b.mode === BLOCKLET_MODES.DEVELOPMENT ? 0 : 3,
+        exp_backoff_restart_delay: 300,
         env: {
           ...environmentObj,
           ...env,
@@ -627,7 +630,7 @@ const startBlockletProcess = async (
 
           const cmdPath = path.join(path.dirname(nodejsBinPath), 'node_modules', cmd);
 
-          const pkg = JSON.parse(fs.readFileSync(path.join(cmdPath, 'package.json')));
+          const pkg = JSON.parse(fs.readFileSync(path.join(cmdPath, 'package.json'), 'utf8'));
           const cmdBinPath = pkg.bin[cmd];
 
           options.script = path.resolve(cmdPath, cmdBinPath);
@@ -1330,6 +1333,9 @@ const getBlocklet = async ({
     fillBlockletConfigs(component, configs);
   });
 
+  const optionalComponents = await parseOptionalComponents(blocklet.children);
+  blocklet.optionalComponents = optionalComponents;
+
   return blocklet;
 };
 
@@ -1978,6 +1984,7 @@ module.exports = {
   forEachBlocklet,
   getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
   parseComponents,
+  filterRequiredComponents,
   getComponentDirs,
   getAppSystemEnvironments,
   getAppOverwrittenEnvironments,

package/lib/util/get-dynamic-components.js

@@ -0,0 +1,14 @@
+const { default: axios } = require('axios');
+const { filterDuplicateComponents, parseComponents } = require('./blocklet');
+
+/**
+ * @param {String} url
+ * @returns {Promise<import('@abtnode/types').TComponentState[]>}
+ */
+async function getDynamicComponents({ url }) {
+  const rawMeta = await axios.get(url).then((res) => res.data);
+  const { dynamicComponents } = await parseComponents({ meta: rawMeta });
+  return filterDuplicateComponents(dynamicComponents);
+}
+
+module.exports = getDynamicComponents;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-f85576a6",
+  "version": "1.16.23-beta-aeb9f5bd",
   "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.23-beta-f85576a6",
-    "@abtnode/auth": "1.16.23-beta-f85576a6",
-    "@abtnode/certificate-manager": "1.16.23-beta-f85576a6",
-    "@abtnode/constant": "1.16.23-beta-f85576a6",
-    "@abtnode/cron": "1.16.23-beta-f85576a6",
-    "@abtnode/logger": "1.16.23-beta-f85576a6",
-    "@abtnode/models": "1.16.23-beta-f85576a6",
-    "@abtnode/queue": "1.16.23-beta-f85576a6",
-    "@abtnode/rbac": "1.16.23-beta-f85576a6",
-    "@abtnode/router-provider": "1.16.23-beta-f85576a6",
-    "@abtnode/static-server": "1.16.23-beta-f85576a6",
-    "@abtnode/timemachine": "1.16.23-beta-f85576a6",
-    "@abtnode/util": "1.16.23-beta-f85576a6",
+    "@abtnode/analytics": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/auth": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/certificate-manager": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/constant": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/cron": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/logger": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/models": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/queue": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/rbac": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/router-provider": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/static-server": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/timemachine": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/util": "1.16.23-beta-aeb9f5bd",
     "@arcblock/did": "1.18.108",
     "@arcblock/did-auth": "1.18.108",
     "@arcblock/did-ext": "^1.18.108",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.108",
     "@arcblock/vc": "1.18.108",
-    "@blocklet/constant": "1.16.23-beta-f85576a6",
-    "@blocklet/env": "1.16.23-beta-f85576a6",
-    "@blocklet/meta": "1.16.23-beta-f85576a6",
-    "@blocklet/resolver": "1.16.23-beta-f85576a6",
-    "@blocklet/sdk": "1.16.23-beta-f85576a6",
-    "@did-space/client": "^0.3.50",
+    "@blocklet/constant": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/env": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/meta": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/resolver": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/sdk": "1.16.23-beta-aeb9f5bd",
+    "@did-space/client": "^0.3.55",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.108",
     "@ocap/util": "1.18.108",
@@ -92,15 +92,15 @@
     "transliteration": "^2.3.5",
     "ua-parser-js": "^1.0.2",
     "url-join": "^4.0.1",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.1",
     "valid-url": "^1.0.9",
     "xbytes": "^1.8.0"
   },
   "devDependencies": {
     "expand-tilde": "^2.0.2",
     "express": "^4.18.2",
-    "jest": "^27.5.1",
+    "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "bac83a74944b4cef3ccb386277023caf0e1d5cd4"
+  "gitHead": "418cacd970d373aecc8706f8992e57369d394577"
 }