@abtnode/core 1.16.8-beta-186fd5aa → 1.16.8-next-d1e52353

package/lib/states/audit-log.js

@@ -40,7 +40,7 @@ const expandSite = async (siteId, info, node) => {
   }
 
   const { blocklet, site } = node.states;
-  const doc = await site.findOne({ _id: siteId });
+  const doc = await site.findOne({ id: siteId });
   if (!doc) {
     return '';
   }
@@ -237,7 +237,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
 
     // integrations
     case 'createWebHook':
-      return `added integration ${result._id}: \n- type: ${args.type}\n${args.params.map(x => `- ${x.name}: ${x.value}`).join('\n')}`; // prettier-ignore
+      return `added integration ${result.id}: \n- type: ${args.type}\n${args.params.map(x => `- ${x.name}: ${x.value}`).join('\n')}`; // prettier-ignore
     case 'deleteWebHook':
       return `deleted integration ${args.id}`;
 
@@ -261,7 +261,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'updateCertificate':
       return `updated certificate #${args.id}`;
     case 'issueLetsEncryptCert':
-      return `tried to issue lets encrypt certificate for domain **${args.domain}**, ticket: ${result._id}`;
+      return `tried to issue lets encrypt certificate for domain **${args.domain}**, ticket: ${result.id}`;
 
     // router
     case 'addDomainAlias':
@@ -416,11 +416,10 @@ const fixActor = (actor) => {
   }
 };
 
