@atcute/util-fetch 1.0.4 → 2.0.0

package/README.md

@@ -1,3 +1,9 @@
 # @atcute/util-fetch
 
-random fetch utilities.
+fetch response utilities used internally by atcute packages.
+
+```sh
+npm install @atcute/util-fetch
+```
+
+this library provides composable fetch response transformers.

package/dist/doh-json.d.ts

@@ -0,0 +1,73 @@
+import * as v from 'valibot';
+/** DoH JSON response schema for TXT record queries */
+export declare const dohJsonTxtResult: v.LooseObjectSchema<{
+    /** DNS response code */
+    readonly Status: v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.CheckAction<number, undefined>]>;
+    /** whether response is truncated */
+    readonly TC: v.BooleanSchema<undefined>;
+    /** whether recursive desired bit is set, always true for Google and Cloudflare DoH */
+    readonly RD: v.BooleanSchema<undefined>;
+    /** whether recursive available bit is set, always true for Google and Cloudflare DoH */
+    readonly RA: v.BooleanSchema<undefined>;
+    /** whether response data was validated with DNSSEC */
+    readonly AD: v.BooleanSchema<undefined>;
+    /** whether client asked to disable DNSSEC validation */
+    readonly CD: v.BooleanSchema<undefined>;
+    /** requested records */
+    readonly Question: v.TupleSchema<[v.LooseObjectSchema<{
+        readonly name: v.StringSchema<undefined>;
+        readonly type: v.LiteralSchema<16, undefined>;
+    }, undefined>], undefined>;
+    /** answers */
+    readonly Answer: v.OptionalSchema<v.ArraySchema<v.LooseObjectSchema<{
+        readonly name: v.StringSchema<undefined>;
+        readonly type: v.LiteralSchema<16, undefined>;
+        readonly TTL: v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.CheckAction<number, undefined>]>;
+        readonly data: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.TransformAction<string, string>]>;
+    }, undefined>, undefined>, () => never[]>;
+    /** authority */
+    readonly Authority: v.OptionalSchema<v.ArraySchema<v.LooseObjectSchema<{
+        readonly name: v.StringSchema<undefined>;
+        readonly type: v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.CheckAction<number, undefined>]>;
+        readonly TTL: v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.CheckAction<number, undefined>]>;
+        readonly data: v.StringSchema<undefined>;
+    }, undefined>, undefined>, undefined>;
+    /** comment from the DNS server */
+    readonly Comment: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+}, undefined>;
+export type DohJsonTxtResult = v.InferOutput<typeof dohJsonTxtResult>;
+/** fetch handler pipeline for DoH JSON TXT record responses */
+export declare const fetchDohJsonTxt: (input: Response) => Promise<import("./transformers.ts").ParsedJsonResponse<{
+    Status: number;
+    TC: boolean;
+    RD: boolean;
+    RA: boolean;
+    AD: boolean;
+    CD: boolean;
+    Question: [{
+        name: string;
+        type: 16;
+    } & {
+        [key: string]: unknown;
+    }];
+    Answer: ({
+        name: string;
+        type: 16;
+        TTL: number;
+        data: string;
+    } & {
+        [key: string]: unknown;
+    })[];
+    Authority?: ({
+        name: string;
+        type: number;
+        TTL: number;
+        data: string;
+    } & {
+        [key: string]: unknown;
+    })[] | undefined;
+    Comment?: string | string[] | undefined;
+} & {
+    [key: string]: unknown;
+}>>;
+//# sourceMappingURL=doh-json.d.ts.map

package/dist/doh-json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doh-json.d.ts","sourceRoot":"","sources":["../lib/doh-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAgC7B,sDAAsD;AACtD,eAAO,MAAM,gBAAgB;IAC5B,wBAAwB;;IAExB,oCAAoC;;IAEpC,sFAAsF;;IAEtF,wFAAwF;;IAExF,sDAAsD;;IAEtD,wDAAwD;;IAExD,wBAAwB;;;;;IAExB,cAAc;;;;;;;IAEd,gBAAgB;;;;;;;IAEhB,kCAAkC;;aAEjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEtE,+DAA+D;AAC/D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAI3B,CAAC"}

package/dist/doh-json.js

