@abtnode/core 1.16.21-beta-bd0e2503 → 1.16.21-beta-445a8baa

package/lib/api/team.js

@@ -1332,10 +1332,9 @@ class TeamAPI extends EventEmitter {
     );
   }
 
-  async createNotification({ teamDid, ...rest }) {
-    const notificationState = await this.getNotificationState(teamDid);
-    return notificationState.create({ teamDid, ...rest });
-  }
+  createNotification = (payload) => {
+    return this.teamManager.createNotification(payload);
+  };
 
   async getNotification({ teamDid, ...rest }) {
     const notificationState = await this.getNotificationState(teamDid);

package/lib/blocklet/manager/config-synchronizer.js

@@ -45,6 +45,7 @@ class ConfigSynchronizer {
           }, {})
         ),
         serverVersion,
+        initialized: app?.settings?.initialized,
       };
       const components = getComponentsInternalInfo(app);
 

package/lib/blocklet/manager/disk.js

@@ -141,6 +141,7 @@ const {
   getAppConfigsFromComponent,
   removeAppConfigsFromComponent,
   getConfigsFromInput,
+  getPackConfig,
 } = require('../../util/blocklet');
 const { getDidDomainForBlocklet } = require('../../util/get-domain-for-blocklet');
 const states = require('../../states');
