@atproto/identity 0.4.2 → 0.4.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atproto/identity
 
+## 0.4.4
+
+### Patch Changes
+
+- [#3177](https://github.com/bluesky-social/atproto/pull/3177) [`72eba67af`](https://github.com/bluesky-social/atproto/commit/72eba67af1af8320b5400bcb9319d5c3c8407d99) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove dependency on Axios
+
+- Updated dependencies [[`72eba67af`](https://github.com/bluesky-social/atproto/commit/72eba67af1af8320b5400bcb9319d5c3c8407d99), [`72eba67af`](https://github.com/bluesky-social/atproto/commit/72eba67af1af8320b5400bcb9319d5c3c8407d99)]:
+  - @atproto/common-web@0.3.2
+  - @atproto/crypto@0.4.2
+
+## 0.4.3
+
+### Patch Changes
+
+- Updated dependencies [[`1982693e3`](https://github.com/bluesky-social/atproto/commit/1982693e3ea1fef4db76ac9aca3db8dc5ebf3fe0)]:
+  - @atproto/crypto@0.4.2
+
 ## 0.4.2
 
 ### Patch Changes

package/dist/did/atproto-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atproto-data.d.ts","sourceRoot":"","sources":["../../src/did/atproto-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EACL,MAAM,EACN,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAEjB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,MAAM,EACN,SAAS,EACT,cAAc,IAAI,MAAM,EACxB,kBAAkB,IAAI,UAAU,EAChC,gBAAgB,IAAI,QAAQ,GAC7B,CAAA;AAED,eAAO,MAAM,MAAM,QAAS,WAAW,KAAG,MAAM,GAAG,SAIlD,CAAA;AAED,eAAO,MAAM,sBAAsB,QAAS;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;CAC3B,KAAG,MAAM,GAAG,SAYZ,CAAA;AAED,eAAO,MAAM,sBAAsB,QAC5B,WAAW,KACf,QAAQ,WAAW,CAQrB,CAAA;AAED,eAAO,MAAM,iBAAiB,QAAS,WAAW,KAAG,WAepD,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAS,WAAW,KAAG,MAMnD,CAAA"}
+{"version":3,"file":"atproto-data.d.ts","sourceRoot":"","sources":["../../src/did/atproto-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EACL,MAAM,EACN,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAEjB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,MAAM,EACN,SAAS,EACT,cAAc,IAAI,MAAM,EACxB,kBAAkB,IAAI,UAAU,EAChC,gBAAgB,IAAI,QAAQ,GAC7B,CAAA;AAED,eAAO,MAAM,MAAM,QAAS,WAAW,KAAG,MAAM,GAAG,SAIlD,CAAA;AAED,eAAO,MAAM,sBAAsB,QAAS;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;CAC3B,KAAG,MAAM,GAAG,SAYZ,CAAA;AAED,eAAO,MAAM,sBAAsB,QAC5B,WAAW,KACf,OAAO,CAAC,WAAW,CAQrB,CAAA;AAED,eAAO,MAAM,iBAAiB,QAAS,WAAW,KAAG,WAepD,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAS,WAAW,KAAG,MAMnD,CAAA"}

package/dist/did/base-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-resolver.d.ts","sourceRoot":"","sources":["../../src/did/base-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,WAAW,EAEX,WAAW,EACZ,MAAM,UAAU,CAAA;AAIjB,8BAAsB,YAAY;IACb,KAAK,CAAC;gBAAN,KAAK,CAAC,sBAAU;IAEnC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAE7D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,WAAW;IAUhD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAMxD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlE,OAAO,CACX,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAqBxB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAQtE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,CAAC;IAKjB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IASrE,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,EACf,YAAY,UAAQ,GACnB,OAAO,CAAC,OAAO,CAAC;CAIpB;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"base-resolver.d.ts","sourceRoot":"","sources":["../../src/did/base-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,WAAW,EAEX,WAAW,EACZ,MAAM,UAAU,CAAA;AAIjB,8BAAsB,YAAY;IACb,KAAK,CAAC,EAAE,QAAQ;gBAAhB,KAAK,CAAC,EAAE,QAAQ,YAAA;IAEnC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAE7D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,WAAW;IAUhD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAMxD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlE,OAAO,CACX,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAqBxB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAQtE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,CAAC;IAKjB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IASrE,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,EACf,YAAY,UAAQ,GACnB,OAAO,CAAC,OAAO,CAAC;CAIpB;AAED,eAAe,YAAY,CAAA"}

package/dist/did/plc-resolver.d.ts

@@ -1,5 +1,5 @@
-import BaseResolver from './base-resolver';
 import { DidCache } from '../types';
+import BaseResolver from './base-resolver';
 export declare class DidPlcResolver extends BaseResolver {
     plcUrl: string;
     timeout: number;

package/dist/did/plc-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plc-resolver.d.ts","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,qBAAa,cAAe,SAAQ,YAAY;IAErC,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,MAAM;IACf,KAAK,CAAC;gBAFN,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,sBAAU;IAKnB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAapD"}
+{"version":3,"file":"plc-resolver.d.ts","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,YAAY,MAAM,iBAAiB,CAAA;AAG1C,qBAAa,cAAe,SAAQ,YAAY;IAErC,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,MAAM;IACf,KAAK,CAAC,EAAE,QAAQ;gBAFhB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,QAAQ,YAAA;IAKnB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBpD"}

package/dist/did/plc-resolver.js

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DidPlcResolver = void 0;
-const axios_1 = __importStar(require("axios"));
 const base_resolver_1 = __importDefault(require("./base-resolver"));
+const util_1 = require("./util");
 class DidPlcResolver extends base_resolver_1.default {
     constructor(plcUrl, timeout, cache) {
         super(cache);
@@ -52,18 +29,21 @@ class DidPlcResolver extends base_resolver_1.default {
         });
     }
     async resolveNoCheck(did) {
-        try {
-            const res = await axios_1.default.get(`${this.plcUrl}/${encodeURIComponent(did)}`, {
-                timeout: this.timeout,
+        return (0, util_1.timed)(this.timeout, async (signal) => {
+            const url = new URL(`/${encodeURIComponent(did)}`, this.plcUrl);
+            const res = await fetch(url, {
+                redirect: 'error',
+                headers: { accept: 'application/did+ld+json,application/json' },
+                signal,
             });
-            return res.data;
-        }
-        catch (err) {
-            if (err instanceof axios_1.AxiosError && err.response?.status === 404) {
-                return null; // Positively not found, versus due to e.g. network error
+            // Positively not found, versus due to e.g. network error
+            if (res.status === 404)
+                return null;
+            if (!res.ok) {
+                throw Object.assign(new Error(res.statusText), { status: res.status });
             }
-            throw err;
-        }
+            return res.json();
+        });
     }
 }
 exports.DidPlcResolver = DidPlcResolver;

package/dist/did/plc-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"plc-resolver.js","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AACzC,oEAA0C;AAG1C,MAAa,cAAe,SAAQ,uBAAY;IAC9C,YACS,MAAc,EACd,OAAe,EACf,KAAgB;QAEvB,KAAK,CAAC,KAAK,CAAC,CAAA;QAJZ;;;;mBAAO,MAAM;WAAQ;QACrB;;;;mBAAO,OAAO;WAAQ;QACtB;;;;mBAAO,KAAK;WAAW;IAGzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE;gBACvE,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAA;YACF,OAAO,GAAG,CAAC,IAAI,CAAA;QACjB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,kBAAU,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC9D,OAAO,IAAI,CAAA,CAAC,yDAAyD;YACvE,CAAC;YACD,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;CACF;AAtBD,wCAsBC"}
+{"version":3,"file":"plc-resolver.js","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":";;;;;;AACA,oEAA0C;AAC1C,iCAA8B;AAE9B,MAAa,cAAe,SAAQ,uBAAY;IAC9C,YACS,MAAc,EACd,OAAe,EACf,KAAgB;QAEvB,KAAK,CAAC,KAAK,CAAC,CAAA;QAJZ;;;;mBAAO,MAAM;WAAQ;QACrB;;;;mBAAO,OAAO;WAAQ;QACtB;;;;mBAAO,KAAK;WAAW;IAGzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,OAAO,IAAA,YAAK,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAC/D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC3B,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,0CAA0C,EAAE;gBAC/D,MAAM;aACP,CAAC,CAAA;YAEF,yDAAyD;YACzD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;gBAAE,OAAO,IAAI,CAAA;YAEnC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;YACxE,CAAC;YAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AA5BD,wCA4BC"}

package/dist/did/util.d.ts

@@ -0,0 +1,2 @@
+export declare function timed<F extends (signal: AbortSignal) => unknown>(ms: number, fn: F): Promise<Awaited<ReturnType<F>>>;
+//# sourceMappingURL=util.d.ts.map

package/dist/did/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/did/util.ts"],"names":[],"mappings":"AAAA,wBAAsB,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,EACpE,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,CAAC,GACJ,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAWjC"}

package/dist/did/util.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.timed = timed;
+async function timed(ms, fn) {
+    const abortController = new AbortController();
+    const timer = setTimeout(() => abortController.abort(), ms);
+    const signal = abortController.signal;
+    try {
+        return (await fn(signal));
+    }
+    finally {
+        clearTimeout(timer);
+        abortController.abort();
+    }
+}
+//# sourceMappingURL=util.js.map

package/dist/did/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/did/util.ts"],"names":[],"mappings":";;AAAA,sBAcC;AAdM,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,EAAK;IAEL,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAA;IAErC,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAA2B,CAAA;IACrD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,eAAe,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;AACH,CAAC"}

package/dist/did/web-resolver.d.ts

@@ -1,5 +1,5 @@
-import BaseResolver from './base-resolver';
 import { DidCache } from '../types';
+import BaseResolver from './base-resolver';
 export declare const DOC_PATH = "/.well-known/did.json";
 export declare class DidWebResolver extends BaseResolver {
     timeout: number;

package/dist/did/web-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-resolver.d.ts","sourceRoot":"","sources":["../../src/did/web-resolver.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGnC,eAAO,MAAM,QAAQ,0BAA0B,CAAA;AAE/C,qBAAa,cAAe,SAAQ,YAAY;IAErC,OAAO,EAAE,MAAM;IACf,KAAK,CAAC;gBADN,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,sBAAU;IAKnB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCpD"}
+{"version":3,"file":"web-resolver.d.ts","sourceRoot":"","sources":["../../src/did/web-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,YAAY,MAAM,iBAAiB,CAAA;AAG1C,eAAO,MAAM,QAAQ,0BAA0B,CAAA;AAE/C,qBAAa,cAAe,SAAQ,YAAY;IAErC,OAAO,EAAE,MAAM;IACf,KAAK,CAAC,EAAE,QAAQ;gBADhB,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,QAAQ,YAAA;IAKnB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCpD"}

package/dist/did/web-resolver.js

@@ -1,35 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DidWebResolver = exports.DOC_PATH = void 0;
-const axios_1 = __importStar(require("axios"));
-const base_resolver_1 = __importDefault(require("./base-resolver"));
 const errors_1 = require("../errors");
+const base_resolver_1 = __importDefault(require("./base-resolver"));
+const util_1 = require("./util");
 exports.DOC_PATH = '/.well-known/did.json';
 class DidWebResolver extends base_resolver_1.default {
     constructor(timeout, cache) {
@@ -66,19 +43,17 @@ class DidWebResolver extends base_resolver_1.default {
         if (url.hostname === 'localhost') {
             url.protocol = 'http';
         }
-        try {
-            const res = await axios_1.default.get(url.toString(), {
-                responseType: 'json',
-                timeout: this.timeout,
+        return (0, util_1.timed)(this.timeout, async (signal) => {
+            const res = await fetch(url, {
+                signal,
+                redirect: 'error',
+                headers: { accept: 'application/did+ld+json,application/json' },
             });
-            return res.data;
-        }
-        catch (err) {
-            if (err instanceof axios_1.AxiosError && err.response) {
-                return null; // Positively not found, versus due to e.g. network error
-            }
-            throw err;
-        }
+            // Positively not found, versus due to e.g. network error
+            if (!res.ok)
+                return null;
+            return res.json();
+        });
     }
 }
 exports.DidWebResolver = DidWebResolver;

package/dist/did/web-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-resolver.js","sourceRoot":"","sources":["../../src/did/web-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AACzC,oEAA0C;AAE1C,sCAA+E;AAElE,QAAA,QAAQ,GAAG,uBAAuB,CAAA;AAE/C,MAAa,cAAe,SAAQ,uBAAY;IAC9C,YACS,OAAe,EACf,KAAgB;QAEvB,KAAK,CAAC,KAAK,CAAC,CAAA;QAHZ;;;;mBAAO,OAAO;WAAQ;QACtB;;;;mBAAO,KAAK;WAAW;IAGzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QACzD,IAAI,IAAY,CAAA;QAChB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,gBAAQ,CAAA;QAC5B,CAAC;aAAM,CAAC;YACN,sEAAsE;YACtE,sCAAsC;YACtC,MAAM,IAAI,mCAA0B,CAAC,GAAG,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;QACtC,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YACjC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAA;QACvB,CAAC;QAED,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;gBAC1C,YAAY,EAAE,MAAM;gBACpB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAA;YACF,OAAO,GAAG,CAAC,IAAI,CAAA;QACjB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,kBAAU,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC9C,OAAO,IAAI,CAAA,CAAC,yDAAyD;YACvE,CAAC;YACD,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;CACF;AAxCD,wCAwCC"}
+{"version":3,"file":"web-resolver.js","sourceRoot":"","sources":["../../src/did/web-resolver.ts"],"names":[],"mappings":";;;;;;AAAA,sCAA+E;AAE/E,oEAA0C;AAC1C,iCAA8B;AAEjB,QAAA,QAAQ,GAAG,uBAAuB,CAAA;AAE/C,MAAa,cAAe,SAAQ,uBAAY;IAC9C,YACS,OAAe,EACf,KAAgB;QAEvB,KAAK,CAAC,KAAK,CAAC,CAAA;QAHZ;;;;mBAAO,OAAO;WAAQ;QACtB;;;;mBAAO,KAAK;WAAW;IAGzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QACzD,IAAI,IAAY,CAAA;QAChB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,gBAAQ,CAAA;QAC5B,CAAC;aAAM,CAAC;YACN,sEAAsE;YACtE,sCAAsC;YACtC,MAAM,IAAI,mCAA0B,CAAC,GAAG,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;QACtC,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YACjC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAA;QACvB,CAAC;QAED,OAAO,IAAA,YAAK,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC3B,MAAM;gBACN,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,0CAA0C,EAAE;aAChE,CAAC,CAAA;YAEF,yDAAyD;YACzD,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,OAAO,IAAI,CAAA;YAExB,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAxCD,wCAwCC"}

package/jest.config.js

@@ -2,6 +2,6 @@
 module.exports = {
   displayName: 'Identity',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
-  transformIgnorePatterns: [`<rootDir>/node_modules/(?!get-port)`],
+  transformIgnorePatterns: ['/node_modules/.pnpm/(?!(get-port)@)'],
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/identity",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "license": "MIT",
   "description": "Library for decentralized identities in atproto using DIDs and handles",
   "keywords": [
@@ -17,9 +17,8 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "axios": "^0.27.2",
-    "@atproto/common-web": "^0.3.1",
-    "@atproto/crypto": "^0.4.1"
+    "@atproto/common-web": "^0.3.2",
+    "@atproto/crypto": "^0.4.2"
   },
   "devDependencies": {
     "@did-plc/lib": "^0.0.1",
@@ -27,7 +26,8 @@
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "get-port": "^6.1.2",
-    "jest": "^28.1.2"
+    "jest": "^28.1.2",
+    "typescript": "^5.6.3"
   },
   "scripts": {
     "test": "jest",

package/src/did/plc-resolver.ts

@@ -1,6 +1,6 @@
-import axios, { AxiosError } from 'axios'
-import BaseResolver from './base-resolver'
 import { DidCache } from '../types'
+import BaseResolver from './base-resolver'
+import { timed } from './util'
 
 export class DidPlcResolver extends BaseResolver {
   constructor(
@@ -12,16 +12,22 @@ export class DidPlcResolver extends BaseResolver {
   }
 
   async resolveNoCheck(did: string): Promise<unknown> {
-    try {
-      const res = await axios.get(`${this.plcUrl}/${encodeURIComponent(did)}`, {
-        timeout: this.timeout,
+    return timed(this.timeout, async (signal) => {
+      const url = new URL(`/${encodeURIComponent(did)}`, this.plcUrl)
+      const res = await fetch(url, {
+        redirect: 'error',
+        headers: { accept: 'application/did+ld+json,application/json' },
+        signal,
       })
-      return res.data
-    } catch (err) {
-      if (err instanceof AxiosError && err.response?.status === 404) {
-        return null // Positively not found, versus due to e.g. network error
+
+      // Positively not found, versus due to e.g. network error
+      if (res.status === 404) return null
+
+      if (!res.ok) {
+        throw Object.assign(new Error(res.statusText), { status: res.status })
       }
-      throw err
-    }
+
+      return res.json()
+    })
   }
 }

package/src/did/util.ts

@@ -0,0 +1,15 @@
+export async function timed<F extends (signal: AbortSignal) => unknown>(
+  ms: number,
+  fn: F,
+): Promise<Awaited<ReturnType<F>>> {
+  const abortController = new AbortController()
+  const timer = setTimeout(() => abortController.abort(), ms)
+  const signal = abortController.signal
+
+  try {
+    return (await fn(signal)) as Awaited<ReturnType<F>>
+  } finally {
+    clearTimeout(timer)
+    abortController.abort()
+  }
+}

package/src/did/web-resolver.ts

@@ -1,7 +1,7 @@
-import axios, { AxiosError } from 'axios'
-import BaseResolver from './base-resolver'
-import { DidCache } from '../types'
 import { PoorlyFormattedDidError, UnsupportedDidWebPathError } from '../errors'
+import { DidCache } from '../types'
+import BaseResolver from './base-resolver'
+import { timed } from './util'
 
 export const DOC_PATH = '/.well-known/did.json'
 
@@ -32,17 +32,17 @@ export class DidWebResolver extends BaseResolver {
       url.protocol = 'http'
     }
 
-    try {
-      const res = await axios.get(url.toString(), {
-        responseType: 'json',
-        timeout: this.timeout,
+    return timed(this.timeout, async (signal) => {
+      const res = await fetch(url, {
+        signal,
+        redirect: 'error',
+        headers: { accept: 'application/did+ld+json,application/json' },
       })
-      return res.data
-    } catch (err) {
-      if (err instanceof AxiosError && err.response) {
-        return null // Positively not found, versus due to e.g. network error
-      }
-      throw err
-    }
+
+      // Positively not found, versus due to e.g. network error
+      if (!res.ok) return null
+
+      return res.json()
+    })
   }
 }

package/tsconfig.build.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./src/errors.ts","./src/id-resolver.ts","./src/index.ts","./src/types.ts","./src/did/atproto-data.ts","./src/did/base-resolver.ts","./src/did/did-resolver.ts","./src/did/index.ts","./src/did/memory-cache.ts","./src/did/plc-resolver.ts","./src/did/util.ts","./src/did/web-resolver.ts","./src/handle/index.ts"],"version":"5.6.3"}

package/tsconfig.tests.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./tests/did-cache.test.ts","./tests/did-document.test.ts","./tests/did-resolver.test.ts","./tests/handle-resolver.test.ts","./tests/web/db.ts","./tests/web/server.ts"],"version":"5.6.3"}