@@ -0,0 +1,46 @@
+import * as v from 'valibot';
+import { pipe } from './pipeline.js';
+import { isResponseOk, parseResponseAsJson, validateJsonWith } from './transformers.js';
+const uint32 = v.pipe(v.number(), v.check((input) => Number.isInteger(input) && input >= 0 && input <= 2 ** 32 - 1));
+const question = v.looseObject({
+    name: v.string(),
+    type: v.literal(16), // TXT
+});
+const answer = v.looseObject({
+    name: v.string(),
+    type: v.literal(16), // TXT
+    TTL: uint32,
+    data: v.pipe(v.string(), v.transform((input) => input.replace(/^"|"$/g, '').replace(/\\"/g, '"'))),
+});
+const authority = v.looseObject({
+    name: v.string(),
+    type: uint32,
+    TTL: uint32,
+    data: v.string(),
+});
+/** DoH JSON response schema for TXT record queries */
+export const dohJsonTxtResult = v.looseObject({
+    /** DNS response code */
+    Status: uint32,
+    /** whether response is truncated */
+    TC: v.boolean(),
+    /** whether recursive desired bit is set, always true for Google and Cloudflare DoH */
+    RD: v.boolean(),
+    /** whether recursive available bit is set, always true for Google and Cloudflare DoH */
+    RA: v.boolean(),
+    /** whether response data was validated with DNSSEC */
+    AD: v.boolean(),
+    /** whether client asked to disable DNSSEC validation */
+    CD: v.boolean(),
+    /** requested records */
+    Question: v.tuple([question]),
+    /** answers */
+    Answer: v.optional(v.array(answer), () => []),
+    /** authority */
+    Authority: v.optional(v.array(authority)),
+    /** comment from the DNS server */
+    Comment: v.optional(v.union([v.string(), v.array(v.string())])),
+});
+/** fetch handler pipeline for DoH JSON TXT record responses */
+export const fetchDohJsonTxt = pipe(isResponseOk, parseResponseAsJson(/^application\/(dns-)?json$/, 16 * 1024), validateJsonWith(dohJsonTxtResult));
+//# sourceMappingURL=doh-json.js.map

package/dist/doh-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"doh-json.js","sourceRoot":"","sources":["../lib/doh-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAExF,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CACpB,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CACjF,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,CAAC,WAAW,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM;CAC3B,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC;IAC5B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM;IAC3B,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,CAAC,CAAC,IAAI,CACX,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACxE;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC;IAC/B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;CAChB,CAAC,CAAC;AAEH,sDAAsD;AACtD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,WAAW,CAAC;IAC7C,wBAAwB;IACxB,MAAM,EAAE,MAAM;IACd,oCAAoC;IACpC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IACf,sFAAsF;IACtF,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IACf,wFAAwF;IACxF,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IACf,sDAAsD;IACtD,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IACf,wDAAwD;IACxD,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IACf,wBAAwB;IACxB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7B,cAAc;IACd,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAC7C,gBAAgB;IAChB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACzC,kCAAkC;IAClC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAC;AAIH,+DAA+D;AAC/D,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAClC,YAAY,EACZ,mBAAmB,CAAC,4BAA4B,EAAE,EAAE,GAAG,IAAI,CAAC,EAC5D,gBAAgB,CAAC,gBAAgB,CAAC,CAClC,CAAC"}

package/dist/errors.d.ts

@@ -2,24 +2,23 @@ export declare class FetchResponseError extends Error {
     name: string;
 }
 export declare class FailedResponseError extends FetchResponseError {
-    response: Response;
     name: string;
+    response: Response;
     constructor(response: Response);
     get status(): number;
 }
 export declare class ImproperContentTypeError extends FetchResponseError {
-    contentType: string | null;
     name: string;
+    contentType: string | null;
     constructor(contentType: string | null, reason: string);
 }
 export declare class ImproperContentLengthError extends FetchResponseError {
+    name: string;
     expectedSize: number;
     actualSize: number | null;
-    name: string;
     constructor(expectedSize: number, actualSize: number | null, reason: string);
 }
 export declare class ImproperResponseError extends FetchResponseError {
     name: string;
-    constructor(reason: string, options?: ErrorOptions);
 }
 //# sourceMappingURL=errors.d.ts.map

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAmB,SAAQ,KAAK;IACnC,IAAI,SAAwB;CACrC;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB;IAGvC,QAAQ,EAAE,QAAQ;IAF5B,IAAI,SAAyB;gBAEnB,QAAQ,EAAE,QAAQ;IAIrC,IAAI,MAAM,IAAI,MAAM,CAEnB;CACD;AAED,qBAAa,wBAAyB,SAAQ,kBAAkB;IAIvD,WAAW,EAAE,MAAM,GAAG,IAAI;IAHzB,IAAI,SAA8B;gBAGnC,WAAW,EAAE,MAAM,GAAG,IAAI,EACjC,MAAM,EAAE,MAAM;CAIf;AAED,qBAAa,0BAA2B,SAAQ,kBAAkB;IAIzD,YAAY,EAAE,MAAM;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI;IAJxB,IAAI,SAAgC;gBAGrC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GAAG,IAAI,EAChC,MAAM,EAAE,MAAM;CAIf;AAED,qBAAa,qBAAsB,SAAQ,kBAAkB;IACnD,IAAI,SAA2B;gBAE5B,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAGlD"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAmB,SAAQ,KAAK;IACnC,IAAI,SAAwB;CACrC;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB;IACjD,IAAI,SAAyB;IAEtC,QAAQ,EAAE,QAAQ,CAAC;IAEnB,YAAY,QAAQ,EAAE,QAAQ,EAG7B;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;CACD;AAED,qBAAa,wBAAyB,SAAQ,kBAAkB;IACtD,IAAI,SAA8B;IAE3C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3B,YAAY,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,EAGrD;CACD;AAED,qBAAa,0BAA2B,SAAQ,kBAAkB;IACxD,IAAI,SAAgC;IAE7C,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1B,YAAY,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,EAI1E;CACD;AAED,qBAAa,qBAAsB,SAAQ,kBAAkB;IACnD,IAAI,SAA2B;CACxC"}

package/dist/errors.js

@@ -2,8 +2,8 @@ export class FetchResponseError extends Error {
     name = 'FetchResponseError';
 }
 export class FailedResponseError extends FetchResponseError {
-    response;
     name = 'FailedResponseError';
+    response;
     constructor(response) {
         super(`got http ${response.status}`);
         this.response = response;
@@ -13,17 +13,17 @@ export class FailedResponseError extends FetchResponseError {
     }
 }
 export class ImproperContentTypeError extends FetchResponseError {
-    contentType;
     name = 'ImproperContentTypeError';
+    contentType;
     constructor(contentType, reason) {
         super(reason);
         this.contentType = contentType;
     }
 }
 export class ImproperContentLengthError extends FetchResponseError {
+    name = 'ImproperContentLengthError';
     expectedSize;
     actualSize;
-    name = 'ImproperContentLengthError';
     constructor(expectedSize, actualSize, reason) {
         super(reason);
         this.expectedSize = expectedSize;
@@ -32,8 +32,5 @@ export class ImproperContentLengthError extends FetchResponseError {
 }
 export class ImproperResponseError extends FetchResponseError {
     name = 'ImproperResponseError';
-    constructor(reason, options) {
-        super(reason, options);
-    }
 }
 //# sourceMappingURL=errors.js.map

package/dist/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IACnC,IAAI,GAAG,oBAAoB,CAAC;CACrC;AAED,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB;IAGvC;IAFV,IAAI,GAAG,qBAAqB,CAAC;IAEtC,YAAmB,QAAkB;QACpC,KAAK,CAAC,YAAY,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QADnB,aAAQ,GAAR,QAAQ,CAAU;IAErC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC7B,CAAC;CACD;AAED,MAAM,OAAO,wBAAyB,SAAQ,kBAAkB;IAIvD;IAHC,IAAI,GAAG,0BAA0B,CAAC;IAE3C,YACQ,WAA0B,EACjC,MAAc;QAEd,KAAK,CAAC,MAAM,CAAC,CAAC;QAHP,gBAAW,GAAX,WAAW,CAAe;IAIlC,CAAC;CACD;AAED,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IAIzD;IACA;IAJC,IAAI,GAAG,4BAA4B,CAAC;IAE7C,YACQ,YAAoB,EACpB,UAAyB,EAChC,MAAc;QAEd,KAAK,CAAC,MAAM,CAAC,CAAC;QAJP,iBAAY,GAAZ,YAAY,CAAQ;QACpB,eAAU,GAAV,UAAU,CAAe;IAIjC,CAAC;CACD;AAED,MAAM,OAAO,qBAAsB,SAAQ,kBAAkB;IACnD,IAAI,GAAG,uBAAuB,CAAC;IAExC,YAAY,MAAc,EAAE,OAAsB;QACjD,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxB,CAAC;CACD"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IACnC,IAAI,GAAG,oBAAoB,CAAC;CACrC;AAED,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB;IACjD,IAAI,GAAG,qBAAqB,CAAC;IAEtC,QAAQ,CAAW;IAEnB,YAAY,QAAkB;QAC7B,KAAK,CAAC,YAAY,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC7B,CAAC;CACD;AAED,MAAM,OAAO,wBAAyB,SAAQ,kBAAkB;IACtD,IAAI,GAAG,0BAA0B,CAAC;IAE3C,WAAW,CAAgB;IAE3B,YAAY,WAA0B,EAAE,MAAc;QACrD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,CAAC;CACD;AAED,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IACxD,IAAI,GAAG,4BAA4B,CAAC;IAE7C,YAAY,CAAS;IACrB,UAAU,CAAgB;IAE1B,YAAY,YAAoB,EAAE,UAAyB,EAAE,MAAc;QAC1E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;CACD;AAED,MAAM,OAAO,qBAAsB,SAAQ,kBAAkB;IACnD,IAAI,GAAG,uBAAuB,CAAC;CACxC"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-export * from './errors.js';
-export * from './pipeline.js';
-export * from './transformers.js';
+export * from './doh-json.ts';
+export * from './errors.ts';
+export * from './pipeline.ts';
+export * from './transformers.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}

package/dist/index.js

@@ -1,3 +1,4 @@
+export * from './doh-json.js';
 export * from './errors.js';
 export * from './pipeline.js';
 export * from './transformers.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}

package/dist/streams/size-limit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"size-limit.d.ts","sourceRoot":"","sources":["../../lib/streams/size-limit.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAgB,SAAQ,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;gBACzF,OAAO,EAAE,MAAM;CAmB3B"}
+{"version":3,"file":"size-limit.d.ts","sourceRoot":"","sources":["../../lib/streams/size-limit.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAgB,SAAQ,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACrG,YAAY,OAAO,EAAE,MAAM,EAkB1B;CACD"}

package/dist/transformers.d.ts

@@ -1,4 +1,4 @@
-import * as v from '@badrap/valita';
+import * as v from 'valibot';
 export type TextResponse = {
     response: Response;
     text: string;
@@ -10,7 +10,5 @@ export type ParsedJsonResponse<T = unknown> = {
 export declare const isResponseOk: (response: Response) => Promise<Response>;
 export declare const readResponseAsText: (maxSize: number) => (response: Response) => Promise<TextResponse>;
 export declare const parseResponseAsJson: (typeRegex: RegExp, maxSize: number) => (response: Response) => Promise<ParsedJsonResponse>;
-type ParseOptions = NonNullable<Parameters<v.Type['parse']>[1]>;
-export declare const validateJsonWith: <T>(schema: v.Type<T>, options?: ParseOptions) => (parsed: ParsedJsonResponse) => Promise<ParsedJsonResponse<T>>;
-export {};
+export declare const validateJsonWith: <TOutput>(schema: v.GenericSchema<unknown, TOutput>) => (parsed: ParsedJsonResponse) => Promise<ParsedJsonResponse<TOutput>>;
 //# sourceMappingURL=transformers.d.ts.map

package/dist/transformers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformers.d.ts","sourceRoot":"","sources":["../lib/transformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAKpC,MAAM,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,OAAO,IAAI;IAC7C,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC;CACR,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,UAAU,QAAQ,KAAG,OAAO,CAAC,QAAQ,CAMvE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,MACT,UAAU,QAAQ,KAAG,OAAO,CAAC,YAAY,CAG/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,MAAM,EAAE,SAAS,MAAM,MAC5B,UAAU,QAAQ,KAAG,OAAO,CAAC,kBAAkB,CAWrD,CAAC;AAEH,KAAK,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhE,eAAO,MAAM,gBAAgB,GAC3B,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,YAAY,MACtC,QAAQ,kBAAkB,KAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAGhE,CAAC"}
+{"version":3,"file":"transformers.d.ts","sourceRoot":"","sources":["../lib/transformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAK7B,MAAM,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,OAAO,IAAI;IAC7C,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC;CACR,CAAC;AAEF,eAAO,MAAM,YAAY,aAAoB,QAAQ,KAAG,OAAO,CAAC,QAAQ,CAMvE,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,gBACC,QAAQ,KAAG,OAAO,CAAC,YAAY,CAG/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,cACnB,MAAM,WAAW,MAAM,gBAClB,QAAQ,KAAG,OAAO,CAAC,kBAAkB,CAWrD,CAAC;AAEH,eAAO,MAAM,gBAAgB,GAC3B,OAAO,UAAU,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,cACpC,kBAAkB,KAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAGtE,CAAC"}

package/dist/transformers.js

@@ -1,4 +1,4 @@
-import * as v from '@badrap/valita';
+import * as v from 'valibot';
 import * as err from './errors.js';
 import { SizeLimitStream } from './streams/size-limit.js';
 export const isResponseOk = async (response) => {
@@ -22,8 +22,8 @@ export const parseResponseAsJson = (typeRegex, maxSize) => async (response) => {
         throw new err.ImproperResponseError(`unexpected json data`, { cause: error });
     }
 };
-export const validateJsonWith = (schema, options) => async (parsed) => {
-    const json = schema.parse(parsed.json, options);
+export const validateJsonWith = (schema) => async (parsed) => {
+    const json = v.parse(schema, parsed.json);
     return { response: parsed.response, json };
 };
 const assertContentType = async (response, typeRegex) => {

package/dist/transformers.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../lib/transformers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../lib/transformers.ts"],"names":[],"mappings":"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"}

package/lib/doh-json.ts

@@ -0,0 +1,64 @@
+import * as v from 'valibot';
+
+import { pipe } from './pipeline.ts';
+import { isResponseOk, parseResponseAsJson, validateJsonWith } from './transformers.ts';
+
+const uint32 = v.pipe(
+	v.number(),
+	v.check((input) => Number.isInteger(input) && input >= 0 && input <= 2 ** 32 - 1),
+);
+
+const question = v.looseObject({
+	name: v.string(),
+	type: v.literal(16), // TXT
+});
+
+const answer = v.looseObject({
+	name: v.string(),
+	type: v.literal(16), // TXT
+	TTL: uint32,
+	data: v.pipe(
+		v.string(),
+		v.transform((input) => input.replace(/^"|"$/g, '').replace(/\\"/g, '"')),
+	),
+});
+
+const authority = v.looseObject({
+	name: v.string(),
+	type: uint32,
+	TTL: uint32,
+	data: v.string(),
+});
+
+/** DoH JSON response schema for TXT record queries */
+export const dohJsonTxtResult = v.looseObject({
+	/** DNS response code */
+	Status: uint32,
+	/** whether response is truncated */
+	TC: v.boolean(),
+	/** whether recursive desired bit is set, always true for Google and Cloudflare DoH */
+	RD: v.boolean(),
+	/** whether recursive available bit is set, always true for Google and Cloudflare DoH */
+	RA: v.boolean(),
+	/** whether response data was validated with DNSSEC */
+	AD: v.boolean(),
+	/** whether client asked to disable DNSSEC validation */
+	CD: v.boolean(),
+	/** requested records */
+	Question: v.tuple([question]),
+	/** answers */
+	Answer: v.optional(v.array(answer), () => []),
+	/** authority */
+	Authority: v.optional(v.array(authority)),
+	/** comment from the DNS server */
+	Comment: v.optional(v.union([v.string(), v.array(v.string())])),
+});
+
+export type DohJsonTxtResult = v.InferOutput<typeof dohJsonTxtResult>;
+
+/** fetch handler pipeline for DoH JSON TXT record responses */
+export const fetchDohJsonTxt = pipe(
+	isResponseOk,
+	parseResponseAsJson(/^application\/(dns-)?json$/, 16 * 1024),
+	validateJsonWith(dohJsonTxtResult),
+);

package/lib/errors.ts

@@ -5,8 +5,11 @@ export class FetchResponseError extends Error {
 export class FailedResponseError extends FetchResponseError {
 	override name = 'FailedResponseError';
 
-	constructor(public response: Response) {
+	response: Response;
+
+	constructor(response: Response) {
 		super(`got http ${response.status}`);
+		this.response = response;
 	}
 
 	get status(): number {
@@ -17,30 +20,27 @@ export class FailedResponseError extends FetchResponseError {
 export class ImproperContentTypeError extends FetchResponseError {
 	override name = 'ImproperContentTypeError';
 
-	constructor(
-		public contentType: string | null,
-		reason: string,
-	) {
+	contentType: string | null;
+
+	constructor(contentType: string | null, reason: string) {
 		super(reason);
+		this.contentType = contentType;
 	}
 }
 
 export class ImproperContentLengthError extends FetchResponseError {
 	override name = 'ImproperContentLengthError';
 
-	constructor(
-		public expectedSize: number,
-		public actualSize: number | null,
-		reason: string,
-	) {
+	expectedSize: number;
+	actualSize: number | null;
+
+	constructor(expectedSize: number, actualSize: number | null, reason: string) {
 		super(reason);
+		this.expectedSize = expectedSize;
+		this.actualSize = actualSize;
 	}
 }
 
 export class ImproperResponseError extends FetchResponseError {
 	override name = 'ImproperResponseError';
-
-	constructor(reason: string, options?: ErrorOptions) {
-		super(reason, options);
-	}
 }

package/lib/index.ts

@@ -1,3 +1,4 @@
-export * from './errors.js';
-export * from './pipeline.js';
-export * from './transformers.js';
+export * from './doh-json.ts';
+export * from './errors.ts';
+export * from './pipeline.ts';
+export * from './transformers.ts';

package/lib/streams/size-limit.ts

@@ -1,4 +1,4 @@
-import * as err from '../errors.js';
+import * as err from '../errors.ts';
 
 export class SizeLimitStream extends TransformStream<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>> {
 	constructor(maxSize: number) {

package/lib/transformers.ts

@@ -1,7 +1,7 @@
-import * as v from '@badrap/valita';
+import * as v from 'valibot';
 
-import * as err from './errors.js';
-import { SizeLimitStream } from './streams/size-limit.js';
+import * as err from './errors.ts';
+import { SizeLimitStream } from './streams/size-limit.ts';
 
 export type TextResponse = {
 	response: Response;
@@ -43,12 +43,10 @@ export const parseResponseAsJson =
 		}
 	};
 
-type ParseOptions = NonNullable<Parameters<v.Type['parse']>[1]>;
-
 export const validateJsonWith =
-	<T>(schema: v.Type<T>, options?: ParseOptions) =>
-	async (parsed: ParsedJsonResponse): Promise<ParsedJsonResponse<T>> => {
-		const json = schema.parse(parsed.json, options);
+	<TOutput>(schema: v.GenericSchema<unknown, TOutput>) =>
+	async (parsed: ParsedJsonResponse): Promise<ParsedJsonResponse<TOutput>> => {
+		const json = v.parse(schema, parsed.json);
 		return { response: parsed.response, json };
 	};
 

package/package.json

@@ -1,7 +1,6 @@
 {
-  "type": "module",
   "name": "@atcute/util-fetch",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "description": "internal fetch utilities",
   "keywords": [
     "atproto",
@@ -16,17 +15,22 @@
     "dist/",
     "lib/",
     "!lib/**/*.bench.ts",
-    "!lib/**/*.test.ts"
+    "!lib/**/*.test.ts",
+    "!dist/**/*.{test,bench}.*"
   ],
+  "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": "./dist/index.js"
   },
-  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
-    "@badrap/valita": "^0.4.6"
+    "valibot": "^1.4.0"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.build.json",
+    "build": "tsgo",
     "prepublish": "rm -rf dist; pnpm run build"
   }
 }