@synnaxlabs/freighter 0.8.1 → 0.9.1

package/dist/http.d.ts

@@ -16,5 +16,5 @@ export declare class HTTPClient extends MiddlewareCollector implements UnaryClie
     fetch: typeof fetch;
     constructor(endpoint: URL, encoder: binary.EncoderDecoder, secure?: boolean);
     get headers(): Record<string, string>;
-    send<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(target: string, req: z.input<RQ> | null, resSchema: RS | null): Promise<[z.output<RS> | null, Error | null]>;
+    send<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(target: string, req: z.input<RQ> | z.output<RQ>, reqSchema: RQ, resSchema: RS): Promise<[z.output<RS> | null, Error | null]>;
 }

package/dist/unary.d.ts

@@ -11,6 +11,6 @@ export interface UnaryClient extends Transport {
      * @param req - The request to send.
      * @param resSchema - The schema to validate the response against.
      */
-    send: <RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(target: string, req: z.input<RQ> | null, resSchema: RS | null) => Promise<[z.output<RS>, null] | [null, Error]>;
+    send: <RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(target: string, req: z.input<RQ> | z.output<RQ>, reqSchema: RQ, resSchema: RS) => Promise<[z.output<RS>, null] | [null, Error]>;
 }
-export declare const sendRequired: <RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(client: UnaryClient, target: string, req: z.input<RQ> | z.output<RQ>, resSchema: RS | null) => Promise<z.output<RS>>;
+export declare const sendRequired: <RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(client: UnaryClient, target: string, req: z.input<RQ> | z.output<RQ>, reqSchema: RQ, resSchema: RS) => Promise<z.output<RS>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@synnaxlabs/freighter",
   "private": false,
-  "version": "0.8.1",
+  "version": "0.9.1",
   "type": "module",
   "description": "a modular transport abstraction",
   "repository": "https://github.com/synnaxlabs/synnax/tree/main/freighter/ts",
@@ -20,12 +20,11 @@
   },
   "dependencies": {
     "js-convert-case": "^4.2.0",
-    "msgpackr": "^1.10.0",
     "node-fetch": "2.6.11",
     "ws": "^8.15.1",
     "zod": "3.22.4",
-    "@synnaxlabs/x": "0.13.0",
-    "@synnaxlabs/alamos": "0.3.0"
+    "@synnaxlabs/alamos": "0.3.0",
+    "@synnaxlabs/x": "0.14.1"
   },
   "devDependencies": {
     "@types/node": "^20.10.5",

package/src/http.spec.ts

@@ -36,6 +36,7 @@ describe("http", () => {
         message: "hello",
       },
       messageZ,
+      messageZ,
     );
     expect(error).toBeNull();
     expect(response).toEqual({ id: 2, message: "hello" });
@@ -46,6 +47,7 @@ describe("http", () => {
       "/not-found",
       {},
       messageZ,
+      messageZ,
     );
     expect(error?.message).toEqual("Not Found");
     expect(response).toBeNull();
@@ -60,6 +62,7 @@ describe("http", () => {
       "/middlewareCheck",
       {},
       messageZ,
+      messageZ,
     );
     expect(error).toBeNull();
     expect(response?.message).toEqual("");

package/src/http.ts

@@ -70,10 +70,12 @@ export class HTTPClient extends MiddlewareCollector implements UnaryClient {
 
   async send<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(
     target: string,
-    req: z.input<RQ> | null,
-    resSchema: RS | null,
+    req: z.input<RQ> | z.output<RQ>,
+    reqSchema: RQ,
+    resSchema: RS,
   ): Promise<[z.output<RS> | null, Error | null]> {
-    let rs: RS | null = null;
+    req = reqSchema?.parse(req)
+    let res: RS | null = null;
     const url = this.endpoint.child(target);
     const request: RequestInit = {};
     request.method = "POST";
@@ -103,7 +105,7 @@ export class HTTPClient extends MiddlewareCollector implements UnaryClient {
         }
         const data = await httpRes.arrayBuffer();
         if (httpRes?.ok) {
-          if (resSchema != null) rs = this.encoder.decode(data, resSchema);
+          if (resSchema != null) res = this.encoder.decode(data, resSchema);
           return [outCtx, null];
         }
         try {
@@ -124,6 +126,6 @@ export class HTTPClient extends MiddlewareCollector implements UnaryClient {
       },
     );
 
-    return [rs, err];
+    return [res, err];
   }
 }

package/src/unary.ts

@@ -24,8 +24,9 @@ export interface UnaryClient extends Transport {
    */
   send: <RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny = RQ>(
     target: string,
-    req: z.input<RQ> | null,
-    resSchema: RS | null,
+    req: z.input<RQ> | z.output<RQ>,
+    reqSchema: RQ ,
+    resSchema: RS,
   ) => Promise<[z.output<RS>, null] | [null, Error]>;
 }
 
@@ -36,9 +37,10 @@ export const sendRequired = async <
   client: UnaryClient,
   target: string,
   req: z.input<RQ> | z.output<RQ>,
-  resSchema: RS | null,
+  reqSchema: RQ,
+  resSchema: RS,
 ): Promise<z.output<RS>> => {
-  const [res, err] = await client.send(target, req, resSchema);
+  const [res, err] = await client.send(target, req, reqSchema, resSchema);
   if (err != null) throw err;
   return res;
 };