@atproto-labs/identity-resolver 0.0.1 → 0.1.1

package/CHANGELOG.md

@@ -1,12 +1,23 @@
 # @atproto-labs/identity-resolver
 
-## 0.0.1
+## 0.1.1
 
 ### Patch Changes
 
-- [`e134c79a0`](https://github.com/bluesky-social/atproto/commit/e134c79a0ffb000b2cb36437815673fa6bda664b) Thanks [@devinivy](https://github.com/devinivy)! - Initial publish of experimental oauth packages to @atproto-labs
+- [#2633](https://github.com/bluesky-social/atproto/pull/2633) [`acc9093d2`](https://github.com/bluesky-social/atproto/commit/acc9093d2845eba02b68fb2f9db33e4f1b59bb10) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Use distinct type names to prevent conflicts
 
-- Updated dependencies [[`e134c79a0`](https://github.com/bluesky-social/atproto/commit/e134c79a0ffb000b2cb36437815673fa6bda664b)]:
-  - @atproto-labs/handle-resolver@0.0.1
-  - @atproto-labs/fetch@0.0.1
-  - @atproto-labs/did@0.0.1
+- Updated dependencies [[`acc9093d2`](https://github.com/bluesky-social/atproto/commit/acc9093d2845eba02b68fb2f9db33e4f1b59bb10)]:
+  - @atproto-labs/handle-resolver@0.1.1
+  - @atproto-labs/did-resolver@0.1.1
+
+## 0.1.0
+
+### Minor Changes
+
+- [#2482](https://github.com/bluesky-social/atproto/pull/2482) [`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add OAuth provider capability & support for DPoP signed tokens
+
+### Patch Changes
+
+- Updated dependencies [[`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646)]:
+  - @atproto-labs/handle-resolver@0.1.0
+  - @atproto-labs/did-resolver@0.1.0

package/dist/identity-resolver.d.ts

@@ -1,13 +1,14 @@
-import { DidResolver } from '@atproto-labs/did';
-import { HandleResolver, ResolvedHandle } from '@atproto-labs/handle-resolver';
+import { ResolveDidOptions, DidResolver } from '@atproto-labs/did-resolver';
+import { ResolveHandleOptions, HandleResolver, ResolvedHandle } from '@atproto-labs/handle-resolver';
 export type ResolvedIdentity = {
     did: NonNullable<ResolvedHandle>;
-    url: URL;
+    pds: URL;
 };
+export type ResolveIdentityOptions = ResolveDidOptions & ResolveHandleOptions;
 export declare class IdentityResolver {
-    readonly handleResolver: HandleResolver;
     readonly didResolver: DidResolver<'plc' | 'web'>;
-    constructor(handleResolver: HandleResolver, didResolver: DidResolver<'plc' | 'web'>);
-    resolve(input: string, serviceType?: string): Promise<ResolvedIdentity>;
+    readonly handleResolver: HandleResolver;
+    constructor(didResolver: DidResolver<'plc' | 'web'>, handleResolver: HandleResolver);
+    resolve(input: string, options?: ResolveIdentityOptions): Promise<ResolvedIdentity>;
 }
 //# sourceMappingURL=identity-resolver.d.ts.map

package/dist/identity-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-resolver.d.ts","sourceRoot":"","sources":["../src/identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,cAAc,EACd,cAAc,EAEf,MAAM,+BAA+B,CAAA;AAGtC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,CAAA;IAChC,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,cAAc,EAAE,cAAc;IACvC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC;gBADvC,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC;IAGrC,OAAO,CAClB,KAAK,EAAE,MAAM,EACb,WAAW,SAA8B,GACxC,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}
+{"version":3,"file":"identity-resolver.d.ts","sourceRoot":"","sources":["../src/identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EACjB,WAAW,EAEZ,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,cAAc,EAEf,MAAM,+BAA+B,CAAA;AAGtC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,CAAA;IAChC,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,GAAG,oBAAoB,CAAA;AAE7E,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC;IAChD,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAD9B,WAAW,EAAE,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,EACvC,cAAc,EAAE,cAAc;IAG5B,OAAO,CAClB,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,gBAAgB,CAAC;CA+B7B"}

package/dist/identity-resolver.js

@@ -4,31 +4,41 @@ exports.IdentityResolver = void 0;
 const handle_resolver_1 = require("@atproto-labs/handle-resolver");
 const syntax_1 = require("@atproto/syntax");
 class IdentityResolver {
-    constructor(handleResolver, didResolver) {
-        Object.defineProperty(this, "handleResolver", {
+    constructor(didResolver, handleResolver) {
+        Object.defineProperty(this, "didResolver", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: handleResolver
+            value: didResolver
         });
-        Object.defineProperty(this, "didResolver", {
+        Object.defineProperty(this, "handleResolver", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: didResolver
+            value: handleResolver
         });
     }
-    async resolve(input, serviceType = 'AtprotoPersonalDataServer') {
+    async resolve(input, options) {
         const did = (0, handle_resolver_1.isResolvedHandle)(input)
             ? input // Already a did
-            : await this.handleResolver.resolve((0, syntax_1.normalizeAndEnsureValidHandle)(input));
-        if (!did)
-            throw new Error(`Handle ${input} does not resolve to a DID`);
-        const url = await this.didResolver.resolveServiceEndpoint(did, {
-            type: serviceType,
-        });
-        return { did, url };
+            : await this.handleResolver.resolve((0, syntax_1.normalizeAndEnsureValidHandle)(input), options);
+        options?.signal?.throwIfAborted();
+        if (!did) {
+            throw new TypeError(`Handle "${input}" does not resolve to a DID`);
+        }
+        const document = await this.didResolver.resolve(did, options);
+        const service = document.service?.find((isAtprotoPersonalDataServerService), document);
+        if (!service) {
+            throw new TypeError(`No valid "AtprotoPersonalDataServer" service found in "${did}" DID document`);
+        }
+        const pds = new URL(service.serviceEndpoint);
+        return { did, pds };
     }
 }
 exports.IdentityResolver = IdentityResolver;
+function isAtprotoPersonalDataServerService(s) {
+    return (typeof s.serviceEndpoint === 'string' &&
+        s.type === 'AtprotoPersonalDataServer' &&
+        (s.id === '#atproto_pds' || s.id === `${this.id}#atproto_pds`));
+}
 //# sourceMappingURL=identity-resolver.js.map

package/dist/identity-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"identity-resolver.js","sourceRoot":"","sources":["../src/identity-resolver.ts"],"names":[],"mappings":";;;AACA,mEAIsC;AACtC,4CAA+D;AAO/D,MAAa,gBAAgB;IAC3B,YACW,cAA8B,EAC9B,WAAuC;QADhD;;;;mBAAS,cAAc;WAAgB;QACvC;;;;mBAAS,WAAW;WAA4B;IAC/C,CAAC;IAEG,KAAK,CAAC,OAAO,CAClB,KAAa,EACb,WAAW,GAAG,2BAA2B;QAEzC,MAAM,GAAG,GAAG,IAAA,kCAAgB,EAAC,KAAK,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,gBAAgB;YACxB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAA,sCAA6B,EAAC,KAAK,CAAC,CAAC,CAAA;QAC3E,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,4BAA4B,CAAC,CAAA;QAEtE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,GAAG,EAAE;YAC7D,IAAI,EAAE,WAAW;SAClB,CAAC,CAAA;QAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;IACrB,CAAC;CACF;AArBD,4CAqBC"}
+{"version":3,"file":"identity-resolver.js","sourceRoot":"","sources":["../src/identity-resolver.ts"],"names":[],"mappings":";;;AAOA,mEAKsC;AACtC,4CAA+D;AAS/D,MAAa,gBAAgB;IAC3B,YACW,WAAuC,EACvC,cAA8B;QADvC;;;;mBAAS,WAAW;WAA4B;QAChD;;;;mBAAS,cAAc;WAAgB;IACtC,CAAC;IAEG,KAAK,CAAC,OAAO,CAClB,KAAa,EACb,OAAgC;QAEhC,MAAM,GAAG,GAAG,IAAA,kCAAgB,EAAC,KAAK,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,gBAAgB;YACxB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC/B,IAAA,sCAA6B,EAAC,KAAK,CAAC,EACpC,OAAO,CACR,CAAA;QAEL,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;QAEjC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,SAAS,CAAC,WAAW,KAAK,6BAA6B,CAAC,CAAA;QACpE,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAE7D,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CACpC,CAAA,kCAAiD,CAAA,EACjD,QAAQ,CACT,CAAA;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,SAAS,CACjB,0DAA0D,GAAG,gBAAgB,CAC9E,CAAA;QACH,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAE5C,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;IACrB,CAAC;CACF;AAxCD,4CAwCC;AAED,SAAS,kCAAkC,CAEzC,CAAa;IAMb,OAAO,CACL,OAAO,CAAC,CAAC,eAAe,KAAK,QAAQ;QACrC,CAAC,CAAC,IAAI,KAAK,2BAA2B;QACtC,CAAC,CAAC,CAAC,EAAE,KAAK,cAAc,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,EAAE,cAAc,CAAC,CAC/D,CAAA;AACH,CAAC"}

package/dist/index.d.ts

@@ -1,3 +1,2 @@
 export * from './identity-resolver.js';
-export * from './universal-identity-resolver.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,kCAAkC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA"}

package/dist/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./identity-resolver.js"), exports);
-__exportStar(require("./universal-identity-resolver.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAsC;AACtC,mEAAgD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/identity-resolver",
-  "version": "0.0.1",
+  "version": "0.1.1",
   "license": "MIT",
   "description": "A library resolving ATPROTO identities",
   "keywords": [
@@ -13,7 +13,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/bluesky-social/atproto",
-    "directory": "packages/identity-resolver"
+    "directory": "packages/internal/identity-resolver"
   },
   "type": "commonjs",
   "main": "dist/index.js",
@@ -25,9 +25,8 @@
     }
   },
   "dependencies": {
-    "@atproto-labs/did": "0.0.1",
-    "@atproto-labs/fetch": "0.0.1",
-    "@atproto-labs/handle-resolver": "0.0.1",
+    "@atproto-labs/did-resolver": "0.1.1",
+    "@atproto-labs/handle-resolver": "0.1.1",
     "@atproto/syntax": "0.3.0"
   },
   "devDependencies": {

package/src/identity-resolver.ts

@@ -1,5 +1,12 @@
-import { DidResolver } from '@atproto-labs/did'
 import {
+  Did,
+  DidDocument,
+  ResolveDidOptions,
+  DidResolver,
+  DidService,
+} from '@atproto-labs/did-resolver'
+import {
+  ResolveHandleOptions,
   HandleResolver,
   ResolvedHandle,
   isResolvedHandle,
@@ -8,28 +15,64 @@ import { normalizeAndEnsureValidHandle } from '@atproto/syntax'
 
 export type ResolvedIdentity = {
   did: NonNullable<ResolvedHandle>
-  url: URL
+  pds: URL
 }
 
+export type ResolveIdentityOptions = ResolveDidOptions & ResolveHandleOptions
+
 export class IdentityResolver {
   constructor(
-    readonly handleResolver: HandleResolver,
     readonly didResolver: DidResolver<'plc' | 'web'>,
+    readonly handleResolver: HandleResolver,
   ) {}
 
   public async resolve(
     input: string,
-    serviceType = 'AtprotoPersonalDataServer',
+    options?: ResolveIdentityOptions,
   ): Promise<ResolvedIdentity> {
     const did = isResolvedHandle(input)
       ? input // Already a did
-      : await this.handleResolver.resolve(normalizeAndEnsureValidHandle(input))
-    if (!did) throw new Error(`Handle ${input} does not resolve to a DID`)
+      : await this.handleResolver.resolve(
+          normalizeAndEnsureValidHandle(input),
+          options,
+        )
+
+    options?.signal?.throwIfAborted()
+
+    if (!did) {
+      throw new TypeError(`Handle "${input}" does not resolve to a DID`)
+    }
 
-    const url = await this.didResolver.resolveServiceEndpoint(did, {
-      type: serviceType,
-    })
+    const document = await this.didResolver.resolve(did, options)
 
-    return { did, url }
+    const service = document.service?.find(
+      isAtprotoPersonalDataServerService<'plc' | 'web'>,
+      document,
+    )
+
+    if (!service) {
+      throw new TypeError(
+        `No valid "AtprotoPersonalDataServer" service found in "${did}" DID document`,
+      )
+    }
+
+    const pds = new URL(service.serviceEndpoint)
+
+    return { did, pds }
   }
 }
+
+function isAtprotoPersonalDataServerService<M extends string>(
+  this: DidDocument<M>,
+  s: DidService,
+): s is {
+  id: '#atproto_pds' | `${Did<M>}#atproto_pds`
+  type: 'AtprotoPersonalDataServer'
+  serviceEndpoint: string
+} {
+  return (
+    typeof s.serviceEndpoint === 'string' &&
+    s.type === 'AtprotoPersonalDataServer' &&
+    (s.id === '#atproto_pds' || s.id === `${this.id}#atproto_pds`)
+  )
+}

package/src/index.ts

@@ -1,2 +1 @@
 export * from './identity-resolver.js'
-export * from './universal-identity-resolver.js'

package/tsconfig.build.json

@@ -0,0 +1,8 @@
+{
+  "extends": ["../../../tsconfig/isomorphic.json"],
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src"
+  },
+  "include": ["src"]
+}

package/tsconfig.json

@@ -1,8 +1,4 @@
 {
-  "extends": "../../tsconfig/isomorphic.json",
-  "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
-  },
-  "include": ["src"]
+  "include": [],
+  "references": [{ "path": "./tsconfig.build.json" }]
 }

package/dist/universal-identity-resolver.d.ts

@@ -1,23 +0,0 @@
-import { DidCache, IsomorphicDidResolverOptions } from '@atproto-labs/did';
-import { Fetch } from '@atproto-labs/fetch';
-import { HandleResolverCache, UniversalHandleResolverOptions } from '@atproto-labs/handle-resolver';
-import { IdentityResolver } from './identity-resolver.js';
-export type { DidCache, DidDocument } from '@atproto-labs/did';
-export type { HandleResolverCache, ResolvedHandle, } from '@atproto-labs/handle-resolver';
-export type UniversalIdentityResolverOptions = {
-    fetch?: Fetch;
-    didCache?: DidCache;
-    handleCache?: HandleResolverCache;
-    /**
-     * @see {@link IsomorphicDidResolverOptions.plcDirectoryUrl}
-     */
-    plcDirectoryUrl?: IsomorphicDidResolverOptions['plcDirectoryUrl'];
-    /**
-     * @see {@link UniversalHandleResolverOptions.atprotoLexiconUrl}
-     */
-    atprotoLexiconUrl?: UniversalHandleResolverOptions['atprotoLexiconUrl'];
-};
-export declare class UniversalIdentityResolver extends IdentityResolver {
-    static from({ fetch, didCache, handleCache, plcDirectoryUrl, atprotoLexiconUrl, }: UniversalIdentityResolverOptions): UniversalIdentityResolver;
-}
-//# sourceMappingURL=universal-identity-resolver.d.ts.map

package/dist/universal-identity-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"universal-identity-resolver.d.ts","sourceRoot":"","sources":["../src/universal-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAgC,EAC9B,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC9D,YAAY,EACV,mBAAmB,EACnB,cAAc,GACf,MAAM,+BAA+B,CAAA;AAEtC,MAAM,MAAM,gCAAgC,GAAG;IAC7C,KAAK,CAAC,EAAE,KAAK,CAAA;IAEb,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,WAAW,CAAC,EAAE,mBAAmB,CAAA;IAEjC;;OAEG;IACH,eAAe,CAAC,EAAE,4BAA4B,CAAC,iBAAiB,CAAC,CAAA;IAEjE;;OAEG;IACH,iBAAiB,CAAC,EAAE,8BAA8B,CAAC,mBAAmB,CAAC,CAAA;CACxE,CAAA;AAED,qBAAa,yBAA0B,SAAQ,gBAAgB;IAC7D,MAAM,CAAC,IAAI,CAAC,EACV,KAAwB,EACxB,QAAQ,EACR,WAAW,EACX,eAAe,EACf,iBAAiB,GAClB,EAAE,gCAAgC;CAcpC"}

package/dist/universal-identity-resolver.js

@@ -1,24 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UniversalIdentityResolver = void 0;
-const did_1 = require("@atproto-labs/did");
-const handle_resolver_1 = __importDefault(require("@atproto-labs/handle-resolver"));
-const identity_resolver_js_1 = require("./identity-resolver.js");
-class UniversalIdentityResolver extends identity_resolver_js_1.IdentityResolver {
-    static from({ fetch = globalThis.fetch, didCache, handleCache, plcDirectoryUrl, atprotoLexiconUrl, }) {
-        return new this(new handle_resolver_1.default({
-            fetch,
-            cache: handleCache,
-            atprotoLexiconUrl,
-        }), new did_1.IsomorphicDidResolver({
-            fetch, //
-            cache: didCache,
-            plcDirectoryUrl,
-        }));
-    }
-}
-exports.UniversalIdentityResolver = UniversalIdentityResolver;
-//# sourceMappingURL=universal-identity-resolver.js.map

package/dist/universal-identity-resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"universal-identity-resolver.js","sourceRoot":"","sources":["../src/universal-identity-resolver.ts"],"names":[],"mappings":";;;;;;AAAA,2CAI0B;AAE1B,oFAGsC;AACtC,iEAAyD;AAyBzD,MAAa,yBAA0B,SAAQ,uCAAgB;IAC7D,MAAM,CAAC,IAAI,CAAC,EACV,KAAK,GAAG,UAAU,CAAC,KAAK,EACxB,QAAQ,EACR,WAAW,EACX,eAAe,EACf,iBAAiB,GACgB;QACjC,OAAO,IAAI,IAAI,CACb,IAAI,yBAAuB,CAAC;YAC1B,KAAK;YACL,KAAK,EAAE,WAAW;YAClB,iBAAiB;SAClB,CAAC,EACF,IAAI,2BAAqB,CAAC;YACxB,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,QAAQ;YACf,eAAe;SAChB,CAAC,CACH,CAAA;IACH,CAAC;CACF;AArBD,8DAqBC"}

package/src/universal-identity-resolver.ts

@@ -1,57 +0,0 @@
-import {
-  DidCache,
-  IsomorphicDidResolver,
-  IsomorphicDidResolverOptions,
-} from '@atproto-labs/did'
-import { Fetch } from '@atproto-labs/fetch'
-import UniversalHandleResolver, {
-  HandleResolverCache,
-  UniversalHandleResolverOptions,
-} from '@atproto-labs/handle-resolver'
-import { IdentityResolver } from './identity-resolver.js'
-
-export type { DidCache, DidDocument } from '@atproto-labs/did'
-export type {
-  HandleResolverCache,
-  ResolvedHandle,
-} from '@atproto-labs/handle-resolver'
-
-export type UniversalIdentityResolverOptions = {
-  fetch?: Fetch
-
-  didCache?: DidCache
-  handleCache?: HandleResolverCache
-
-  /**
-   * @see {@link IsomorphicDidResolverOptions.plcDirectoryUrl}
-   */
-  plcDirectoryUrl?: IsomorphicDidResolverOptions['plcDirectoryUrl']
-
-  /**
-   * @see {@link UniversalHandleResolverOptions.atprotoLexiconUrl}
-   */
-  atprotoLexiconUrl?: UniversalHandleResolverOptions['atprotoLexiconUrl']
-}
-
-export class UniversalIdentityResolver extends IdentityResolver {
-  static from({
-    fetch = globalThis.fetch,
-    didCache,
-    handleCache,
-    plcDirectoryUrl,
-    atprotoLexiconUrl,
-  }: UniversalIdentityResolverOptions) {
-    return new this(
-      new UniversalHandleResolver({
-        fetch,
-        cache: handleCache,
-        atprotoLexiconUrl,
-      }),
-      new IsomorphicDidResolver({
-        fetch, //
-        cache: didCache,
-        plcDirectoryUrl,
-      }),
-    )
-  }
-}