@abtnode/core 1.7.9 → 1.7.10

package/lib/blocklet/manager/disk.js

@@ -627,7 +627,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async config({ did, childDid, configs: newConfigs }, context) {
+  async config({ did, childDid, configs: newConfigs, skipHook }, context) {
     logger.info('config blocklet', { did });
     if (!Array.isArray(newConfigs)) {
       throw new Error('configs list is not an array');
@@ -694,15 +694,17 @@ class BlockletManager extends BaseBlockletManager {
       blocklet.configObj[x.key] = x.value;
     }
 
-    // FIXME: we should also call preConfig for child blocklets
-    await hooks.preConfig(blocklet.env.appId, {
-      appDir: blocklet.env.appDir,
-      hooks: Object.assign(blocklet.meta.hooks || {}, blocklet.meta.scripts || {}),
-      exitOnError: true,
-      env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments), ...blocklet.configObj },
-      did,
-      context,
-    });
+    if (!skipHook) {
+      // FIXME: we should also call preConfig for child blocklets
+      await hooks.preConfig(blocklet.env.appId, {
+        appDir: blocklet.env.appDir,
+        hooks: Object.assign(blocklet.meta.hooks || {}, blocklet.meta.scripts || {}),
+        exitOnError: true,
+        env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments), ...blocklet.configObj },
+        did,
+        context,
+      });
+    }
 
     // update db
     const configs = childDid

package/lib/cert.js

@@ -37,6 +37,16 @@ const onCertIssued = (cert) => {
   });
 };
 
