@abtnode/core 1.16.21-beta-46c675eb → 1.16.21-beta-e828f413

package/lib/api/team.js

@@ -1332,6 +1332,26 @@ class TeamAPI extends EventEmitter {
     );
   }
 
+  async createNotification({ teamDid, ...rest }) {
+    const notificationState = await this.getNotificationState(teamDid);
+    return notificationState.create({ teamDid, ...rest });
+  }
+
+  async getNotification({ teamDid, ...rest }) {
+    const notificationState = await this.getNotificationState(teamDid);
+    return notificationState.findPaginated({ teamDid, ...rest });
+  }
+
+  async readNotifications({ teamDid, ...rest }) {
+    const notificationState = await this.getNotificationState(teamDid);
+    return notificationState.read({ teamDid, ...rest });
+  }
+
+  async unreadNotifications({ teamDid, ...rest }) {
+    const notificationState = await this.getNotificationState(teamDid);
+    return notificationState.unread({ teamDid, ...rest });
+  }
+
   // =======
   // Private
   // =======
@@ -1356,6 +1376,10 @@ class TeamAPI extends EventEmitter {
     return this.teamManager.getSessionState(did);
   }
 
+  getNotificationState(did) {
+    return this.teamManager.getNotification(did);
+  }
+
   // =============
   // Just for test
   // =============

package/lib/blocklet/hooks.js

