@abtnode/certificate-manager 1.16.8-beta-186fd5aa → 1.16.8-next-d1e52353

package/libs/acme-manager.js

@@ -34,7 +34,7 @@ class Manager extends EventEmitter {
     this.getJobId = (job) => (job ? md5(`${job.domain}-${job.challenge}`) : '');
     this.queue = createQueue({
       name: 'create-cert-queue',
-      dataDir,
+      model: states.job,
       onJob: async (data) => {
         if (process.env.NODE_ENV === 'test') {
           logger.info('skip in test environment');
@@ -64,7 +64,7 @@ class Manager extends EventEmitter {
   async pushToJobQueue(domain) {
     const jobData = { domain, subscriberEmail: this.maintainerEmail };
 
-    const job = await this.queue.getJob(this.getJobId(jobData));
+    const job = await this.queue.get(this.getJobId(jobData));
 
     if (!job) {
       this.queue.push(jobData);

package/libs/acme-wrapper.js

@@ -115,10 +115,9 @@ class AcmeWrapper extends EventEmitter {
       accountKey,
     });
 
-    await states.account.update(
+    await states.account.upsert(
       { directoryUrl: this.directoryUrl },
-      { directoryUrl: this.directoryUrl, private_key: accountKey, account, maintainer_email: this.maintainerEmail },
-      { upsert: true }
+      { directoryUrl: this.directoryUrl, private_key: accountKey, account, maintainer_email: this.maintainerEmail }
     );
 
     logger.info('account was created', { directoryUrl: this.directoryUrl, maintainerEmail: this.maintainerEmail });

package/libs/http-01.js

@@ -18,7 +18,7 @@ const create = () => {
         const ch = data.challenge;
         const key = ch.token;
         logger.info('set key:', { key });
-        await states.httpChallenge.update({ key }, { key, value: ch.keyAuthorization }, { upsert: true });
+        await states.httpChallenge.upsert({ key }, { value: ch.keyAuthorization });
         logger.info('setted key:', { key });
 
         return null;

package/libs/queue.js

@@ -1,23 +1,12 @@
-const path = require('path');
 const createQueue = require('@abtnode/queue');
+const QueueStore = require('@abtnode/queue/lib/store/sequelize');
 
-module.exports = ({ name, dataDir, onJob, options = {} }) => {
+module.exports = ({ name, model, onJob, options = {} }) => {
   const queue = createQueue({
-    file: path.join(dataDir, `${name}.db`),
+    store: new QueueStore(model, name),
     onJob,
     options,
   });
 
-  queue.getJob = (id) =>
-    new Promise((resolve, reject) => {
-      queue.store.getJob(id, (error, job) => {
-        if (error) {
-          return reject(error);
-        }
-
-        return resolve(job);
-      });
-    });
-
   return queue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/certificate-manager",
-  "version": "1.16.8-beta-186fd5aa",
+  "version": "1.16.8-next-d1e52353",
   "description": "Manage ABT Node SSL certificates",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,11 +32,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.8-beta-186fd5aa",
-    "@abtnode/db": "1.16.8-beta-186fd5aa",
-    "@abtnode/logger": "1.16.8-beta-186fd5aa",
-    "@abtnode/queue": "1.16.8-beta-186fd5aa",
-    "@abtnode/util": "1.16.8-beta-186fd5aa",
+    "@abtnode/cron": "1.16.8-next-d1e52353",
+    "@abtnode/logger": "1.16.8-next-d1e52353",
+    "@abtnode/models": "1.16.8-next-d1e52353",
+    "@abtnode/queue": "1.16.8-next-d1e52353",
+    "@abtnode/util": "1.16.8-next-d1e52353",
     "@fidm/x509": "^1.2.1",
     "@greenlock/manager": "^3.1.0",
     "@root/acme": "^3.1.0",
@@ -50,5 +50,5 @@
     "moment": "^2.29.4",
     "punycode": "^2.1.1"
   },
-  "gitHead": "3150c3a5c3e041fe7f5a3902418d9d62adee3173"
+  "gitHead": "d357376aa3df9ef789befc7f548629deecb04d96"
 }

package/sdk/manager.js

@@ -146,13 +146,13 @@ class Manager extends EventEmitter {
       data.source = CERT_SOURCE.upload;
     }
 
-    return states.certificate.update({ domain: data.domain }, data, { upsert: true });
+    return states.certificate.upsert({ domain: data.domain }, data);
   }
 
   async update(id, data) {
     await validateUpdate(data);
 
-    const existed = await states.certificate.findOne({ _id: id });
+    const existed = await states.certificate.findOne({ id });
     if (!existed) {
       throw new Error(`The name ${data.name} does not exists`);
     }
@@ -161,16 +161,16 @@ class Manager extends EventEmitter {
       throw new Error('Can not update non-upload certificate');
     }
 
-    return states.certificate.update({ _id: id }, { $set: data });
+    return states.certificate.update({ id }, { $set: data });
   }
 
   async remove(id) {
-    const existed = await states.certificate.findOne({ _id: id });
+    const existed = await states.certificate.findOne({ id });
     if (!existed) {
       throw new Error(`The certificate ${id} does not exists!`);
     }
 
-    return states.certificate.remove({ _id: id });
+    return states.certificate.remove({ id });
   }
 
   addWithoutValidations(data) {
@@ -178,7 +178,7 @@ class Manager extends EventEmitter {
   }
 
   updateWithoutValidations(id, data) {
-    return states.certificate.update({ _id: id }, { $set: data });
+    return states.certificate.update({ id }, { $set: data });
   }
 }
 

package/states/account.js

@@ -1,9 +1,8 @@
-const BaseSate = require('./base');
+const { BaseState } = require('@abtnode/models');
 
-class Account extends BaseSate {
-  constructor(dataDir) {
-    super(dataDir, { filename: 'account.db' });
-  }
-}
+/**
+ * @extends BaseState<import('@abtnode/models').AccountState>
+ */
+class Account extends BaseState {}
 
 module.exports = Account;

package/states/certificate.js

@@ -1,14 +1,13 @@
 const get = require('lodash.get');
+const { BaseState } = require('@abtnode/models');
 
 const { CERT_STATUS } = require('../libs/constant');
-const BaseSate = require('./base');
 const { getCertInfo } = require('../libs/util');
 
-class Certificate extends BaseSate {
-  constructor(dataDir) {
-    super(dataDir, { filename: 'certificate.db' });
-  }
-
+/**
+ * @extends BaseState<import('@abtnode/models').CertificateState>
+ */
+class Certificate extends BaseState {
   async updateStatus(domain, status) {
     if (!Object.values(CERT_STATUS).includes(status)) {
       throw new Error('invalid domain status');
@@ -25,14 +24,14 @@ class Certificate extends BaseSate {
     return super.insert(data);
   }
 
-  async update(condition, data, options) {
+  async update(condition, data) {
     if (data.certificate) {
       data.meta = getCertInfo(data.certificate);
     } else if (get(data, '$set.certificate')) {
       data.$set.meta = getCertInfo(get(data, '$set.certificate'));
     }
 
-    return super.update(condition, data, options);
+    return super.update(condition, data);
   }
 }
 

package/states/http-challenge.js

@@ -1,9 +1,8 @@
-const BaseSate = require('./base');
+const { BaseState } = require('@abtnode/models');
 
-class HttpChallenge extends BaseSate {
-  constructor(dataDir) {
-    super(dataDir, { filename: 'http-challenge.db' });
-  }
-}
+/**
+ * @extends BaseState<import('@abtnode/models').HttpChallengeState>
+ */
+class HttpChallenge extends BaseState {}
 
 module.exports = HttpChallenge;

package/states/index.js

@@ -1,26 +1,33 @@
 const path = require('path');
-const fs = require('fs');
-const stateFactory = require('@abtnode/db/lib/factory');
+const { createSequelize, createStateFactory, getCertificateManagerModels, setupModels } = require('@abtnode/models');
 
 const Account = require('./account');
 const Certificate = require('./certificate');
 const HttpChallenge = require('./http-challenge');
+const Job = require('./job');
+
+const models = getCertificateManagerModels();
+
+const getDbFilePath = (filePath) => (process.env.NODE_ENV === 'test' ? `${filePath}:memory:` : filePath);
 
 const init = (dataDir) => {
-  const dbDir = path.join(dataDir, 'db');
-  if (!fs.existsSync(dbDir)) {
-    fs.mkdirSync(dbDir, { recursive: true });
-  }
+  const dbPath = getDbFilePath(path.join(dataDir, 'module.db'));
+
+  const sequelize = createSequelize(dbPath);
+  setupModels(models, sequelize);
+  console.info(`Init certificate manager states in ${dbPath}`); // eslint-disable-line
 
-  const account = new Account(dbDir);
-  const certificate = new Certificate(dbDir);
-  const httpChallenge = new HttpChallenge(dbDir);
+  const account = new Account(models.Account);
+  const certificate = new Certificate(models.Certificate);
+  const httpChallenge = new HttpChallenge(models.HttpChallenge);
+  const job = new Job(models.Job);
 
   return {
     account,
     certificate,
     httpChallenge,
+    job,
   };
 };
 
-module.exports = stateFactory(init);
+module.exports = createStateFactory(init, models);

package/states/job.js

@@ -0,0 +1,8 @@
+const { BaseState } = require('@abtnode/models');
+
+/**
+ * @extends BaseState<import('@abtnode/models').JobState>
+ */
+class Job extends BaseState {}
+
+module.exports = Job;

package/states/base.js

@@ -1,15 +0,0 @@
-const DB = require('@abtnode/db');
-
-module.exports = class BaseDB extends DB {
-  async find(...args) {
-    const dbEntity = await super.find(...args);
-
-    return DB.renameIdFiledName(dbEntity);
-  }
-
-  async findOne(...args) {
-    const dbEntity = await super.findOne(...args);
-
-    return DB.renameIdFiledName(dbEntity);
-  }
-};