@atproto/xrpc 0.0.2 → 0.0.4

package/dist/{src/client.d.ts → client.d.ts}

@@ -1,5 +1,5 @@
 import { Lexicons } from '@atproto/lexicon';
-import { FetchHandler, CallOptions, QueryParams, XRPCResponse } from './types';
+import { FetchHandler, FetchHandlerResponse, Headers, CallOptions, QueryParams, XRPCResponse } from './types';
 export declare class Client {
     fetch: FetchHandler;
     lex: Lexicons;
@@ -18,3 +18,4 @@ export declare class ServiceClient {
     unsetHeader(key: string): void;
     call(methodNsid: string, params?: QueryParams, data?: unknown, opts?: CallOptions): Promise<XRPCResponse>;
 }
+export declare function defaultFetchHandler(httpUri: string, httpMethod: string, httpHeaders: Headers, httpReqBody: unknown): Promise<FetchHandlerResponse>;

package/dist/index.js

@@ -1,8 +1,13 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod2) => function __require() {
+  return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,8 +20,61 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
+  isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
+  mod2
+));
 var __toCommonJS = (mod2) => __copyProps(__defProp({}, "__esModule", { value: true }), mod2);
 
+// ../../node_modules/iso-datestring-validator/dist/index.js
+var require_dist = __commonJS({
+  "../../node_modules/iso-datestring-validator/dist/index.js"(exports) {
+    (() => {
+      "use strict";
+      var e = { d: (t2, r2) => {
+        for (var n2 in r2)
+          e.o(r2, n2) && !e.o(t2, n2) && Object.defineProperty(t2, n2, { enumerable: true, get: r2[n2] });
+      }, o: (e2, t2) => Object.prototype.hasOwnProperty.call(e2, t2), r: (e2) => {
+        "undefined" != typeof Symbol && Symbol.toStringTag && Object.defineProperty(e2, Symbol.toStringTag, { value: "Module" }), Object.defineProperty(e2, "__esModule", { value: true });
+      } }, t = {};
+      function r(e2, t2) {
+        return void 0 === t2 && (t2 = "-"), new RegExp("^(?!0{4}" + t2 + "0{2}" + t2 + "0{2})((?=[0-9]{4}" + t2 + "(((0[^2])|1[0-2])|02(?=" + t2 + "(([0-1][0-9])|2[0-8])))" + t2 + "[0-9]{2})|(?=((([13579][26])|([2468][048])|(0[48]))0{2})|([0-9]{2}((((0|[2468])[48])|[2468][048])|([13579][26])))" + t2 + "02" + t2 + "29))([0-9]{4})" + t2 + "(?!((0[469])|11)" + t2 + "31)((0[1,3-9]|1[0-2])|(02(?!" + t2 + "3)))" + t2 + "(0[1-9]|[1-2][0-9]|3[0-1])$").test(e2);
+      }
+      function n(e2) {
+        var t2 = /\D/.exec(e2);
+        return t2 ? t2[0] : "";
+      }
+      function i(e2, t2, r2) {
+        void 0 === t2 && (t2 = ":"), void 0 === r2 && (r2 = false);
+        var i2 = new RegExp("^([0-1]|2(?=([0-3])|4" + t2 + "00))[0-9]" + t2 + "[0-5][0-9](" + t2 + "([0-5]|6(?=0))[0-9])?(.[0-9]{1,9})?$");
+        if (!r2 || !/[Z+\-]/.test(e2))
+          return i2.test(e2);
+        if (/Z$/.test(e2))
+          return i2.test(e2.replace("Z", ""));
+        var o2 = e2.includes("+"), a2 = e2.split(/[+-]/), u2 = a2[0], d2 = a2[1];
+        return i2.test(u2) && function(e3, t3, r3) {
+          return void 0 === r3 && (r3 = ":"), new RegExp(t3 ? "^(0(?!(2" + r3 + "4)|0" + r3 + "3)|1(?=([0-1]|2(?=" + r3 + "[04])|[34](?=" + r3 + "0))))([03469](?=" + r3 + "[03])|[17](?=" + r3 + "0)|2(?=" + r3 + "[04])|5(?=" + r3 + "[034])|8(?=" + r3 + "[04]))" + r3 + "([03](?=0)|4(?=5))[05]$" : "^(0(?=[^0])|1(?=[0-2]))([39](?=" + r3 + "[03])|[0-24-8](?=" + r3 + "00))" + r3 + "[03]0$").test(e3);
+        }(d2, o2, n(d2));
+      }
+      function o(e2) {
+        var t2 = e2.split("T"), o2 = t2[0], a2 = t2[1], u2 = r(o2, n(o2));
+        if (!a2)
+          return false;
+        var d2, s = (d2 = a2.match(/([^Z+\-\d])(?=\d+\1)/), Array.isArray(d2) ? d2[0] : "");
+        return u2 && i(a2, s, true);
+      }
+      function a(e2, t2) {
+        return void 0 === t2 && (t2 = "-"), new RegExp("^[0-9]{4}" + t2 + "(0(?=[^0])|1(?=[0-2]))[0-9]$").test(e2);
+      }
+      e.r(t), e.d(t, { isValidDate: () => r, isValidISODateString: () => o, isValidTime: () => i, isValidYearMonth: () => a });
+      var u = exports;
+      for (var d in t)
+        u[d] = t[d];
+      t.__esModule && Object.defineProperty(u, "__esModule", { value: true });
+    })();
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -29,6 +87,7 @@ __export(src_exports, {
   XRPCInvalidResponseError: () => XRPCInvalidResponseError,
   XRPCResponse: () => XRPCResponse,
   default: () => src_default,
+  defaultFetchHandler: () => defaultFetchHandler,
   errorResponseBody: () => errorResponseBody
 });
 module.exports = __toCommonJS(src_exports);
@@ -3186,6 +3245,11 @@ var lexArray = mod.object({
   minLength: mod.number().int().optional(),
   maxLength: mod.number().int().optional()
 });
+var lexPrimitiveArray = lexArray.merge(
+  mod.object({
+    items: lexPrimitive
+  })
+);
 var lexToken = mod.object({
   type: mod.literal("token"),
   description: mod.string().optional()
@@ -3200,7 +3264,7 @@ var lexXrpcParameters = mod.object({
   type: mod.literal("params"),
   description: mod.string().optional(),
   required: mod.string().array().optional(),
-  properties: mod.record(lexPrimitive)
+  properties: mod.record(mod.union([lexPrimitive, lexPrimitiveArray]))
 });
 var lexXrpcBody = mod.object({
   description: mod.string().optional(),
@@ -3296,6 +3360,7 @@ var LexiconDefNotFoundError = class extends Error {
 };
 
 // ../lexicon/src/validators/primitives.ts
+var import_iso_datestring_validator = __toESM(require_dist());
 function validate(lexicons, path, def, value) {
   switch (def.type) {
     case "boolean":
@@ -3483,8 +3548,7 @@ function datetime(lexicons, path, def, value) {
   }
   {
     try {
-      const date = new Date(Date.parse(value));
-      if (value !== date.toISOString()) {
+      if (typeof value !== "string" || !(0, import_iso_datestring_validator.isValidISODateString)(value)) {
         throw new ValidationError(
           `${path} must be an iso8601 formatted datetime`
         );
@@ -3572,7 +3636,6 @@ function validate2(lexicons, path, def, value) {
   }
 }
 function array(lexicons, path, def, value) {
-  def = def;
   if (!Array.isArray(value)) {
     return {
       success: false,
@@ -3620,7 +3683,7 @@ function object(lexicons, path, def, value) {
   }
   if (Array.isArray(def.required)) {
     for (const key of def.required) {
-      if (!(key in value)) {
+      if (typeof value[key] === "undefined") {
         return {
           success: false,
           error: new ValidationError(`${path} must have the property "${key}"`)
@@ -3724,13 +3787,12 @@ function toConcreteTypes(lexicons, def) {
 
 // ../lexicon/src/validators/xrpc.ts
 function params(lexicons, path, def, value) {
-  def = def;
   if (!value || typeof value !== "object") {
     value = {};
   }
   if (Array.isArray(def.required)) {
     for (const key of def.required) {
-      if (!(key in value)) {
+      if (typeof value[key] === "undefined") {
         return {
           success: false,
           error: new ValidationError(`${path} must have the property "${key}"`)
@@ -3743,12 +3805,8 @@ function params(lexicons, path, def, value) {
       continue;
     }
     const paramDef = def.properties[key];
-    const res = validate(
-      lexicons,
-      key,
-      paramDef,
-      value[key]
-    );
+    const val = value[key];
+    const res = paramDef.type === "array" ? array(lexicons, key, paramDef, val) : validate(lexicons, key, paramDef, val);
     if (!res.success) {
       return res;
     }
@@ -3941,7 +3999,17 @@ function constructMethodCallUri(nsid, schema, serviceUri, params2) {
         throw new Error(`Invalid query parameter: ${key}`);
       }
       if (value !== void 0) {
-        uri.searchParams.set(key, encodeQueryParam(paramSchema.type, value));
+        if (paramSchema.type === "array") {
+          const vals = [];
+          vals.concat(value).forEach((val) => {
+            uri.searchParams.append(
+              key,
+              encodeQueryParam(paramSchema.items.type, val)
+            );
+          });
+        } else {
+          uri.searchParams.set(key, encodeQueryParam(paramSchema.type, value));
+        }
       }
     }
   }
@@ -4119,11 +4187,13 @@ var ServiceClient = class {
 };
 async function defaultFetchHandler(httpUri, httpMethod, httpHeaders, httpReqBody) {
   try {
-    const res = await fetch(httpUri, {
+    const reqInit = {
       method: httpMethod,
       headers: httpHeaders,
-      body: encodeMethodCallBody(httpHeaders, httpReqBody)
-    });
+      body: encodeMethodCallBody(httpHeaders, httpReqBody),
+      duplex: "half"
+    };
+    const res = await fetch(httpUri, reqInit);
     const resBody = await res.arrayBuffer();
     return {
       status: res.status,
@@ -4151,6 +4221,7 @@ var src_default = defaultInst;
   XRPCError,
   XRPCInvalidResponseError,
   XRPCResponse,
+  defaultFetchHandler,
   errorResponseBody
 });
 //# sourceMappingURL=index.js.map