@ocap/statedb 1.6.3 → 1.6.10

package/lib/db.js

@@ -1,15 +1,28 @@
 const Ready = require('@ocap/util/lib/ready');
+const { tables } = require('@ocap/state');
 
 class StateDB extends Ready {
   constructor() {
     super();
 
-    this.readyMarks = {
-      account: false,
-      asset: false,
-      delegation: false,
-      tx: false,
-    };
+    this.readyMarks = tables.reduce((acc, x) => ({ ...acc, [x]: false }), {});
+    this.readyListenersAttached = false;
+  }
+
+  attachReadyListeners() {
+    if (this.readyListenersAttached) {
+      return;
+    }
+
+    for (const table of tables) {
+      if (typeof this[table] === 'undefined') {
+        throw new Error(`Missing table ${table} in statedb adapter: ${this.name}`);
+      }
+
+      this[table].onReady(() => this.markReady(table));
+    }
+
+    this.readyListenersAttached = true;
   }
 }
 

package/lib/table.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 const Kareem = require('kareem');
+const omit = require('lodash/omit');
+const pick = require('lodash/pick');
 const Ready = require('@ocap/util/lib/ready');
 
 class StateDBTable extends Ready {
@@ -11,12 +13,29 @@ class StateDBTable extends Ready {
     Object.defineProperty(this, 'pre', { value: (name, fn) => hooks.pre(name, fn) });
     Object.defineProperty(this, 'post', { value: (name, fn) => hooks.post(name, fn) });
 
-    ['create', 'get', 'update', 'reset'].forEach((x) => {
+    ['create', 'get', 'history', 'update', 'reset'].forEach((x) => {
       Object.defineProperty(this, x, {
         value: async (...args) => {
           hooks.execPreSync(x, args);
           const result = await this[`_${x}`](...args);
           hooks.execPostSync(x, result);
+
+          if (['create', 'update', 'reset'].includes(x)) {
+            const ctx = args.slice(-1).pop();
+            if (ctx && ctx.tx) {
+              ctx.events = ctx.events || [];
+              ctx.events.push({
+                table: this.name,
+                name: x,
+                data: omit(result, '$loki'),
+                ctx: pick(
+                  ctx,
+                  Object.keys(ctx).filter((k) => ['events', 'states', 'statedb'].includes(k) === false)
+                ),
+              });
+            }
+          }
+
           return result;
         },
       });
@@ -42,6 +61,16 @@ class StateDBTable extends Ready {
   _reset(context) {
     throw new Error('`_reset` must be implemented in sub statedb');
   }
+
+  // eslint-disable-next-line no-unused-vars
+  _history(id, context) {
+    throw new Error('`_history` must be implemented in sub statedb');
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  updateOrCreate(id, attrs, context) {
+    throw new Error('`updateOrCreate` must be implemented in sub statedb');
+  }
 }
 
 module.exports = StateDBTable;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.3",
+  "version": "1.6.10",
   "description": "Defines the basic interface for OCAP StateDB",
   "main": "lib/index.js",
   "files": [
@@ -12,18 +12,20 @@
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
+    "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "devDependencies": {
-    "jest": "^26.6.3"
+    "jest": "^27.3.1"
   },
   "dependencies": {
-    "@ocap/util": "^1.6.3",
-    "kareem": "^2.3.2"
+    "@ocap/state": "1.6.10",
+    "@ocap/util": "1.6.10",
+    "kareem": "^2.3.2",
+    "lodash": "^4.17.21"
   },
-  "gitHead": "5246168dbbc268a3e6f95c3992d9d343647ca25b"
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1"
 }