@atproto-labs/handle-resolver 0.1.8 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atproto-labs/handle-resolver
 
+## 0.3.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)! - Use `HandleResolverError` 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)! - Export `asResolvedHandle` utility
+
+## 0.2.0
+
+### Minor Changes
+
+- [#3976](https://github.com/bluesky-social/atproto/pull/3976) [`90b4775fc`](https://github.com/bluesky-social/atproto/commit/90b4775fc9c6959171bc12b961ce9421cc14d6ee) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Rename `AppViewHandleResolver` to `XrpcHandleResolver`
+
+- [#3976](https://github.com/bluesky-social/atproto/pull/3976) [`90b4775fc`](https://github.com/bluesky-social/atproto/commit/90b4775fc9c6959171bc12b961ce9421cc14d6ee) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove `XrpcHandleResolver.from` static method
+
 ## 0.1.8
 
 ### Patch Changes

package/LICENSE.txt

@@ -1,6 +1,6 @@
 Dual MIT/Apache-2.0 License
 
-Copyright (c) 2022-2025 Bluesky PBC, and Contributors
+Copyright (c) 2022-2025 Bluesky Social PBC, and Contributors
 
 Except as otherwise noted in individual files, this software is licensed under the MIT license (<http://opensource.org/licenses/MIT>), or the Apache License, Version 2.0 (<http://www.apache.org/licenses/LICENSE-2.0>).
 

package/dist/atproto-doh-handle-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atproto-doh-handle-resolver.d.ts","sourceRoot":"","sources":["../src/atproto-doh-handle-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,8BAA8B,CAAA;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,MAAM,+BAA+B,GAAG,IAAI,CAChD,4BAA4B,EAC5B,YAAY,GAAG,oBAAoB,CACpC,GAAG;IACF,WAAW,EAAE,MAAM,GAAG,GAAG,CAAA;CAC1B,CAAA;AAED,qBAAa,wBACX,SAAQ,qBACR,YAAW,cAAc;gBAEb,OAAO,EAAE,+BAA+B;CAOrD"}
+{"version":3,"file":"atproto-doh-handle-resolver.d.ts","sourceRoot":"","sources":["../src/atproto-doh-handle-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,MAAM,+BAA+B,GAAG,IAAI,CAChD,4BAA4B,EAC5B,YAAY,GAAG,oBAAoB,CACpC,GAAG;IACF,WAAW,EAAE,MAAM,GAAG,GAAG,CAAA;CAC1B,CAAA;AAED,qBAAa,wBACX,SAAQ,qBACR,YAAW,cAAc;gBAEb,OAAO,EAAE,+BAA+B;CAOrD"}

package/dist/atproto-doh-handle-resolver.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AtprotoDohHandleResolver = void 0;
 const atproto_handle_resolver_js_1 = require("./atproto-handle-resolver.js");
+const handle_resolver_error_js_1 = require("./handle-resolver-error.js");
 class AtprotoDohHandleResolver extends atproto_handle_resolver_js_1.AtprotoHandleResolver {
     constructor(options) {
         super({
@@ -36,10 +37,10 @@ function dohResolveTxtFactory({ dohEndpoint, fetch = globalThis.fetch, }) {
                 const message = contentType?.startsWith('text/plain')
                     ? await response.text()
                     : `Failed to resolve ${hostname}`;
-                throw new TypeError(message);
+                throw new handle_resolver_error_js_1.HandleResolverError(message);
             }
             else if (contentType?.match(/application\/(dns-)?json/i) == null) {
-                throw new TypeError('Unexpected response from DoH server');
+                throw new handle_resolver_error_js_1.HandleResolverError('Unexpected response from DoH server');
             }
             const result = asResult(await response.json());
             return result.Answer?.filter(isAnswerTxt).map(extractTxtData) ?? null;
@@ -72,7 +73,7 @@ function isResult(result) {
 function asResult(result) {
     if (isResult(result))
         return result;
-    throw new TypeError('Invalid DoH response');
+    throw new handle_resolver_error_js_1.HandleResolverError('Invalid DoH response');
 }
 function isArrayOf(value, predicate) {
     return Array.isArray(value) && value.every(predicate);

package/dist/atproto-doh-handle-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"atproto-doh-handle-resolver.js","sourceRoot":"","sources":["../src/atproto-doh-handle-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atproto-doh-handle-resolver.js","sourceRoot":"","sources":["../src/atproto-doh-handle-resolver.ts"],"names":[],"mappings":";;;AAAA,6EAGqC;AACrC,yEAAgE;AAWhE,MAAa,wBACX,SAAQ,kDAAqB;IAG7B,YAAY,OAAwC;QAClD,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,UAAU,EAAE,oBAAoB,CAAC,OAAO,CAAC;YACzC,kBAAkB,EAAE,SAAS;SAC9B,CAAC,CAAA;IACJ,CAAC;CACF;AAXD,4DAWC;AAED;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAAC,EAC5B,WAAW,EACX,KAAK,GAAG,UAAU,CAAC,KAAK,GACQ;IAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAA;QAChC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACnC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,EAAE,MAAM,EAAE,sBAAsB,EAAE;YAC3C,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;QACF,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAA;YAChE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,OAAO,GAAG,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC;oBACnD,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE;oBACvB,CAAC,CAAC,qBAAqB,QAAQ,EAAE,CAAA;gBACnC,MAAM,IAAI,8CAAmB,CAAC,OAAO,CAAC,CAAA;YACxC,CAAC;iBAAM,IAAI,WAAW,EAAE,KAAK,CAAC,2BAA2B,CAAC,IAAI,IAAI,EAAE,CAAC;gBACnE,MAAM,IAAI,8CAAmB,CAAC,qCAAqC,CAAC,CAAA;YACtE,CAAC;YAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;YAC9C,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,IAAI,CAAA;QACvE,CAAC;gBAAS,CAAC;YACT,yEAAyE;YACzE,gCAAgC;YAChC,qDAAqD;YACrD,IAAI,QAAQ,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;gBAChC,kCAAkC;gBAClC,KAAK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED,SAAS,aAAa,CAAC,GAAY;IACjC,IAAI,CAAC,CAAC,GAAG,YAAY,YAAY,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAChE,OAAO,CAAC,KAAK,CAAC,uDAAuD,EAAE,GAAG,CAAC,CAAA;IAC7E,CAAC;AACH,CAAC;AAGD,SAAS,QAAQ,CAAC,MAAe;IAC/B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC/D,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC5E,IAAI,QAAQ,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAA;IAC3E,OAAO,IAAI,CAAA;AACb,CAAC;AACD,SAAS,QAAQ,CAAC,MAAe;IAC/B,IAAI,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAA;IACnC,MAAM,IAAI,8CAAmB,CAAC,sBAAsB,CAAC,CAAA;AACvD,CAAC;AAED,SAAS,SAAS,CAChB,KAAc,EACd,SAAiC;IAEjC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;AACvD,CAAC;AAGD,SAAS,QAAQ,CAAC,MAAe;IAC/B,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,MAAM,IAAI,MAAM;QAChB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,IAAI,MAAM;QAChB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,IAAI,MAAM;QAChB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;QAC/B,KAAK,IAAI,MAAM;QACf,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,CAC/B,CAAA;AACH,CAAC;AAGD,SAAS,WAAW,CAAC,MAAc;IACjC,OAAO,MAAM,CAAC,IAAI,KAAK,EAAE,CAAA;AAC3B,CAAC;AAED,SAAS,cAAc,CAAC,MAAiB;IACvC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC/D,CAAC"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"handle-resolver-error.d.ts","sourceRoot":"","sources":["../src/handle-resolver-error.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,IAAI,SAAwB;CAC7B"}

package/dist/handle-resolver-error.js

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"handle-resolver-error.js","sourceRoot":"","sources":["../src/handle-resolver-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAoB,SAAQ,KAAK;IAA9C;;QACE;;;;mBAAO,qBAAqB;WAAA;IAC9B,CAAC;CAAA;AAFD,kDAEC"}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
+export * from './handle-resolver-error.js';
 export * from './types.js';
-export * from './app-view-handle-resolver.js';
+export * from './xrpc-handle-resolver.js';
 export * from './atproto-doh-handle-resolver.js';
 export * from './atproto-handle-resolver.js';
 export * from './cached-handle-resolver.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAG1B,cAAc,+BAA+B,CAAA;AAC7C,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAG5C,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA;AAC1C,cAAc,YAAY,CAAA;AAG1B,cAAc,2BAA2B,CAAA;AACzC,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAG5C,cAAc,6BAA6B,CAAA"}

package/dist/index.js

@@ -14,9 +14,10 @@ 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("./handle-resolver-error.js"), exports);
 __exportStar(require("./types.js"), exports);
 // Main Handle Resolvers strategies
-__exportStar(require("./app-view-handle-resolver.js"), exports);
+__exportStar(require("./xrpc-handle-resolver.js"), exports);
 __exportStar(require("./atproto-doh-handle-resolver.js"), exports);
 __exportStar(require("./atproto-handle-resolver.js"), exports);
 // Handle Resolver Caching utility

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAE1B,mCAAmC;AACnC,gEAA6C;AAC7C,mEAAgD;AAChD,+DAA4C;AAE5C,kCAAkC;AAClC,8DAA2C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA0C;AAC1C,6CAA0B;AAE1B,mCAAmC;AACnC,4DAAyC;AACzC,mEAAgD;AAChD,+DAA4C;AAE5C,kCAAkC;AAClC,8DAA2C"}

package/dist/types.d.ts

@@ -12,6 +12,7 @@ export type ResolvedHandle = null | AtprotoDid;
  * @see {@link https://atproto.com/specs/did#blessed-did-methods}
  */
 export declare function isResolvedHandle<T>(value: T): value is T & ResolvedHandle;
+export declare function asResolvedHandle(value: string): ResolvedHandle;
 export interface HandleResolver {
     /**
      * @returns the DID that corresponds to the given handle, or `null` if no DID

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAA;AACvD,YAAY,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AAEzE,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,IAAI,GAAG,UAAU,CAAA;AAE9C;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,cAAc,CAEzE;AAED,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,OAAO,CACL,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,cAAc,CAAC,CAAA;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAA;AACvD,YAAY,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AAEzE,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,IAAI,GAAG,UAAU,CAAA;AAE9C;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,cAAc,CAEzE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAE9D;AAED,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,OAAO,CACL,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,cAAc,CAAC,CAAA;CAC3B"}

package/dist/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isResolvedHandle = isResolvedHandle;
+exports.asResolvedHandle = asResolvedHandle;
 const did_1 = require("@atproto/did");
 /**
  * @see {@link https://atproto.com/specs/did#blessed-did-methods}
@@ -8,4 +9,7 @@ const did_1 = require("@atproto/did");
 function isResolvedHandle(value) {
     return value === null || (0, did_1.isAtprotoDid)(value);
 }
+function asResolvedHandle(value) {
+    return isResolvedHandle(value) ? value : null;
+}
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;AAgBA,4CAEC;AAlBD,sCAAuD;AAavD;;GAEG;AACH,SAAgB,gBAAgB,CAAI,KAAQ;IAC1C,OAAO,KAAK,KAAK,IAAI,IAAI,IAAA,kBAAY,EAAC,KAAK,CAAC,CAAA;AAC9C,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;AAgBA,4CAEC;AAED,4CAEC;AAtBD,sCAAuD;AAavD;;GAEG;AACH,SAAgB,gBAAgB,CAAI,KAAQ;IAC1C,OAAO,KAAK,KAAK,IAAI,IAAI,IAAA,kBAAY,EAAC,KAAK,CAAC,CAAA;AAC9C,CAAC;AAED,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AAC/C,CAAC"}

package/dist/{app-view-handle-resolver.d.ts → xrpc-handle-resolver.d.ts}

@@ -10,7 +10,7 @@ export declare const xrpcErrorSchema: z.ZodObject<{
     error: string;
     message?: string | undefined;
 }>;
-export type AppViewHandleResolverOptions = {
+export type XrpcHandleResolverOptions = {
     /**
      * Fetch function to use for HTTP requests. Allows customizing the request
      * behavior, e.g. adding headers, setting a timeout, mocking, etc.
@@ -19,15 +19,14 @@ export type AppViewHandleResolverOptions = {
      */
     fetch?: typeof globalThis.fetch;
 };
-export declare class AppViewHandleResolver implements HandleResolver {
-    static from(service: URL | string | HandleResolver, options?: AppViewHandleResolverOptions): HandleResolver;
+export declare class XrpcHandleResolver implements HandleResolver {
     /**
      * URL of the atproto lexicon server. This is the base URL where the
      * `com.atproto.identity.resolveHandle` XRPC method is located.
      */
     protected readonly serviceUrl: URL;
     protected readonly fetch: typeof globalThis.fetch;
-    constructor(service: URL | string, options?: AppViewHandleResolverOptions);
+    constructor(service: URL | string, options?: XrpcHandleResolverOptions);
     resolve(handle: string, options?: ResolveHandleOptions): Promise<ResolvedHandle>;
 }
-//# sourceMappingURL=app-view-handle-resolver.d.ts.map
+//# sourceMappingURL=xrpc-handle-resolver.d.ts.map

package/dist/xrpc-handle-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xrpc-handle-resolver.d.ts","sourceRoot":"","sources":["../src/xrpc-handle-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,cAAc,EAEf,MAAM,YAAY,CAAA;AAEnB,eAAO,MAAM,eAAe;;;;;;;;;EAG1B,CAAA;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC,CAAA;AAED,qBAAa,kBAAmB,YAAW,cAAc;IACvD;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAA;IAClC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;gBAErC,OAAO,EAAE,GAAG,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAKzD,OAAO,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,cAAc,CAAC;CAmD3B"}

package/dist/{app-view-handle-resolver.js → xrpc-handle-resolver.js}

@@ -1,19 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppViewHandleResolver = exports.xrpcErrorSchema = void 0;
+exports.XrpcHandleResolver = exports.xrpcErrorSchema = void 0;
 const zod_1 = require("zod");
+const handle_resolver_error_js_1 = require("./handle-resolver-error.js");
 const types_js_1 = require("./types.js");
 exports.xrpcErrorSchema = zod_1.z.object({
     error: zod_1.z.string(),
     message: zod_1.z.string().optional(),
 });
-class AppViewHandleResolver {
-    static from(service, options) {
-        if (typeof service === 'string' || service instanceof URL) {
-            return new AppViewHandleResolver(service, options);
-        }
-        return service;
-    }
+class XrpcHandleResolver {
     constructor(service, options) {
         /**
          * URL of the atproto lexicon server. This is the base URL where the
@@ -48,21 +43,24 @@ class AppViewHandleResolver {
         // - 200 OK with { did: NonNullable<ResolvedHandle> }
         // Any other response is considered unexpected behavior an should throw an error.
         if (response.status === 400) {
-            const data = exports.xrpcErrorSchema.parse(payload);
+            const { error, data } = exports.xrpcErrorSchema.safeParse(payload);
+            if (error) {
+                throw new handle_resolver_error_js_1.HandleResolverError(`Invalid response from resolveHandle method: ${error.message}`, { cause: error });
+            }
             if (data.error === 'InvalidRequest' &&
                 data.message === 'Unable to resolve handle') {
                 return null;
             }
         }
         if (!response.ok) {
-            throw new TypeError('Invalid response from resolveHandle method');
+            throw new handle_resolver_error_js_1.HandleResolverError('Invalid status code from resolveHandle method');
         }
         const value = payload?.did;
         if (!(0, types_js_1.isResolvedHandle)(value)) {
-            throw new TypeError('Invalid DID returned from resolveHandle method');
+            throw new handle_resolver_error_js_1.HandleResolverError('Invalid DID returned from resolveHandle method');
         }
         return value;
     }
 }
-exports.AppViewHandleResolver = AppViewHandleResolver;
-//# sourceMappingURL=app-view-handle-resolver.js.map
+exports.XrpcHandleResolver = XrpcHandleResolver;
+//# sourceMappingURL=xrpc-handle-resolver.js.map

package/dist/xrpc-handle-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xrpc-handle-resolver.js","sourceRoot":"","sources":["../src/xrpc-handle-resolver.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AACvB,yEAAgE;AAChE,yCAKmB;AAEN,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA;AAYF,MAAa,kBAAkB;IAQ7B,YAAY,OAAqB,EAAE,OAAmC;QAPtE;;;WAGG;QACgB;;;;;WAAe;QACf;;;;;WAA8B;QAG/C,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;QAClC,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,UAAU,CAAC,KAAK,CAAA;IACjD,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,MAAc,EACd,OAA8B;QAE9B,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,0CAA0C,EAC1C,IAAI,CAAC,UAAU,CAChB,CAAA;QACD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;YAChD,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YAChD,MAAM,EAAE,OAAO,EAAE,MAAM;YACvB,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAErC,gCAAgC;QAChC,0FAA0F;QAC1F,qDAAqD;QACrD,iFAAiF;QAEjF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,uBAAe,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;YAC1D,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,IAAI,8CAAmB,CAC3B,+CAA+C,KAAK,CAAC,OAAO,EAAE,EAC9D,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAA;YACH,CAAC;YACD,IACE,IAAI,CAAC,KAAK,KAAK,gBAAgB;gBAC/B,IAAI,CAAC,OAAO,KAAK,0BAA0B,EAC3C,CAAC;gBACD,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,8CAAmB,CAC3B,+CAA+C,CAChD,CAAA;QACH,CAAC;QAED,MAAM,KAAK,GAAY,OAAO,EAAE,GAAG,CAAA;QAEnC,IAAI,CAAC,IAAA,2BAAgB,EAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,8CAAmB,CAC3B,gDAAgD,CACjD,CAAA;QACH,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAnED,gDAmEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/handle-resolver",
-  "version": "0.1.8",
+  "version": "0.3.0",
   "license": "MIT",
   "description": "Isomorphic ATProto handle to DID resolver",
   "keywords": [

package/src/atproto-doh-handle-resolver.ts

@@ -2,6 +2,7 @@ import {
   AtprotoHandleResolver,
   AtprotoHandleResolverOptions,
 } from './atproto-handle-resolver.js'
+import { HandleResolverError } from './handle-resolver-error.js'
 import { ResolveTxt } from './internal-resolvers/dns-handle-resolver.js'
 import { HandleResolver } from './types.js'
 
@@ -53,9 +54,9 @@ function dohResolveTxtFactory({
         const message = contentType?.startsWith('text/plain')
           ? await response.text()
           : `Failed to resolve ${hostname}`
-        throw new TypeError(message)
+        throw new HandleResolverError(message)
       } else if (contentType?.match(/application\/(dns-)?json/i) == null) {
-        throw new TypeError('Unexpected response from DoH server')
+        throw new HandleResolverError('Unexpected response from DoH server')
       }
 
       const result = asResult(await response.json())
@@ -87,7 +88,7 @@ function isResult(result: unknown): result is Result {
 }
 function asResult(result: unknown): Result {
   if (isResult(result)) return result
-  throw new TypeError('Invalid DoH response')
+  throw new HandleResolverError('Invalid DoH response')
 }
 
 function isArrayOf<T>(

package/src/handle-resolver-error.ts

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

package/src/index.ts

@@ -1,7 +1,8 @@
+export * from './handle-resolver-error.js'
 export * from './types.js'
 
 // Main Handle Resolvers strategies
-export * from './app-view-handle-resolver.js'
+export * from './xrpc-handle-resolver.js'
 export * from './atproto-doh-handle-resolver.js'
 export * from './atproto-handle-resolver.js'
 

package/src/types.ts

@@ -18,6 +18,10 @@ export function isResolvedHandle<T>(value: T): value is T & ResolvedHandle {
   return value === null || isAtprotoDid(value)
 }
 
+export function asResolvedHandle(value: string): ResolvedHandle {
+  return isResolvedHandle(value) ? value : null
+}
+
 export interface HandleResolver {
   /**
    * @returns the DID that corresponds to the given handle, or `null` if no DID

package/src/{app-view-handle-resolver.ts → xrpc-handle-resolver.ts}

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { HandleResolverError } from './handle-resolver-error.js'
 import {
   HandleResolver,
   ResolveHandleOptions,
@@ -11,7 +12,7 @@ export const xrpcErrorSchema = z.object({
   message: z.string().optional(),
 })
 
-export type AppViewHandleResolverOptions = {
+export type XrpcHandleResolverOptions = {
   /**
    * Fetch function to use for HTTP requests. Allows customizing the request
    * behavior, e.g. adding headers, setting a timeout, mocking, etc.
@@ -21,17 +22,7 @@ export type AppViewHandleResolverOptions = {
   fetch?: typeof globalThis.fetch
 }
 
-export class AppViewHandleResolver implements HandleResolver {
-  static from(
-    service: URL | string | HandleResolver,
-    options?: AppViewHandleResolverOptions,
-  ): HandleResolver {
-    if (typeof service === 'string' || service instanceof URL) {
-      return new AppViewHandleResolver(service, options)
-    }
-    return service
-  }
-
+export class XrpcHandleResolver implements HandleResolver {
   /**
    * URL of the atproto lexicon server. This is the base URL where the
    * `com.atproto.identity.resolveHandle` XRPC method is located.
@@ -39,7 +30,7 @@ export class AppViewHandleResolver implements HandleResolver {
   protected readonly serviceUrl: URL
   protected readonly fetch: typeof globalThis.fetch
 
-  constructor(service: URL | string, options?: AppViewHandleResolverOptions) {
+  constructor(service: URL | string, options?: XrpcHandleResolverOptions) {
     this.serviceUrl = new URL(service)
     this.fetch = options?.fetch ?? globalThis.fetch
   }
@@ -67,7 +58,13 @@ export class AppViewHandleResolver implements HandleResolver {
     // Any other response is considered unexpected behavior an should throw an error.
 
     if (response.status === 400) {
-      const data = xrpcErrorSchema.parse(payload)
+      const { error, data } = xrpcErrorSchema.safeParse(payload)
+      if (error) {
+        throw new HandleResolverError(
+          `Invalid response from resolveHandle method: ${error.message}`,
+          { cause: error },
+        )
+      }
       if (
         data.error === 'InvalidRequest' &&
         data.message === 'Unable to resolve handle'
@@ -77,13 +74,17 @@ export class AppViewHandleResolver implements HandleResolver {
     }
 
     if (!response.ok) {
-      throw new TypeError('Invalid response from resolveHandle method')
+      throw new HandleResolverError(
+        'Invalid status code from resolveHandle method',
+      )
     }
 
     const value: unknown = payload?.did
 
     if (!isResolvedHandle(value)) {
-      throw new TypeError('Invalid DID returned from resolveHandle method')
+      throw new HandleResolverError(
+        'Invalid DID returned from resolveHandle method',
+      )
     }
 
     return value

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/app-view-handle-resolver.ts","./src/atproto-doh-handle-resolver.ts","./src/atproto-handle-resolver.ts","./src/cached-handle-resolver.ts","./src/index.ts","./src/types.ts","./src/internal-resolvers/dns-handle-resolver.ts","./src/internal-resolvers/well-known-handler-resolver.ts"],"version":"5.8.2"}
+{"root":["./src/atproto-doh-handle-resolver.ts","./src/atproto-handle-resolver.ts","./src/cached-handle-resolver.ts","./src/handle-resolver-error.ts","./src/index.ts","./src/types.ts","./src/xrpc-handle-resolver.ts","./src/internal-resolvers/dns-handle-resolver.ts","./src/internal-resolvers/well-known-handler-resolver.ts"],"version":"5.8.2"}

package/dist/app-view-handle-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-view-handle-resolver.d.ts","sourceRoot":"","sources":["../src/app-view-handle-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,cAAc,EAEf,MAAM,YAAY,CAAA;AAEnB,eAAO,MAAM,eAAe;;;;;;;;;EAG1B,CAAA;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC,CAAA;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,cAAc,EACtC,OAAO,CAAC,EAAE,4BAA4B,GACrC,cAAc;IAOjB;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAA;IAClC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;gBAErC,OAAO,EAAE,GAAG,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,4BAA4B;IAK5D,OAAO,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,cAAc,CAAC;CAyC3B"}

package/dist/app-view-handle-resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-view-handle-resolver.js","sourceRoot":"","sources":["../src/app-view-handle-resolver.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AACvB,yCAKmB;AAEN,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA;AAYF,MAAa,qBAAqB;IAChC,MAAM,CAAC,IAAI,CACT,OAAsC,EACtC,OAAsC;QAEtC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,YAAY,GAAG,EAAE,CAAC;YAC1D,OAAO,IAAI,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACpD,CAAC;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IASD,YAAY,OAAqB,EAAE,OAAsC;QAPzE;;;WAGG;QACgB;;;;;WAAe;QACf;;;;;WAA8B;QAG/C,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;QAClC,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,UAAU,CAAC,KAAK,CAAA;IACjD,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,MAAc,EACd,OAA8B;QAE9B,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,0CAA0C,EAC1C,IAAI,CAAC,UAAU,CAChB,CAAA;QACD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;YAChD,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YAChD,MAAM,EAAE,OAAO,EAAE,MAAM;YACvB,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAErC,gCAAgC;QAChC,0FAA0F;QAC1F,qDAAqD;QACrD,iFAAiF;QAEjF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,uBAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC3C,IACE,IAAI,CAAC,KAAK,KAAK,gBAAgB;gBAC/B,IAAI,CAAC,OAAO,KAAK,0BAA0B,EAC3C,CAAC;gBACD,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,SAAS,CAAC,4CAA4C,CAAC,CAAA;QACnE,CAAC;QAED,MAAM,KAAK,GAAY,OAAO,EAAE,GAAG,CAAA;QAEnC,IAAI,CAAC,IAAA,2BAAgB,EAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,SAAS,CAAC,gDAAgD,CAAC,CAAA;QACvE,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAnED,sDAmEC"}