@abtnode/core 1.6.4 → 1.6.8

package/lib/router/manager.js

@@ -70,8 +70,9 @@ const normalizeRedirectUrl = (url) => {
 };
 
 class RouterManager extends EventEmitter {
-  constructor() {
+  constructor({ certManager }) {
     super();
+    this.certManager = certManager;
 
     // HACK: do not emit any events from CLI
     if (isCLI()) {
@@ -300,7 +301,10 @@ class RouterManager extends EventEmitter {
     await this.validateRouterConfig('updateRoutingRule', { id, rule });
 
     // update rules
-    const newRules = [...dbSite.rules.filter((x) => x.groupId !== rule.id), ...(await this.getRules(rule))];
+    const newRules = [
+      ...dbSite.rules.filter((x) => x.groupId !== rule.id || x.id !== rule.id), // 有些路由没有 rule.groupId
+      ...(await this.getRules(rule)),
+    ];
 
     const updateResult = await states.site.update({ _id: id }, { $set: { rules: newRules } });
     logger.info('update result', { updateResult });
@@ -363,7 +367,7 @@ class RouterManager extends EventEmitter {
       domain,
     });
     logger.info('add certificate result', { domain: newCert.domain });
-    this.emit('router.certificate.add', { type: 'nginx', data: newCert });
+    this.emit('cert.added', { type: 'nginx', data: newCert });
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -376,7 +380,7 @@ class RouterManager extends EventEmitter {
     const removeResult = await states.certificate.remove({ _id: id });
 
     logger.info('delete certificate', { removeResult, domain: tmpCert.domain });
-    this.emit('router.certificate.remove', { type: 'nginx', data: { domain: tmpCert.domain } });
+    this.emit('cert.removed', { type: 'nginx', data: { domain: tmpCert.domain } });
     return {};
   }
 
@@ -386,7 +390,7 @@ class RouterManager extends EventEmitter {
     this.fixCertificate(entity);
     this.validateCertificate(entity, entity.domain);
     const dbEntity = await states.certificate.upsert(entity);
-    this.emit('router.certificate.updated', { type: 'nginx', data: dbEntity });
+    this.emit('cert.issued', { type: 'nginx', data: dbEntity });
   }
 
   findCertificateByDomain(domain) {
@@ -448,7 +452,7 @@ class RouterManager extends EventEmitter {
   }
 
   async getMatchedCert(domain) {
-    const certs = await states.certificate.find();
+    const certs = await this.certManager.getAll();
     const matchedCert = certs.find((cert) => this.isCertMatchedDomain(cert, domain));
 
     if (matchedCert) {

package/lib/states/base.js

@@ -1,226 +1,17 @@
-const fs = require('fs');
-const path = require('path');
-const util = require('util');
-const { EventEmitter } = require('events');
-const cloneDeep = require('lodash/cloneDeep');
-const DataStore =
-  process.env.NODE_ENV === 'test' ? require('@nedb/core') : require('@nedb/multi')(Number(process.env.NEDB_MULTI_PORT));
+const DB = require('@abtnode/db');
 const logger = require('@abtnode/logger')('@abtnode/core:states');
 
 const { isCLI } = require('../util');
 
-class BaseState extends EventEmitter {
+class BaseState extends DB {
   constructor(baseDir, options) {
-    super();
+    super(baseDir, options);
 
     // HACK: do not emit any events from CLI
     if (isCLI() && process.env.NODE_ENV !== 'test') {
       this.emit = (name) => logger.debug('stopped state db event in CLI', name);
     }
-
-    const dbOptions = options.db || {};
-    this.filename = path.join(baseDir, options.filename);
-    this.options = Object.freeze(cloneDeep(options));
-    this.db = new DataStore({
-      filename: this.filename,
-      timestampData: true,
-      ...dbOptions,
-    });
-
-    logger.info('initialized', { filename: this.filename });
-
-    this.ready = false;
-    this.readyCallbacks = [];
-    this.db.loadDatabase((err) => {
-      if (err) {
-        logger.error(`failed to load disk database ${this.filename}`, { error: err });
-        console.error(err);
-      } else {
-        this.ready = true;
-        if (this.readyCallbacks.length) {
-          this.readyCallbacks.forEach((x) => x());
-        }
-      }
-    });
-
-    this.asyncDB = new Proxy(this.db, {
-      get(target, property) {
-        if (typeof target[property] === 'function') {
-          return util
-            .promisify((...args) => {
-              const cb = args[args.length - 1];
-              const rest = args.slice(0, args.length - 1);
-
-              target[property](...rest, (err, ...result) => {
-                if (err) {
-                  return cb(err);
-                }
-
-                if (result.length === 1) {
-                  return cb(null, result[0]);
-                }
-
-                return cb(null, result);
-              });
-            })
-            .bind(target);
-        }
-
-        return target[property];
-      },
-    });
-  }
-
-  onReady(cb) {
-    if (this.ready) {
-      cb();
-    } else {
-      this.readyCallbacks.push(cb);
-    }
-  }
-
-  createNotification(payload) {
-    if (this.notification && typeof this.notification.create === 'function') {
-      this.notification.create(payload);
-    }
-  }
-
-  paginate(conditions, sort, paging) {
-    const { pageSize: size = 20, page = 1 } = paging || {};
-    const pageSize = Math.min(100, size);
-
-    return new Promise((resolve, reject) => {
-      this.db
-        .find(conditions)
-        .sort(sort)
-        .exec((err, docs) => {
-          if (err) {
-            return reject(err);
-          }
-
-          const pageCount = Math.ceil(docs.length / pageSize);
-          const total = docs.length;
-          const skip = (page - 1) * pageSize;
-          const list = docs.slice(skip, skip + pageSize);
-
-          list.forEach((doc) => {
-            // eslint-disable-next-line no-underscore-dangle
-            doc.id = doc._id;
-          });
-
-          return resolve({
-            list,
-            paging: {
-              total,
-              pageSize,
-              pageCount,
-              page,
-            },
-          });
-        });
-    });
-  }
-
-  async updateById(id, updates, options = {}) {
-    const [, doc] = await this.asyncDB.update({ _id: id }, updates, {
-      multi: false,
-      upsert: false,
-      returnUpdatedDocs: true,
-      ...options,
-    });
-
-    return doc;
-  }
-
-  update(...args) {
-    if (args.length === 0) {
-      throw new Error('param is required by update method');
-    }
-
-    if (typeof args[0] === 'string') {
-      return this.updateById(...args);
-    }
-
-    return this.asyncDB.update(args[0], args[1], { returnUpdatedDocs: true, ...(args[2] || {}) });
-  }
-
-  count(conditions = {}) {
-    return new Promise((resolve, reject) => {
-      this.db.count(conditions, (err, num) => {
-        if (err) {
-          return reject(err);
-        }
-
-        return resolve(num);
-      });
-    });
-  }
-
-  remove(conditions = {}, options = { multi: false }) {
-    return new Promise((resolve, reject) => {
-      this.db.remove(conditions, options, (err, num) => {
-        if (err) {
-          return reject(err);
-        }
-
-        return resolve(num);
-      });
-    });
-  }
-
-  reset() {
-    fs.unlinkSync(this.filename);
-  }
-
-  find(...args) {
-    if (args.length === 0) {
-      return this.asyncDB.find({});
-    }
-
-    return this.asyncDB.find(...args);
-  }
-
-  findOne(...args) {
-    if (args.length === 0) {
-      return this.asyncDB.findOne({});
-    }
-
-    return this.asyncDB.findOne(...args);
-  }
-
-  insert(...args) {
-    return this.asyncDB.insert(...args);
   }
 }
 
-/**
- * Rename _id field name to id, this method has side effects
- * @param {object} entities
- */
-const renameIdFiledName = (entities, from = '_id', to = 'id') => {
-  /* eslint-disable  no-underscore-dangle, no-param-reassign */
-
-  if (!entities) {
-    return entities;
-  }
-
-  const mapEntity = (entity) => {
-    if (entity[from]) {
-      entity[to] = entity[from];
-      delete entity[from];
-    }
-  };
-
-  if (!Array.isArray(entities)) {
-    mapEntity(entities);
-    return entities;
-  }
-
-  entities.forEach(mapEntity);
-
-  return entities;
-};
-
-BaseState.renameIdFiledName = renameIdFiledName;
-
 module.exports = BaseState;

package/lib/states/blocklet.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-async-promise-executor */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable function-paren-newline */
 /* eslint-disable no-underscore-dangle */
@@ -5,6 +6,7 @@ const omit = require('lodash/omit');
 const uniq = require('lodash/uniq');
 const detectPort = require('detect-port');
 const Lock = require('@abtnode/util/lib/lock');
+const security = require('@abtnode/util/lib/security');
 const { fixPerson, fixInterfaces } = require('@blocklet/meta/lib/fix');
 const {
   BlockletStatus,
@@ -27,6 +29,40 @@ const getMaxPort = (ports = {}) => Math.max(Object.values(ports).map(Number));
 const getExternalPortsFromMeta = (meta) =>
   (meta.interfaces || []).map((x) => x.port && x.port.external).filter(Boolean);
 
+const formatBlocklet = (blocklet, phase, dek) => {
+  forEachBlocklet(
+    blocklet,
+    (b) => {
+      if (b.meta) {
+        fixPerson(b.meta);
+        fixInterfaces(b.meta);
+      }
+
+      b.children = b.children || [];
+
+      if (!b.environments || !b.meta || !dek) {
+        return;
+      }
+
+      ['BLOCKLET_APP_SK'].forEach((key) => {
+        const env = b.environments.find((x) => x.key === key);
+        if (!env) {
+          return;
+        }
+        if (phase === 'onUpdate' && env.value.indexOf('0x') === 0) {
+          env.value = security.encrypt(env.value, b.meta.did, dek);
+        }
+        if (phase === 'onRead' && env.value.indexOf('0x') === -1) {
+          env.value = security.decrypt(env.value, b.meta.did, dek);
+        }
+      });
+    },
+    { sync: true }
+  );
+
+  return blocklet;
+};
+
 class BlockletState extends BaseState {
   /**
    * Creates an instance of BlockletState
@@ -48,14 +84,7 @@ class BlockletState extends BaseState {
           return reject(err);
         }
 
-        if (doc) {
-          // TODO: this only exists for backward compatible
-          fixPerson(doc.meta);
-          fixInterfaces(doc.meta);
-          doc.children = doc.children || [];
-        }
-
-        return resolve(doc);
+        return resolve(doc ? formatBlocklet(doc, 'onRead', this.options.dek) : null);
       });
     });
   }
@@ -70,14 +99,7 @@ class BlockletState extends BaseState {
             return reject(err);
           }
 
-          return resolve(
-            docs.filter(Boolean).map((doc) => {
-              // TODO: this only exists for backward compatible
-              fixPerson(doc.meta);
-              fixInterfaces(doc.meta);
-              return doc;
-            })
-          );
+          return resolve(docs.filter(Boolean).map((doc) => formatBlocklet(doc, 'onRead', this.options.dek)));
         });
     });
   }
@@ -114,7 +136,6 @@ class BlockletState extends BaseState {
   } = {}) {
     return this.getBlocklet(did).then(
       (doc) =>
-        // eslint-disable-next-line no-async-promise-executor
         new Promise(async (resolve, reject) => {
           if (doc) {
             reject(new Error('Blocklet already added'));
@@ -165,6 +186,26 @@ class BlockletState extends BaseState {
     );
   }
 
+  updateBlocklet(did, updates) {
+    return this.getBlocklet(did).then(
+      (doc) =>
+        new Promise(async (resolve, reject) => {
+          if (!doc) {
+            reject(new Error('Blocklet does not exist'));
+            return;
+          }
+
+          try {
+            const formatted = formatBlocklet(updates, 'onUpdate', this.options.dek);
+            const newDoc = await this.updateById(doc._id, { $set: formatted });
+            resolve(newDoc);
+          } catch (err) {
+            reject(err);
+          }
+        })
+    );
+  }
+
   upgradeBlocklet({ meta, source, deployedFrom, children } = {}) {
     return this.getBlocklet(meta.did).then(
       (doc) =>

package/lib/states/index.js

@@ -1,4 +1,4 @@
-const BaseState = require('./base');
+const stateFactory = require('@abtnode/db/lib/factory');
 const NodeState = require('./node');
 const ChallengeState = require('./challenge');
 const BlockletState = require('./blocklet');
@@ -12,8 +12,6 @@ const SessionState = require('./session');
 const ExtrasState = require('./blocklet-extras');
 const CacheState = require('./cache');
 
-const states = {};
-
 const init = (dataDirs, options) => {
   const notificationState = new NotificationState(dataDirs.core, options);
   const nodeState = new NodeState(dataDirs.core, options, dataDirs, notificationState);
@@ -28,7 +26,7 @@ const init = (dataDirs, options) => {
   const extrasState = new ExtrasState(dataDirs.core, options);
   const cacheState = new CacheState(dataDirs.core, options);
 
-  Object.assign(states, {
+  return {
     node: nodeState,
     blocklet: blockletState,
     notification: notificationState,
@@ -41,22 +39,7 @@ const init = (dataDirs, options) => {
     session: sessionState,
     blockletExtras: extrasState,
     cache: cacheState,
-  });
+  };
 };
 
-module.exports = new Proxy(
-  {},
-  {
-    get(target, prop) {
-      if (prop === 'init') {
-        return init;
-      }
-
-      if (states[prop] instanceof BaseState) {
-        return states[prop];
-      }
-
-      throw new Error(`State ${String(prop)} may not be initialized`);
-    },
-  }
-);
+module.exports = stateFactory(init);

package/lib/states/node.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-underscore-dangle */
+const semver = require('semver');
 const omit = require('lodash/omit');
 const isEqual = require('lodash/isEqual');
 const isEmpty = require('lodash/isEmpty');
@@ -163,7 +164,7 @@ class NodeState extends BaseState {
 
   cleanupDirtyUpgradeState() {
     return this.read().then((doc) => {
-      if (doc.nextVersion === doc.version) {
+      if (doc.nextVersion && semver.lte(doc.nextVersion, doc.version)) {
         const updates = { nextVersion: '', upgradeSessionId: '' };
 
         // FIXME: this may cause the node exit some mode unexpectedly if it is not being upgraded

package/lib/util/blocklet.js

@@ -192,7 +192,6 @@ const fillBlockletConfigs = (blocklet, configs) => {
     acc[x.key] = x.value;
     return acc;
   }, {});
-  blocklet.userEnvironments = blocklet.configObj; // deprecated
   blocklet.environmentObj = (blocklet.environments || []).reduce((acc, x) => {
     acc[x.key] = x.value;
     return acc;
@@ -308,6 +307,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments) => {
 
   return {
     ...blocklet.environmentObj,
+    ...blocklet.configObj,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };

package/lib/util/index.js

@@ -332,6 +332,8 @@ const getDataDirs = (dataDir) => ({
   tmp: path.join(dataDir, 'tmp'),
   blocklets: path.join(dataDir, 'blocklets'),
   services: path.join(dataDir, 'services'),
+  modules: path.join(dataDir, 'modules'),
+  certManagerModule: path.join(dataDir, 'modules', 'certificate-manager'),
 });
 
 // Ensure data dir for Blocklet Server exists

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.4",
+  "version": "1.6.8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,26 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.6.4",
-    "@abtnode/cron": "1.6.4",
-    "@abtnode/logger": "1.6.4",
-    "@abtnode/queue": "1.6.4",
-    "@abtnode/rbac": "1.6.4",
-    "@abtnode/router-provider": "1.6.4",
-    "@abtnode/static-server": "1.6.4",
-    "@abtnode/timemachine": "1.6.4",
-    "@abtnode/util": "1.6.4",
-    "@arcblock/did": "^1.13.77",
-    "@arcblock/event-hub": "1.13.77",
+    "@abtnode/certificate-manager": "1.6.8",
+    "@abtnode/constant": "1.6.8",
+    "@abtnode/cron": "1.6.8",
+    "@abtnode/db": "1.6.8",
+    "@abtnode/logger": "1.6.8",
+    "@abtnode/queue": "1.6.8",
+    "@abtnode/rbac": "1.6.8",
+    "@abtnode/router-provider": "1.6.8",
+    "@abtnode/static-server": "1.6.8",
+    "@abtnode/timemachine": "1.6.8",
+    "@abtnode/util": "1.6.8",
+    "@arcblock/did": "^1.13.79",
+    "@arcblock/event-hub": "1.13.79",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.77",
-    "@blocklet/meta": "1.6.4",
+    "@arcblock/vc": "^1.13.79",
+    "@blocklet/meta": "1.6.8",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.77",
-    "@ocap/util": "^1.13.77",
-    "@ocap/wallet": "^1.13.77",
+    "@ocap/mcrypto": "^1.13.79",
+    "@ocap/util": "^1.13.79",
+    "@ocap/wallet": "^1.13.79",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -51,7 +53,7 @@
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.4.0",
+    "joi": "^17.5.0",
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
@@ -71,7 +73,7 @@
     "compression": "^1.7.4",
     "expand-tilde": "^2.0.2",
     "express": "^4.17.1",
-    "jest": "^27.3.1"
+    "jest": "^27.4.5"
   },
-  "gitHead": "1c144cb9fb9a9952bc92f25cabbdb47a378cbd24"
+  "gitHead": "f97ec3a44250e034ff4b5e3f088c1417f448a7bb"
 }