+const onCertIssueFailed = (cert) => {
+  states.notification.create({
+    title: 'Certificate Issue Failed',
+    description: `Failed to issue certificate for ${cert.domain}`,
+    severity: 'error',
+    entityType: 'certificate',
+    entityId: cert.id,
+  });
+};
+
 const getDomainFromInput = (input) => {
   if (Object.prototype.toString.call(input) === '[object Object]') {
     return input.domain;
@@ -58,6 +68,10 @@ class Cert extends EventEmitter {
 
     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);
+    });
   }
 
   start() {

package/lib/event.js

@@ -25,6 +25,7 @@ module.exports = ({
   handleRouting,
   domainStatus,
   teamAPI,
+  certManager,
 }) => {
   const notificationState = states.notification;
   const nodeState = states.node;
@@ -230,5 +231,8 @@ module.exports = ({
   events.handleServerEvent = handleServerEvent;
   events.handleBlockletEvent = handleBlockletEvent;
 
+  certManager.on('cert.issued', (data) => onEvent(EVENTS.CERT_ISSUED, data));
+  certManager.on('cert.error', (data) => onEvent(EVENTS.CERT_ERROR, data));
+
   return events;
 };

package/lib/index.js

@@ -10,6 +10,7 @@ const {
   fromBlockletSource,
   toBlockletSource,
 } = require('@blocklet/meta/lib/constants');
+const { getServiceMetas } = require('@blocklet/meta/lib/service');
 const { listProviders } = require('@abtnode/router-provider');
 const { DEFAULT_CERTIFICATE_EMAIL, EVENTS } = require('@abtnode/constant');
 
@@ -29,7 +30,6 @@ const IP = require('./util/ip');
 const DomainStatus = require('./util/domain-status');
 const Upgrade = require('./util/upgrade');
 const resetNode = require('./util/reset-node');
-const { getServices } = require('./util/service');
 const DiskMonitor = require('./util/disk-monitor');
 const createQueue = require('./queue');
 const createEvents = require('./event');
@@ -377,7 +377,7 @@ function ABTNode(options) {
     endSession: (params, context) => states.session.end(params.id, context),
 
     // Services
-    getServices: (params, context) => getServices({ stringifySchema: true }, context),
+    getServices: (params, context) => getServiceMetas({ stringifySchema: true }, context),
 
     // Utilities: moved here because some deps require native build
     getSysInfo,

package/lib/router/index.js

@@ -110,7 +110,7 @@ class Router {
     await this.provider.update({
       routingTable: this.routingTable,
       certificates,
-      globalHeaders: headers,
+      commonHeaders: headers,
       services,
       nodeInfo: pick(nodeInfo, ['name', 'version', 'port', 'mode', 'enableWelcomePage', 'routing']),
     });

package/lib/router/manager.js

@@ -222,7 +222,7 @@ class RouterManager extends EventEmitter {
     }
 
     // let custom domain in front of protected domain
-    const domainAliases = [{ value: domainAlias, isProtected: false }, ...dbSite.domainAliases];
+    const domainAliases = [{ value: domainAlias, isProtected: false }, ...(dbSite.domainAliases || [])];
 
     const updateResult = await states.site.update({ _id: id }, { $set: { domainAliases } });
     logger.debug('add domain alias update result', { id, updateResult, domainAlias });
@@ -420,7 +420,7 @@ class RouterManager extends EventEmitter {
   }
 
   async getMatchedCert(domain) {
-    const certs = await this.certManager.getAll();
+    const certs = await this.certManager.getAllNormal();
     const matchedCert = certs.find((cert) => this.isCertMatchedDomain(cert, domain));
 
     if (matchedCert) {
@@ -546,7 +546,7 @@ class RouterManager extends EventEmitter {
       getRoutingParams: async () => ({
         sites: await ensureLatestInfo(sites),
         certificates,
-        globalHeaders: get(info, 'routing.headers', {}),
+        commonHeaders: get(info, 'routing.headers', {}),
         services: [], // TODO: do we need to add some item here?
         nodeInfo: info,
       }),

package/lib/util/blocklet.js

@@ -48,7 +48,6 @@ const { validate: validateEngine, get: getEngine } = require('../blocklet/manage
 
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
-const { getServices } = require('./service');
 const {
   isBeforeInstalled,
   expandBundle,
@@ -1024,7 +1023,7 @@ const fixAndVerifyBlockletMeta = (meta, did) => {
   }
 
   // this step comes last because it has side effects: the meta is changed
-  return fixAndValidateService(meta, getServices());
+  return fixAndValidateService(meta);
 };
 
 const getUpdateMetaList = (oldMetas = [], newMetas = []) => {

package/lib/util/index.js

@@ -35,7 +35,6 @@ const DEFAULT_WELLKNOWN_PORT = 8088;
 
 const logger = require('@abtnode/logger')('@abtnode/core:util');
 
-const { getServices } = require('./service');
 const request = require('./request');
 
 const validateOwner = (owner) => {
@@ -496,13 +495,9 @@ const lib = {
   ensureDataDirs,
   getDataDirs,
   getBaseUrls,
-  getBlockletMeta: (dir, opts = {}) =>
-    parseBlockletMeta(dir, {
-      serviceMetas: getServices(),
-      ...opts,
-    }),
+  getBlockletMeta: parseBlockletMeta,
   validateBlockletMeta: (meta, opts = {}) => {
-    fixAndValidateService(meta, getServices(), opts.fix);
+    fixAndValidateService(meta);
     return validateMeta(meta, opts);
   },
   getBlockletMetaByUrl,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.9",
+  "version": "1.7.10",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,31 +19,30 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.9",
-    "@abtnode/constant": "1.7.9",
-    "@abtnode/cron": "1.7.9",
-    "@abtnode/db": "1.7.9",
-    "@abtnode/logger": "1.7.9",
-    "@abtnode/queue": "1.7.9",
-    "@abtnode/rbac": "1.7.9",
-    "@abtnode/router-provider": "1.7.9",
-    "@abtnode/static-server": "1.7.9",
-    "@abtnode/timemachine": "1.7.9",
-    "@abtnode/util": "1.7.9",
-    "@arcblock/did": "^1.16.4",
+    "@abtnode/certificate-manager": "1.7.10",
+    "@abtnode/constant": "1.7.10",
+    "@abtnode/cron": "1.7.10",
+    "@abtnode/db": "1.7.10",
+    "@abtnode/logger": "1.7.10",
+    "@abtnode/queue": "1.7.10",
+    "@abtnode/rbac": "1.7.10",
+    "@abtnode/router-provider": "1.7.10",
+    "@abtnode/static-server": "1.7.10",
+    "@abtnode/timemachine": "1.7.10",
+    "@abtnode/util": "1.7.10",
+    "@arcblock/did": "^1.16.5",
     "@arcblock/did-motif": "^1.1.5",
-    "@arcblock/event-hub": "1.16.4",
+    "@arcblock/event-hub": "1.16.5",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.16.4",
-    "@blocklet/meta": "1.7.9",
+    "@arcblock/vc": "^1.16.5",
+    "@blocklet/meta": "1.7.10",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.16.4",
-    "@ocap/util": "^1.16.4",
-    "@ocap/wallet": "^1.16.4",
+    "@ocap/mcrypto": "^1.16.5",
+    "@ocap/util": "^1.16.5",
+    "@ocap/wallet": "^1.16.5",
     "@slack/webhook": "^5.0.3",
-    "ajv": "^7.0.3",
     "axios": "^0.26.1",
     "axon": "^2.0.3",
     "chalk": "^4.0.0",
@@ -78,5 +77,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "285f4fedd41fcb8e1814ce5d8250ac10616e67e0"
+  "gitHead": "8eab10fd39b6183a2fa4d2706f52e8b2ecaa059a"
 }

package/lib/util/service.js

@@ -1,81 +0,0 @@
-const fs = require('fs-extra');
-const cloneDeep = require('lodash/cloneDeep');
-const Ajv = require('ajv').default;
-
-const { NODE_SERVICES } = require('@abtnode/constant');
-
-const ajv = new Ajv({
-  useDefaults: true,
-  removeAdditional: 'all',
-});
-
-const SERVICES = {
-  AUTH: fs.readJSONSync(require.resolve('@abtnode/blocklet-services/configs/auth.json')),
-};
-
-const getServices = ({ stringifySchema = false } = {}) => {
-  const list = Object.values(SERVICES).map((x) => {
-    const data = cloneDeep(x);
-    if (stringifySchema) {
-      data.schema = JSON.stringify(x.schema);
-    }
-    return data;
-  });
-
-  // backward compatible
-  const authService = cloneDeep(list.find((x) => x.name === NODE_SERVICES.AUTH));
-  authService.name = NODE_SERVICES.AUTH_SERVICE;
-  list.push(authService);
-
-  return list;
-};
-
-const getServiceMeta = (serviceName) => {
-  if (!serviceName) {
-    throw new Error('service name should not be empty');
-  }
-  const metas = getServices();
-  const meta = metas.find((x) => x.name === serviceName);
-  if (!meta) {
-    throw new Error(`service ${serviceName} does not exist`);
-  }
-
-  return meta;
-};
-
-const getServiceConfig = (service, customConfig) => {
-  const serviceMeta = typeof service === 'string' ? getServiceMeta(service) : service;
-
-  const validate = ajv.compile(serviceMeta.schema.JSONSchema);
-
-  const data = cloneDeep(customConfig || {});
-  // this method may have side effect thar will fill default value to customConfig
-  validate(data || {});
-
-  return data;
-};
-
-const getDefaultServiceConfig = (service) => {
-  const serviceMeta = typeof service === 'string' ? getServiceMeta(service) : service;
-
-  // parse empty custom config to get default config
-  return getServiceConfig(serviceMeta, {});
-};
-
-const findService = (services, name) => {
-  const names = [name];
-
-  // backward compatible
-  if (name === NODE_SERVICES.AUTH) {
-    names.push(NODE_SERVICES.AUTH_SERVICE);
-  }
-
-  return (services || []).find((x) => names.includes(x.name));
-};
-
-module.exports = {
-  getServices,
-  getServiceConfig,
-  getDefaultServiceConfig,
-  findService,
-};