@abtnode/core 1.8.63-beta-b71f5f80 → 1.8.63-beta-a36b5e1a

package/lib/blocklet/manager/disk.js

@@ -3583,16 +3583,18 @@ class BlockletManager extends BaseBlockletManager {
     fs.removeSync(cacheDir);
     await this._cleanBlockletData({ blocklet, keepData, keepLogsDir, keepConfigs });
 
-    const nodeInfo = await states.node.read();
-    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-    didDocument
-      .disableDNS({ wallet, didRegistryUrl: nodeInfo.didRegistry })
-      .then(() => {
-        logger.info(`disabled blocklet ${blocklet.appDid} dns`);
-      })
-      .catch((err) => {
-        logger.error(`disable blocklet ${blocklet.appDid} dns failed`, { error: err });
-      });
+    if (blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
+      const nodeInfo = await states.node.read();
+      const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+      didDocument
+        .disableDNS({ wallet, didRegistryUrl: nodeInfo.didRegistry })
+        .then(() => {
+          logger.info(`disabled blocklet ${blocklet.appDid} dns`);
+        })
+        .catch((err) => {
+          logger.error(`disable blocklet ${blocklet.appDid} dns failed`, { error: err });
+        });
+    }
 
     const result = await states.blocklet.deleteBlocklet(did);
     logger.info('blocklet removed successfully', { did });

package/lib/cert.js

@@ -1,9 +1,10 @@
 const { EventEmitter } = require('events');
 const CertificateManager = require('@abtnode/certificate-manager/sdk/manager');
 const logger = require('@abtnode/logger')('@abtnode/core:cert');
-const states = require('./states');
+const { EVENTS } = require('@abtnode/constant');
+const { BlockletEvents } = require('@blocklet/constant');
 
-const onCertExpired = async (cert) => {
+const onCertExpired = async (cert, states) => {
   logger.info('send certificate expire notification', { domain: cert.domain });
   states.notification.create({
     title: 'SSL Certificate Expired',
@@ -14,7 +15,7 @@ const onCertExpired = async (cert) => {
   });
 };
 
-const onCertAboutExpire = (cert) => {
+const onCertAboutExpire = (cert, states) => {
   logger.info('send certificate about-expire notification', { domain: cert.domain });
   states.notification.create({
     title: 'SSL Certificate Expire Warning',
@@ -27,7 +28,7 @@ const onCertAboutExpire = (cert) => {
   });
 };
 
-const onCertIssued = (cert) => {
+const onCertIssued = (cert, states) => {
   states.notification.create({
     title: 'Certificate Issued',
     description: `The ${cert.domain} certificate is issued successfully`,
@@ -37,7 +38,7 @@ const onCertIssued = (cert) => {
   });
 };
 
-const onCertIssueFailed = (cert) => {
+const onCertIssueFailed = (cert, states) => {
   states.notification.create({
     title: 'Certificate Issue Failed',
     description: `Failed to issue certificate for ${cert.domain}`,
@@ -56,22 +57,21 @@ const getDomainFromInput = (input) => {
 };
 
 class Cert extends EventEmitter {
-  constructor({ maintainerEmail, dataDir }) {
+  constructor({ maintainerEmail, dataDir, states }) {
     super();
 
     this.manager = new CertificateManager({ maintainerEmail, dataDir });
 
-    this.manager.on('cert.issued', (cert) => {
-      this.emit('cert.issued', cert);
-      onCertIssued(cert);
-    });
+    this.manager.on('cert.issued', this._onCertIssued.bind(this));
+    this.manager.on('cert.expired', this._onCertExpired.bind(this));
+    this.manager.on('cert.about_to_expire', this._onCertAboutToExpire.bind(this));
+    this.manager.on('cert.error', this._onCertError.bind(this));
 
-    this.manager.on('cert.expired', onCertExpired);
-    this.manager.on('cert.about_to_expire', onCertAboutExpire);
-    this.manager.on('cert.error', (cert) => {
-      this.emit('cert.error', cert);
-      onCertIssueFailed(cert);
-    });
+    /**
+     * Array<{domain: string, did: string}>
+     */
+    this._blockletDomains = [];
+    this.states = states;
   }
 
   start() {
@@ -110,20 +110,29 @@ class Cert extends EventEmitter {
 
     const result = await this.manager.add(data);
     logger.info('add certificate result', { name: result.name });
-    this.emit('cert.added', result);
+    this.emit(EVENTS.CERT_ADDED, result);
 
     return result;
   }
 
-  async issue({ domain }) {
+  /**
+   * @param {{
+   *   did?:string // blocklet.meta.did
+   * }}
+   */
+  async issue({ domain, did }) {
     logger.info(`generate certificate for ${domain}`);
 
+    if (did) {
+      this._bindBlocklet({ domain, did });
+    }
+
     return this.manager.issue(domain);
   }
 
   async upsertByDomain(data) {
     const result = await this.manager.upsertByDomain(data);
-    this.emit('cert.updated', result);
+    this.emit(EVENTS.CERT_UPDATED, result);
 
     return result;
   }
@@ -135,7 +144,7 @@ class Cert extends EventEmitter {
   async remove({ id }) {
     await this.manager.remove(id);
     logger.info('delete certificate', { id });
-    this.emit('cert.removed');
+    this.emit(EVENTS.CERT_REMOVED);
 
     return {};
   }
@@ -147,6 +156,51 @@ class Cert extends EventEmitter {
   async updateWithoutValidations(id, data) {
     return this.manager.updateWithoutValidations(id, data);
   }
+
+  _bindBlocklet({ domain, did }) {
+    // only save 100 domains in memory
+    const list = this._blockletDomains.slice(-100).filter((x) => x.domain !== domain);
+    list.push({ domain, did });
+    this._blockletDomains = list;
+  }
+
+  /**
+   * @param {{
+   *   blocklet: string;
+   *   server: string;
+   * }} event
+   * @param {{
+   *   domain: string
+   * }} cert
+   */
+  _emitEvent(event, cert) {
+    const blockletDomain = this._blockletDomains.find((x) => x.domain === cert.domain);
+    if (blockletDomain) {
+      this.emit(event.blocklet, { ...cert, meta: { did: blockletDomain.did } });
+    } else {
+      this.emit(event.server, cert);
+    }
+  }
+
+  _onCertIssued(cert) {
+    this._emitEvent({ blocklet: BlockletEvents.certIssued, server: EVENTS.CERT_ISSUED }, cert);
+
+    onCertIssued(cert, this.states);
+  }
+
+  _onCertError(cert) {
+    this._emitEvent({ blocklet: BlockletEvents.certError, server: EVENTS.CERT_ERROR }, cert);
+
+    onCertIssueFailed(cert, this.states);
+  }
+
+  _onCertExpired(cert) {
+    onCertExpired(cert, this.states);
+  }
+
+  _onCertAboutToExpire(cert) {
+    onCertAboutExpire(cert, this.states);
+  }
 }
 
 module.exports = Cert;

package/lib/event.js

@@ -332,6 +332,8 @@ module.exports = ({
 
   listen(certManager, EVENTS.CERT_ISSUED, onEvent);
   listen(certManager, EVENTS.CERT_ERROR, onEvent);
+  listen(certManager, BlockletEvents.certIssued, onEvent);
+  listen(certManager, BlockletEvents.certError, onEvent);
 
   listen(routerManager, BlockletEvents.updated, onEvent);
 

package/lib/index.js

@@ -110,6 +110,7 @@ function ABTNode(options) {
   const certManager = new Cert({
     maintainerEmail: DEFAULT_CERTIFICATE_EMAIL,
     dataDir: dataDirs.certManagerModule,
+    states,
   });
 
   const routerManager = new RouterManager({ certManager });

package/lib/router/helper.js

@@ -34,6 +34,7 @@ const {
   WELLKNOWN_DID_RESOLVER_PREFIX,
   WELLKNOWN_PING_PREFIX,
   LOG_RETAIN_IN_DAYS,
+  EVENTS,
 } = require('@abtnode/constant');
 const {
   BLOCKLET_DYNAMIC_PATH_PREFIX,
@@ -689,6 +690,21 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     };
 
     const existSite = await states.site.findOne({ domain: domainGroup });
+    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    updateBlockletDocument({
+      wallet,
+      blockletAppDid: blocklet.appDid,
+      daemonDidDomain: getServerDidDomain(nodeInfo),
+      didRegistryUrl: nodeInfo.didRegistry,
+      domain: nodeInfo.didDomain,
+    })
+      .then(() => {
+        logger.info(`updated blocklet ${blocklet.appDid} dns`);
+      })
+      .catch((err) => {
+        logger.error(`update blocklet ${blocklet.appDid} dns failed`, { error: err });
+      });
+
     if (!existSite) {
       const domainAliases = [];
 
@@ -697,21 +713,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         didDomain: nodeInfo.didDomain,
       });
 
-      const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-      updateBlockletDocument({
-        wallet,
-        blockletAppDid: blocklet.appDid,
-        daemonDidDomain: getServerDidDomain(nodeInfo),
-        didRegistryUrl: nodeInfo.didRegistry,
-        domain: nodeInfo.didDomain,
-      })
-        .then(() => {
-          logger.info(`updated blocklet ${blocklet.appDid} dns`);
-        })
-        .catch((err) => {
-          logger.error(`update blocklet ${blocklet.appDid} dns failed`, { error: err });
-        });
-
       const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet, webInterface, nodeInfo.did);
 
       // let didDomain in front of ipEchoDnsDomain
@@ -1038,10 +1039,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         },
       });
 
-      certManager.on('cert.added', () => providers[providerName].reload());
-      certManager.on('cert.removed', () => providers[providerName].reload());
-      certManager.on('cert.issued', () => providers[providerName].reload());
-      certManager.on('cert.updated', () => providers[providerName].reload());
+      certManager.on(EVENTS.CERT_ADDED, () => providers[providerName].reload());
+      certManager.on(EVENTS.CERT_REMOVED, () => providers[providerName].reload());
+      certManager.on(EVENTS.CERT_ISSUED, () => providers[providerName].reload());
+      certManager.on(EVENTS.CERT_UPDATED, () => providers[providerName].reload());
 
       await providers[providerName].start();
     }
@@ -1248,6 +1249,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
   const addRoutingRule = _proxyToRouterManager('addRoutingRule');
   const updateRoutingRule = _proxyToRouterManager('updateRoutingRule');
   const deleteRoutingRule = _proxyToRouterManager('deleteRoutingRule');
+  // FIXME: should verify domain owner before added
   const addDomainAlias = _proxyToRouterManager('addDomainAlias');
   const deleteDomainAlias = _proxyToRouterManager('deleteDomainAlias');
 

package/lib/util/blocklet.js

@@ -1459,7 +1459,7 @@ const ensureEnvDefault = (environments, ancestors) => {
 const fromProperty2Config = (properties = {}, result) => {
   Object.keys(properties).forEach((key) => {
     const prop = properties[key];
-    if (prop.properties) {
+    if (prop.properties && ['ArrayTable', 'ArrayCards'].includes(prop['x-component']) === false) {
       fromProperty2Config(prop.properties, result);
     } else if (prop['x-decorator'] === 'FormItem') {
       const secure = prop['x-component'] === 'Password';

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.63-beta-b71f5f80",
+  "version": "1.8.63-beta-a36b5e1a",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.63-beta-b71f5f80",
-    "@abtnode/certificate-manager": "1.8.63-beta-b71f5f80",
-    "@abtnode/constant": "1.8.63-beta-b71f5f80",
-    "@abtnode/cron": "1.8.63-beta-b71f5f80",
-    "@abtnode/db": "1.8.63-beta-b71f5f80",
-    "@abtnode/logger": "1.8.63-beta-b71f5f80",
-    "@abtnode/queue": "1.8.63-beta-b71f5f80",
-    "@abtnode/rbac": "1.8.63-beta-b71f5f80",
-    "@abtnode/router-provider": "1.8.63-beta-b71f5f80",
-    "@abtnode/static-server": "1.8.63-beta-b71f5f80",
-    "@abtnode/timemachine": "1.8.63-beta-b71f5f80",
-    "@abtnode/util": "1.8.63-beta-b71f5f80",
+    "@abtnode/auth": "1.8.63-beta-a36b5e1a",
+    "@abtnode/certificate-manager": "1.8.63-beta-a36b5e1a",
+    "@abtnode/constant": "1.8.63-beta-a36b5e1a",
+    "@abtnode/cron": "1.8.63-beta-a36b5e1a",
+    "@abtnode/db": "1.8.63-beta-a36b5e1a",
+    "@abtnode/logger": "1.8.63-beta-a36b5e1a",
+    "@abtnode/queue": "1.8.63-beta-a36b5e1a",
+    "@abtnode/rbac": "1.8.63-beta-a36b5e1a",
+    "@abtnode/router-provider": "1.8.63-beta-a36b5e1a",
+    "@abtnode/static-server": "1.8.63-beta-a36b5e1a",
+    "@abtnode/timemachine": "1.8.63-beta-a36b5e1a",
+    "@abtnode/util": "1.8.63-beta-a36b5e1a",
     "@arcblock/did": "1.18.36",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.36",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.36",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.36",
-    "@blocklet/constant": "1.8.63-beta-b71f5f80",
-    "@blocklet/meta": "1.8.63-beta-b71f5f80",
-    "@blocklet/sdk": "1.8.63-beta-b71f5f80",
+    "@blocklet/constant": "1.8.63-beta-a36b5e1a",
+    "@blocklet/meta": "1.8.63-beta-a36b5e1a",
+    "@blocklet/sdk": "1.8.63-beta-a36b5e1a",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.36",
     "@ocap/util": "1.18.36",
@@ -85,5 +85,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "ad50b6425a056b2db12b07283d0c08af62532c64"
+  "gitHead": "0c5385668fbd6235a3aead7d3a4a1ca5159088dd"
 }