+/**
+ * @extends BaseState<import('@abtnode/models').AuditLogState>
+ */
 class AuditLogState extends BaseState {
-  constructor(baseDir, config = {}) {
-    super(baseDir, { filename: 'audit-log.db', ...config });
-  }
-
   /**
    * Create new audit log
    *
@@ -442,7 +441,7 @@ class AuditLogState extends BaseState {
         locale: 'en',
         firstLoginAt: '2022-04-27T22:55:51.788Z',
         lastLoginAt: '2022-04-27T22:55:51.788Z',
-        _id: 'dvOIJJVUJHGxnWBU',
+        id: 'dvOIJJVUJHGxnWBU',
         createdAt: '2022-04-27T22:55:51.789Z',
         updatedAt: '2022-04-27T22:55:51.789Z',
         role: 'owner',

package/lib/states/backup.js

@@ -1,21 +1,3 @@
-/**
- * @typedef{{
-    appPid: string; // 此处建议使用 appPid
-    userDid: string;
-    strategy?: 0 | 1; 
-
-    sourceUrl: string; 
-    
-    target?: "Spaces" | 'Local'; 
-    targetUrl?: string; 
-
-    createdAt: string;
-    updatedAt?: string;
-    status?: 0 | 1; 
-    message?: string;
- * }} Backup
- */
-
 const { Joi } = require('@arcblock/validator');
 const BaseState = require('./base');
 const { validateBackupSuccess, validateBackupFail, validateBackupStart } = require('../validators/backup.js');
@@ -47,22 +29,11 @@ const validateBackup = Joi.object({
 });
 
 /**
- * @description
- * @class BackupState
+ * @extends BaseState<import('@abtnode/models').BackupState>
  */
 class BackupState extends BaseState {
-  constructor(baseDir, config = {}) {
-    super(baseDir, {
-      filename: 'backup.db',
-      ...config,
-    });
-  }
-
   /**
-   * @description
-   * @param {Pick<Backup, 'appPid' | 'userDid' | 'strategy' | 'sourceUrl' | 'target'>} backup
-   * @return {Promise<Backup & {_id: string}>}
-   * @memberof BackupState
+   * @param {Pick<import('@abtnode/models').BackupState, 'appPid' | 'userDid' | 'strategy' | 'sourceUrl' | 'target'>} backup
    */
   async start(backup) {
     const { error, value } = validateBackupStart.validate(backup, {
@@ -74,17 +45,12 @@ class BackupState extends BaseState {
       throw error;
     }
 
-    return this.create({
-      ...value,
-    });
+    return this.insert(value);
   }
 
   /**
-   * @description
    * @param {string} id
-   * @param {Pick<Backup, 'targetUrl'>} successBackupInfo
-   * @return {PromiseLike<import('@nedb/core').UpdateResult<Backup>>}
-   * @memberof BackupState
+   * @param {Pick<import('@abtnode/models').BackupState, 'targetUrl'>} successBackupInfo
    */
   async success(id, successBackupInfo) {
     const { error, value } = validateBackupSuccess.validate(successBackupInfo, {
@@ -97,7 +63,7 @@ class BackupState extends BaseState {
     }
 
     return this.update(
-      { _id: id },
+      { id },
       {
         $set: {
           ...value,
@@ -109,11 +75,8 @@ class BackupState extends BaseState {
   }
 
   /**
-   * @description
    * @param {string} id
-   * @param {Pick<Backup, 'message'>} errorBackupInfo
-   * @return {PromiseLike<import('@nedb/core').UpdateResult<Backup>>}
-   * @memberof BackupState
+   * @param {Pick<import('@abtnode/models').BackupState, 'message'>} errorBackupInfo
    */
   async fail(id, errorBackupInfo) {
     const { error, value } = validateBackupFail.validate(errorBackupInfo, {
@@ -126,7 +89,7 @@ class BackupState extends BaseState {
     }
 
     return this.update(
-      { _id: id },
+      { id },
       {
         $set: {
           ...value,
@@ -138,10 +101,8 @@ class BackupState extends BaseState {
   }
 
   /**
-   * @description
-   * @param {Backup} backup
-   * @return {Promise<Backup & {_id: string}>}
-   * @memberof BackupState
+   * @param {import('@abtnode/models').BackupState} backup
+   * @return {Promise<import('@abtnode/models').BackupState>}
    */
   async create(backup) {
     const { error, value } = validateBackup.validate(backup, {
@@ -157,20 +118,11 @@ class BackupState extends BaseState {
   }
 
   /**
-   * @description
    * @param {{ did: string }} { did }
-   * @return {Promise<Array<import('@abtnode/client').Backup>>}
+   * @return {Promise<Array<import('@abtnode/models').BackupState>>}
    */
   async getBlockletBackups({ did }) {
-    const backups = await this.cursor({
-      appPid: did,
-    })
-      .sort({
-        updatedAt: -1,
-      })
-      .exec();
-
-    return backups ?? [];
+    return this.find({ appPid: did }, {}, { updatedAt: -1 });
   }
 }
 

package/lib/states/base.js

@@ -1,17 +1,25 @@
-const DB = require('@abtnode/db');
+const { BaseState } = require('@abtnode/models');
 const logger = require('@abtnode/logger')('@abtnode/core:states');
 
 const { isCLI } = require('../util');
 
-class BaseState extends DB {
-  constructor(baseDir, config) {
-    super(baseDir, config);
+/**
+ * @template T
+ * @extends BaseState<T>
+ */
+class ExtendedBase extends BaseState {
+  constructor(model, config) {
+    super(model, config);
 
     // 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);
     }
   }
+
+  update(condition, updates, options) {
+    return super.update(condition, updates, { returnUpdatedDocs: true, ...options });
+  }
 }
 
-module.exports = BaseState;
+module.exports = ExtendedBase;

package/lib/states/blocklet-extras.js

@@ -59,9 +59,12 @@ const noop = (k) => (v) => v[k];
 //   children: Children
 // };
 
+/**
+ * @extends BaseState<import('@abtnode/models').BlockletExtraState>
+ */
 class BlockletExtrasState extends BaseState {
-  constructor(baseDir, config = {}) {
-    super(baseDir, { filename: 'blocklet_extras.db', ...config });
+  constructor(...args) {
+    super(...args);
 
     this.extras = [
       // environment
@@ -184,7 +187,7 @@ class BlockletExtrasState extends BaseState {
         await this.insert(item);
         logger.info('create extra success', { name, dids });
       } else {
-        await this.update(item._id, item);
+        await this.updateByDid(item.did, item);
         logger.info('update extra success', { name, dids });
       }
 
@@ -219,7 +222,7 @@ class BlockletExtrasState extends BaseState {
       const updated = component[name];
       component[name] = null;
 
-      await this.update(item._id, item);
+      await this.updateByDid(item.did, item);
 
       return updated;
     };
@@ -248,7 +251,7 @@ class BlockletExtrasState extends BaseState {
 
     await validateAddMeta(entity);
 
-    return super.update({ did }, { $set: entity }, { upsert: true });
+    return super.upsert({ did }, { $set: entity });
   }
 
   async getMeta(did) {
@@ -259,7 +262,7 @@ class BlockletExtrasState extends BaseState {
     const entity = { did, expiredAt };
     await validateExpiredInfo(entity);
 
-    return super.update({ did }, { $set: { expiredAt } });
+    return this.updateByDid(did, { expiredAt });
   }
 
   async getExpiredList() {
@@ -299,8 +302,8 @@ class BlockletExtrasState extends BaseState {
     return data;
   }
 
-  updateByDid(did, data) {
-    return super.update({ did }, { $set: data });
+  updateByDid(did, updates) {
+    return super.update({ did }, { $set: updates });
   }
 }