@abtnode/core 1.8.10 → 1.8.13

package/lib/blocklet/manager/disk.js

@@ -533,7 +533,7 @@ class BlockletManager extends BaseBlockletManager {
     logger.info('blocklet reload successfully', { did });
 
     const res = await this.status(did);
-    this.emit(BlockletEvents.statusUpdated, res);
+    this.emit(BlockletEvents.statusChange, res);
     return res;
   }
 
@@ -1370,7 +1370,9 @@ class BlockletManager extends BaseBlockletManager {
         return blocklet;
       }
 
-      return states.blocklet.setBlockletStatus(did, BlockletStatus.stopped);
+      const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped);
+      this.emit(BlockletEvents.statusChange, res);
+      return res;
     };
 
     const blocklet = await this.ensureBlocklet(did);
@@ -1384,22 +1386,22 @@ class BlockletManager extends BaseBlockletManager {
       }
     }
 
+    if (!shouldUpdateStatus) {
+      return blocklet;
+    }
+
     try {
       const status = await getBlockletStatusFromProcess(blocklet);
-      if (shouldUpdateStatus) {
-        if (status === BlockletStatus.stopped) {
-          await states.blocklet.stopBlocklet(did);
-        }
-        return states.blocklet.setBlockletStatus(did, status);
+      if (blocklet.status !== status) {
+        const res = await states.blocklet.setBlockletStatus(did, status);
+        this.emit(BlockletEvents.statusChange, res);
+        return res;
       }
+
+      return blocklet;
     } catch (err) {
-      if (shouldUpdateStatus) {
-        return fastReturnOnForceSync(blocklet);
-      }
-      throw err;
+      return fastReturnOnForceSync(blocklet);
     }
-
-    return blocklet;
   }
 
   async getBlockletInterfaces({ blocklet, nodeInfo, context }) {
@@ -2301,7 +2303,7 @@ class BlockletManager extends BaseBlockletManager {
   async _syncBlockletStatus() {
     const run = async (blocklet) => {
       try {
-        await this.status(blocklet.meta.did, { forceSync: true });
+        await this.status(blocklet.meta.did);
       } catch (err) {
         logger.error('sync blocklet status failed', { error: err });
       }

package/lib/router/helper.js

@@ -1284,12 +1284,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     });
   };
 
-  const checkDomain = async (domain) => {
-    const matchedCert = await routerManager.getMatchedCert(domain);
-
-    return { domain, isHttps: !!matchedCert, matchedCert };
-  };
-
   return {
     ensureDashboardRouting,
     ensureBlockletRouting,
@@ -1305,7 +1299,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     getSnapshotSites,
     getSitesFromSnapshot,
     getCertificates,
-    checkDomain,
     ensureWildcardCerts,
     addWellknownSite,
     upsertSiteRule,

package/lib/states/webhook.js

@@ -8,7 +8,7 @@ class WebhookState extends BaseState {
     super(baseDir, { filename: 'webhook.db', ...options });
   }
 
-  async create(info) {
+  async create(info, { mock } = {}) {
     const { type, params } = info;
     const filterParams = params.map((item) => {
       const data = {
@@ -26,6 +26,10 @@ class WebhookState extends BaseState {
 
     await validateWebhook(data);
 
+    if (mock) {
+      return data;
+    }
+
     const webhook = await this.asyncDB.insert(data);
     return webhook;
   }

package/lib/util/blocklet.js

@@ -353,8 +353,8 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
   for (const x of root.children || []) {
     mountPoints.push({
       title: x.meta.title,
-      did: x.meta.did,
-      name: x.meta.name,
+      did: x.meta.bundleDid,
+      name: x.meta.bundleName,
       mountPoint: x.mountPoint || '',
     });
   }
@@ -366,6 +366,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     ...devEnvironments,
     BLOCKLET_WEB_PORTS: JSON.stringify(ports),
     BLOCKLET_MOUNT_POINTS: JSON.stringify(mountPoints),
+    BLOCKLET_MODE: blocklet.mode || BLOCKLET_MODES.PRODUCTION,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };

package/lib/util/domain-status.js

@@ -1,6 +1,7 @@
+const https = require('https');
 const { EventEmitter } = require('events');
 const logger = require('@abtnode/logger')('@abtnode/domain-status');
-const { EVENTS } = require('@abtnode/constant');
+const { EVENTS, WELLKNOWN_PING_PREFIX } = require('@abtnode/constant');
 const { checkDomainDNS } = require('./index');
 
 const dnsStatusStore = Object.create(null);
@@ -31,9 +32,51 @@ class DomainStatus extends EventEmitter {
     this.routerManager = routerManager;
   }
 
+  async getHttpsCert(domain) {
+    const matchedCert = await this.routerManager.getMatchedCert(domain);
+
+    if (matchedCert) {
+      return matchedCert;
+    }
+
+    return new Promise((resolve) => {
+      const req = https.request(
+        {
+          host: domain,
+          path: WELLKNOWN_PING_PREFIX,
+          method: 'GET',
+          timeout: 1000 * 10,
+        },
+        (res) => {
+          try {
+            const data = res.socket.getPeerCertificate();
+            const cert = {
+              issuer: {
+                countryName: data.issuer.C,
+                organizationName: data.issuer.O,
+                commonName: data.issuer.CN,
+              },
+              validFrom: data.valid_from,
+              validTo: data.valid_to,
+            };
+            resolve(cert);
+          } catch {
+            resolve(null);
+          }
+        }
+      );
+
+      req.on('error', () => {
+        resolve(null);
+      });
+
+      req.end();
+    });
+  }
+
   checkDomainsStatus({ domains } = {}) {
     (domains || []).forEach((domain) => {
-      Promise.all([this.routerManager.getMatchedCert(domain), checkDomainDnsWrapper(domain)])
+      Promise.all([this.getHttpsCert(domain), checkDomainDnsWrapper(domain)])
         .then((data) => {
           const [matchedCert, dns] = data;
           this.emit(EVENTS.DOMAIN_STATUS, { domain, matchedCert, isHttps: !!matchedCert, dns });

package/lib/webhook/index.js

@@ -134,13 +134,14 @@ module.exports = ({ events, dataDirs, instance }) => {
 
   const createWebhook = async (webhook) => {
     try {
-      const createRes = await webhookState.create(webhook);
-      await sentTextMessage(createRes, `A ${createRes.type} integration is now *successfully added*`);
+      const mockCreateRes = await webhookState.create(webhook, { mock: true });
+      await sentTextMessage(mockCreateRes, `A ${mockCreateRes.type} integration is now *successfully added*`);
 
+      const createRes = await webhookState.create(webhook);
       return createRes;
     } catch (err) {
-      logger.error('create webhook error', { err });
-      throw new Error(err.message);
+      logger.error('Failed to create webhook', { err });
+      throw new Error(`Failed to create webhook: ${err.message}`);
     }
   };
 

package/lib/webhook/sender/slack/index.js

@@ -29,7 +29,7 @@ class SlackSender extends BaseSender {
             type: 'section',
             text: {
               type: 'mrkdwn',
-              text: `*${nodeInfo.name}*`,
+              text: `*${nodeInfo?.name}*`,
             },
           },
           {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.10",
+  "version": "1.8.13",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.10",
-    "@abtnode/constant": "1.8.10",
-    "@abtnode/cron": "1.8.10",
-    "@abtnode/db": "1.8.10",
-    "@abtnode/logger": "1.8.10",
-    "@abtnode/queue": "1.8.10",
-    "@abtnode/rbac": "1.8.10",
-    "@abtnode/router-provider": "1.8.10",
-    "@abtnode/static-server": "1.8.10",
-    "@abtnode/timemachine": "1.8.10",
-    "@abtnode/util": "1.8.10",
-    "@arcblock/did": "1.17.11",
+    "@abtnode/certificate-manager": "1.8.13",
+    "@abtnode/constant": "1.8.13",
+    "@abtnode/cron": "1.8.13",
+    "@abtnode/db": "1.8.13",
+    "@abtnode/logger": "1.8.13",
+    "@abtnode/queue": "1.8.13",
+    "@abtnode/rbac": "1.8.13",
+    "@abtnode/router-provider": "1.8.13",
+    "@abtnode/static-server": "1.8.13",
+    "@abtnode/timemachine": "1.8.13",
+    "@abtnode/util": "1.8.13",
+    "@arcblock/did": "1.17.15",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.11",
-    "@arcblock/event-hub": "1.17.11",
-    "@arcblock/jwt": "^1.17.11",
+    "@arcblock/did-util": "1.17.15",
+    "@arcblock/event-hub": "1.17.15",
+    "@arcblock/jwt": "^1.17.15",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.11",
-    "@blocklet/meta": "1.8.10",
-    "@blocklet/sdk": "1.8.10",
+    "@arcblock/vc": "1.17.15",
+    "@blocklet/meta": "1.8.13",
+    "@blocklet/sdk": "1.8.13",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.3.4",
     "@nedb/multi": "^1.3.4",
-    "@ocap/mcrypto": "1.17.11",
-    "@ocap/util": "1.17.11",
-    "@ocap/wallet": "1.17.11",
+    "@ocap/mcrypto": "1.17.15",
+    "@ocap/util": "1.17.15",
+    "@ocap/wallet": "1.17.15",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -82,5 +82,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "84f655bd7b8d55fde2656fac8671faad3c3bde28"
+  "gitHead": "028f33d8a3a4f999456bfe8e7bd2e1a53b664b47"
 }