@abtnode/core 1.7.2 → 1.7.5

package/lib/blocklet/extras.js

@@ -29,6 +29,9 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
     newConfigs.forEach((x) => {
       if (x.secure) {
         x.value = security.encrypt(x.value, did, dek);
+        if (x.default) {
+          x.default = security.encrypt(x.default, did, dek);
+        }
       }
     });
   }

package/lib/blocklet/manager/disk.js

@@ -15,6 +15,8 @@ const { isValid: isValidDid } = require('@arcblock/did');
 const { verifyPresentation } = require('@arcblock/vc');
 const { toBase58, isHex } = require('@ocap/util');
 const { fromSecretKey } = require('@ocap/wallet');
+const { toPng: createDidLogo } =
+  process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
 
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
 const downloadFile = require('@abtnode/util/lib/download-file');
@@ -2214,6 +2216,8 @@ class BlockletManager extends BaseBlockletManager {
       blocklet = await this.ensureBlocklet(did);
       logger.info('blocklet installed', { source, did: meta.did });
 
+      await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.png'), createDidLogo(blocklet.meta.did));
+
       this.emit(BlockletEvents.installed, { blocklet, context });
 
       states.notification.create({
@@ -2339,6 +2343,9 @@ class BlockletManager extends BaseBlockletManager {
       }
 
       blocklet = await this.ensureBlocklet(did, context);
+
+      await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.png'), createDidLogo(blocklet.meta.did));
+
       this.refreshListCache();
 
       try {

package/lib/index.js

@@ -247,7 +247,7 @@ function ABTNode(options) {
     updateNodeRouting,
     isInitialized,
     resetNode: (params, context) =>
-      resetNode({ params, context, blockletManager, routerManager, takeRoutingSnapshot, teamManager }),
+      resetNode({ params, context, blockletManager, routerManager, takeRoutingSnapshot, teamManager, certManager }),
 
     // Team && Access control
 

package/lib/migrations/1.7.1-blocklet-setup.js

@@ -3,7 +3,7 @@
 /* eslint-disable no-underscore-dangle */
 
 module.exports = async ({ states, printInfo }) => {
-  printInfo('Try to update blocklet to 1.7.1...');
+  printInfo('Try to update blocklet server to 1.7.1...');
 
   const blockletExtras = await states.blockletExtras.find({});
   for (const extra of blockletExtras) {
@@ -13,6 +13,6 @@ module.exports = async ({ states, printInfo }) => {
 
     await states.blockletExtras.setSettings(extra.did, { initialized: true });
 
-    printInfo(`Set initialized: ${extra}`);
+    printInfo(`Set initialized: ${extra.did}`);
   }
 };

package/lib/router/helper.js

@@ -7,6 +7,7 @@ const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
 const isEqual = require('lodash/isEqual');
 const joinUrl = require('url-join');
+const { replaceSlotToIp } = require('@blocklet/meta/lib/util');
 const { getProvider } = require('@abtnode/router-provider');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const getTmpDir = require('@abtnode/util/lib/get-tmp-directory');
@@ -79,7 +80,7 @@ const attachRuntimeDomainAliases = async ({ sites = [], context = {}, node }) =>
         return domain;
       }
       if (domain.value.includes(SLOT_FOR_IP_DNS_SITE) && ip) {
-        domain.value = domain.value.replace(SLOT_FOR_IP_DNS_SITE, ip.replace(/\./g, '-'));
+        domain.value = replaceSlotToIp(domain.value, ip);
       }
       return domain;
     });

package/lib/router/manager.js

@@ -365,58 +365,6 @@ class RouterManager extends EventEmitter {
     return newSite;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async addCertificate(entity, context = {}) {
-    entity.type = 'nginx';
-    this.fixCertificate(entity);
-
-    this.validateCertificate(entity);
-
-    const info = Certificate.fromPEM(entity.certificate);
-    const domain = get(info, 'subject.commonName', '');
-
-    const cert = await states.certificate.find({ domain });
-    const hasOne = cert && cert.length;
-
-    if (hasOne) {
-      throw new Error('certificate has exists!');
-    }
-
-    const newCert = await states.certificate.upsert({
-      ...entity,
-      domain,
-    });
-    logger.info('add certificate result', { domain: newCert.domain });
-    this.emit('cert.added', { type: 'nginx', data: newCert });
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async deleteCertificate({ id }, context = {}) {
-    const tmpCert = await states.certificate.find({ _id: id });
-    if (!tmpCert) {
-      throw new Error('certificate does not exist');
-    }
-
-    const removeResult = await states.certificate.remove({ _id: id });
-
-    logger.info('delete certificate', { removeResult, domain: tmpCert.domain });
-    this.emit('cert.removed', { type: 'nginx', data: { domain: tmpCert.domain } });
-    return {};
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async updateNginxHttpsCert(entity, context = {}) {
-    entity.type = 'nginx';
-    this.fixCertificate(entity);
-    this.validateCertificate(entity, entity.domain);
-    const dbEntity = await states.certificate.upsert(entity);
-    this.emit('cert.issued', { type: 'nginx', data: dbEntity });
-  }
-
-  findCertificateByDomain(domain) {
-    return states.certificate.findOne({ domain });
-  }
-
   // ============================================================================================
   // Internal API that are used by public APIs and called from CLI
   // ============================================================================================
@@ -546,10 +494,7 @@ class RouterManager extends EventEmitter {
     const info = await states.node.read();
     const httpsEnabled = get(info, 'routing.https', true);
 
-    const selection = { domain: 1, privateKey: 1, certificate: 1 };
-    const certificates = httpsEnabled
-      ? await states.certificate.find({ type: get(info, 'routing.provider', null) }, selection)
-      : [];
+    const certificates = httpsEnabled ? await this.certManager.getAllNormal() : [];
 
     let sites = await states.site.getSites();
     // mutate data by input

package/lib/states/index.js

@@ -4,7 +4,6 @@ const ChallengeState = require('./challenge');
 const BlockletState = require('./blocklet');
 const NotificationState = require('./notification');
 const SiteState = require('./site');
-const HttpsCertState = require('./https-cert');
 const AccessKeyState = require('./access-key');
 const WebhookState = require('./webhook');
 const MigrationState = require('./migration');
@@ -18,7 +17,6 @@ const init = (dataDirs, options) => {
   const blockletState = new BlockletState(dataDirs.core, options);
   const challengeState = new ChallengeState(dataDirs.core, options);
   const siteState = new SiteState(dataDirs.core, options);
-  const httpsCertState = new HttpsCertState(dataDirs.core, options);
   const accessKeyState = new AccessKeyState(dataDirs.core, options);
   const webhookState = new WebhookState(dataDirs.core, options);
   const migrationState = new MigrationState(dataDirs.core, options);
@@ -30,7 +28,6 @@ const init = (dataDirs, options) => {
     node: nodeState,
     blocklet: blockletState,
     notification: notificationState,
-    certificate: httpsCertState,
     site: siteState,
     accessKey: accessKeyState,
     webhook: webhookState,

package/lib/util/index.js

@@ -17,6 +17,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const parseBlockletMeta = require('@blocklet/meta/lib/parse');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const { BlockletStatus, BLOCKLET_INTERFACE_WELLKNOWN } = require('@blocklet/meta/lib/constants');
+const { replaceSlotToIp } = require('@blocklet/meta/lib/util');
 const {
   StatusCode,
   DOMAIN_FOR_DEFAULT_SITE,
@@ -83,10 +84,10 @@ const getBlockletHost = ({ domain, context, nodeIp }) => {
     const ipRegex = /\d+[-.]\d+[-.]\d+[-.]\d+/;
     const match = ipRegex.exec(context.hostname);
     if (match) {
-      const ip = match[0].replace(/\./g, '-');
-      tmpDomain = tmpDomain.replace(SLOT_FOR_IP_DNS_SITE, ip);
+      const ip = match[0];
+      tmpDomain = replaceSlotToIp(tmpDomain, ip);
     } else if (nodeIp) {
-      tmpDomain = tmpDomain.replace(SLOT_FOR_IP_DNS_SITE, nodeIp.replace(/\./g, '-'));
+      tmpDomain = replaceSlotToIp(tmpDomain, nodeIp);
     }
   }
 

package/lib/util/reset-node.js

@@ -52,14 +52,14 @@ const resetSites = async ({ context, routerManager, takeRoutingSnapshot }) => {
 };
 
 /* istanbul ignore next */
-const resetCertificates = async ({ context, routerManager }) => {
-  const certs = await states.certificate.find();
+const resetCertificates = async ({ certManager }) => {
+  const certs = await certManager.getAll();
   for (let i = 0; i < certs.length; i++) {
     const cert = certs[i];
-    if (!cert.sans.includes('*.ip.abtnet.io')) {
+    if (!cert.domain === '*.ip.abtnet.io') {
       try {
         // eslint-disable-next-line no-await-in-loop
-        await routerManager.deleteCertificate({ id: cert.id }, context);
+        await certManager.remove(cert.id);
       } catch (err) {
         // Do nothing
       }
@@ -109,7 +109,15 @@ const resetFns = {
   invitations: resetInvitations,
 };
 
-module.exports = async ({ params, context, blockletManager, routerManager, takeRoutingSnapshot, teamManager }) => {
+module.exports = async ({
+  params,
+  context,
+  blockletManager,
+  routerManager,
+  takeRoutingSnapshot,
+  teamManager,
+  certManager,
+}) => {
   if (process.env.NODE_ENV !== 'e2e') {
     throw new Error('Reset node only exists for test purpose');
   }
@@ -140,7 +148,14 @@ module.exports = async ({ params, context, blockletManager, routerManager, takeR
       }
 
       // eslint-disable-next-line no-await-in-loop
-      results[key] = await resetFns[key]({ context, blockletManager, routerManager, takeRoutingSnapshot, teamManager });
+      results[key] = await resetFns[key]({
+        context,
+        blockletManager,
+        routerManager,
+        takeRoutingSnapshot,
+        teamManager,
+        certManager,
+      });
     }
   }
 

package/lib/webhook/index.js

@@ -1,6 +1,7 @@
 const logger = require('@abtnode/logger')('@abtnode/core:webhook:index');
 
-const sortPriorityUrl = require('@abtnode/util/lib/sort-priority-url');
+const { evaluateURLs } = require('@abtnode/util/lib/url-evaluation');
+const checkURLAccessible = require('@abtnode/util/lib/url-evaluation/check-accessible-node');
 const { EVENTS } = require('@abtnode/constant');
 const WebHookSender = require('./sender');
 const createQueue = require('../queue');
@@ -29,7 +30,10 @@ const getSlackUrlInfo = async (actionPath = '/notifications', urls) => {
     });
   }
 
-  const prioritys = await sortPriorityUrl(urls);
+  const prioritys = await evaluateURLs(
+    urls.map((item) => item.url),
+    { checkAccessble: checkURLAccessible }
+  );
   const priorityUrl = prioritys[0].url;
 
   const { protocol } = new URL(priorityUrl);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.2",
+  "version": "1.7.5",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,29 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.2",
-    "@abtnode/constant": "1.7.2",
-    "@abtnode/cron": "1.7.2",
-    "@abtnode/db": "1.7.2",
-    "@abtnode/logger": "1.7.2",
-    "@abtnode/queue": "1.7.2",
-    "@abtnode/rbac": "1.7.2",
-    "@abtnode/router-provider": "1.7.2",
-    "@abtnode/static-server": "1.7.2",
-    "@abtnode/timemachine": "1.7.2",
-    "@abtnode/util": "1.7.2",
-    "@arcblock/did": "^1.15.3",
-    "@arcblock/event-hub": "1.15.3",
+    "@abtnode/certificate-manager": "1.7.5",
+    "@abtnode/constant": "1.7.5",
+    "@abtnode/cron": "1.7.5",
+    "@abtnode/db": "1.7.5",
+    "@abtnode/logger": "1.7.5",
+    "@abtnode/queue": "1.7.5",
+    "@abtnode/rbac": "1.7.5",
+    "@abtnode/router-provider": "1.7.5",
+    "@abtnode/static-server": "1.7.5",
+    "@abtnode/timemachine": "1.7.5",
+    "@abtnode/util": "1.7.5",
+    "@arcblock/did": "^1.15.7",
+    "@arcblock/did-motif": "^1.1.3",
+    "@arcblock/event-hub": "1.15.7",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.15.3",
-    "@blocklet/meta": "1.7.2",
+    "@arcblock/vc": "^1.15.7",
+    "@blocklet/meta": "1.7.5",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.15.3",
-    "@ocap/util": "^1.15.3",
-    "@ocap/wallet": "^1.15.3",
+    "@ocap/mcrypto": "^1.15.7",
+    "@ocap/util": "^1.15.7",
+    "@ocap/wallet": "^1.15.7",
     "@slack/webhook": "^5.0.3",
     "ajv": "^7.0.3",
     "axios": "^0.25.0",
@@ -49,7 +50,7 @@
     "deep-diff": "^1.0.2",
     "detect-port": "^1.3.0",
     "flat": "^5.0.2",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "get-port": "^5.1.1",
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
@@ -77,5 +78,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "b84e7406d84fb9c3be5bf7ce968cb7b6b661d550"
+  "gitHead": "b17d83773e5a4c06bae390fc70398d49d6dd86b3"
 }

package/lib/migrations/1.6.7-certificate.js

@@ -1,30 +0,0 @@
-module.exports = async ({ states, node, printInfo }) => {
-  printInfo('Migrate certificates...');
-  const certs = await states.certificate.find(
-    {},
-    {
-      domain: 1,
-      privateKey: 1,
-      certificate: 1,
-      createdAt: 1,
-      updatedAt: 1,
-    }
-  );
-
-  const tasks = certs.map((cert) => {
-    const data = {
-      _id: cert.id,
-      domain: cert.domain,
-      privateKey: cert.privateKey,
-      certificate: cert.certificate,
-      createdAt: cert.createdAt,
-      updatedAt: cert.updatedAt,
-      source: 'lets_encrypt',
-      status: 'generated',
-    };
-
-    return node.certManager.addWithoutValidations(data);
-  });
-
-  await Promise.all(tasks);
-};

package/lib/states/https-cert.js

@@ -1,67 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-
-const logger = require('@abtnode/logger')('@abtnode/core:https-cert');
-const BaseState = require('./base');
-const { getHttpsCertInfo } = require('../util');
-
-const attachHttpsCertInfo = (certificates = []) => {
-  if (!certificates) {
-    return null;
-  }
-
-  if (Array.isArray(certificates)) {
-    return certificates.map((cert) => {
-      const info = cert.certificate ? getHttpsCertInfo(cert.certificate) : {};
-      return { ...cert, ...info };
-    });
-  }
-
-  const info = certificates.certificate ? getHttpsCertInfo(certificates.certificate) : {};
-  return { ...certificates, ...info };
-};
-
-class HttpsCert extends BaseState {
-  constructor(baseDir, options = {}) {
-    super(baseDir, { filename: 'https_cert.db', ...options });
-
-    this.db.ensureIndex({ fieldName: 'domain', unique: true }, (error) => {
-      if (error) {
-        logger.error('ensure unique index failed', { error });
-      }
-    });
-  }
-
-  async upsert(entity) {
-    const updateResult = await this.asyncDB.update(
-      { domain: entity.domain },
-      { $set: entity },
-      {
-        upsert: true,
-      }
-    );
-
-    logger.debug('upsert result', { updateResult });
-
-    const newEntity = await this.findOne({ domain: entity.domain });
-
-    return HttpsCert.renameIdFiledName(newEntity);
-  }
-
-  async find(condition, projection) {
-    const dbEntity = await this.asyncDB.find(condition, { privateKey: 0, ...(projection || {}) });
-
-    return attachHttpsCertInfo(HttpsCert.renameIdFiledName(dbEntity));
-  }
-
-  async findOne(condition, projection) {
-    const dbEntity = await this.asyncDB.findOne(condition, { privateKey: 0, ...(projection || {}) });
-
-    return attachHttpsCertInfo(HttpsCert.renameIdFiledName(dbEntity));
-  }
-
-  async remove(...args) {
-    return this.asyncDB.remove(...args);
-  }
-}
-
-module.exports = HttpsCert;