@@ -57,6 +57,7 @@ const runUserHook = async (label, hookName, args) => {
 const preInstall = (label, ...args) => runUserHook(label, 'pre-install', ...args);
 const postInstall = (label, ...args) => runUserHook(label, 'post-install', ...args);
 const preConfig = (label, ...args) => runUserHook(label, 'pre-config', ...args);
+const preFlight = (label, ...args) => runUserHook(get(label, 'meta.title') || label, 'pre-flight', ...args);
 const preStart = (blocklet, options) => {
   // check required environments
   let environments = get(blocklet, 'meta.environments', []);
@@ -76,4 +77,4 @@ const postStart = (blocklet, ...args) => runUserHook(blocklet.meta.title, 'post-
 const preUninstall = (label, ...args) => runUserHook(label, 'pre-uninstall', ...args);
 const preStop = (label, ...args) => runUserHook(label, 'pre-stop', ...args);
 
-module.exports = { preInstall, postInstall, preStart, postStart, preUninstall, preStop, preConfig };
+module.exports = { preInstall, postInstall, preFlight, preStart, postStart, preUninstall, preStop, preConfig };

package/lib/blocklet/manager/disk.js

@@ -576,6 +576,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       await startBlockletProcess(blocklet, {
         ...context,
+        preFlight: getHookFn('preFlight'),
         preStart: getHookFn('preStart'),
         postStart: getHookFn('postStart'),
         nodeEnvironments,
@@ -2827,14 +2828,17 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
 
       // pre install
-      await this._runPreInstallHook(blocklet, context);
+      await this._runUserHook('preInstall', blocklet, context);
 
       // Add environments
       await this._updateBlockletEnvironment(meta.did);
       blocklet = await this.getBlocklet(did);
 
       // post install
-      await this._runPostInstallHook(blocklet, context);
+      await this._runUserHook('postInstall', blocklet, context);
+
+      // pre flight
+      await this._runUserHook('preFlight', blocklet, context);
 
       await states.blocklet.setInstalledAt(did);
 
@@ -2951,14 +2955,17 @@ class DiskBlockletManager extends BaseBlockletManager {
       let blocklet = await this.ensureBlocklet(did);
 
       // pre install
-      await this._runPreInstallHook(blocklet, context);
+      await this._runUserHook('preInstall', blocklet, context);
 
       // Add environments
       await this._updateBlockletEnvironment(did);
       blocklet = await this.getBlocklet(did);
 
       // post install
-      await this._runPostInstallHook(blocklet, context);
+      await this._runUserHook('postInstall', blocklet, context);
+
+      // pre flight
+      await this._runUserHook('preFlight', blocklet, context);
 
       logger.info('start migration on upgrading', { did, componentDids });
       {
@@ -3357,28 +3364,11 @@ class DiskBlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
-  async _runPreInstallHook(blocklet, context) {
-    const nodeEnvironments = await states.node.getEnvironments();
-
-    const preInstall = (b) =>
-      hooks.preInstall(b.meta.title, {
-        hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
-        env: { ...nodeEnvironments },
-        appDir: b.env.appDir,
-        did: blocklet.meta.did, // root blocklet did
-        notification: states.notification,
-        context,
-        ...getHooksOutputFiles(b),
-      });
-
-    await forEachBlocklet(blocklet, preInstall, { parallel: true, concurrencyLimit: 2 });
-  }
-
-  async _runPostInstallHook(blocklet, context) {
+  async _runUserHook(name, blocklet, context) {
     const nodeEnvironments = await states.node.getEnvironments();
 
-    const postInstall = (b, { ancestors }) =>
-      hooks.postInstall(b.meta.title, {
+    const hookFn = (b, { ancestors }) =>
+      hooks[name](b.meta.title, {
         hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
         env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
         appDir: b.env.appDir,
@@ -3388,7 +3378,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         ...getHooksOutputFiles(b),
       });
 
-    await forEachBlocklet(blocklet, postInstall, { parallel: true, concurrencyLimit: 2 });
+    await forEachBlocklet(blocklet, hookFn, { parallel: true, concurrencyLimit: 2 });
   }
 
   async _createNotification(did, notification) {
@@ -3419,6 +3409,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
 
       await states.notification.create({ ...notification, blockletUrl });
+      const notificationState = await Promise.resolve(this.teamManager.getNotification(did));
+      await notificationState.create({ teamId: did, ...notification, blockletUrl });
     } catch (error) {
       logger.error('create notification failed', { error });
     }

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

@@ -98,14 +98,17 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
   let blocklet = await manager.ensureBlocklet(rootDid);
 
   // pre install
-  await manager._runPreInstallHook(blocklet);
+  await manager._runUserHook('preInstall', blocklet);
 
   // Add environments
   await manager._updateBlockletEnvironment(rootDid);
   blocklet = await manager.getBlocklet(rootDid);
 
   // post install
-  await manager._runPostInstallHook(blocklet);
+  await manager._runUserHook('postInstall', blocklet);
+
+  // pre flight
+  await manager._runUserHook('preFlight', blocklet);
 
   logger.info('add blocklet component for dev', { did, version, meta });
 

package/lib/event/index.js

@@ -332,14 +332,16 @@ module.exports = ({
         }
 
         if (payload?.progress !== 100) {
-          await node.createNotification({
+          const param = {
             title: 'App Backup Failed',
             description: `Failed to backup ${getDisplayName(blocklet)} to ${args.url}, due to: ${args.errorMessage}`,
             entityType: 'blocklet',
             entityId: args.did,
             severity: 'error',
             sticky: true,
-          });
+          };
+          await node.createNotification(param);
+          await node.createBlockeltNotification({ ...param });
         }
       } catch (error) {
         logger.error('Failed to createAuditLog for backupToSpaces failed', { error });

package/lib/index.js

@@ -450,6 +450,12 @@ function ABTNode(options) {
     readNotifications: states.notification.read.bind(states.notification),
     unreadNotifications: states.notification.unread.bind(states.notification),
 
+    // Blocklet Notifications
+    createBlockletNotification: teamAPI.createNotification.bind(teamAPI),
+    getBlockletNotifications: teamAPI.getNotification.bind(teamAPI),
+    readBlockletNotifications: teamAPI.readNotifications.bind(teamAPI),
+    unreadBlockletNotifications: teamAPI.unreadNotifications.bind(teamAPI),
+
     // AuditLog
     createAuditLog: (params) => states.auditLog.create(params, instance),
     getAuditLogs: async (params) => {
@@ -493,6 +499,7 @@ function ABTNode(options) {
 
     addDomainAlias,
     deleteDomainAlias,
+    isDidDomain: routerManager.isDidDomain.bind(routerManager),
 
     getRoutingProviders: () => listProviders(dataDirs.router),
     checkDomains: domainStatus.checkDomainsStatus.bind(domainStatus),

package/lib/router/manager.js

@@ -6,6 +6,7 @@
  */
 const path = require('path');
 const os = require('os');
+const dns = require('dns');
 const fse = require('fs-extra');
 const get = require('lodash/get');
 const toLower = require('lodash/toLower');
@@ -32,6 +33,7 @@ const {
   BlockletGroup,
 } = require('@blocklet/constant');
 const { forEachChildSync, hasStartEngine, isGatewayBlocklet } = require('@blocklet/meta/lib/util');
+const { fromPublicKey } = require('@ocap/wallet');
 
 const {
   validateAddSite,
@@ -186,6 +188,46 @@ class RouterManager extends EventEmitter {
     return dbSite;
   }
 
+  /**
+   *
+   * @param {object} params
+   * @param {string} params.domain
+   * @returns
+   */
+  async isDidDomain({ domain } = {}) {
+    if (!domain) {
+      throw new Error('domain is required');
+    }
+
+    const tempArray = toLower(domain).split('.');
+    let domainTld = domain;
+    if (tempArray.length > 2) {
+      domainTld = tempArray.slice(tempArray.length - 2).join('.');
+    }
+
+    const results = await dns.promises.resolveTxt(domainTld).catch(() => []);
+
+    return !!results.find(
+      (x) =>
+        !!x.find((v) => {
+          try {
+            const [type, value] = v.split('=');
+            if (type === 'dv') {
+              const [sig, pk] = value.split('.');
+              const wallet = fromPublicKey(pk);
+
+              return wallet.verify(domainTld, sig);
+            }
+
+            return false;
+          } catch (error) {
+            // do nothing
+            return false;
+          }
+        })
+    );
+  }
+
   async addDomainAlias(
     { id, domainAlias: tmpAlias, force, type, nftDid, chainHost, inBlockletSetup = false },
     context = {}
@@ -196,6 +238,12 @@ class RouterManager extends EventEmitter {
       throw new Error(`site ${id} does not exist`);
     }
 
+    if (type !== 'nft-domain') {
+      if (await this.isDidDomain({ domain: domainAlias })) {
+        throw new Error(`domain ${domainAlias} is a did domain`);
+      }
+    }
+
     // check domain exists in site domain
     const mainDomainSiteCount = await states.site.count({
       domain: domainAlias,

package/lib/states/notification.js

@@ -44,12 +44,14 @@ class NotificationState extends BaseState {
     return doc;
   }
 
-  findPaginated({ read, paging } = {}) {
+  findPaginated({ read, paging, teamDid } = {}) {
     const conditions = {};
     if (typeof read === 'boolean') {
       conditions.read = read;
     }
-
+    if (teamDid) {
+      conditions.entityId = teamDid;
+    }
     return this.paginate(conditions, { createdAt: -1 }, { ...paging, pageSize: 10 });
   }
 

package/lib/team/manager.js

@@ -35,6 +35,7 @@ const States = {
   Tag: require('../states/tag'),
   Project: require('../states/project'),
   Release: require('../states/release'),
+  Notification: require('../states/notification'),
 };
 
 const getDefaultTeamState = () => ({
@@ -46,6 +47,7 @@ const getDefaultTeamState = () => ({
   tag: null,
   project: null,
   release: null,
+  notification: null,
 });
 
 class TeamManager extends EventEmitter {
@@ -102,6 +104,7 @@ class TeamManager extends EventEmitter {
       passport: await this.createState(this.nodeDid, 'Passport'),
       connectedAccount: await this.createState(this.nodeDid, 'ConnectedAccount'),
       session: await this.createState(this.nodeDid, 'Session'),
+      notification: await this.createState(this.nodeDid, 'Notification'),
     };
   }
 
@@ -129,6 +132,10 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'session');
   }
 
+  getNotification(teamDid) {
+    return this.getState(teamDid, 'notification');
+  }
+
   async getProjectState(teamDid) {
     return {
       projectState: await this.getState(teamDid, 'project'),

package/lib/util/blocklet.js

@@ -488,6 +488,7 @@ const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {
 const startBlockletProcess = async (
   blocklet,
   {
+    preFlight = noop,
     preStart = noop,
     postStart = noopAsync,
     nodeEnvironments,
@@ -541,6 +542,9 @@ const startBlockletProcess = async (
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
 
+      // run hook
+      await preFlight(b, { env });
+
       // run hook
       await preStart(b, { env });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.21-beta-46c675eb",
+  "version": "1.16.21-beta-e828f413",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,39 +19,39 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.21-beta-46c675eb",
-    "@abtnode/auth": "1.16.21-beta-46c675eb",
-    "@abtnode/certificate-manager": "1.16.21-beta-46c675eb",
-    "@abtnode/constant": "1.16.21-beta-46c675eb",
-    "@abtnode/cron": "1.16.21-beta-46c675eb",
-    "@abtnode/logger": "1.16.21-beta-46c675eb",
-    "@abtnode/models": "1.16.21-beta-46c675eb",
-    "@abtnode/queue": "1.16.21-beta-46c675eb",
-    "@abtnode/rbac": "1.16.21-beta-46c675eb",
-    "@abtnode/router-provider": "1.16.21-beta-46c675eb",
-    "@abtnode/static-server": "1.16.21-beta-46c675eb",
-    "@abtnode/timemachine": "1.16.21-beta-46c675eb",
-    "@abtnode/util": "1.16.21-beta-46c675eb",
-    "@arcblock/did": "1.18.105",
-    "@arcblock/did-auth": "1.18.105",
-    "@arcblock/did-ext": "^1.18.105",
+    "@abtnode/analytics": "1.16.21-beta-e828f413",
+    "@abtnode/auth": "1.16.21-beta-e828f413",
+    "@abtnode/certificate-manager": "1.16.21-beta-e828f413",
+    "@abtnode/constant": "1.16.21-beta-e828f413",
+    "@abtnode/cron": "1.16.21-beta-e828f413",
+    "@abtnode/logger": "1.16.21-beta-e828f413",
+    "@abtnode/models": "1.16.21-beta-e828f413",
+    "@abtnode/queue": "1.16.21-beta-e828f413",
+    "@abtnode/rbac": "1.16.21-beta-e828f413",
+    "@abtnode/router-provider": "1.16.21-beta-e828f413",
+    "@abtnode/static-server": "1.16.21-beta-e828f413",
+    "@abtnode/timemachine": "1.16.21-beta-e828f413",
+    "@abtnode/util": "1.16.21-beta-e828f413",
+    "@arcblock/did": "1.18.107",
+    "@arcblock/did-auth": "1.18.107",
+    "@arcblock/did-ext": "^1.18.107",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.105",
-    "@arcblock/event-hub": "1.18.105",
-    "@arcblock/jwt": "^1.18.105",
+    "@arcblock/did-util": "1.18.107",
+    "@arcblock/event-hub": "1.18.107",
+    "@arcblock/jwt": "^1.18.107",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.105",
-    "@arcblock/vc": "1.18.105",
-    "@blocklet/constant": "1.16.21-beta-46c675eb",
-    "@blocklet/env": "1.16.21-beta-46c675eb",
-    "@blocklet/meta": "1.16.21-beta-46c675eb",
-    "@blocklet/resolver": "1.16.21-beta-46c675eb",
-    "@blocklet/sdk": "1.16.21-beta-46c675eb",
-    "@did-space/client": "^0.3.43",
+    "@arcblock/validator": "^1.18.107",
+    "@arcblock/vc": "1.18.107",
+    "@blocklet/constant": "1.16.21-beta-e828f413",
+    "@blocklet/env": "1.16.21-beta-e828f413",
+    "@blocklet/meta": "1.16.21-beta-e828f413",
+    "@blocklet/resolver": "1.16.21-beta-e828f413",
+    "@blocklet/sdk": "1.16.21-beta-e828f413",
+    "@did-space/client": "^0.3.44",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.105",
-    "@ocap/util": "1.18.105",
-    "@ocap/wallet": "1.18.105",
+    "@ocap/mcrypto": "1.18.107",
+    "@ocap/util": "1.18.107",
+    "@ocap/wallet": "1.18.107",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -102,5 +102,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a852c7930e8bc84c641579d8e4c009accf478078"
+  "gitHead": "936af9cb0549f341d3683ea63085b460bf6ddbf0"
 }