@abtnode/connect-storage 1.16.19-beta-340de95d → 1.16.19-beta-7b2db880

package/README.md

@@ -1,6 +1,6 @@
 # Connect Storage
 
-Simple storage implemented on `@abtnode/models`, should be used with `WalletHandler` from `@blocklet/sdk`
+Simple did connect storage that can be used cross multiple processes.
 
 ## Usage
 
@@ -11,4 +11,20 @@ yarn add @abtnode/connect-storage
 Then:
 
 ```javascript
+import { join } from 'path';
+
+import AuthStorage from '@abtnode/connect-storage';
+import WalletAuthenticator from '@blocklet/sdk/lib/wallet-authenticator';
+import WalletHandler from '@blocklet/sdk/lib/wallet-handler';
+import Config from '@blocklet/sdk/lib/config';
+
+export const authenticator = new WalletAuthenticator();
+export const handlers = new WalletHandler({
+  authenticator,
+  tokenStorage: new AuthStorage({
+    // FIXME: update this
+    dbPath: join(Config.env.dataDir, 'path/to/component.db'),
+  }),
+});
+
 ```

package/lib/index.js

@@ -9,18 +9,21 @@ class SequelizeStorage extends EventEmitter {
       throw new Error('SequelizeStorage requires dbPath to be set');
     }
 
+    const model = options.v2 ? 'ConnectionV2' : 'Connection';
+    const primaryKey = options.v2 ? 'sessionId' : 'token';
+
     super(options);
 
-    this.sequelize = createSequelize(options.dbPath);
-    this.models = getConnectModels();
-    setupModels(this.models, this.sequelize);
+    const sequelize = createSequelize(options.dbPath);
+    const models = getConnectModels();
+
+    setupModels(models, sequelize);
 
-    this.state = new ConnectionState(this.models.Connection);
+    this.state = new ConnectionState(models[model], { ...options, primaryKey });
+    this.primaryKey = primaryKey;
 
     doSchemaMigration(options.dbPath, 'connect')
       .then(() => {
-        // eslint-disable-next-line no-console
-        console.info(`Connection storage schema migration succeed: ${options.dbPath}`);
         if (typeof options.onload === 'function') {
           options.onload();
         }
@@ -51,13 +54,13 @@ class SequelizeStorage extends EventEmitter {
   }
 
   async delete(token) {
-    const num = await this.state.remove({ token });
+    const num = await this.state.remove({ [this.primaryKey]: token });
     this.emit('destroy', token);
     return num;
   }
 
   async exist(token, did) {
-    const data = await this.state.count({ token, did });
+    const data = await this.state.count({ [this.primaryKey]: token, did });
     return data;
   }
 

package/lib/state.js

@@ -7,12 +7,16 @@ const { BaseState } = require('@abtnode/models');
  */
 class Connection extends BaseState {
   async start(token, status = 'created') {
-    const doc = await this.insert({ token, status });
+    const attrs =
+      status && typeof status === 'object'
+        ? { [this.config.primaryKey]: token, ...status }
+        : { [this.config.primaryKey]: token, status };
+    const doc = await this.insert(attrs);
     return this._format(doc);
   }
 
   async update(token, updates) {
-    const doc = await this.findOne({ token });
+    const doc = await this.findOne({ [this.config.primaryKey]: token });
     if (!doc) {
       throw new Error(`Connect session does not exist: ${token}`);
     }
@@ -20,12 +24,15 @@ class Connection extends BaseState {
     const knownKeys = Object.keys(this.model.getAttributes());
     const extra = omit(updates, knownKeys);
 
-    await super.update({ token }, { ...pick(updates, knownKeys), __extra: { ...doc.__extra, ...extra } });
+    await super.update(
+      { [this.config.primaryKey]: token },
+      { ...pick(updates, knownKeys), __extra: { ...doc.__extra, ...extra } }
+    );
     return this._format(doc, updates);
   }
 
   async read(token) {
-    const doc = await this.findOne({ token });
+    const doc = await this.findOne({ [this.config.primaryKey]: token });
     return this._format(doc);
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.19-beta-340de95d",
+  "version": "1.16.19-beta-7b2db880",
   "description": "Sequelize storage for @arcblock/did-auth",
   "main": "lib/index.js",
   "files": [
@@ -19,11 +19,11 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/models": "1.16.19-beta-340de95d",
+    "@abtnode/models": "1.16.19-beta-7b2db880",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "cc7afa5fe28ef4b0304f97b7e0b9ad8194427ae7"
+  "gitHead": "598b576b97dd7accbfa1bb509b75e423ad27e5e2"
 }