DIDResolver/UniversalResolver alpha (#709)

Bump `@web5/dids` to `0.4.2` Bump `dwn-sdk-js` to `0.2.20` --------- Signed-off-by: Frank Hinek <[email protected]> Co-authored-by: Frank Hinek <[email protected]>
decentralized-identity · Mar 22, 2024 · 2b4b848 · 2b4b848
1 parent b66d4e7
commit 2b4b848
Show file tree

Hide file tree

Showing 31 changed files with 120 additions and 83 deletions.
diff --git a/.github/workflows/npm-publish-unstable.yml b/.github/workflows/npm-publish-unstable.yml
@@ -5,11 +5,6 @@ on:
     branches:
       - main
   workflow_dispatch:
-    inputs:
-      branchName:
-        description: 'Branch name to run the workflow on'
-        required: true
-        default: 'main'
 
 jobs:
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tbd54566975/dwn-sdk-js",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "A reference implementation of https://identity.foundation/decentralized-web-node/spec/",
   "repository": {
     "type": "git",
@@ -65,7 +65,7 @@
     "@js-temporal/polyfill": "0.4.4",
     "@noble/ed25519": "2.0.0",
     "@noble/secp256k1": "2.0.0",
-    "@web5/dids": "0.4.1",
+    "@web5/dids": "0.4.2",
     "abstract-level": "1.0.3",
     "ajv": "8.12.0",
     "blockstore-core": "4.2.0",

diff --git a/src/dwn.ts b/src/dwn.ts
@@ -1,4 +1,6 @@
+
 import type { DataStore } from './types/data-store.js';
+import type { DidResolver } from '@web5/dids';
 import type { EventLog } from './types/event-log.js';
 import type { EventStream } from './types/subscriptions.js';
 import type { MessageStore } from './types/message-store.js';
@@ -30,7 +32,7 @@ import { RecordsQueryHandler } from './handlers/records-query.js';
 import { RecordsReadHandler } from './handlers/records-read.js';
 import { RecordsSubscribeHandler } from './handlers/records-subscribe.js';
 import { RecordsWriteHandler } from './handlers/records-write.js';
-import { DidDht, DidIon, DidKey, DidResolver, DidResolverCacheLevel } from '@web5/dids';
+import { DidDht, DidIon, DidKey, DidResolverCacheLevel, UniversalResolver } from '@web5/dids';
 import { DwnInterfaceName, DwnMethodName } from './enums/dwn-interface-method.js';
 
 export class Dwn {
@@ -134,7 +136,7 @@ export class Dwn {
    * Creates an instance of the DWN.
    */
   public static async create(config: DwnConfig): Promise<Dwn> {
-    config.didResolver ??= new DidResolver({
+    config.didResolver ??= new UniversalResolver({
       didResolvers : [DidDht, DidIon, DidKey],
       cache        : new DidResolverCacheLevel({ location: 'RESOLVERCACHE' }),
     });

diff --git a/tests/core/auth.spec.ts b/tests/core/auth.spec.ts
@@ -1,13 +1,13 @@
 import { authenticate } from '../../src/core/auth.js';
 import { DwnErrorCode } from '../../src/core/dwn-error.js';
 import { expect } from 'chai';
-import { DidDht, DidResolver } from '@web5/dids';
+import { DidDht, UniversalResolver } from '@web5/dids';
 
 describe('Auth', () => {
   describe('authenticate()', () => {
     it('should throw if given JWS is `undefined`', async () => {
       const jws = undefined;
-      await expect(authenticate(jws, new DidResolver({ didResolvers: [DidDht] }))).to.be.rejectedWith(DwnErrorCode.AuthenticateJwsMissing);
+      await expect(authenticate(jws, new UniversalResolver({ didResolvers: [DidDht] }))).to.be.rejectedWith(DwnErrorCode.AuthenticateJwsMissing);
     });
   });
 });
diff --git a/tests/features/author-delegated-grant.spec.ts b/tests/features/author-delegated-grant.spec.ts
@@ -1,4 +1,5 @@
 import type { DelegatedGrantMessage } from '../../src/types/delegated-grant-message.js';
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type { DataStore, EventLog, MessageStore, PermissionScope } from '../../src/index.js';
 import type { RecordEvent, RecordsWriteMessage } from '../../src/types/records-types.js';
@@ -22,7 +23,7 @@ import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
 import { Time } from '../../src/utils/time.js';
 
-import { DidKey, DidResolver } from '@web5/dids';
+import { DidKey, UniversalResolver } from '@web5/dids';
 import { DwnInterfaceName, DwnMethodName, Encoder, Message, PermissionsGrant, PermissionsRevoke, RecordsDelete, RecordsQuery, RecordsRead, RecordsSubscribe } from '../../src/index.js';
 
 chai.use(chaiAsPromised);
@@ -39,7 +40,7 @@ export function testAuthorDelegatedGrant(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;
@@ -1134,6 +1135,8 @@ export function testAuthorDelegatedGrant(): void {
         signer      : Jws.createSigner(alice)
       });
 
+      await Time.minimalSleep();
+
       const deviceXGrant2 = await PermissionsGrant.create({
         delegated   : true,
         dateExpires : Time.createOffsetTimestamp({ seconds: 100 }),

diff --git a/tests/features/owner-delegated-grant.spec.ts b/tests/features/owner-delegated-grant.spec.ts
@@ -1,4 +1,5 @@
 import type { DelegatedGrantMessage } from '../../src/types/delegated-grant-message.js';
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type { DataStore, EventLog, MessageStore, PermissionScope } from '../../src/index.js';
 
@@ -18,7 +19,7 @@ import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
 import { Time } from '../../src/utils/time.js';
 
-import { DidKey, DidResolver } from '@web5/dids';
+import { DidKey, UniversalResolver } from '@web5/dids';
 import { DwnInterfaceName, DwnMethodName, Encoder, Message, PermissionsGrant, PermissionsRevoke, ProtocolsConfigure } from '../../src/index.js';
 
 chai.use(chaiAsPromised);
@@ -35,7 +36,7 @@ export function testOwnerDelegatedGrant(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;
@@ -528,6 +529,8 @@ export function testOwnerDelegatedGrant(): void {
         signer      : Jws.createSigner(alice)
       });
 
+      await Time.minimalSleep();
+
       const appXGrant2 = await PermissionsGrant.create({
         delegated   : true,
         dateExpires : Time.createOffsetTimestamp({ seconds: 100 }),

diff --git a/tests/features/owner-signature.spec.ts b/tests/features/owner-signature.spec.ts
@@ -1,3 +1,4 @@
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type { DataStore, EventLog, MessageStore } from '../../src/index.js';
 
@@ -8,8 +9,6 @@ import chai, { expect } from 'chai';
 
 import { ArrayUtility } from '../../src/utils/array.js';
 import { DataStream } from '../../src/utils/data-stream.js';
-import { DidKey } from '@web5/dids';
-import { DidResolver } from '@web5/dids';
 import { Dwn } from '../../src/dwn.js';
 import { DwnErrorCode } from '../../src/core/dwn-error.js';
 import { Jws } from '../../src/utils/jws.js';
@@ -18,6 +17,7 @@ import { RecordsWrite } from '../../src/interfaces/records-write.js';
 import { TestDataGenerator } from '../utils/test-data-generator.js';
 import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
+import { DidKey, UniversalResolver } from '@web5/dids';
 
 chai.use(chaiAsPromised);
 
@@ -33,7 +33,7 @@ export function testOwnerSignature(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;

diff --git a/tests/features/protocol-create-action.spec.ts b/tests/features/protocol-create-action.spec.ts
@@ -1,3 +1,4 @@
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type { ProtocolDefinition } from '../../src/types/protocols-types.js';
 import type { DataStore, EventLog, MessageStore } from '../../src/index.js';
@@ -7,15 +8,14 @@ import sinon from 'sinon';
 import chai, { expect } from 'chai';
 
 import { DataStream } from '../../src/utils/data-stream.js';
-import { DidKey } from '@web5/dids';
-import { DidResolver } from '@web5/dids';
 import { Dwn } from '../../src/dwn.js';
 import { Jws } from '../../src/utils/jws.js';
 import { ProtocolAction } from '../../src/types/protocols-types.js';
 import { RecordsWrite } from '../../src/interfaces/records-write.js';
 import { TestDataGenerator } from '../utils/test-data-generator.js';
 import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
+import { DidKey, UniversalResolver } from '@web5/dids';
 
 import { DwnErrorCode, ProtocolsConfigure } from '../../src/index.js';
 
@@ -33,7 +33,7 @@ export function testProtocolCreateAction(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;

diff --git a/tests/features/protocol-delete-action.spec.ts b/tests/features/protocol-delete-action.spec.ts
@@ -1,3 +1,4 @@
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type { DataStore, EventLog, MessageStore } from '../../src/index.js';
 import type { ProtocolDefinition, ProtocolsConfigureDescriptor } from '../../src/types/protocols-types.js';
@@ -7,8 +8,6 @@ import sinon from 'sinon';
 import chai, { expect } from 'chai';
 
 import { DataStream } from '../../src/utils/data-stream.js';
-import { DidKey } from '@web5/dids';
-import { DidResolver } from '@web5/dids';
 import { Dwn } from '../../src/dwn.js';
 import { Jws } from '../../src/utils/jws.js';
 import { ProtocolAction } from '../../src/types/protocols-types.js';
@@ -18,6 +17,7 @@ import { RecordsWrite } from '../../src/interfaces/records-write.js';
 import { TestDataGenerator } from '../utils/test-data-generator.js';
 import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
+import { DidKey, UniversalResolver } from '@web5/dids';
 import { DwnErrorCode, DwnInterfaceName, DwnMethodName, Message, ProtocolsConfigure, RecordsDelete, Time } from '../../src/index.js';
 
 chai.use(chaiAsPromised);
@@ -34,7 +34,7 @@ export function testProtocolDeleteAction(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;

diff --git a/tests/features/protocol-update-action.spec.ts b/tests/features/protocol-update-action.spec.ts
@@ -1,3 +1,4 @@
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type { DataStore, EventLog, MessageStore } from '../../src/index.js';
 import type { ProtocolDefinition, ProtocolsConfigureDescriptor } from '../../src/types/protocols-types.js';
@@ -7,8 +8,6 @@ import sinon from 'sinon';
 import chai, { expect } from 'chai';
 
 import { DataStream } from '../../src/utils/data-stream.js';
-import { DidKey } from '@web5/dids';
-import { DidResolver } from '@web5/dids';
 import { Dwn } from '../../src/dwn.js';
 import { Jws } from '../../src/utils/jws.js';
 import { ProtocolAction } from '../../src/types/protocols-types.js';
@@ -17,6 +16,7 @@ import { RecordsWrite } from '../../src/interfaces/records-write.js';
 import { TestDataGenerator } from '../utils/test-data-generator.js';
 import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
+import { DidKey, UniversalResolver } from '@web5/dids';
 import { DwnErrorCode, DwnInterfaceName, DwnMethodName, Message, ProtocolsConfigure, Time } from '../../src/index.js';
 
 chai.use(chaiAsPromised);
@@ -33,7 +33,7 @@ export function testProtocolUpdateAction(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;

diff --git a/tests/handlers/events-get.spec.ts b/tests/handlers/events-get.spec.ts
@@ -1,3 +1,4 @@
+import type { DidResolver } from '@web5/dids';
 import type { EventStream } from '../../src/types/subscriptions.js';
 import type {
   DataStore,
@@ -14,7 +15,7 @@ import { TestDataGenerator } from '../utils/test-data-generator.js';
 import { Message } from '../../src/core/message.js';
 import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
-import { DidKey, DidResolver } from '@web5/dids';
+import { DidKey, UniversalResolver } from '@web5/dids';
 
 export function testEventsGetHandler(): void {
   describe('EventsGetHandler.handle()', () => {
@@ -28,7 +29,7 @@ export function testEventsGetHandler(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;

diff --git a/tests/handlers/events-query.spec.ts b/tests/handlers/events-query.spec.ts
@@ -1,3 +1,4 @@
+import type { DidResolver } from '@web5/dids';
 import type {
   DataStore,
   EventLog,
@@ -11,7 +12,7 @@ import { expect } from 'chai';
 import { TestDataGenerator } from '../utils/test-data-generator.js';
 import { TestEventStream } from '../test-event-stream.js';
 import { TestStores } from '../test-stores.js';
-import { DidKey, DidResolver } from '@web5/dids';
+import { DidKey, UniversalResolver } from '@web5/dids';
 
 
 export function testEventsQueryHandler(): void {
@@ -26,7 +27,7 @@ export function testEventsQueryHandler(): void {
     // important to follow the `before` and `after` pattern to initialize and clean the stores in tests
     // so that different test suites can reuse the same backend store for testing
     before(async () => {
-      didResolver = new DidResolver({ didResolvers: [DidKey] });
+      didResolver = new UniversalResolver({ didResolvers: [DidKey] });
 
       const stores = TestStores.get();
       messageStore = stores.messageStore;