@@ -1184,7 +1185,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async config({ did, configs: newConfigs, skipHook, skipDidDocument }, context) {
+  async config({ did, configs: newConfigs, skipHook, skipDidDocument, skipEmitEvents }, context) {
     // todo: skipDidDocument will be deleted
     if (!Array.isArray(newConfigs)) {
       throw new Error('configs list is not an array');
@@ -1323,25 +1324,27 @@ class DiskBlockletManager extends BaseBlockletManager {
       await this._updateDidDocument(newState);
     }
 
-    if (!childDid && !newConfigs.some((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK)) {
-      this.emit(BlockletInternalEvents.appConfigChanged, {
-        appDid: rootDid,
-        configs: newConfigs.map((x) => ({ key: x.key, value: x.value })),
-      });
-      this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
-    }
+    if (!skipEmitEvents) {
+      if (!childDid && !newConfigs.some((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK)) {
+        this.emit(BlockletInternalEvents.appConfigChanged, {
+          appDid: rootDid,
+          configs: newConfigs.map((x) => ({ key: x.key, value: x.value })),
+        });
+        this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
+      }
 
-    this.emit(BlockletEvents.updated, { ...newState, context });
-    const serverSk = (await states.node.read()).sk;
-    if (childDid) {
-      const configs = JSON.stringify(newConfigs.map((x) => ({ key: x.key, value: x.value })));
-      this.emit(BlockletInternalEvents.componentConfigChanged, {
-        appDid: rootDid,
-        componentDid: childDid,
-        configs: encrypt(configs, getComponentApiKey({ serverSk, app: ancestors[0], component: blocklet }), childDid),
-      });
+      this.emit(BlockletEvents.updated, { ...newState, context });
+      const serverSk = (await states.node.read()).sk;
+      if (childDid) {
+        const configs = JSON.stringify(newConfigs.map((x) => ({ key: x.key, value: x.value })));
+        this.emit(BlockletInternalEvents.componentConfigChanged, {
+          appDid: rootDid,
+          componentDid: childDid,
+          configs: encrypt(configs, getComponentApiKey({ serverSk, app: ancestors[0], component: blocklet }), childDid),
+        });
 
-      this.configSynchronizer.syncComponentConfig(childDid, rootDid, { serverSk });
+        this.configSynchronizer.syncComponentConfig(childDid, rootDid, { serverSk });
+      }
     }
 
     return newState;
@@ -1628,6 +1631,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     const blocklet = await states.blocklet.getBlocklet(did);
     await states.blockletExtras.setSettings(blocklet.meta.did, { initialized: true, owner });
+    this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
     logger.info('Blocklet initialized', { did, owner });
 
     this.emit(BlockletEvents.updated, { meta: { did: blocklet.meta.did }, context });
@@ -2857,6 +2861,22 @@ class DiskBlockletManager extends BaseBlockletManager {
       await this._updateDependents(did);
       blocklet = await this.getBlocklet(did);
 
+      // Inject pack configs
+      const packConfig = await getPackConfig(blocklet);
+      if (packConfig) {
+        await this.configNavigations({ did, navigations: packConfig.navigations });
+
+        for (const { did: componentDid, configs } of packConfig.components || []) {
+          await this.config({
+            did: [blocklet.meta.did, componentDid],
+            configs,
+            skipHook: true,
+            skipDidDocument: true,
+            skipEmitEvents: true,
+          });
+        }
+      }
+
       this.emit(BlockletEvents.installed, { blocklet, context });
 
       // Update dynamic component meta in blocklet settings
@@ -3387,13 +3407,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     try {
-      const extra = await states.blockletExtras.getMeta(did);
-      const isExternal = !!extra?.controller;
-
-      if (isExternal) {
-        return;
-      }
-
       let blockletUrl;
       try {
         const blocklet = await this.getBlocklet(did);
@@ -3408,9 +3421,18 @@ class DiskBlockletManager extends BaseBlockletManager {
         logger.error('[_createNotification] get blocklet url failed', { error });
       }
 
-      await states.notification.create({ ...notification, blockletUrl });
-      const notificationState = await Promise.resolve(this.teamManager.getNotification(did));
-      await notificationState.create({ teamId: did, ...notification, blockletUrl });
+      // if blocklet is external, no need to create notification in server
+      const extra = await states.blockletExtras.getMeta(did);
+      const isExternal = !!extra?.controller;
+      if (!isExternal) {
+        await states.notification.create({ ...notification, blockletUrl });
+      }
+
+      await this.teamManager.createNotification({
+        teamDid: did,
+        ...notification,
+        blockletUrl,
+      });
     } catch (error) {
       logger.error('create notification failed', { error });
     }

package/lib/blocklet/project/index.js

@@ -2,12 +2,14 @@ const path = require('path');
 const fs = require('fs-extra');
 const createArchive = require('archiver');
 const { slugify } = require('transliteration');
-const { BLOCKLET_META_FILE, PROJECT } = require('@blocklet/constant');
+const { isValid: isValidDid } = require('@arcblock/did');
+const { BLOCKLET_META_FILE, PROJECT, BLOCKLET_RESOURCE_DIR } = require('@blocklet/constant');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const { createRelease: createBlockletRelease } = require('@abtnode/util/lib/create-blocklet-release');
 const { titleSchema } = require('@blocklet/meta/lib/schema');
 const { validateNewDid } = require('@blocklet/meta/lib/name');
 const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
+const fg = require('fast-glob');
 
 const logger = require('@abtnode/logger')('create-resource-blocklet');
 
@@ -119,6 +121,28 @@ const checkResourceExists = async (projectDir, action, releaseId) => {
   }
 };
 
+const getResourceList = async (resourceDir) => {
+  const list = await fg(['*/*'], { cwd: resourceDir, onlyDirectories: true });
+
+  return list
+    .filter((x) => x !== COMPONENT_CONFIG_MAP_DIR)
+    .map((x) => {
+      const [did, type] = x.split('/');
+      if (!type) {
+        throw new Error(`invalid resource: ${x}. type is required`);
+      }
+      if (!isValidDid(did)) {
+        throw new Error(`invalid resource: ${x}. did is invalid`);
+      }
+
+      return {
+        did,
+        type,
+        public: true,
+      };
+    });
+};
+
 const createRelease = async ({
   did,
   projectId,
@@ -274,15 +298,12 @@ const createRelease = async ({
 
     // create resource
     await fs.ensureDir(resourceDir);
-    const tmpBundleResourceDir = path.join(tmpBundleDir, 'resource');
+    const tmpBundleResourceDir = path.join(tmpBundleDir, BLOCKLET_RESOURCE_DIR);
     await fs.copy(resourceDir, tmpBundleResourceDir);
     await fs.remove(path.join(tmpBundleResourceDir, COMPONENT_CONFIG_MAP_DIR));
 
     // create blocklet.yml
-    const resourceList = await fs.readdir(resourceDir);
-    const resourcesPaths = resourceList
-      .filter((x) => x !== COMPONENT_CONFIG_MAP_DIR)
-      .map((x) => path.join('/resource', x));
+    const resourceList = await getResourceList(resourceDir);
     const meta = {
       did: blockletDid,
       name: blockletDid,
@@ -290,7 +311,9 @@ const createRelease = async ({
       description: blockletDescription,
       version: blockletVersion,
       logo: logoFileName,
-      resources: resourcesPaths.length ? resourcesPaths : undefined,
+      resource: {
+        bundles: resourceList.length ? resourceList : undefined,
+      },
       components: [],
       files: project.blockletScreenshots?.length ? ['screenshots'] : [],
       screenshots: project.blockletScreenshots || [],

package/lib/event/index.js

@@ -341,7 +341,7 @@ module.exports = ({
             sticky: true,
           };
           await node.createNotification(param);
-          await node.createBlockeltNotification({ ...param });
+          await node.createBlockletNotification({ ...param, teamDid: args.did });
         }
       } catch (error) {
         logger.error('Failed to createAuditLog for backupToSpaces failed', { error });
@@ -500,6 +500,7 @@ module.exports = ({
   listen(teamAPI, EVENTS.USER_PERMISSION_UPDATED, onEvent);
   listen(teamAPI, BlockletEvents.updated, onEvent);
   listen(teamManager, BlockletEvents.storeChange, onEvent);
+  listen(teamManager, EVENTS.NOTIFICATION_BLOCKLET_CREATE, onEvent);
 
   listen(certManager, EVENTS.CERT_ISSUED, onEvent);
   listen(certManager, EVENTS.CERT_ERROR, onEvent);

package/lib/router/helper.js

@@ -77,7 +77,11 @@ const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-acces
 const Router = require('./index');
 const states = require('../states');
 const { getBlockletDomainGroupName, getDidFromDomainGroupName } = require('../util/router');
-const { getBlockletDidDomainList, updateDidDocument: updateBlockletDocument } = require('../util/blocklet');
+const {
+  getBlockletDidDomainList,
+  updateDidDocument: updateBlockletDocument,
+  getPackConfig,
+} = require('../util/blocklet');
 const { toCamelCase } = require('../util/index');
 const { get: getIp } = require('../util/ip');
 
@@ -391,6 +395,7 @@ const ensureWellknownRule = async (sites = []) => {
             componentId: rule.to.componentId,
             cacheGroup: isServiceFeDevelopment ? '' : 'blockletProxy',
             target: avatarPathPrefix,
+            port: process.env.ABT_NODE_SERVICE_PORT,
           },
           isProtected: true,
           dynamic: true,
@@ -1008,13 +1013,26 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       // let didDomain in front of ipEchoDnsDomain
       domainAliases.push({ value: getIpDnsDomainForBlocklet(blocklet), isProtected: true });
 
+      const rules = [rule];
+
+      // inject rules in pack after app installed
+      const config = await getPackConfig(blocklet);
+      const rulesInPack = (config?.site?.rules || []).map((x) => {
+        const y = { ...x };
+        if (y.to.did) {
+          y.to.did = blocklet.meta.did;
+        }
+        return y;
+      });
+      rules.push(...rulesInPack);
+
       await routerManager.addRoutingSite(
         {
           site: {
             domain: domainGroup,
             domainAliases,
             isProtected: true,
-            rules: [rule],
+            rules,
           },
           skipCheckDynamicBlacklist: true,
           skipValidation: true,

package/lib/router/manager.js

@@ -32,7 +32,12 @@ const {
   BLOCKLET_INTERFACE_TYPE_WEB,
   BlockletGroup,
 } = require('@blocklet/constant');
-const { forEachChildSync, hasStartEngine, isGatewayBlocklet } = require('@blocklet/meta/lib/util');
+const {
+  forEachComponentV2Sync,
+  hasStartEngine,
+  isGatewayBlocklet,
+  getComponentId,
+} = require('@blocklet/meta/lib/util');
 const { fromPublicKey } = require('@ocap/wallet');
 
 const {
@@ -708,7 +713,7 @@ class RouterManager extends EventEmitter {
       rules.push(rawRule);
     }
 
-    forEachChildSync(blocklet, (component, { id, ancestors }) => {
+    forEachComponentV2Sync(blocklet, (component) => {
       const { meta } = component;
       if (isGatewayBlocklet(meta) || !hasStartEngine(meta)) {
         return;
@@ -728,12 +733,7 @@ class RouterManager extends EventEmitter {
         return;
       }
 
-      const pathPrefix = path.join(
-        blockletPrefix,
-        // level 1 component should be independent with root component
-        ...ancestors.slice(1).map((x) => x.mountPoint || ''),
-        mountPoint
-      );
+      const pathPrefix = path.join(blockletPrefix, mountPoint);
 
       const occupied = normalizePathPrefix(pathPrefix) === normalizePathPrefix(rawRule.from.pathPrefix);
 
@@ -754,7 +754,7 @@ class RouterManager extends EventEmitter {
           port: findInterfacePortByName(component, childWebInterface.name),
           did: rawRule.to.did, // root component did
           interfaceName: rawRule.to.interfaceName, // root component interface
-          componentId: id,
+          componentId: getComponentId(component, [blocklet]),
         },
         isProtected: occupied ? rawRule.isProtected : true,
       };

package/lib/states/notification.js

@@ -40,7 +40,14 @@ class NotificationState extends BaseState {
       severity: payload.severity || 'info',
       read: false,
     });
-    this.emit(EVENTS.NOTIFICATION_CREATE, { ...payload, ...doc });
+
+    if (!payload.teamDid) {
+      this.emit(EVENTS.NOTIFICATION_CREATE, {
+        ...payload,
+        ...doc,
+      });
+    }
+
     return doc;
   }
 

package/lib/team/manager.js

@@ -10,7 +10,7 @@ const pick = require('lodash/pick');
 
 const { createRBAC, MemoryStorage, SequelizeStorage } = require('@abtnode/rbac');
 const logger = require('@abtnode/logger')('@abtnode/core:team:manager');
-const { ROLES, RBAC_CONFIG } = require('@abtnode/constant');
+const { ROLES, RBAC_CONFIG, EVENTS } = require('@abtnode/constant');
 const { BlockletEvents } = require('@blocklet/constant');
 const Lock = require('@abtnode/util/lib/lock');
 const {
@@ -136,6 +136,13 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'notification');
   }
 
+  async createNotification({ teamDid, ...payload }) {
+    const notification = await this.getState(teamDid, 'notification');
+    const doc = await notification.create({ ...payload, teamDid });
+    const metaDid = await this.states.blocklet.getBlockletMetaDid(teamDid);
+    this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, { meta: { did: metaDid }, ...payload, ...doc, teamDid });
+  }
+
   async getProjectState(teamDid) {
     return {
       projectState: await this.getState(teamDid, 'project'),

package/lib/util/blocklet.js

@@ -70,6 +70,7 @@ const {
   fromBlockletStatus,
   BLOCKLET_PREFERENCE_FILE,
   BLOCKLET_PREFERENCE_PREFIX,
+  BLOCKLET_RESOURCE_DIR,
 } = require('@blocklet/constant');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
@@ -377,6 +378,8 @@ const getComponentSystemEnvironments = (blocklet) => {
 const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
   const root = (ancestors || [])[0] || blocklet;
 
+  const initialized = root?.settings?.initialized;
+
   // pm2 will force inject env variables of daemon process to blocklet process
   // we can only rewrite these private env variables to empty
   const safeNodeEnvironments = PRIVATE_NODE_ENVS.reduce((o, x) => {
@@ -436,6 +439,10 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     ...safeNodeEnvironments,
   };
 
+  if (initialized) {
+    env.initialized = initialized;
+  }
+
   // ensure all envs are literals and do not contain line breaks
   Object.keys(env).forEach((key) => {
     env[key] = formatEnv(env[key]);
@@ -1536,16 +1543,10 @@ const checkDuplicateAppSk = async ({ sk, did, states }) => {
   }
 };
 
-const checkDuplicateMountPoint = (blocklet, mountPoint) => {
+const checkDuplicateMountPoint = (app, mountPoint) => {
   const err = new Error(`cannot add duplicate mount point, ${mountPoint || '/'} already exist`);
-  if (
-    blocklet.meta?.group !== BlockletGroup.gateway &&
-    normalizePathPrefix(blocklet.mountPoint) === normalizePathPrefix(mountPoint)
-  ) {
-    throw err;
-  }
 
-  for (const component of blocklet.children || []) {
+  for (const component of app.children || []) {
     if (
       hasStartEngine(component.meta) &&
       normalizePathPrefix(component.mountPoint) === normalizePathPrefix(mountPoint)
@@ -1935,6 +1936,30 @@ const removeAppConfigsFromComponent = async (componentConfigs, app, blockletExtr
   }
 };
 
+const getPackConfig = (app) => {
+  const packComponent = (app?.children || []).find((x) => x.meta.group === BlockletGroup.pack);
+  if (!packComponent) {
+    return null;
+  }
+
+  const resource = (packComponent.meta.resource?.bundles || []).find(
+    (x) => x.did === packComponent.meta.did && x.type === 'config'
+  );
+
+  if (!resource) {
+    return null;
+  }
+
+  const { appDir } = packComponent.env;
+  const configFile = path.join(appDir, BLOCKLET_RESOURCE_DIR, resource.did, resource.type, 'config.json');
+
+  if (!fs.existsSync(configFile)) {
+    return null;
+  }
+
+  return fs.readJSON(configFile);
+};
+
 module.exports = {
   updateBlockletFallbackLogo,
   forEachBlocklet,
@@ -2002,4 +2027,5 @@ module.exports = {
   getAppConfigsFromComponent,
   removeAppConfigsFromComponent,
   getConfigsFromInput,
+  getPackConfig,
 };

package/lib/webhook/index.js

@@ -100,7 +100,11 @@ module.exports = ({ events, dataDirs, instance }) => {
           const options = { ...message, nodeInfo, node: instance };
           if (item.type === 'slack') {
             // eslint-disable-next-line
-            options.urlInfo = await getSlackUrlInfo({ blockletUrl: message.blockletUrl, path: message.action, serverUrls: baseUrls });
+            options.urlInfo = await getSlackUrlInfo({
+              blockletUrl: message.blockletUrl,
+              path: message.action,
+              serverUrls: baseUrls,
+            });
           }
           try {
             // eslint-disable-next-line
@@ -133,6 +137,11 @@ module.exports = ({ events, dataDirs, instance }) => {
     queue.push({ title, description, status: severity, action, entityType, blockletUrl });
   });
 
+  events.on(EVENTS.NOTIFICATION_BLOCKLET_CREATE, (data) => {
+    const { title, description, severity, action, entityType, blockletUrl } = data;
+    queue.push({ title, description, status: severity, action, entityType, blockletUrl });
+  });
+
   events.on(EVENTS.NODE_STARTED, async (message) => {
     await sendMessage(message);
   });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.21-beta-bd0e2503",
+  "version": "1.16.21-beta-445a8baa",
   "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.21-beta-bd0e2503",
-    "@abtnode/auth": "1.16.21-beta-bd0e2503",
-    "@abtnode/certificate-manager": "1.16.21-beta-bd0e2503",
-    "@abtnode/constant": "1.16.21-beta-bd0e2503",
-    "@abtnode/cron": "1.16.21-beta-bd0e2503",
-    "@abtnode/logger": "1.16.21-beta-bd0e2503",
-    "@abtnode/models": "1.16.21-beta-bd0e2503",
-    "@abtnode/queue": "1.16.21-beta-bd0e2503",
-    "@abtnode/rbac": "1.16.21-beta-bd0e2503",
-    "@abtnode/router-provider": "1.16.21-beta-bd0e2503",
-    "@abtnode/static-server": "1.16.21-beta-bd0e2503",
-    "@abtnode/timemachine": "1.16.21-beta-bd0e2503",
-    "@abtnode/util": "1.16.21-beta-bd0e2503",
+    "@abtnode/analytics": "1.16.21-beta-445a8baa",
+    "@abtnode/auth": "1.16.21-beta-445a8baa",
+    "@abtnode/certificate-manager": "1.16.21-beta-445a8baa",
+    "@abtnode/constant": "1.16.21-beta-445a8baa",
+    "@abtnode/cron": "1.16.21-beta-445a8baa",
+    "@abtnode/logger": "1.16.21-beta-445a8baa",
+    "@abtnode/models": "1.16.21-beta-445a8baa",
+    "@abtnode/queue": "1.16.21-beta-445a8baa",
+    "@abtnode/rbac": "1.16.21-beta-445a8baa",
+    "@abtnode/router-provider": "1.16.21-beta-445a8baa",
+    "@abtnode/static-server": "1.16.21-beta-445a8baa",
+    "@abtnode/timemachine": "1.16.21-beta-445a8baa",
+    "@abtnode/util": "1.16.21-beta-445a8baa",
     "@arcblock/did": "1.18.107",
     "@arcblock/did-auth": "1.18.107",
     "@arcblock/did-ext": "^1.18.107",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.107",
     "@arcblock/vc": "1.18.107",
-    "@blocklet/constant": "1.16.21-beta-bd0e2503",
-    "@blocklet/env": "1.16.21-beta-bd0e2503",
-    "@blocklet/meta": "1.16.21-beta-bd0e2503",
-    "@blocklet/resolver": "1.16.21-beta-bd0e2503",
-    "@blocklet/sdk": "1.16.21-beta-bd0e2503",
+    "@blocklet/constant": "1.16.21-beta-445a8baa",
+    "@blocklet/env": "1.16.21-beta-445a8baa",
+    "@blocklet/meta": "1.16.21-beta-445a8baa",
+    "@blocklet/resolver": "1.16.21-beta-445a8baa",
+    "@blocklet/sdk": "1.16.21-beta-445a8baa",
     "@did-space/client": "^0.3.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.107",
@@ -102,5 +102,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "f4550e061b661cb67d7f1413ada51f3f6491f0b8"
+  "gitHead": "7a7ff8be7f424775c3bde0eead773d8e6177fa1a"
 }