Refactor DID Manager

Signed-off-by: Frank Hinek <[email protected]>

src/did/manager.js

@@ -1,22 +1,28 @@
-export async function clear(store) {
-  if (store){
-    store.clear();
-  }
-}
-
-export async function exists(id, store) {
-  const value = await store.get(id);
-  return value !== undefined;
-}
+export class DidManager {
+  #store;
 
-export async function get(id, store) {
-  return store.get(id);
-}
+  constructor(options) {
+    this.#store = options.store;
+  }
 
-export async function remove(id, store) {
-  store.remove(id);
+  async clear() {
+    this.#store.clear();
+  }
+
+  async exists(id) {
+    const value = await this.#store.get(id);
+    return value !== undefined;
+  }
+
+  async get(id) {
+    return this.#store.get(id);
+  }
+
+  async remove(id) {
+    this.#store.remove(id);
+  }
+
+  async set(id, value) {
+    this.#store.set(id, value);
+  }
 }
-
-export async function set(id, value, store) {
-  store.set(id, value);
-}

src/did/web5-did.js

@@ -2,7 +2,7 @@ import { Encoder } from '@tbd54566975/dwn-sdk-js';
 
 import { DidConnect } from './connect/connect.js';
 import * as CryptoCiphers from './crypto/ciphers.js';
-import * as DidManager from './manager.js';
+import { DidManager } from './manager.js';
 import * as Methods from './methods/methods.js';
 import * as DidUtils from './utils.js';
 import { MemoryStorage } from '../storage/memory-storage.js';
@@ -13,7 +13,7 @@ export class Web5Did {
   #didConnect;
   #web5;
 
-  #didStore = new MemoryStorage();
+  #didManager;
   #resolvedDids = new MemoryStorage();
 
   constructor(web5) {
@@ -28,6 +28,8 @@ export class Web5Did {
     // Bind functions to the instance of DidConnect
     this.#didConnect.connect = this.#didConnect.connect.bind(this.#didConnect);
     this.#didConnect.permissionsRequest = this.#didConnect.permissionsRequest.bind(this.#didConnect);
+
+    this.#didManager = new DidManager({ store: new MemoryStorage() });
   }
 
   get connect() {
@@ -40,11 +42,11 @@ export class Web5Did {
 
   get manager() {
     return {
-      clear: (...args) => DidManager.clear(...args, this.#didStore),
-      exists: (...args) => DidManager.exists(...args, this.#didStore),
-      get: (...args) => DidManager.get(...args, this.#didStore),
-      remove: (...args) => DidManager.remove(...args, this.#didStore),
-      set: (...args) => DidManager.set(...args, this.#didStore),
+      clear: () => this.#didManager.clear(),
+      exists: (...args) => this.#didManager.exists(...args),
+      get: (...args) => this.#didManager.get(...args),
+      remove: (...args) => this.#didManager.remove(...args),
+      set: (...args) => this.#didManager.set(...args),
     };
   }