@atproto-labs/identity-resolver 0.1.19 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atproto-labs/identity-resolver
 
+## 0.2.0
+
+### Minor Changes
+
+- [#3977](https://github.com/bluesky-social/atproto/pull/3977) [`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Return the whole did document when resolving an identity
+
+- [#3977](https://github.com/bluesky-social/atproto/pull/3977) [`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Reject did documents containing invalid `alsoKnownAs` ATProto handles
+
+- [#3977](https://github.com/bluesky-social/atproto/pull/3977) [`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Use `IdentityResolverError` instances instead of `TypeError`
+
+### Patch Changes
+
+- [#3977](https://github.com/bluesky-social/atproto/pull/3977) [`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Perform a bi-directional check when resolving identity from did
+
+- [#3977](https://github.com/bluesky-social/atproto/pull/3977) [`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Allow non-normalized handles in did documents
+
+- Updated dependencies [[`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47), [`9dac8b0c6`](https://github.com/bluesky-social/atproto/commit/9dac8b0c600520ecb0066ac104787b27668dea47)]:
+  - @atproto-labs/handle-resolver@0.3.0
+
 ## 0.1.19
 
 ### Patch Changes

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

@@ -0,0 +1,4 @@
+export declare class IdentityResolverError extends Error {
+    name: string;
+}
+//# sourceMappingURL=identity-resolver-error.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"identity-resolver-error.d.ts","sourceRoot":"","sources":["../src/identity-resolver-error.ts"],"names":[],"mappings":"AAAA,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,IAAI,SAA0B;CAC/B"}

package/dist/identity-resolver-error.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IdentityResolverError = void 0;
+class IdentityResolverError extends Error {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'IdentityResolverError'
+        });
+    }
+}
+exports.IdentityResolverError = IdentityResolverError;
+//# sourceMappingURL=identity-resolver-error.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"identity-resolver-error.js","sourceRoot":"","sources":["../src/identity-resolver-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,qBAAsB,SAAQ,KAAK;IAAhD;;QACE;;;;mBAAO,uBAAuB;WAAA;IAChC,CAAC;CAAA;AAFD,sDAEC"}

package/dist/identity-resolver.d.ts

@@ -1,8 +1,11 @@
-import { DidDocument, DidResolver, ResolveDidOptions } from '@atproto-labs/did-resolver';
-import { AtprotoIdentityDidMethods, HandleResolver, ResolveHandleOptions, ResolvedHandle } from '@atproto-labs/handle-resolver';
+import { AtprotoDid, AtprotoIdentityDidMethods, DidDocument, DidResolver, ResolveDidOptions } from '@atproto-labs/did-resolver';
+import { HandleResolver, ResolveHandleOptions } from '@atproto-labs/handle-resolver';
 export type ResolvedIdentity = {
-    did: NonNullable<ResolvedHandle>;
-    pds: URL;
+    document: DidDocument<AtprotoIdentityDidMethods>;
+    /**
+     * Will be defined if the document contains a handle alias that resolves
+     * to the document's DID.
+     */
     handle?: string;
 };
 export type ResolveIdentityOptions = ResolveDidOptions & ResolveHandleOptions;
@@ -11,7 +14,9 @@ export declare class IdentityResolver {
     readonly handleResolver: HandleResolver;
     constructor(didResolver: DidResolver<AtprotoIdentityDidMethods>, handleResolver: HandleResolver);
     resolve(input: string, options?: ResolveIdentityOptions): Promise<ResolvedIdentity>;
-    getDocumentFromDid(did: NonNullable<ResolvedHandle>, options?: ResolveDidOptions): Promise<DidDocument<AtprotoIdentityDidMethods>>;
+    resolveFromDid(did: AtprotoDid, options?: ResolveDidOptions): Promise<ResolvedIdentity>;
+    resolveFromHandle(handle: string, options?: ResolveHandleOptions): Promise<ResolvedIdentity>;
+    getDocumentFromDid(did: AtprotoDid, options?: ResolveDidOptions): Promise<DidDocument<AtprotoIdentityDidMethods>>;
     getDocumentFromHandle(input: string, options?: ResolveHandleOptions): Promise<DidDocument<AtprotoIdentityDidMethods>>;
 }
 //# 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":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAEX,iBAAiB,EAClB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,yBAAyB,EACzB,cAAc,EACd,oBAAoB,EACpB,cAAc,EAEf,MAAM,+BAA+B,CAAA;AAEtC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,CAAA;IAChC,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,GAAG,oBAAoB,CAAA;AAE7E,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,yBAAyB,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAD9B,WAAW,EAAE,WAAW,CAAC,yBAAyB,CAAC,EACnD,cAAc,EAAE,cAAc;IAG5B,OAAO,CAClB,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IAuBf,kBAAkB,CAC7B,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,EAChC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;IAIrC,qBAAqB,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;CAyBnD"}
+{"version":3,"file":"identity-resolver.d.ts","sourceRoot":"","sources":["../src/identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,yBAAyB,EACzB,WAAW,EACX,WAAW,EACX,iBAAiB,EAElB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,cAAc,EACd,oBAAoB,EACrB,MAAM,+BAA+B,CAAA;AAItC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,WAAW,CAAC,yBAAyB,CAAC,CAAA;IAEhD;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,GAAG,oBAAoB,CAAA;AAE7E,qBAAa,gBAAgB;IAEzB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,yBAAyB,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAD9B,WAAW,EAAE,WAAW,CAAC,yBAAyB,CAAC,EACnD,cAAc,EAAE,cAAc;IAG5B,OAAO,CAClB,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IAMf,cAAc,CACzB,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC;IAoBf,iBAAiB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,gBAAgB,CAAC;IAWf,kBAAkB,CAC7B,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;IAIrC,qBAAqB,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;CA8BnD"}

package/dist/identity-resolver.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentityResolver = void 0;
-const syntax_1 = require("@atproto/syntax");
-const handle_resolver_1 = require("@atproto-labs/handle-resolver");
+const did_resolver_1 = require("@atproto-labs/did-resolver");
+const identity_resolver_error_1 = require("./identity-resolver-error");
+const util_1 = require("./util");
 class IdentityResolver {
     constructor(didResolver, handleResolver) {
         Object.defineProperty(this, "didResolver", {
@@ -19,57 +20,56 @@ class IdentityResolver {
         });
     }
     async resolve(input, options) {
-        const document = (0, handle_resolver_1.isResolvedHandle)(input)
-            ? await this.getDocumentFromDid(input, options)
-            : await this.getDocumentFromHandle(input, options);
-        const service = document.service?.find((isAtprotoPersonalDataServerService), document);
-        if (!service) {
-            throw new TypeError(`No valid "AtprotoPersonalDataServer" service found in "${document.id}" DID document`);
-        }
+        return (0, did_resolver_1.isAtprotoDid)(input)
+            ? this.resolveFromDid(input, options)
+            : this.resolveFromHandle(input, options);
+    }
+    async resolveFromDid(did, options) {
+        const document = await this.getDocumentFromDid(did, options);
+        options?.signal?.throwIfAborted();
+        // We will only return the document's handle alias if it resolves to the
+        // same DID as the input.
+        const handle = (0, util_1.extractNormalizedHandle)(document);
+        const resolvedDid = handle
+            ? await this.handleResolver
+                .resolve(handle, options)
+                .catch(() => undefined) // Ignore errors (temporarily unavailable)
+            : undefined;
+        return {
+            document,
+            handle: resolvedDid === did ? handle : undefined,
+        };
+    }
+    async resolveFromHandle(handle, options) {
+        const document = await this.getDocumentFromHandle(handle, options);
+        // @NOTE bi-directional resolution enforced in getDocumentFromHandle()
         return {
-            did: document.id,
-            pds: new URL(service.serviceEndpoint),
-            handle: extractHandle(document),
+            document,
+            handle: (0, util_1.extractNormalizedHandle)(document),
         };
     }
     async getDocumentFromDid(did, options) {
         return this.didResolver.resolve(did, options);
     }
     async getDocumentFromHandle(input, options) {
-        const handle = (0, syntax_1.normalizeAndEnsureValidHandle)(input);
+        const handle = (0, util_1.asNormalizedHandle)(input);
+        if (!handle) {
+            throw new identity_resolver_error_1.IdentityResolverError(`Invalid handle "${input}" provided.`);
+        }
         const did = await this.handleResolver.resolve(handle, options);
         if (!did) {
-            throw new TypeError(`Handle "${handle}" does not resolve to a DID`);
+            throw new identity_resolver_error_1.IdentityResolverError(`Handle "${handle}" does not resolve to a DID`);
         }
         options?.signal?.throwIfAborted();
         // Note: Not using "return this.resolveDid(did, options)" to make the extra
         // check for the handle in the DID document:
         const document = await this.didResolver.resolve(did, options);
-        // Ensure that the handle is included in the document
-        if (!document.alsoKnownAs?.includes(`at://${handle}`)) {
-            throw new TypeError(`Did document for "${did}" does not include the handle "${handle}"`);
+        // Enforce bi-directional resolution
+        if (handle !== (0, util_1.extractNormalizedHandle)(document)) {
+            throw new identity_resolver_error_1.IdentityResolverError(`Did document for "${did}" does not include the handle "${handle}"`);
         }
         return document;
     }
 }
 exports.IdentityResolver = IdentityResolver;
-function extractHandle(document) {
-    if (document.alsoKnownAs) {
-        for (const h of document.alsoKnownAs) {
-            if (h.startsWith('at://')) {
-                const handle = h.slice(5);
-                if ((0, syntax_1.isValidHandle)(handle))
-                    return handle;
-            }
-        }
-    }
-    return undefined;
-}
-function isAtprotoPersonalDataServerService(s) {
-    return (typeof s.serviceEndpoint === 'string' &&
-        s.type === 'AtprotoPersonalDataServer' &&
-        (s.id.startsWith('#')
-            ? 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":"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"}
+{"version":3,"file":"identity-resolver.js","sourceRoot":"","sources":["../src/identity-resolver.ts"],"names":[],"mappings":";;;AAAA,6DAOmC;AAKnC,uEAAiE;AACjE,iCAAoE;AAcpE,MAAa,gBAAgB;IAC3B,YACW,WAAmD,EACnD,cAA8B;QADvC;;;;mBAAS,WAAW;WAAwC;QAC5D;;;;mBAAS,cAAc;WAAgB;IACtC,CAAC;IAEG,KAAK,CAAC,OAAO,CAClB,KAAa,EACb,OAAgC;QAEhC,OAAO,IAAA,2BAAY,EAAC,KAAK,CAAC;YACxB,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,cAAc,CACzB,GAAe,EACf,OAA2B;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAE5D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;QAEjC,wEAAwE;QACxE,yBAAyB;QACzB,MAAM,MAAM,GAAG,IAAA,8BAAuB,EAAC,QAAQ,CAAC,CAAA;QAChD,MAAM,WAAW,GAAG,MAAM;YACxB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;iBACtB,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;iBACxB,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,0CAA0C;YACtE,CAAC,CAAC,SAAS,CAAA;QAEb,OAAO;YACL,QAAQ;YACR,MAAM,EAAE,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SACjD,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,MAAc,EACd,OAA8B;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAElE,sEAAsE;QAEtE,OAAO;YACL,QAAQ;YACR,MAAM,EAAE,IAAA,8BAAuB,EAAC,QAAQ,CAAC;SAC1C,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC7B,GAAe,EACf,OAA2B;QAE3B,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC/C,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAChC,KAAa,EACb,OAA8B;QAE9B,MAAM,MAAM,GAAG,IAAA,yBAAkB,EAAC,KAAK,CAAC,CAAA;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,+CAAqB,CAAC,mBAAmB,KAAK,aAAa,CAAC,CAAA;QACxE,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAE9D,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,+CAAqB,CAC7B,WAAW,MAAM,6BAA6B,CAC/C,CAAA;QACH,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;QAEjC,2EAA2E;QAC3E,4CAA4C;QAE5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAE7D,oCAAoC;QACpC,IAAI,MAAM,KAAK,IAAA,8BAAuB,EAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,+CAAqB,CAC7B,qBAAqB,GAAG,kCAAkC,MAAM,GAAG,CACpE,CAAA;QACH,CAAC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AA5FD,4CA4FC"}

package/dist/index.d.ts

@@ -1,2 +1,4 @@
+export * from './identity-resolver-error.js';
 export * from './identity-resolver.js';
+export * from './util.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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAA;AAC5C,cAAc,wBAAwB,CAAA;AACtC,cAAc,WAAW,CAAA"}

package/dist/index.js

@@ -14,5 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./identity-resolver-error.js"), exports);
 __exportStar(require("./identity-resolver.js"), exports);
+__exportStar(require("./util.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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA4C;AAC5C,yDAAsC;AACtC,4CAAyB"}

package/dist/util.d.ts

@@ -0,0 +1,13 @@
+import { AtprotoIdentityDidMethods, DidDocument } from '@atproto-labs/did-resolver';
+/**
+ * Extract the raw, un-validated, Atproto handle from a DID document.
+ */
+export declare function extractAtprotoHandle(document: DidDocument<AtprotoIdentityDidMethods>): string | undefined;
+/**
+ * Extracts a validated, normalized Atproto handle from a DID document.
+ */
+export declare function extractNormalizedHandle(document: DidDocument<AtprotoIdentityDidMethods>): string | undefined;
+export declare function asNormalizedHandle(input: string): string | undefined;
+export declare function normalizeHandle(handle: string): string;
+export declare function isValidHandle(handle: string): boolean;
+//# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,WAAW,EACZ,MAAM,4BAA4B,CAAA;AAEnC;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,WAAW,CAAC,yBAAyB,CAAC,GAC/C,MAAM,GAAG,SAAS,CAUpB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,WAAW,CAAC,yBAAyB,CAAC,GAC/C,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQrD"}

package/dist/util.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractAtprotoHandle = extractAtprotoHandle;
+exports.extractNormalizedHandle = extractNormalizedHandle;
+exports.asNormalizedHandle = asNormalizedHandle;
+exports.normalizeHandle = normalizeHandle;
+exports.isValidHandle = isValidHandle;
+/**
+ * Extract the raw, un-validated, Atproto handle from a DID document.
+ */
+function extractAtprotoHandle(document) {
+    if (document.alsoKnownAs) {
+        for (const h of document.alsoKnownAs) {
+            if (h.startsWith('at://')) {
+                // strip off "at://" prefix
+                return h.slice(5);
+            }
+        }
+    }
+    return undefined;
+}
+/**
+ * Extracts a validated, normalized Atproto handle from a DID document.
+ */
+function extractNormalizedHandle(document) {
+    const handle = extractAtprotoHandle(document);
+    if (!handle)
+        return undefined;
+    return asNormalizedHandle(handle);
+}
+function asNormalizedHandle(input) {
+    const handle = normalizeHandle(input);
+    return isValidHandle(handle) ? handle : undefined;
+}
+function normalizeHandle(handle) {
+    return handle.toLowerCase();
+}
+function isValidHandle(handle) {
+    return (handle.length > 0 &&
+        handle.length < 254 &&
+        /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/.test(handle));
+}
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;AAQA,oDAYC;AAKD,0DAMC;AAED,gDAGC;AAED,0CAEC;AAED,sCAQC;AA7CD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,QAAgD;IAEhD,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1B,2BAA2B;gBAC3B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;GAEG;AACH,SAAgB,uBAAuB,CACrC,QAAgD;IAEhD,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAC7C,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAA;IAC7B,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAA;AACnC,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACrC,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC;AAED,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO,MAAM,CAAC,WAAW,EAAE,CAAA;AAC7B,CAAC;AAED,SAAgB,aAAa,CAAC,MAAc;IAC1C,OAAO,CACL,MAAM,CAAC,MAAM,GAAG,CAAC;QACjB,MAAM,CAAC,MAAM,GAAG,GAAG;QACnB,4FAA4F,CAAC,IAAI,CAC/F,MAAM,CACP,CACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/identity-resolver",
-  "version": "0.1.19",
+  "version": "0.2.0",
   "license": "MIT",
   "description": "A library resolving ATPROTO identities",
   "keywords": [
@@ -26,8 +26,7 @@
   },
   "dependencies": {
     "@atproto-labs/did-resolver": "0.2.0",
-    "@atproto-labs/handle-resolver": "0.2.0",
-    "@atproto/syntax": "0.4.0"
+    "@atproto-labs/handle-resolver": "0.3.0"
   },
   "devDependencies": {
     "typescript": "^5.6.3"

package/src/identity-resolver-error.ts

@@ -0,0 +1,3 @@
+export class IdentityResolverError extends Error {
+  name = 'IdentityResolverError'
+}

package/src/identity-resolver.ts

@@ -1,22 +1,25 @@
-import { isValidHandle, normalizeAndEnsureValidHandle } from '@atproto/syntax'
 import {
-  Did,
+  AtprotoDid,
+  AtprotoIdentityDidMethods,
   DidDocument,
   DidResolver,
-  DidService,
   ResolveDidOptions,
+  isAtprotoDid,
 } from '@atproto-labs/did-resolver'
 import {
-  AtprotoIdentityDidMethods,
   HandleResolver,
   ResolveHandleOptions,
-  ResolvedHandle,
-  isResolvedHandle,
 } from '@atproto-labs/handle-resolver'
+import { IdentityResolverError } from './identity-resolver-error'
+import { asNormalizedHandle, extractNormalizedHandle } from './util'
 
 export type ResolvedIdentity = {
-  did: NonNullable<ResolvedHandle>
-  pds: URL
+  document: DidDocument<AtprotoIdentityDidMethods>
+
+  /**
+   * Will be defined if the document contains a handle alias that resolves
+   * to the document's DID.
+   */
   handle?: string
 }
 
@@ -32,30 +35,50 @@ export class IdentityResolver {
     input: string,
     options?: ResolveIdentityOptions,
   ): Promise<ResolvedIdentity> {
-    const document = isResolvedHandle(input)
-      ? await this.getDocumentFromDid(input, options)
-      : await this.getDocumentFromHandle(input, options)
+    return isAtprotoDid(input)
+      ? this.resolveFromDid(input, options)
+      : this.resolveFromHandle(input, options)
+  }
 
-    const service = document.service?.find(
-      isAtprotoPersonalDataServerService<AtprotoIdentityDidMethods>,
-      document,
-    )
+  public async resolveFromDid(
+    did: AtprotoDid,
+    options?: ResolveDidOptions,
+  ): Promise<ResolvedIdentity> {
+    const document = await this.getDocumentFromDid(did, options)
 
-    if (!service) {
-      throw new TypeError(
-        `No valid "AtprotoPersonalDataServer" service found in "${document.id}" DID document`,
-      )
+    options?.signal?.throwIfAborted()
+
+    // We will only return the document's handle alias if it resolves to the
+    // same DID as the input.
+    const handle = extractNormalizedHandle(document)
+    const resolvedDid = handle
+      ? await this.handleResolver
+          .resolve(handle, options)
+          .catch(() => undefined) // Ignore errors (temporarily unavailable)
+      : undefined
+
+    return {
+      document,
+      handle: resolvedDid === did ? handle : undefined,
     }
+  }
+
+  public async resolveFromHandle(
+    handle: string,
+    options?: ResolveHandleOptions,
+  ): Promise<ResolvedIdentity> {
+    const document = await this.getDocumentFromHandle(handle, options)
+
+    // @NOTE bi-directional resolution enforced in getDocumentFromHandle()
 
     return {
-      did: document.id,
-      pds: new URL(service.serviceEndpoint),
-      handle: extractHandle(document),
+      document,
+      handle: extractNormalizedHandle(document),
     }
   }
 
   public async getDocumentFromDid(
-    did: NonNullable<ResolvedHandle>,
+    did: AtprotoDid,
     options?: ResolveDidOptions,
   ): Promise<DidDocument<AtprotoIdentityDidMethods>> {
     return this.didResolver.resolve(did, options)
@@ -65,12 +88,17 @@ export class IdentityResolver {
     input: string,
     options?: ResolveHandleOptions,
   ): Promise<DidDocument<AtprotoIdentityDidMethods>> {
-    const handle = normalizeAndEnsureValidHandle(input)
+    const handle = asNormalizedHandle(input)
+    if (!handle) {
+      throw new IdentityResolverError(`Invalid handle "${input}" provided.`)
+    }
 
     const did = await this.handleResolver.resolve(handle, options)
 
     if (!did) {
-      throw new TypeError(`Handle "${handle}" does not resolve to a DID`)
+      throw new IdentityResolverError(
+        `Handle "${handle}" does not resolve to a DID`,
+      )
     }
 
     options?.signal?.throwIfAborted()
@@ -80,9 +108,9 @@ export class IdentityResolver {
 
     const document = await this.didResolver.resolve(did, options)
 
-    // Ensure that the handle is included in the document
-    if (!document.alsoKnownAs?.includes(`at://${handle}`)) {
-      throw new TypeError(
+    // Enforce bi-directional resolution
+    if (handle !== extractNormalizedHandle(document)) {
+      throw new IdentityResolverError(
         `Did document for "${did}" does not include the handle "${handle}"`,
       )
     }
@@ -90,35 +118,3 @@ export class IdentityResolver {
     return document
   }
 }
-
-function extractHandle(
-  document: DidDocument<AtprotoIdentityDidMethods>,
-): string | undefined {
-  if (document.alsoKnownAs) {
-    for (const h of document.alsoKnownAs) {
-      if (h.startsWith('at://')) {
-        const handle = h.slice(5)
-        if (isValidHandle(handle)) return handle
-      }
-    }
-  }
-
-  return undefined
-}
-
-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.startsWith('#')
-      ? s.id === '#atproto_pds'
-      : s.id === `${this.id}#atproto_pds`)
-  )
-}

package/src/index.ts

@@ -1 +1,3 @@
+export * from './identity-resolver-error.js'
 export * from './identity-resolver.js'
+export * from './util.js'

package/src/util.ts

@@ -0,0 +1,51 @@
+import {
+  AtprotoIdentityDidMethods,
+  DidDocument,
+} from '@atproto-labs/did-resolver'
+
+/**
+ * Extract the raw, un-validated, Atproto handle from a DID document.
+ */
+export function extractAtprotoHandle(
+  document: DidDocument<AtprotoIdentityDidMethods>,
+): string | undefined {
+  if (document.alsoKnownAs) {
+    for (const h of document.alsoKnownAs) {
+      if (h.startsWith('at://')) {
+        // strip off "at://" prefix
+        return h.slice(5)
+      }
+    }
+  }
+  return undefined
+}
+
+/**
+ * Extracts a validated, normalized Atproto handle from a DID document.
+ */
+export function extractNormalizedHandle(
+  document: DidDocument<AtprotoIdentityDidMethods>,
+): string | undefined {
+  const handle = extractAtprotoHandle(document)
+  if (!handle) return undefined
+  return asNormalizedHandle(handle)
+}
+
+export function asNormalizedHandle(input: string): string | undefined {
+  const handle = normalizeHandle(input)
+  return isValidHandle(handle) ? handle : undefined
+}
+
+export function normalizeHandle(handle: string): string {
+  return handle.toLowerCase()
+}
+
+export function isValidHandle(handle: string): boolean {
+  return (
+    handle.length > 0 &&
+    handle.length < 254 &&
+    /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/.test(
+      handle,
+    )
+  )
+}

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/identity-resolver.ts","./src/index.ts"],"version":"5.8.2"}
+{"root":["./src/identity-resolver-error.ts","./src/identity-resolver.ts","./src/index.ts","./src/util.ts"],"version":"5.8.2"}