@trigger.dev/core 3.0.0-beta.34 → 3.0.0-beta.36

package/dist/v3/zodMessageHandler.d.mts

@@ -29,8 +29,8 @@ declare const ZodMessageSchema: z.ZodObject<{
     type: z.ZodString;
     payload: z.ZodUnknown;
 }, "strip", z.ZodTypeAny, {
-    type: string;
     version: "v1";
+    type: string;
     payload?: unknown;
 }, {
     type: string;

package/dist/v3/zodMessageHandler.d.ts

@@ -29,8 +29,8 @@ declare const ZodMessageSchema: z.ZodObject<{
     type: z.ZodString;
     payload: z.ZodUnknown;
 }, "strip", z.ZodTypeAny, {
-    type: string;
     version: "v1";
+    type: string;
     payload?: unknown;
 }, {
     type: string;

package/dist/v3/zodNamespace.js

@@ -2,6 +2,7 @@
 
 var zod = require('zod');
 require('socket.io-client');
+var zodValidationError = require('zod-validation-error');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -155,10 +156,8 @@ structuredLog_fn = /* @__PURE__ */ __name(function(loggerFunction, message, leve
 }, "#structuredLog");
 __name(_SimpleStructuredLogger, "SimpleStructuredLogger");
 var SimpleStructuredLogger = _SimpleStructuredLogger;
-
-// src/v3/zodSocket.ts
 var messageSchema = zod.z.object({
-  version: zod.z.literal("v1").default("v1"),
+  version: zod.z.string(),
   type: zod.z.string(),
   payload: zod.z.unknown()
 });
@@ -192,9 +191,17 @@ var _ZodSocketMessageHandler = class _ZodSocketMessageHandler {
     if (!schema) {
       throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
     }
-    const parsedPayload = schema.safeParse(parsedMessage.data.payload);
+    const messageWithVersion = {
+      version: parsedMessage.data.version,
+      ...typeof parsedMessage.data.payload === "object" ? parsedMessage.data.payload : {}
+    };
+    const parsedPayload = schema.safeParse(messageWithVersion);
     if (!parsedPayload.success) {
-      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+      console.error("Failed to parse message payload", {
+        message,
+        payload: messageWithVersion
+      });
+      throw parsedPayload.error instanceof zod.ZodError ? zodValidationError.fromZodError(parsedPayload.error) : parsedPayload.error;
     }
     return {
       type: parsedMessage.data.type,
@@ -230,7 +237,10 @@ var _ZodSocketMessageHandler = class _ZodSocketMessageHandler {
           }
         } catch (error) {
           log.error("Error while handling message", {
-            error
+            error: error instanceof Error ? {
+              message: error.message,
+              stack: error.stack
+            } : error
           });
           return;
         }

package/dist/v3/zodNamespace.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/v3/zodMessageHandler.ts","../../src/v3/zodSocket.ts","../../src/v3/utils/structuredLogger.ts","../../src/v3/zodNamespace.ts"],"names":["z","ZodSchemaParsedError","Error","constructor","error","payload","message","ZodMessageSchema","object","version","literal","default","type","string","unknown","ZodMessageSender","options","schema","sender","send","parsedPayload","safeParse","success","forwardMessage","parsedMessage","JSON","stringify","data","io","LogLevel","SimpleStructuredLogger","name","level","includes","process","env","DEBUG","debug","info","fields","child","log","args","console","warn","loggerFunction","structuredLog","length","timestamp","Date","messageSchema","_schema","ZodSocketMessageHandler","handlers","handleMessage","parseMessage","handler","String","ack","registerHandlers","emitter","logger","eventName","Object","keys","on","callback","hasCallback","ZodNamespace","opts","clientMessages","namespace","of","serverMessages","Promise","resolve","reject","emit","err","preAuth","use","socket","next","socketId","id","socketStage","authToken","auth","handshake","disconnect","token","postAuth","reason","description","onDisconnect","onError","onConnection","fetchSockets"],"mappings":"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","sourcesContent":["import { z } from \"zod\";\nimport { StructuredLogger } from \"./utils/structuredLogger\";\n\nexport class ZodSchemaParsedError extends Error {\n  constructor(\n    public error: z.ZodError,\n    public payload: unknown\n  ) {\n    super(error.message);\n  }\n}\n\nexport type ZodMessageValueSchema<TDiscriminatedUnion extends z.ZodDiscriminatedUnion<any, any>> =\n  | z.ZodFirstPartySchemaTypes\n  | TDiscriminatedUnion;\n\nexport interface ZodMessageCatalogSchema {\n  [key: string]: ZodMessageValueSchema<any>;\n}\n\nexport type ZodMessageHandlers<TCatalogSchema extends ZodMessageCatalogSchema> = Partial<{\n  [K in keyof TCatalogSchema]: (payload: z.infer<TCatalogSchema[K]>) => Promise<any>;\n}>;\n\nexport type ZodMessageHandlerOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  messages?: ZodMessageHandlers<TMessageCatalog>;\n};\n\nexport type MessageFromSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<TMessageCatalog[K]>;\n};\n\nexport type MessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nexport const ZodMessageSchema = z.object({\n  version: z.literal(\"v1\").default(\"v1\"),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport interface EventEmitterLike {\n  on(eventName: string | symbol, listener: (...args: any[]) => void): this;\n}\n\nexport class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #handlers: ZodMessageHandlers<TMessageCatalog> | undefined;\n\n  constructor(options: ZodMessageHandlerOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.messages;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessageFromCatalog<TMessageCatalog> {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#schema)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        // FIXME: this only works if the message doesn't have genuine payload prop\n        if (\"payload\" in message) {\n          ack = await this.handleMessage({ type: eventName, ...message });\n        } else {\n          // Handle messages not sent by ZodMessageSender\n          const { version, ...payload } = message;\n          ack = await this.handleMessage({ type: eventName, version, payload });\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\ntype ZodMessageSenderCallback<TMessageCatalog extends ZodMessageCatalogSchema> = (message: {\n  type: keyof TMessageCatalog;\n  payload: z.infer<TMessageCatalog[keyof TMessageCatalog]>;\n  version: \"v1\";\n}) => Promise<void>;\n\nexport type ZodMessageSenderOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  sender: ZodMessageSenderCallback<TMessageCatalog>;\n};\n\nexport class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #sender: ZodMessageSenderCallback<TMessageCatalog>;\n\n  constructor(options: ZodMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#sender = options.sender;\n  }\n\n  public async send<K extends keyof TMessageCatalog>(\n    type: K,\n    payload: z.input<TMessageCatalog[K]>\n  ) {\n    const schema = this.#schema[type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new ZodSchemaParsedError(parsedPayload.error, payload);\n    }\n\n    await this.#sender({ type, payload, version: \"v1\" });\n  }\n\n  public async forwardMessage(message: unknown) {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    await this.#sender({\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n      version: \"v1\",\n    });\n  }\n}\n\nexport type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TCatalog]: (message: z.infer<TCatalog[K]>) => void;\n};\n","import type { Socket } from \"socket.io-client\";\nimport { io } from \"socket.io-client\";\nimport { z } from \"zod\";\nimport { EventEmitterLike, ZodMessageValueSchema } from \"./zodMessageHandler\";\nimport { LogLevel, SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\n\nexport interface ZodSocketMessageCatalogSchema {\n  [key: string]:\n    | {\n        message: ZodMessageValueSchema<any>;\n      }\n    | {\n        message: ZodMessageValueSchema<any>;\n        callback?: ZodMessageValueSchema<any>;\n      };\n}\n\nexport type ZodMessageCatalogToSocketIoEvents<TCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TCatalog]: SocketMessageHasCallback<TCatalog, K> extends true\n    ? (\n        message: z.infer<GetSocketMessageSchema<TCatalog, K>>,\n        callback: (ack: z.infer<GetSocketCallbackSchema<TCatalog, K>>) => void\n      ) => void\n    : (message: z.infer<GetSocketMessageSchema<TCatalog, K>>) => void;\n};\n\nexport type GetSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType][\"message\"];\n\nexport type InferSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketMessageSchema<TRPCCatalog, TMessageType>>;\n\nexport type GetSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType] extends { callback: any }\n  ? TRPCCatalog[TMessageType][\"callback\"]\n  : never;\n\nexport type InferSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketCallbackSchema<TRPCCatalog, TMessageType>>;\n\nexport type SocketMessageHasCallback<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = GetSocketCallbackSchema<TRPCCatalog, TMessageType> extends never ? false : true;\n\nexport type ZodSocketMessageHandlers<TCatalogSchema extends ZodSocketMessageCatalogSchema> =\n  Partial<{\n    [K in keyof TCatalogSchema]: (\n      payload: z.infer<GetSocketMessageSchema<TCatalogSchema, K>>\n    ) => Promise<\n      SocketMessageHasCallback<TCatalogSchema, K> extends true\n        ? z.input<GetSocketCallbackSchema<TCatalogSchema, K>>\n        : void\n    >;\n  }>;\n\nexport type ZodSocketMessageHandlerOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> =\n  {\n    schema: TMessageCatalog;\n    handlers?: ZodSocketMessageHandlers<TMessageCatalog>;\n  };\n\ntype MessageFromSocketSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>;\n};\n\nexport type MessagesFromSocketCatalog<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSocketSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nconst messageSchema = z.object({\n  version: z.literal(\"v1\").default(\"v1\"),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TRPCCatalog;\n  #handlers: ZodSocketMessageHandlers<TRPCCatalog> | undefined;\n\n  constructor(options: ZodSocketMessageHandlerOptions<TRPCCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.handlers;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessagesFromSocketCatalog<TRPCCatalog> {\n    const parsedMessage = messageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#handlers)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        try {\n          // FIXME: this only works if the message doesn't have genuine payload prop\n          if (\"payload\" in message) {\n            ack = await this.handleMessage({ type: eventName, ...message });\n          } else {\n            // Handle messages not sent by ZodMessageSender\n            const { version, ...payload } = message;\n            ack = await this.handleMessage({ type: eventName, version, payload });\n          }\n        } catch (error) {\n          log.error(\"Error while handling message\", { error });\n          return;\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\nexport type ZodSocketMessageSenderOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  socket: ZodSocket<any, TMessageCatalog>;\n};\n\nexport type GetSocketMessagesWithCallback<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? K\n    : never;\n}[keyof TMessageCatalog];\n\nexport type GetSocketMessagesWithoutCallback<\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? never\n    : K;\n}[keyof TMessageCatalog];\n\nexport class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #socket: ZodSocket<any, TMessageCatalog>;\n\n  constructor(options: ZodSocketMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#socket = options.socket;\n  }\n\n  public send<K extends GetSocketMessagesWithoutCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): void {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    this.#socket.emit(type, { payload, version: \"v1\" });\n\n    return;\n  }\n\n  public async sendWithAck<K extends GetSocketMessagesWithCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): Promise<z.infer<GetSocketCallbackSchema<TMessageCatalog, K>>> {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    const callbackResult = await this.#socket.emitWithAck(type, { payload, version: \"v1\" });\n\n    return callbackResult;\n  }\n}\n\nexport type ZodSocket<\n  TListenEvents extends ZodSocketMessageCatalogSchema,\n  TEmitEvents extends ZodSocketMessageCatalogSchema,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TListenEvents>,\n  ZodMessageCatalogToSocketIoEvents<TEmitEvents>\n>;\n\ninterface ZodSocketConnectionOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  host: string;\n  port?: number;\n  secure?: boolean;\n  namespace: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  extraHeaders?: {\n    [header: string]: string;\n  };\n  handlers?: ZodSocketMessageHandlers<TServerMessages>;\n  authToken?: string;\n  onConnection?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    handler: ZodSocketMessageHandler<TServerMessages>,\n    sender: ZodSocketMessageSender<TClientMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    reason: Socket.DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodSocketConnection<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  #sender: ZodSocketMessageSender<TClientMessages>;\n  socket: ZodSocket<TServerMessages, TClientMessages>;\n\n  #handler: ZodSocketMessageHandler<TServerMessages>;\n  #logger: StructuredLogger;\n\n  constructor(opts: ZodSocketConnectionOptions<TClientMessages, TServerMessages>) {\n    const uri = `${opts.secure ? \"wss\" : \"ws\"}://${opts.host}:${\n      opts.port ?? (opts.secure ? \"443\" : \"80\")\n    }/${opts.namespace}`;\n\n    const logger = new SimpleStructuredLogger(opts.namespace, LogLevel.info);\n    logger.log(\"new zod socket\", { uri });\n\n    this.socket = io(uri, {\n      transports: [\"websocket\"],\n      auth: {\n        token: opts.authToken,\n      },\n      extraHeaders: opts.extraHeaders,\n      reconnectionDelay: 500,\n      reconnectionDelayMax: 1000,\n    });\n\n    this.#logger = logger.child({\n      socketId: this.socket.id,\n    });\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.serverMessages,\n      handlers: opts.handlers,\n    });\n    this.#handler.registerHandlers(this.socket, this.#logger);\n\n    this.#sender = new ZodSocketMessageSender({\n      schema: opts.clientMessages,\n      socket: this.socket,\n    });\n\n    this.socket.on(\"connect_error\", async (error) => {\n      this.#logger.error(`connect_error: ${error}`);\n\n      if (opts.onError) {\n        await opts.onError(this.socket, error, this.#logger);\n      }\n    });\n\n    this.socket.on(\"connect\", async () => {\n      this.#logger.info(\"connect\");\n\n      if (opts.onConnection) {\n        await opts.onConnection(this.socket, this.#handler, this.#sender, this.#logger);\n      }\n    });\n\n    this.socket.on(\"disconnect\", async (reason, description) => {\n      this.#logger.info(\"disconnect\", { reason, description });\n\n      if (opts.onDisconnect) {\n        await opts.onDisconnect(this.socket, reason, description, this.#logger);\n      }\n    });\n  }\n\n  close() {\n    this.socket.close();\n  }\n\n  connect() {\n    this.socket.connect();\n  }\n\n  get send() {\n    return this.#sender.send.bind(this.#sender);\n  }\n\n  get sendWithAck() {\n    return this.#sender.sendWithAck.bind(this.#sender);\n  }\n}\n\nfunction createLogger(prefix: string) {\n  return (...args: any[]) => console.log(prefix, ...args);\n}\n","type StructuredArgs = (Record<string, unknown> | undefined)[];\n\nexport interface StructuredLogger {\n  log: (message: string, ...args: StructuredArgs) => any;\n  error: (message: string, ...args: StructuredArgs) => any;\n  warn: (message: string, ...args: StructuredArgs) => any;\n  info: (message: string, ...args: StructuredArgs) => any;\n  debug: (message: string, ...args: StructuredArgs) => any;\n  child: (fields: Record<string, unknown>) => StructuredLogger;\n}\n\nexport enum LogLevel {\n  \"log\",\n  \"error\",\n  \"warn\",\n  \"info\",\n  \"debug\",\n}\n\nexport class SimpleStructuredLogger implements StructuredLogger {\n  constructor(\n    private name: string,\n    private level: LogLevel = [\"1\", \"true\"].includes(process.env.DEBUG ?? \"\")\n      ? LogLevel.debug\n      : LogLevel.info,\n    private fields?: Record<string, unknown>\n  ) {}\n\n  child(fields: Record<string, unknown>, level?: LogLevel) {\n    return new SimpleStructuredLogger(this.name, level, { ...this.fields, ...fields });\n  }\n\n  log(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.log) return;\n\n    this.#structuredLog(console.log, message, \"log\", ...args);\n  }\n\n  error(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.error) return;\n\n    this.#structuredLog(console.error, message, \"error\", ...args);\n  }\n\n  warn(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.warn) return;\n\n    this.#structuredLog(console.warn, message, \"warn\", ...args);\n  }\n\n  info(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.info) return;\n\n    this.#structuredLog(console.info, message, \"info\", ...args);\n  }\n\n  debug(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.debug) return;\n\n    this.#structuredLog(console.debug, message, \"debug\", ...args);\n  }\n\n  #structuredLog(\n    loggerFunction: (message: string, ...args: any[]) => void,\n    message: string,\n    level: string,\n    ...args: StructuredArgs\n  ) {\n    const structuredLog = {\n      ...(args.length === 1 ? args[0] : args),\n      ...this.fields,\n      timestamp: new Date(),\n      name: this.name,\n      message,\n      level,\n    };\n\n    loggerFunction(JSON.stringify(structuredLog));\n  }\n}\n","import type { DisconnectReason, Namespace, Server, Socket } from \"socket.io\";\nimport { ZodMessageSender } from \"./zodMessageHandler\";\nimport {\n  ZodMessageCatalogToSocketIoEvents,\n  ZodSocketMessageCatalogSchema,\n  ZodSocketMessageHandler,\n  ZodSocketMessageHandlers,\n} from \"./zodSocket\";\nimport type { DefaultEventsMap, EventsMap } from \"socket.io/dist/typed-events\";\nimport { z } from \"zod\";\nimport { SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\n\ninterface ExtendedError extends Error {\n  data?: any;\n}\n\nexport type ZodNamespaceSocket<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n  ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n  TServerSideEvents,\n  z.infer<TSocketData>\n>;\n\ninterface ZodNamespaceOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> {\n  io: Server;\n  name: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  socketData?: TSocketData;\n  handlers?: ZodSocketMessageHandlers<TClientMessages>;\n  authToken?: string;\n  logger?: StructuredLogger;\n  preAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  postAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onConnection?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    handler: ZodSocketMessageHandler<TClientMessages>,\n    sender: ZodMessageSender<TServerMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    reason: DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodNamespace<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n> {\n  #logger: StructuredLogger;\n  #handler: ZodSocketMessageHandler<TClientMessages>;\n  sender: ZodMessageSender<TServerMessages>;\n\n  io: Server;\n  namespace: Namespace<\n    ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n    ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n    TServerSideEvents,\n    z.infer<TSocketData>\n  >;\n\n  constructor(\n    opts: ZodNamespaceOptions<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>\n  ) {\n    this.#logger = opts.logger ?? new SimpleStructuredLogger(opts.name);\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.clientMessages,\n      handlers: opts.handlers,\n    });\n\n    this.io = opts.io;\n\n    this.namespace = this.io.of(opts.name);\n\n    // FIXME: There's a bug here, this sender should not accept Socket schemas with callbacks\n    this.sender = new ZodMessageSender({\n      schema: opts.serverMessages,\n      sender: async (message) => {\n        return new Promise((resolve, reject) => {\n          try {\n            // @ts-expect-error\n            this.namespace.emit(message.type, message.payload);\n            resolve();\n          } catch (err) {\n            reject(err);\n          }\n        });\n      },\n    });\n\n    if (opts.preAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"preAuth\" });\n\n        if (typeof opts.preAuth === \"function\") {\n          await opts.preAuth(socket, next, logger);\n        }\n      });\n    }\n\n    if (opts.authToken) {\n      this.namespace.use((socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        const { auth } = socket.handshake;\n\n        if (!(\"token\" in auth)) {\n          logger.error(\"no token\");\n          return socket.disconnect(true);\n        }\n\n        if (auth.token !== opts.authToken) {\n          logger.error(\"invalid token\");\n          return socket.disconnect(true);\n        }\n\n        logger.info(\"success\");\n\n        next();\n      });\n    }\n\n    if (opts.postAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        if (typeof opts.postAuth === \"function\") {\n          await opts.postAuth(socket, next, logger);\n        }\n      });\n    }\n\n    this.namespace.on(\"connection\", async (socket) => {\n      const logger = this.#logger.child({ socketId: socket.id, socketStage: \"connection\" });\n      logger.info(\"connected\");\n\n      this.#handler.registerHandlers(socket, logger);\n\n      socket.on(\"disconnect\", async (reason, description) => {\n        logger.info(\"disconnect\", { reason, description });\n\n        if (opts.onDisconnect) {\n          await opts.onDisconnect(socket, reason, description, logger);\n        }\n      });\n\n      socket.on(\"error\", async (error) => {\n        logger.error(\"error\", { error });\n\n        if (opts.onError) {\n          await opts.onError(socket, error, logger);\n        }\n      });\n\n      if (opts.onConnection) {\n        await opts.onConnection(socket, this.#handler, this.sender, logger);\n      }\n    });\n  }\n\n  fetchSockets() {\n    return this.namespace.fetchSockets();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/v3/zodMessageHandler.ts","../../src/v3/zodSocket.ts","../../src/v3/utils/structuredLogger.ts","../../src/v3/zodNamespace.ts"],"names":["z","ZodSchemaParsedError","Error","constructor","error","payload","message","ZodMessageSchema","object","version","literal","default","type","string","unknown","ZodMessageSender","options","schema","sender","send","parsedPayload","safeParse","success","forwardMessage","parsedMessage","JSON","stringify","data","io","ZodError","LogLevel","SimpleStructuredLogger","name","level","includes","process","env","DEBUG","debug","info","fields","child","log","args","console","warn","loggerFunction","structuredLog","length","timestamp","Date","fromZodError","messageSchema","_schema","ZodSocketMessageHandler","handlers","handleMessage","parseMessage","handler","String","ack","messageWithVersion","registerHandlers","emitter","logger","eventName","Object","keys","on","callback","hasCallback","stack","ZodNamespace","opts","clientMessages","namespace","of","serverMessages","Promise","resolve","reject","emit","err","preAuth","use","socket","next","socketId","id","socketStage","authToken","auth","handshake","disconnect","token","postAuth","reason","description","onDisconnect","onError","onConnection","fetchSockets"],"mappings":"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","sourcesContent":["import { z } from \"zod\";\nimport { StructuredLogger } from \"./utils/structuredLogger\";\n\nexport class ZodSchemaParsedError extends Error {\n  constructor(\n    public error: z.ZodError,\n    public payload: unknown\n  ) {\n    super(error.message);\n  }\n}\n\nexport type ZodMessageValueSchema<TDiscriminatedUnion extends z.ZodDiscriminatedUnion<any, any>> =\n  | z.ZodFirstPartySchemaTypes\n  | TDiscriminatedUnion;\n\nexport interface ZodMessageCatalogSchema {\n  [key: string]: ZodMessageValueSchema<any>;\n}\n\nexport type ZodMessageHandlers<TCatalogSchema extends ZodMessageCatalogSchema> = Partial<{\n  [K in keyof TCatalogSchema]: (payload: z.infer<TCatalogSchema[K]>) => Promise<any>;\n}>;\n\nexport type ZodMessageHandlerOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  messages?: ZodMessageHandlers<TMessageCatalog>;\n};\n\nexport type MessageFromSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<TMessageCatalog[K]>;\n};\n\nexport type MessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nexport const ZodMessageSchema = z.object({\n  version: z.literal(\"v1\").default(\"v1\"),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport interface EventEmitterLike {\n  on(eventName: string | symbol, listener: (...args: any[]) => void): this;\n}\n\nexport class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #handlers: ZodMessageHandlers<TMessageCatalog> | undefined;\n\n  constructor(options: ZodMessageHandlerOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.messages;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessageFromCatalog<TMessageCatalog> {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#schema)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        // FIXME: this only works if the message doesn't have genuine payload prop\n        if (\"payload\" in message) {\n          ack = await this.handleMessage({ type: eventName, ...message });\n        } else {\n          // Handle messages not sent by ZodMessageSender\n          const { version, ...payload } = message;\n          ack = await this.handleMessage({ type: eventName, version, payload });\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\ntype ZodMessageSenderCallback<TMessageCatalog extends ZodMessageCatalogSchema> = (message: {\n  type: keyof TMessageCatalog;\n  payload: z.infer<TMessageCatalog[keyof TMessageCatalog]>;\n  version: \"v1\";\n}) => Promise<void>;\n\nexport type ZodMessageSenderOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  sender: ZodMessageSenderCallback<TMessageCatalog>;\n};\n\nexport class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #sender: ZodMessageSenderCallback<TMessageCatalog>;\n\n  constructor(options: ZodMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#sender = options.sender;\n  }\n\n  public async send<K extends keyof TMessageCatalog>(\n    type: K,\n    payload: z.input<TMessageCatalog[K]>\n  ) {\n    const schema = this.#schema[type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new ZodSchemaParsedError(parsedPayload.error, payload);\n    }\n\n    await this.#sender({ type, payload, version: \"v1\" });\n  }\n\n  public async forwardMessage(message: unknown) {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    await this.#sender({\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n      version: \"v1\",\n    });\n  }\n}\n\nexport type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TCatalog]: (message: z.infer<TCatalog[K]>) => void;\n};\n","import type { Socket } from \"socket.io-client\";\nimport { io } from \"socket.io-client\";\nimport { ZodError, z } from \"zod\";\nimport { EventEmitterLike, ZodMessageValueSchema } from \"./zodMessageHandler\";\nimport { LogLevel, SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\nimport { fromZodError } from \"zod-validation-error\";\n\nexport interface ZodSocketMessageCatalogSchema {\n  [key: string]:\n    | {\n        message: ZodMessageValueSchema<any>;\n      }\n    | {\n        message: ZodMessageValueSchema<any>;\n        callback?: ZodMessageValueSchema<any>;\n      };\n}\n\nexport type ZodMessageCatalogToSocketIoEvents<TCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TCatalog]: SocketMessageHasCallback<TCatalog, K> extends true\n    ? (\n        message: z.infer<GetSocketMessageSchema<TCatalog, K>>,\n        callback: (ack: z.infer<GetSocketCallbackSchema<TCatalog, K>>) => void\n      ) => void\n    : (message: z.infer<GetSocketMessageSchema<TCatalog, K>>) => void;\n};\n\nexport type GetSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType][\"message\"];\n\nexport type InferSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketMessageSchema<TRPCCatalog, TMessageType>>;\n\nexport type GetSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType] extends { callback: any }\n  ? TRPCCatalog[TMessageType][\"callback\"]\n  : never;\n\nexport type InferSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketCallbackSchema<TRPCCatalog, TMessageType>>;\n\nexport type SocketMessageHasCallback<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = GetSocketCallbackSchema<TRPCCatalog, TMessageType> extends never ? false : true;\n\nexport type ZodSocketMessageHandlers<TCatalogSchema extends ZodSocketMessageCatalogSchema> =\n  Partial<{\n    [K in keyof TCatalogSchema]: (\n      payload: z.infer<GetSocketMessageSchema<TCatalogSchema, K>>\n    ) => Promise<\n      SocketMessageHasCallback<TCatalogSchema, K> extends true\n        ? z.input<GetSocketCallbackSchema<TCatalogSchema, K>>\n        : void\n    >;\n  }>;\n\nexport type ZodSocketMessageHandlerOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> =\n  {\n    schema: TMessageCatalog;\n    handlers?: ZodSocketMessageHandlers<TMessageCatalog>;\n  };\n\ntype MessageFromSocketSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>;\n};\n\nexport type MessagesFromSocketCatalog<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSocketSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nconst messageSchema = z.object({\n  version: z.string(),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TRPCCatalog;\n  #handlers: ZodSocketMessageHandlers<TRPCCatalog> | undefined;\n\n  constructor(options: ZodSocketMessageHandlerOptions<TRPCCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.handlers;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessagesFromSocketCatalog<TRPCCatalog> {\n    const parsedMessage = messageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const messageWithVersion = {\n      version: parsedMessage.data.version,\n      ...(typeof parsedMessage.data.payload === \"object\" ? parsedMessage.data.payload : {}),\n    };\n\n    const parsedPayload = schema.safeParse(messageWithVersion);\n\n    if (!parsedPayload.success) {\n      console.error(\"Failed to parse message payload\", {\n        message,\n        payload: messageWithVersion,\n      });\n\n      throw parsedPayload.error instanceof ZodError\n        ? fromZodError(parsedPayload.error)\n        : parsedPayload.error;\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#handlers)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        try {\n          // FIXME: this only works if the message doesn't have genuine payload prop\n          if (\"payload\" in message) {\n            ack = await this.handleMessage({ type: eventName, ...message });\n          } else {\n            // Handle messages not sent by ZodMessageSender\n            const { version, ...payload } = message;\n            ack = await this.handleMessage({ type: eventName, version, payload });\n          }\n        } catch (error) {\n          log.error(\"Error while handling message\", {\n            error:\n              error instanceof Error\n                ? {\n                    message: error.message,\n                    stack: error.stack,\n                  }\n                : error,\n          });\n          return;\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\nexport type ZodSocketMessageSenderOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  socket: ZodSocket<any, TMessageCatalog>;\n};\n\nexport type GetSocketMessagesWithCallback<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? K\n    : never;\n}[keyof TMessageCatalog];\n\nexport type GetSocketMessagesWithoutCallback<\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? never\n    : K;\n}[keyof TMessageCatalog];\n\nexport class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #socket: ZodSocket<any, TMessageCatalog>;\n\n  constructor(options: ZodSocketMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#socket = options.socket;\n  }\n\n  public send<K extends GetSocketMessagesWithoutCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): void {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    this.#socket.emit(type, { payload, version: \"v1\" });\n\n    return;\n  }\n\n  public async sendWithAck<K extends GetSocketMessagesWithCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): Promise<z.infer<GetSocketCallbackSchema<TMessageCatalog, K>>> {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    const callbackResult = await this.#socket.emitWithAck(type, { payload, version: \"v1\" });\n\n    return callbackResult;\n  }\n}\n\nexport type ZodSocket<\n  TListenEvents extends ZodSocketMessageCatalogSchema,\n  TEmitEvents extends ZodSocketMessageCatalogSchema,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TListenEvents>,\n  ZodMessageCatalogToSocketIoEvents<TEmitEvents>\n>;\n\ninterface ZodSocketConnectionOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  host: string;\n  port?: number;\n  secure?: boolean;\n  namespace: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  extraHeaders?: {\n    [header: string]: string;\n  };\n  handlers?: ZodSocketMessageHandlers<TServerMessages>;\n  authToken?: string;\n  onConnection?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    handler: ZodSocketMessageHandler<TServerMessages>,\n    sender: ZodSocketMessageSender<TClientMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    reason: Socket.DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodSocketConnection<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  #sender: ZodSocketMessageSender<TClientMessages>;\n  socket: ZodSocket<TServerMessages, TClientMessages>;\n\n  #handler: ZodSocketMessageHandler<TServerMessages>;\n  #logger: StructuredLogger;\n\n  constructor(opts: ZodSocketConnectionOptions<TClientMessages, TServerMessages>) {\n    const uri = `${opts.secure ? \"wss\" : \"ws\"}://${opts.host}:${\n      opts.port ?? (opts.secure ? \"443\" : \"80\")\n    }/${opts.namespace}`;\n\n    const logger = new SimpleStructuredLogger(opts.namespace, LogLevel.info);\n    logger.log(\"new zod socket\", { uri });\n\n    this.socket = io(uri, {\n      transports: [\"websocket\"],\n      auth: {\n        token: opts.authToken,\n      },\n      extraHeaders: opts.extraHeaders,\n      reconnectionDelay: 500,\n      reconnectionDelayMax: 1000,\n    });\n\n    this.#logger = logger.child({\n      socketId: this.socket.id,\n    });\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.serverMessages,\n      handlers: opts.handlers,\n    });\n    this.#handler.registerHandlers(this.socket, this.#logger);\n\n    this.#sender = new ZodSocketMessageSender({\n      schema: opts.clientMessages,\n      socket: this.socket,\n    });\n\n    this.socket.on(\"connect_error\", async (error) => {\n      this.#logger.error(`connect_error: ${error}`);\n\n      if (opts.onError) {\n        await opts.onError(this.socket, error, this.#logger);\n      }\n    });\n\n    this.socket.on(\"connect\", async () => {\n      this.#logger.info(\"connect\");\n\n      if (opts.onConnection) {\n        await opts.onConnection(this.socket, this.#handler, this.#sender, this.#logger);\n      }\n    });\n\n    this.socket.on(\"disconnect\", async (reason, description) => {\n      this.#logger.info(\"disconnect\", { reason, description });\n\n      if (opts.onDisconnect) {\n        await opts.onDisconnect(this.socket, reason, description, this.#logger);\n      }\n    });\n  }\n\n  close() {\n    this.socket.close();\n  }\n\n  connect() {\n    this.socket.connect();\n  }\n\n  get send() {\n    return this.#sender.send.bind(this.#sender);\n  }\n\n  get sendWithAck() {\n    return this.#sender.sendWithAck.bind(this.#sender);\n  }\n}\n\nfunction createLogger(prefix: string) {\n  return (...args: any[]) => console.log(prefix, ...args);\n}\n","type StructuredArgs = (Record<string, unknown> | undefined)[];\n\nexport interface StructuredLogger {\n  log: (message: string, ...args: StructuredArgs) => any;\n  error: (message: string, ...args: StructuredArgs) => any;\n  warn: (message: string, ...args: StructuredArgs) => any;\n  info: (message: string, ...args: StructuredArgs) => any;\n  debug: (message: string, ...args: StructuredArgs) => any;\n  child: (fields: Record<string, unknown>) => StructuredLogger;\n}\n\nexport enum LogLevel {\n  \"log\",\n  \"error\",\n  \"warn\",\n  \"info\",\n  \"debug\",\n}\n\nexport class SimpleStructuredLogger implements StructuredLogger {\n  constructor(\n    private name: string,\n    private level: LogLevel = [\"1\", \"true\"].includes(process.env.DEBUG ?? \"\")\n      ? LogLevel.debug\n      : LogLevel.info,\n    private fields?: Record<string, unknown>\n  ) {}\n\n  child(fields: Record<string, unknown>, level?: LogLevel) {\n    return new SimpleStructuredLogger(this.name, level, { ...this.fields, ...fields });\n  }\n\n  log(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.log) return;\n\n    this.#structuredLog(console.log, message, \"log\", ...args);\n  }\n\n  error(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.error) return;\n\n    this.#structuredLog(console.error, message, \"error\", ...args);\n  }\n\n  warn(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.warn) return;\n\n    this.#structuredLog(console.warn, message, \"warn\", ...args);\n  }\n\n  info(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.info) return;\n\n    this.#structuredLog(console.info, message, \"info\", ...args);\n  }\n\n  debug(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.debug) return;\n\n    this.#structuredLog(console.debug, message, \"debug\", ...args);\n  }\n\n  #structuredLog(\n    loggerFunction: (message: string, ...args: any[]) => void,\n    message: string,\n    level: string,\n    ...args: StructuredArgs\n  ) {\n    const structuredLog = {\n      ...(args.length === 1 ? args[0] : args),\n      ...this.fields,\n      timestamp: new Date(),\n      name: this.name,\n      message,\n      level,\n    };\n\n    loggerFunction(JSON.stringify(structuredLog));\n  }\n}\n","import type { DisconnectReason, Namespace, Server, Socket } from \"socket.io\";\nimport { ZodMessageSender } from \"./zodMessageHandler\";\nimport {\n  ZodMessageCatalogToSocketIoEvents,\n  ZodSocketMessageCatalogSchema,\n  ZodSocketMessageHandler,\n  ZodSocketMessageHandlers,\n} from \"./zodSocket\";\nimport type { DefaultEventsMap, EventsMap } from \"socket.io/dist/typed-events\";\nimport { z } from \"zod\";\nimport { SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\n\ninterface ExtendedError extends Error {\n  data?: any;\n}\n\nexport type ZodNamespaceSocket<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n  ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n  TServerSideEvents,\n  z.infer<TSocketData>\n>;\n\ninterface ZodNamespaceOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> {\n  io: Server;\n  name: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  socketData?: TSocketData;\n  handlers?: ZodSocketMessageHandlers<TClientMessages>;\n  authToken?: string;\n  logger?: StructuredLogger;\n  preAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  postAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onConnection?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    handler: ZodSocketMessageHandler<TClientMessages>,\n    sender: ZodMessageSender<TServerMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    reason: DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodNamespace<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n> {\n  #logger: StructuredLogger;\n  #handler: ZodSocketMessageHandler<TClientMessages>;\n  sender: ZodMessageSender<TServerMessages>;\n\n  io: Server;\n  namespace: Namespace<\n    ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n    ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n    TServerSideEvents,\n    z.infer<TSocketData>\n  >;\n\n  constructor(\n    opts: ZodNamespaceOptions<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>\n  ) {\n    this.#logger = opts.logger ?? new SimpleStructuredLogger(opts.name);\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.clientMessages,\n      handlers: opts.handlers,\n    });\n\n    this.io = opts.io;\n\n    this.namespace = this.io.of(opts.name);\n\n    // FIXME: There's a bug here, this sender should not accept Socket schemas with callbacks\n    this.sender = new ZodMessageSender({\n      schema: opts.serverMessages,\n      sender: async (message) => {\n        return new Promise((resolve, reject) => {\n          try {\n            // @ts-expect-error\n            this.namespace.emit(message.type, message.payload);\n            resolve();\n          } catch (err) {\n            reject(err);\n          }\n        });\n      },\n    });\n\n    if (opts.preAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"preAuth\" });\n\n        if (typeof opts.preAuth === \"function\") {\n          await opts.preAuth(socket, next, logger);\n        }\n      });\n    }\n\n    if (opts.authToken) {\n      this.namespace.use((socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        const { auth } = socket.handshake;\n\n        if (!(\"token\" in auth)) {\n          logger.error(\"no token\");\n          return socket.disconnect(true);\n        }\n\n        if (auth.token !== opts.authToken) {\n          logger.error(\"invalid token\");\n          return socket.disconnect(true);\n        }\n\n        logger.info(\"success\");\n\n        next();\n      });\n    }\n\n    if (opts.postAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        if (typeof opts.postAuth === \"function\") {\n          await opts.postAuth(socket, next, logger);\n        }\n      });\n    }\n\n    this.namespace.on(\"connection\", async (socket) => {\n      const logger = this.#logger.child({ socketId: socket.id, socketStage: \"connection\" });\n      logger.info(\"connected\");\n\n      this.#handler.registerHandlers(socket, logger);\n\n      socket.on(\"disconnect\", async (reason, description) => {\n        logger.info(\"disconnect\", { reason, description });\n\n        if (opts.onDisconnect) {\n          await opts.onDisconnect(socket, reason, description, logger);\n        }\n      });\n\n      socket.on(\"error\", async (error) => {\n        logger.error(\"error\", { error });\n\n        if (opts.onError) {\n          await opts.onError(socket, error, logger);\n        }\n      });\n\n      if (opts.onConnection) {\n        await opts.onConnection(socket, this.#handler, this.sender, logger);\n      }\n    });\n  }\n\n  fetchSockets() {\n    return this.namespace.fetchSockets();\n  }\n}\n"]}

package/dist/v3/zodNamespace.mjs

@@ -1,5 +1,6 @@
-import { z } from 'zod';
+import { z, ZodError } from 'zod';
 import 'socket.io-client';
+import { fromZodError } from 'zod-validation-error';
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -153,10 +154,8 @@ structuredLog_fn = /* @__PURE__ */ __name(function(loggerFunction, message, leve
 }, "#structuredLog");
 __name(_SimpleStructuredLogger, "SimpleStructuredLogger");
 var SimpleStructuredLogger = _SimpleStructuredLogger;
-
-// src/v3/zodSocket.ts
 var messageSchema = z.object({
-  version: z.literal("v1").default("v1"),
+  version: z.string(),
   type: z.string(),
   payload: z.unknown()
 });
@@ -190,9 +189,17 @@ var _ZodSocketMessageHandler = class _ZodSocketMessageHandler {
     if (!schema) {
       throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
     }
-    const parsedPayload = schema.safeParse(parsedMessage.data.payload);
+    const messageWithVersion = {
+      version: parsedMessage.data.version,
+      ...typeof parsedMessage.data.payload === "object" ? parsedMessage.data.payload : {}
+    };
+    const parsedPayload = schema.safeParse(messageWithVersion);
     if (!parsedPayload.success) {
-      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+      console.error("Failed to parse message payload", {
+        message,
+        payload: messageWithVersion
+      });
+      throw parsedPayload.error instanceof ZodError ? fromZodError(parsedPayload.error) : parsedPayload.error;
     }
     return {
       type: parsedMessage.data.type,
@@ -228,7 +235,10 @@ var _ZodSocketMessageHandler = class _ZodSocketMessageHandler {
           }
         } catch (error) {
           log.error("Error while handling message", {
-            error
+            error: error instanceof Error ? {
+              message: error.message,
+              stack: error.stack
+            } : error
           });
           return;
         }

package/dist/v3/zodNamespace.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/v3/zodMessageHandler.ts","../../src/v3/zodSocket.ts","../../src/v3/utils/structuredLogger.ts","../../src/v3/zodNamespace.ts"],"names":["z","ZodSchemaParsedError","Error","constructor","error","payload","message","ZodMessageSchema","object","version","literal","default","type","string","unknown","ZodMessageSender","options","schema","sender","send","parsedPayload","safeParse","success","forwardMessage","parsedMessage","JSON","stringify","data","io","LogLevel","SimpleStructuredLogger","name","level","includes","process","env","DEBUG","debug","info","fields","child","log","args","console","warn","loggerFunction","structuredLog","length","timestamp","Date","messageSchema","_schema","ZodSocketMessageHandler","handlers","handleMessage","parseMessage","handler","String","ack","registerHandlers","emitter","logger","eventName","Object","keys","on","callback","hasCallback","ZodNamespace","opts","clientMessages","namespace","of","serverMessages","Promise","resolve","reject","emit","err","preAuth","use","socket","next","socketId","id","socketStage","authToken","auth","handshake","disconnect","token","postAuth","reason","description","onDisconnect","onError","onConnection","fetchSockets"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAASA,SAAS;AAGX,IAAMC,wBAAN,MAAMA,8BAA6BC,MAAAA;EACxCC,YACSC,OACAC,SACP;AACA,UAAMD,MAAME,OAAO;iBAHZF;mBACAC;EAGT;AACF;AAP0CH;AAAnC,IAAMD,uBAAN;AAsCA,IAAMM,mBAAmBP,EAAEQ,OAAO;EACvCC,SAAST,EAAEU,QAAQ,IAAA,EAAMC,QAAQ,IAAA;EACjCC,MAAMZ,EAAEa,OAAM;EACdR,SAASL,EAAEc,QAAO;AACpB,CAAA;AA7CA;AAqJO,IAAMC,oBAAN,MAAMA,kBAAAA;EAIXZ,YAAYa,SAAmD;AAH/D;AACA;AAGE,uBAAK,SAAUA,QAAQC;AACvB,uBAAK,SAAUD,QAAQE;EACzB;EAEA,MAAaC,KACXP,MACAP,SACA;AACA,UAAMY,SAAS,mBAAK,SAAQL,IAAAA;AAE5B,QAAI,CAACK,QAAQ;AACX,YAAM,IAAIf,MAAM,yBAAyBU,IAAAA,EAAgB;IAC3D;AAEA,UAAMQ,gBAAgBH,OAAOI,UAAUhB,OAAAA;AAEvC,QAAI,CAACe,cAAcE,SAAS;AAC1B,YAAM,IAAIrB,qBAAqBmB,cAAchB,OAAOC,OAAAA;IACtD;AAEA,UAAM,mBAAK,SAAL,WAAa;MAAEO;MAAMP;MAASI,SAAS;IAAK;EACpD;EAEA,MAAac,eAAejB,SAAkB;AAC5C,UAAMkB,gBAAgBjB,iBAAiBc,UAAUf,OAAAA;AAEjD,QAAI,CAACkB,cAAcF,SAAS;AAC1B,YAAM,IAAIpB,MAAM,4BAA4BuB,KAAKC,UAAUF,cAAcpB,KAAK,CAAA,EAAG;IACnF;AAEA,UAAMa,SAAS,mBAAK,SAAQO,cAAcG,KAAKf,IAAI;AAEnD,QAAI,CAACK,QAAQ;AACX,YAAM,IAAIf,MAAM,yBAAyBsB,cAAcG,KAAKf,IAAI,EAAE;IACpE;AAEA,UAAMQ,gBAAgBH,OAAOI,UAAUG,cAAcG,KAAKtB,OAAO;AAEjE,QAAI,CAACe,cAAcE,SAAS;AAC1B,YAAM,IAAIpB,MAAM,oCAAoCuB,KAAKC,UAAUN,cAAchB,KAAK,CAAA,EAAG;IAC3F;AAEA,UAAM,mBAAK,SAAL,WAAa;MACjBQ,MAAMY,cAAcG,KAAKf;MACzBP,SAASe,cAAcO;MACvBlB,SAAS;IACX;EACF;AACF;AApDE;AACA;AAFWM;AAAN,IAAMA,mBAAN;;;ACpJP,SAASa,UAAU;AACnB,SAAS5B,KAAAA,UAAS;;;ICSX;UAAK6B,WAAQ;AAARA,EAAAA,UAAAA,UACV,KAAA,IAAA,CAAA,IAAA;AADUA,EAAAA,UAAAA,UAEV,OAAA,IAAA,CAAA,IAAA;AAFUA,EAAAA,UAAAA,UAGV,MAAA,IAAA,CAAA,IAAA;AAHUA,EAAAA,UAAAA,UAIV,MAAA,IAAA,CAAA,IAAA;AAJUA,EAAAA,UAAAA,UAKV,OAAA,IAAA,CAAA,IAAA;GALUA,aAAAA,WAAAA,CAAAA,EAAAA;;AAQL,IAAMC,0BAAN,MAAMA,wBAAAA;EACX3B,YACU4B,MACAC,QAAkB;IAAC;IAAK;IAAQC,SAASC,QAAQC,IAAIC,SAAS,EAAA,IAClEP,SAASQ,QACTR,SAASS,MACLC,QACR;AAoCF;gBAzCUR;iBACAC;kBAGAO;EACP;EAEHC,MAAMD,QAAiCP,OAAkB;AACvD,WAAO,IAAIF,wBAAuB,KAAKC,MAAMC,OAAO;MAAE,GAAG,KAAKO;MAAQ,GAAGA;IAAO,CAAA;EAClF;EAEAE,IAAInC,YAAoBoC,MAAsB;AAC5C,QAAI,KAAKV,QAAQH,SAASY;AAAK;AAE/B,0BAAK,kCAAL,WAAoBE,QAAQF,KAAKnC,SAAS,OAAA,GAAUoC;EACtD;EAEAtC,MAAME,YAAoBoC,MAAsB;AAC9C,QAAI,KAAKV,QAAQH,SAASzB;AAAO;AAEjC,0BAAK,kCAAL,WAAoBuC,QAAQvC,OAAOE,SAAS,SAAA,GAAYoC;EAC1D;EAEAE,KAAKtC,YAAoBoC,MAAsB;AAC7C,QAAI,KAAKV,QAAQH,SAASe;AAAM;AAEhC,0BAAK,kCAAL,WAAoBD,QAAQC,MAAMtC,SAAS,QAAA,GAAWoC;EACxD;EAEAJ,KAAKhC,YAAoBoC,MAAsB;AAC7C,QAAI,KAAKV,QAAQH,SAASS;AAAM;AAEhC,0BAAK,kCAAL,WAAoBK,QAAQL,MAAMhC,SAAS,QAAA,GAAWoC;EACxD;EAEAL,MAAM/B,YAAoBoC,MAAsB;AAC9C,QAAI,KAAKV,QAAQH,SAASQ;AAAO;AAEjC,0BAAK,kCAAL,WAAoBM,QAAQN,OAAO/B,SAAS,SAAA,GAAYoC;EAC1D;AAmBF;AAjBE;mBAAc,gCACZG,gBACAvC,SACA0B,UACGU,MACH;AACA,QAAMI,gBAAgB;IACpB,GAAIJ,KAAKK,WAAW,IAAIL,KAAK,CAAA,IAAKA;IAClC,GAAG,KAAKH;IACRS,WAAW,oBAAIC,KAAAA;IACflB,MAAM,KAAKA;IACXzB;IACA0B;EACF;AAEAa,iBAAepB,KAAKC,UAAUoB,aAAAA,CAAAA;AAChC,GAhBc;AA3CHhB;AAAN,IAAMA,yBAAN;;;AD+DP,IAAMoB,gBAAgBlD,GAAEQ,OAAO;EAC7BC,SAAST,GAAEU,QAAQ,IAAA,EAAMC,QAAQ,IAAA;EACjCC,MAAMZ,GAAEa,OAAM;EACdR,SAASL,GAAEc,QAAO;AACpB,CAAA;AArFA,IAAAqC,UAAA;AAuFO,IAAMC,2BAAN,MAAMA,yBAAAA;EAIXjD,YAAYa,SAAsD;AAHlE,uBAAAmC,UAAA;AACA;AAGE,uBAAKA,UAAUnC,QAAQC;AACvB,uBAAK,WAAYD,QAAQqC;EAC3B;EAEA,MAAaC,cAAchD,SAAkB;AAC3C,UAAMkB,gBAAgB,KAAK+B,aAAajD,OAAAA;AAExC,QAAI,CAAC,mBAAK,YAAW;AACnB,YAAM,IAAIJ,MAAM,sBAAA;IAClB;AAEA,UAAMsD,UAAU,mBAAK,WAAUhC,cAAcZ,IAAI;AAEjD,QAAI,CAAC4C,SAAS;AACZb,cAAQvC,MAAM,gCAAgCqD,OAAOjC,cAAcZ,IAAI,CAAA,EAAG;AAC1E;IACF;AAEA,UAAM8C,MAAM,MAAMF,QAAQhC,cAAcnB,OAAO;AAE/C,WAAOqD;EACT;EAEOH,aAAajD,SAA0D;AAC5E,UAAMkB,gBAAgB0B,cAAc7B,UAAUf,OAAAA;AAE9C,QAAI,CAACkB,cAAcF,SAAS;AAC1B,YAAM,IAAIpB,MAAM,4BAA4BuB,KAAKC,UAAUF,cAAcpB,KAAK,CAAA,EAAG;IACnF;AAEA,UAAMa,SAAS,mBAAKkC,UAAQ3B,cAAcG,KAAKf,IAAI,EAAE,SAAA;AAErD,QAAI,CAACK,QAAQ;AACX,YAAM,IAAIf,MAAM,yBAAyBsB,cAAcG,KAAKf,IAAI,EAAE;IACpE;AAEA,UAAMQ,gBAAgBH,OAAOI,UAAUG,cAAcG,KAAKtB,OAAO;AAEjE,QAAI,CAACe,cAAcE,SAAS;AAC1B,YAAM,IAAIpB,MAAM,oCAAoCuB,KAAKC,UAAUN,cAAchB,KAAK,CAAA,EAAG;IAC3F;AAEA,WAAO;MACLQ,MAAMY,cAAcG,KAAKf;MACzBP,SAASe,cAAcO;IACzB;EACF;EAEOgC,iBAAiBC,SAA2BC,QAA2B;AAC5E,UAAMpB,MAAMoB,UAAUlB;AAEtB,QAAI,CAAC,mBAAK,YAAW;AACnBF,UAAIH,KAAK,sBAAA;AACT;IACF;AAEA,eAAWwB,aAAaC,OAAOC,KAAK,mBAAK,UAAS,GAAG;AACnDJ,cAAQK,GAAGH,WAAW,OAAOxD,SAAc4D,aAAkC;AAC3EzB,YAAIH,KAAK,YAAYwB,SAAAA,IAAa;UAChCzD,SAASC;UACT6D,aAAa,CAAC,CAACD;QACjB,CAAA;AAEA,YAAIR;AAEJ,YAAI;AAEF,cAAI,aAAapD,SAAS;AACxBoD,kBAAM,MAAM,KAAKJ,cAAc;cAAE1C,MAAMkD;cAAW,GAAGxD;YAAQ,CAAA;UAC/D,OAAO;AAEL,kBAAM,EAAEG,SAAS,GAAGJ,QAAAA,IAAYC;AAChCoD,kBAAM,MAAM,KAAKJ,cAAc;cAAE1C,MAAMkD;cAAWrD;cAASJ;YAAQ,CAAA;UACrE;QACF,SAASD,OAAO;AACdqC,cAAIrC,MAAM,gCAAgC;YAAEA;UAAM,CAAA;AAClD;QACF;AAEA,YAAI8D,YAAY,OAAOA,aAAa,YAAY;AAC9CA,mBAASR,GAAAA;QACX;MACF,CAAA;IACF;EACF;AACF;AAzFEP,WAAA;AACA;AAFWC;AAAN,IAAMA,0BAAN;;;AEvFP;AAsEO,IAAMgB,gBAAN,MAAMA,cAAAA;EAkBXjE,YACEkE,MACA;AAdF;AACA;AAcE,uBAAK,SAAUA,KAAKR,UAAU,IAAI/B,uBAAuBuC,KAAKtC,IAAI;AAElE,uBAAK,UAAW,IAAIqB,wBAAwB;MAC1CnC,QAAQoD,KAAKC;MACbjB,UAAUgB,KAAKhB;IACjB,CAAA;AAEA,SAAKzB,KAAKyC,KAAKzC;AAEf,SAAK2C,YAAY,KAAK3C,GAAG4C,GAAGH,KAAKtC,IAAI;AAGrC,SAAKb,SAAS,IAAIH,iBAAiB;MACjCE,QAAQoD,KAAKI;MACbvD,QAAQ,OAAOZ,YAAY;AACzB,eAAO,IAAIoE,QAAQ,CAACC,SAASC,WAAW;AACtC,cAAI;AAEF,iBAAKL,UAAUM,KAAKvE,QAAQM,MAAMN,QAAQD,OAAO;AACjDsE,oBAAAA;UACF,SAASG,KAAK;AACZF,mBAAOE,GAAAA;UACT;QACF,CAAA;MACF;IACF,CAAA;AAEA,QAAIT,KAAKU,SAAS;AAChB,WAAKR,UAAUS,IAAI,OAAOC,QAAQC,SAAS;AACzC,cAAMrB,SAAS,mBAAK,SAAQrB,MAAM;UAAE2C,UAAUF,OAAOG;UAAIC,aAAa;QAAU,CAAA;AAEhF,YAAI,OAAOhB,KAAKU,YAAY,YAAY;AACtC,gBAAMV,KAAKU,QAAQE,QAAQC,MAAMrB,MAAAA;QACnC;MACF,CAAA;IACF;AAEA,QAAIQ,KAAKiB,WAAW;AAClB,WAAKf,UAAUS,IAAI,CAACC,QAAQC,SAAS;AACnC,cAAMrB,SAAS,mBAAK,SAAQrB,MAAM;UAAE2C,UAAUF,OAAOG;UAAIC,aAAa;QAAO,CAAA;AAE7E,cAAM,EAAEE,KAAI,IAAKN,OAAOO;AAExB,YAAI,EAAE,WAAWD,OAAO;AACtB1B,iBAAOzD,MAAM,UAAA;AACb,iBAAO6E,OAAOQ,WAAW,IAAI;QAC/B;AAEA,YAAIF,KAAKG,UAAUrB,KAAKiB,WAAW;AACjCzB,iBAAOzD,MAAM,eAAA;AACb,iBAAO6E,OAAOQ,WAAW,IAAI;QAC/B;AAEA5B,eAAOvB,KAAK,SAAA;AAEZ4C,aAAAA;MACF,CAAA;IACF;AAEA,QAAIb,KAAKsB,UAAU;AACjB,WAAKpB,UAAUS,IAAI,OAAOC,QAAQC,SAAS;AACzC,cAAMrB,SAAS,mBAAK,SAAQrB,MAAM;UAAE2C,UAAUF,OAAOG;UAAIC,aAAa;QAAO,CAAA;AAE7E,YAAI,OAAOhB,KAAKsB,aAAa,YAAY;AACvC,gBAAMtB,KAAKsB,SAASV,QAAQC,MAAMrB,MAAAA;QACpC;MACF,CAAA;IACF;AAEA,SAAKU,UAAUN,GAAG,cAAc,OAAOgB,WAAW;AAChD,YAAMpB,SAAS,mBAAK,SAAQrB,MAAM;QAAE2C,UAAUF,OAAOG;QAAIC,aAAa;MAAa,CAAA;AACnFxB,aAAOvB,KAAK,WAAA;AAEZ,yBAAK,UAASqB,iBAAiBsB,QAAQpB,MAAAA;AAEvCoB,aAAOhB,GAAG,cAAc,OAAO2B,QAAQC,gBAAgB;AACrDhC,eAAOvB,KAAK,cAAc;UAAEsD;UAAQC;QAAY,CAAA;AAEhD,YAAIxB,KAAKyB,cAAc;AACrB,gBAAMzB,KAAKyB,aAAab,QAAQW,QAAQC,aAAahC,MAAAA;QACvD;MACF,CAAA;AAEAoB,aAAOhB,GAAG,SAAS,OAAO7D,UAAU;AAClCyD,eAAOzD,MAAM,SAAS;UAAEA;QAAM,CAAA;AAE9B,YAAIiE,KAAK0B,SAAS;AAChB,gBAAM1B,KAAK0B,QAAQd,QAAQ7E,OAAOyD,MAAAA;QACpC;MACF,CAAA;AAEA,UAAIQ,KAAK2B,cAAc;AACrB,cAAM3B,KAAK2B,aAAaf,QAAQ,mBAAK,WAAU,KAAK/D,QAAQ2C,MAAAA;MAC9D;IACF,CAAA;EACF;EAEAoC,eAAe;AACb,WAAO,KAAK1B,UAAU0B,aAAY;EACpC;AACF;AAnHE;AACA;AAPW7B;AAAN,IAAMA,eAAN","sourcesContent":["import { z } from \"zod\";\nimport { StructuredLogger } from \"./utils/structuredLogger\";\n\nexport class ZodSchemaParsedError extends Error {\n  constructor(\n    public error: z.ZodError,\n    public payload: unknown\n  ) {\n    super(error.message);\n  }\n}\n\nexport type ZodMessageValueSchema<TDiscriminatedUnion extends z.ZodDiscriminatedUnion<any, any>> =\n  | z.ZodFirstPartySchemaTypes\n  | TDiscriminatedUnion;\n\nexport interface ZodMessageCatalogSchema {\n  [key: string]: ZodMessageValueSchema<any>;\n}\n\nexport type ZodMessageHandlers<TCatalogSchema extends ZodMessageCatalogSchema> = Partial<{\n  [K in keyof TCatalogSchema]: (payload: z.infer<TCatalogSchema[K]>) => Promise<any>;\n}>;\n\nexport type ZodMessageHandlerOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  messages?: ZodMessageHandlers<TMessageCatalog>;\n};\n\nexport type MessageFromSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<TMessageCatalog[K]>;\n};\n\nexport type MessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nexport const ZodMessageSchema = z.object({\n  version: z.literal(\"v1\").default(\"v1\"),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport interface EventEmitterLike {\n  on(eventName: string | symbol, listener: (...args: any[]) => void): this;\n}\n\nexport class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #handlers: ZodMessageHandlers<TMessageCatalog> | undefined;\n\n  constructor(options: ZodMessageHandlerOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.messages;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessageFromCatalog<TMessageCatalog> {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#schema)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        // FIXME: this only works if the message doesn't have genuine payload prop\n        if (\"payload\" in message) {\n          ack = await this.handleMessage({ type: eventName, ...message });\n        } else {\n          // Handle messages not sent by ZodMessageSender\n          const { version, ...payload } = message;\n          ack = await this.handleMessage({ type: eventName, version, payload });\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\ntype ZodMessageSenderCallback<TMessageCatalog extends ZodMessageCatalogSchema> = (message: {\n  type: keyof TMessageCatalog;\n  payload: z.infer<TMessageCatalog[keyof TMessageCatalog]>;\n  version: \"v1\";\n}) => Promise<void>;\n\nexport type ZodMessageSenderOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  sender: ZodMessageSenderCallback<TMessageCatalog>;\n};\n\nexport class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #sender: ZodMessageSenderCallback<TMessageCatalog>;\n\n  constructor(options: ZodMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#sender = options.sender;\n  }\n\n  public async send<K extends keyof TMessageCatalog>(\n    type: K,\n    payload: z.input<TMessageCatalog[K]>\n  ) {\n    const schema = this.#schema[type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new ZodSchemaParsedError(parsedPayload.error, payload);\n    }\n\n    await this.#sender({ type, payload, version: \"v1\" });\n  }\n\n  public async forwardMessage(message: unknown) {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    await this.#sender({\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n      version: \"v1\",\n    });\n  }\n}\n\nexport type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TCatalog]: (message: z.infer<TCatalog[K]>) => void;\n};\n","import type { Socket } from \"socket.io-client\";\nimport { io } from \"socket.io-client\";\nimport { z } from \"zod\";\nimport { EventEmitterLike, ZodMessageValueSchema } from \"./zodMessageHandler\";\nimport { LogLevel, SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\n\nexport interface ZodSocketMessageCatalogSchema {\n  [key: string]:\n    | {\n        message: ZodMessageValueSchema<any>;\n      }\n    | {\n        message: ZodMessageValueSchema<any>;\n        callback?: ZodMessageValueSchema<any>;\n      };\n}\n\nexport type ZodMessageCatalogToSocketIoEvents<TCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TCatalog]: SocketMessageHasCallback<TCatalog, K> extends true\n    ? (\n        message: z.infer<GetSocketMessageSchema<TCatalog, K>>,\n        callback: (ack: z.infer<GetSocketCallbackSchema<TCatalog, K>>) => void\n      ) => void\n    : (message: z.infer<GetSocketMessageSchema<TCatalog, K>>) => void;\n};\n\nexport type GetSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType][\"message\"];\n\nexport type InferSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketMessageSchema<TRPCCatalog, TMessageType>>;\n\nexport type GetSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType] extends { callback: any }\n  ? TRPCCatalog[TMessageType][\"callback\"]\n  : never;\n\nexport type InferSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketCallbackSchema<TRPCCatalog, TMessageType>>;\n\nexport type SocketMessageHasCallback<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = GetSocketCallbackSchema<TRPCCatalog, TMessageType> extends never ? false : true;\n\nexport type ZodSocketMessageHandlers<TCatalogSchema extends ZodSocketMessageCatalogSchema> =\n  Partial<{\n    [K in keyof TCatalogSchema]: (\n      payload: z.infer<GetSocketMessageSchema<TCatalogSchema, K>>\n    ) => Promise<\n      SocketMessageHasCallback<TCatalogSchema, K> extends true\n        ? z.input<GetSocketCallbackSchema<TCatalogSchema, K>>\n        : void\n    >;\n  }>;\n\nexport type ZodSocketMessageHandlerOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> =\n  {\n    schema: TMessageCatalog;\n    handlers?: ZodSocketMessageHandlers<TMessageCatalog>;\n  };\n\ntype MessageFromSocketSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>;\n};\n\nexport type MessagesFromSocketCatalog<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSocketSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nconst messageSchema = z.object({\n  version: z.literal(\"v1\").default(\"v1\"),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TRPCCatalog;\n  #handlers: ZodSocketMessageHandlers<TRPCCatalog> | undefined;\n\n  constructor(options: ZodSocketMessageHandlerOptions<TRPCCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.handlers;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessagesFromSocketCatalog<TRPCCatalog> {\n    const parsedMessage = messageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#handlers)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        try {\n          // FIXME: this only works if the message doesn't have genuine payload prop\n          if (\"payload\" in message) {\n            ack = await this.handleMessage({ type: eventName, ...message });\n          } else {\n            // Handle messages not sent by ZodMessageSender\n            const { version, ...payload } = message;\n            ack = await this.handleMessage({ type: eventName, version, payload });\n          }\n        } catch (error) {\n          log.error(\"Error while handling message\", { error });\n          return;\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\nexport type ZodSocketMessageSenderOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  socket: ZodSocket<any, TMessageCatalog>;\n};\n\nexport type GetSocketMessagesWithCallback<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? K\n    : never;\n}[keyof TMessageCatalog];\n\nexport type GetSocketMessagesWithoutCallback<\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? never\n    : K;\n}[keyof TMessageCatalog];\n\nexport class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #socket: ZodSocket<any, TMessageCatalog>;\n\n  constructor(options: ZodSocketMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#socket = options.socket;\n  }\n\n  public send<K extends GetSocketMessagesWithoutCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): void {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    this.#socket.emit(type, { payload, version: \"v1\" });\n\n    return;\n  }\n\n  public async sendWithAck<K extends GetSocketMessagesWithCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): Promise<z.infer<GetSocketCallbackSchema<TMessageCatalog, K>>> {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    const callbackResult = await this.#socket.emitWithAck(type, { payload, version: \"v1\" });\n\n    return callbackResult;\n  }\n}\n\nexport type ZodSocket<\n  TListenEvents extends ZodSocketMessageCatalogSchema,\n  TEmitEvents extends ZodSocketMessageCatalogSchema,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TListenEvents>,\n  ZodMessageCatalogToSocketIoEvents<TEmitEvents>\n>;\n\ninterface ZodSocketConnectionOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  host: string;\n  port?: number;\n  secure?: boolean;\n  namespace: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  extraHeaders?: {\n    [header: string]: string;\n  };\n  handlers?: ZodSocketMessageHandlers<TServerMessages>;\n  authToken?: string;\n  onConnection?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    handler: ZodSocketMessageHandler<TServerMessages>,\n    sender: ZodSocketMessageSender<TClientMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    reason: Socket.DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodSocketConnection<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  #sender: ZodSocketMessageSender<TClientMessages>;\n  socket: ZodSocket<TServerMessages, TClientMessages>;\n\n  #handler: ZodSocketMessageHandler<TServerMessages>;\n  #logger: StructuredLogger;\n\n  constructor(opts: ZodSocketConnectionOptions<TClientMessages, TServerMessages>) {\n    const uri = `${opts.secure ? \"wss\" : \"ws\"}://${opts.host}:${\n      opts.port ?? (opts.secure ? \"443\" : \"80\")\n    }/${opts.namespace}`;\n\n    const logger = new SimpleStructuredLogger(opts.namespace, LogLevel.info);\n    logger.log(\"new zod socket\", { uri });\n\n    this.socket = io(uri, {\n      transports: [\"websocket\"],\n      auth: {\n        token: opts.authToken,\n      },\n      extraHeaders: opts.extraHeaders,\n      reconnectionDelay: 500,\n      reconnectionDelayMax: 1000,\n    });\n\n    this.#logger = logger.child({\n      socketId: this.socket.id,\n    });\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.serverMessages,\n      handlers: opts.handlers,\n    });\n    this.#handler.registerHandlers(this.socket, this.#logger);\n\n    this.#sender = new ZodSocketMessageSender({\n      schema: opts.clientMessages,\n      socket: this.socket,\n    });\n\n    this.socket.on(\"connect_error\", async (error) => {\n      this.#logger.error(`connect_error: ${error}`);\n\n      if (opts.onError) {\n        await opts.onError(this.socket, error, this.#logger);\n      }\n    });\n\n    this.socket.on(\"connect\", async () => {\n      this.#logger.info(\"connect\");\n\n      if (opts.onConnection) {\n        await opts.onConnection(this.socket, this.#handler, this.#sender, this.#logger);\n      }\n    });\n\n    this.socket.on(\"disconnect\", async (reason, description) => {\n      this.#logger.info(\"disconnect\", { reason, description });\n\n      if (opts.onDisconnect) {\n        await opts.onDisconnect(this.socket, reason, description, this.#logger);\n      }\n    });\n  }\n\n  close() {\n    this.socket.close();\n  }\n\n  connect() {\n    this.socket.connect();\n  }\n\n  get send() {\n    return this.#sender.send.bind(this.#sender);\n  }\n\n  get sendWithAck() {\n    return this.#sender.sendWithAck.bind(this.#sender);\n  }\n}\n\nfunction createLogger(prefix: string) {\n  return (...args: any[]) => console.log(prefix, ...args);\n}\n","type StructuredArgs = (Record<string, unknown> | undefined)[];\n\nexport interface StructuredLogger {\n  log: (message: string, ...args: StructuredArgs) => any;\n  error: (message: string, ...args: StructuredArgs) => any;\n  warn: (message: string, ...args: StructuredArgs) => any;\n  info: (message: string, ...args: StructuredArgs) => any;\n  debug: (message: string, ...args: StructuredArgs) => any;\n  child: (fields: Record<string, unknown>) => StructuredLogger;\n}\n\nexport enum LogLevel {\n  \"log\",\n  \"error\",\n  \"warn\",\n  \"info\",\n  \"debug\",\n}\n\nexport class SimpleStructuredLogger implements StructuredLogger {\n  constructor(\n    private name: string,\n    private level: LogLevel = [\"1\", \"true\"].includes(process.env.DEBUG ?? \"\")\n      ? LogLevel.debug\n      : LogLevel.info,\n    private fields?: Record<string, unknown>\n  ) {}\n\n  child(fields: Record<string, unknown>, level?: LogLevel) {\n    return new SimpleStructuredLogger(this.name, level, { ...this.fields, ...fields });\n  }\n\n  log(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.log) return;\n\n    this.#structuredLog(console.log, message, \"log\", ...args);\n  }\n\n  error(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.error) return;\n\n    this.#structuredLog(console.error, message, \"error\", ...args);\n  }\n\n  warn(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.warn) return;\n\n    this.#structuredLog(console.warn, message, \"warn\", ...args);\n  }\n\n  info(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.info) return;\n\n    this.#structuredLog(console.info, message, \"info\", ...args);\n  }\n\n  debug(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.debug) return;\n\n    this.#structuredLog(console.debug, message, \"debug\", ...args);\n  }\n\n  #structuredLog(\n    loggerFunction: (message: string, ...args: any[]) => void,\n    message: string,\n    level: string,\n    ...args: StructuredArgs\n  ) {\n    const structuredLog = {\n      ...(args.length === 1 ? args[0] : args),\n      ...this.fields,\n      timestamp: new Date(),\n      name: this.name,\n      message,\n      level,\n    };\n\n    loggerFunction(JSON.stringify(structuredLog));\n  }\n}\n","import type { DisconnectReason, Namespace, Server, Socket } from \"socket.io\";\nimport { ZodMessageSender } from \"./zodMessageHandler\";\nimport {\n  ZodMessageCatalogToSocketIoEvents,\n  ZodSocketMessageCatalogSchema,\n  ZodSocketMessageHandler,\n  ZodSocketMessageHandlers,\n} from \"./zodSocket\";\nimport type { DefaultEventsMap, EventsMap } from \"socket.io/dist/typed-events\";\nimport { z } from \"zod\";\nimport { SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\n\ninterface ExtendedError extends Error {\n  data?: any;\n}\n\nexport type ZodNamespaceSocket<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n  ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n  TServerSideEvents,\n  z.infer<TSocketData>\n>;\n\ninterface ZodNamespaceOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> {\n  io: Server;\n  name: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  socketData?: TSocketData;\n  handlers?: ZodSocketMessageHandlers<TClientMessages>;\n  authToken?: string;\n  logger?: StructuredLogger;\n  preAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  postAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onConnection?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    handler: ZodSocketMessageHandler<TClientMessages>,\n    sender: ZodMessageSender<TServerMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    reason: DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodNamespace<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n> {\n  #logger: StructuredLogger;\n  #handler: ZodSocketMessageHandler<TClientMessages>;\n  sender: ZodMessageSender<TServerMessages>;\n\n  io: Server;\n  namespace: Namespace<\n    ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n    ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n    TServerSideEvents,\n    z.infer<TSocketData>\n  >;\n\n  constructor(\n    opts: ZodNamespaceOptions<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>\n  ) {\n    this.#logger = opts.logger ?? new SimpleStructuredLogger(opts.name);\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.clientMessages,\n      handlers: opts.handlers,\n    });\n\n    this.io = opts.io;\n\n    this.namespace = this.io.of(opts.name);\n\n    // FIXME: There's a bug here, this sender should not accept Socket schemas with callbacks\n    this.sender = new ZodMessageSender({\n      schema: opts.serverMessages,\n      sender: async (message) => {\n        return new Promise((resolve, reject) => {\n          try {\n            // @ts-expect-error\n            this.namespace.emit(message.type, message.payload);\n            resolve();\n          } catch (err) {\n            reject(err);\n          }\n        });\n      },\n    });\n\n    if (opts.preAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"preAuth\" });\n\n        if (typeof opts.preAuth === \"function\") {\n          await opts.preAuth(socket, next, logger);\n        }\n      });\n    }\n\n    if (opts.authToken) {\n      this.namespace.use((socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        const { auth } = socket.handshake;\n\n        if (!(\"token\" in auth)) {\n          logger.error(\"no token\");\n          return socket.disconnect(true);\n        }\n\n        if (auth.token !== opts.authToken) {\n          logger.error(\"invalid token\");\n          return socket.disconnect(true);\n        }\n\n        logger.info(\"success\");\n\n        next();\n      });\n    }\n\n    if (opts.postAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        if (typeof opts.postAuth === \"function\") {\n          await opts.postAuth(socket, next, logger);\n        }\n      });\n    }\n\n    this.namespace.on(\"connection\", async (socket) => {\n      const logger = this.#logger.child({ socketId: socket.id, socketStage: \"connection\" });\n      logger.info(\"connected\");\n\n      this.#handler.registerHandlers(socket, logger);\n\n      socket.on(\"disconnect\", async (reason, description) => {\n        logger.info(\"disconnect\", { reason, description });\n\n        if (opts.onDisconnect) {\n          await opts.onDisconnect(socket, reason, description, logger);\n        }\n      });\n\n      socket.on(\"error\", async (error) => {\n        logger.error(\"error\", { error });\n\n        if (opts.onError) {\n          await opts.onError(socket, error, logger);\n        }\n      });\n\n      if (opts.onConnection) {\n        await opts.onConnection(socket, this.#handler, this.sender, logger);\n      }\n    });\n  }\n\n  fetchSockets() {\n    return this.namespace.fetchSockets();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/v3/zodMessageHandler.ts","../../src/v3/zodSocket.ts","../../src/v3/utils/structuredLogger.ts","../../src/v3/zodNamespace.ts"],"names":["z","ZodSchemaParsedError","Error","constructor","error","payload","message","ZodMessageSchema","object","version","literal","default","type","string","unknown","ZodMessageSender","options","schema","sender","send","parsedPayload","safeParse","success","forwardMessage","parsedMessage","JSON","stringify","data","io","ZodError","LogLevel","SimpleStructuredLogger","name","level","includes","process","env","DEBUG","debug","info","fields","child","log","args","console","warn","loggerFunction","structuredLog","length","timestamp","Date","fromZodError","messageSchema","_schema","ZodSocketMessageHandler","handlers","handleMessage","parseMessage","handler","String","ack","messageWithVersion","registerHandlers","emitter","logger","eventName","Object","keys","on","callback","hasCallback","stack","ZodNamespace","opts","clientMessages","namespace","of","serverMessages","Promise","resolve","reject","emit","err","preAuth","use","socket","next","socketId","id","socketStage","authToken","auth","handshake","disconnect","token","postAuth","reason","description","onDisconnect","onError","onConnection","fetchSockets"],"mappings":"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","sourcesContent":["import { z } from \"zod\";\nimport { StructuredLogger } from \"./utils/structuredLogger\";\n\nexport class ZodSchemaParsedError extends Error {\n  constructor(\n    public error: z.ZodError,\n    public payload: unknown\n  ) {\n    super(error.message);\n  }\n}\n\nexport type ZodMessageValueSchema<TDiscriminatedUnion extends z.ZodDiscriminatedUnion<any, any>> =\n  | z.ZodFirstPartySchemaTypes\n  | TDiscriminatedUnion;\n\nexport interface ZodMessageCatalogSchema {\n  [key: string]: ZodMessageValueSchema<any>;\n}\n\nexport type ZodMessageHandlers<TCatalogSchema extends ZodMessageCatalogSchema> = Partial<{\n  [K in keyof TCatalogSchema]: (payload: z.infer<TCatalogSchema[K]>) => Promise<any>;\n}>;\n\nexport type ZodMessageHandlerOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  messages?: ZodMessageHandlers<TMessageCatalog>;\n};\n\nexport type MessageFromSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<TMessageCatalog[K]>;\n};\n\nexport type MessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nexport const ZodMessageSchema = z.object({\n  version: z.literal(\"v1\").default(\"v1\"),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport interface EventEmitterLike {\n  on(eventName: string | symbol, listener: (...args: any[]) => void): this;\n}\n\nexport class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #handlers: ZodMessageHandlers<TMessageCatalog> | undefined;\n\n  constructor(options: ZodMessageHandlerOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.messages;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessageFromCatalog<TMessageCatalog> {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#schema)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        // FIXME: this only works if the message doesn't have genuine payload prop\n        if (\"payload\" in message) {\n          ack = await this.handleMessage({ type: eventName, ...message });\n        } else {\n          // Handle messages not sent by ZodMessageSender\n          const { version, ...payload } = message;\n          ack = await this.handleMessage({ type: eventName, version, payload });\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\ntype ZodMessageSenderCallback<TMessageCatalog extends ZodMessageCatalogSchema> = (message: {\n  type: keyof TMessageCatalog;\n  payload: z.infer<TMessageCatalog[keyof TMessageCatalog]>;\n  version: \"v1\";\n}) => Promise<void>;\n\nexport type ZodMessageSenderOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  sender: ZodMessageSenderCallback<TMessageCatalog>;\n};\n\nexport class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #sender: ZodMessageSenderCallback<TMessageCatalog>;\n\n  constructor(options: ZodMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#sender = options.sender;\n  }\n\n  public async send<K extends keyof TMessageCatalog>(\n    type: K,\n    payload: z.input<TMessageCatalog[K]>\n  ) {\n    const schema = this.#schema[type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new ZodSchemaParsedError(parsedPayload.error, payload);\n    }\n\n    await this.#sender({ type, payload, version: \"v1\" });\n  }\n\n  public async forwardMessage(message: unknown) {\n    const parsedMessage = ZodMessageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const parsedPayload = schema.safeParse(parsedMessage.data.payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    await this.#sender({\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n      version: \"v1\",\n    });\n  }\n}\n\nexport type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {\n  [K in keyof TCatalog]: (message: z.infer<TCatalog[K]>) => void;\n};\n","import type { Socket } from \"socket.io-client\";\nimport { io } from \"socket.io-client\";\nimport { ZodError, z } from \"zod\";\nimport { EventEmitterLike, ZodMessageValueSchema } from \"./zodMessageHandler\";\nimport { LogLevel, SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\nimport { fromZodError } from \"zod-validation-error\";\n\nexport interface ZodSocketMessageCatalogSchema {\n  [key: string]:\n    | {\n        message: ZodMessageValueSchema<any>;\n      }\n    | {\n        message: ZodMessageValueSchema<any>;\n        callback?: ZodMessageValueSchema<any>;\n      };\n}\n\nexport type ZodMessageCatalogToSocketIoEvents<TCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TCatalog]: SocketMessageHasCallback<TCatalog, K> extends true\n    ? (\n        message: z.infer<GetSocketMessageSchema<TCatalog, K>>,\n        callback: (ack: z.infer<GetSocketCallbackSchema<TCatalog, K>>) => void\n      ) => void\n    : (message: z.infer<GetSocketMessageSchema<TCatalog, K>>) => void;\n};\n\nexport type GetSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType][\"message\"];\n\nexport type InferSocketMessageSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketMessageSchema<TRPCCatalog, TMessageType>>;\n\nexport type GetSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = TRPCCatalog[TMessageType] extends { callback: any }\n  ? TRPCCatalog[TMessageType][\"callback\"]\n  : never;\n\nexport type InferSocketCallbackSchema<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = z.infer<GetSocketCallbackSchema<TRPCCatalog, TMessageType>>;\n\nexport type SocketMessageHasCallback<\n  TRPCCatalog extends ZodSocketMessageCatalogSchema,\n  TMessageType extends keyof TRPCCatalog,\n> = GetSocketCallbackSchema<TRPCCatalog, TMessageType> extends never ? false : true;\n\nexport type ZodSocketMessageHandlers<TCatalogSchema extends ZodSocketMessageCatalogSchema> =\n  Partial<{\n    [K in keyof TCatalogSchema]: (\n      payload: z.infer<GetSocketMessageSchema<TCatalogSchema, K>>\n    ) => Promise<\n      SocketMessageHasCallback<TCatalogSchema, K> extends true\n        ? z.input<GetSocketCallbackSchema<TCatalogSchema, K>>\n        : void\n    >;\n  }>;\n\nexport type ZodSocketMessageHandlerOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> =\n  {\n    schema: TMessageCatalog;\n    handlers?: ZodSocketMessageHandlers<TMessageCatalog>;\n  };\n\ntype MessageFromSocketSchema<\n  K extends keyof TMessageCatalog,\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  type: K;\n  payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>;\n};\n\nexport type MessagesFromSocketCatalog<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: MessageFromSocketSchema<K, TMessageCatalog>;\n}[keyof TMessageCatalog];\n\nconst messageSchema = z.object({\n  version: z.string(),\n  type: z.string(),\n  payload: z.unknown(),\n});\n\nexport class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TRPCCatalog;\n  #handlers: ZodSocketMessageHandlers<TRPCCatalog> | undefined;\n\n  constructor(options: ZodSocketMessageHandlerOptions<TRPCCatalog>) {\n    this.#schema = options.schema;\n    this.#handlers = options.handlers;\n  }\n\n  public async handleMessage(message: unknown) {\n    const parsedMessage = this.parseMessage(message);\n\n    if (!this.#handlers) {\n      throw new Error(\"No handlers provided\");\n    }\n\n    const handler = this.#handlers[parsedMessage.type];\n\n    if (!handler) {\n      console.error(`No handler for message type: ${String(parsedMessage.type)}`);\n      return;\n    }\n\n    const ack = await handler(parsedMessage.payload);\n\n    return ack;\n  }\n\n  public parseMessage(message: unknown): MessagesFromSocketCatalog<TRPCCatalog> {\n    const parsedMessage = messageSchema.safeParse(message);\n\n    if (!parsedMessage.success) {\n      throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);\n    }\n\n    const schema = this.#schema[parsedMessage.data.type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${parsedMessage.data.type}`);\n    }\n\n    const messageWithVersion = {\n      version: parsedMessage.data.version,\n      ...(typeof parsedMessage.data.payload === \"object\" ? parsedMessage.data.payload : {}),\n    };\n\n    const parsedPayload = schema.safeParse(messageWithVersion);\n\n    if (!parsedPayload.success) {\n      console.error(\"Failed to parse message payload\", {\n        message,\n        payload: messageWithVersion,\n      });\n\n      throw parsedPayload.error instanceof ZodError\n        ? fromZodError(parsedPayload.error)\n        : parsedPayload.error;\n    }\n\n    return {\n      type: parsedMessage.data.type,\n      payload: parsedPayload.data,\n    };\n  }\n\n  public registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger) {\n    const log = logger ?? console;\n\n    if (!this.#handlers) {\n      log.info(\"No handlers provided\");\n      return;\n    }\n\n    for (const eventName of Object.keys(this.#handlers)) {\n      emitter.on(eventName, async (message: any, callback?: any): Promise<void> => {\n        log.info(`handling ${eventName}`, {\n          payload: message,\n          hasCallback: !!callback,\n        });\n\n        let ack;\n\n        try {\n          // FIXME: this only works if the message doesn't have genuine payload prop\n          if (\"payload\" in message) {\n            ack = await this.handleMessage({ type: eventName, ...message });\n          } else {\n            // Handle messages not sent by ZodMessageSender\n            const { version, ...payload } = message;\n            ack = await this.handleMessage({ type: eventName, version, payload });\n          }\n        } catch (error) {\n          log.error(\"Error while handling message\", {\n            error:\n              error instanceof Error\n                ? {\n                    message: error.message,\n                    stack: error.stack,\n                  }\n                : error,\n          });\n          return;\n        }\n\n        if (callback && typeof callback === \"function\") {\n          callback(ack);\n        }\n      });\n    }\n  }\n}\n\nexport type ZodSocketMessageSenderOptions<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  schema: TMessageCatalog;\n  socket: ZodSocket<any, TMessageCatalog>;\n};\n\nexport type GetSocketMessagesWithCallback<TMessageCatalog extends ZodSocketMessageCatalogSchema> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? K\n    : never;\n}[keyof TMessageCatalog];\n\nexport type GetSocketMessagesWithoutCallback<\n  TMessageCatalog extends ZodSocketMessageCatalogSchema,\n> = {\n  [K in keyof TMessageCatalog]: SocketMessageHasCallback<TMessageCatalog, K> extends true\n    ? never\n    : K;\n}[keyof TMessageCatalog];\n\nexport class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCatalogSchema> {\n  #schema: TMessageCatalog;\n  #socket: ZodSocket<any, TMessageCatalog>;\n\n  constructor(options: ZodSocketMessageSenderOptions<TMessageCatalog>) {\n    this.#schema = options.schema;\n    this.#socket = options.socket;\n  }\n\n  public send<K extends GetSocketMessagesWithoutCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): void {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    this.#socket.emit(type, { payload, version: \"v1\" });\n\n    return;\n  }\n\n  public async sendWithAck<K extends GetSocketMessagesWithCallback<TMessageCatalog>>(\n    type: K,\n    payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>\n  ): Promise<z.infer<GetSocketCallbackSchema<TMessageCatalog, K>>> {\n    const schema = this.#schema[type][\"message\"];\n\n    if (!schema) {\n      throw new Error(`Unknown message type: ${type as string}`);\n    }\n\n    const parsedPayload = schema.safeParse(payload);\n\n    if (!parsedPayload.success) {\n      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);\n    }\n\n    // @ts-expect-error\n    const callbackResult = await this.#socket.emitWithAck(type, { payload, version: \"v1\" });\n\n    return callbackResult;\n  }\n}\n\nexport type ZodSocket<\n  TListenEvents extends ZodSocketMessageCatalogSchema,\n  TEmitEvents extends ZodSocketMessageCatalogSchema,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TListenEvents>,\n  ZodMessageCatalogToSocketIoEvents<TEmitEvents>\n>;\n\ninterface ZodSocketConnectionOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  host: string;\n  port?: number;\n  secure?: boolean;\n  namespace: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  extraHeaders?: {\n    [header: string]: string;\n  };\n  handlers?: ZodSocketMessageHandlers<TServerMessages>;\n  authToken?: string;\n  onConnection?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    handler: ZodSocketMessageHandler<TServerMessages>,\n    sender: ZodSocketMessageSender<TClientMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    reason: Socket.DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodSocket<TServerMessages, TClientMessages>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodSocketConnection<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n> {\n  #sender: ZodSocketMessageSender<TClientMessages>;\n  socket: ZodSocket<TServerMessages, TClientMessages>;\n\n  #handler: ZodSocketMessageHandler<TServerMessages>;\n  #logger: StructuredLogger;\n\n  constructor(opts: ZodSocketConnectionOptions<TClientMessages, TServerMessages>) {\n    const uri = `${opts.secure ? \"wss\" : \"ws\"}://${opts.host}:${\n      opts.port ?? (opts.secure ? \"443\" : \"80\")\n    }/${opts.namespace}`;\n\n    const logger = new SimpleStructuredLogger(opts.namespace, LogLevel.info);\n    logger.log(\"new zod socket\", { uri });\n\n    this.socket = io(uri, {\n      transports: [\"websocket\"],\n      auth: {\n        token: opts.authToken,\n      },\n      extraHeaders: opts.extraHeaders,\n      reconnectionDelay: 500,\n      reconnectionDelayMax: 1000,\n    });\n\n    this.#logger = logger.child({\n      socketId: this.socket.id,\n    });\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.serverMessages,\n      handlers: opts.handlers,\n    });\n    this.#handler.registerHandlers(this.socket, this.#logger);\n\n    this.#sender = new ZodSocketMessageSender({\n      schema: opts.clientMessages,\n      socket: this.socket,\n    });\n\n    this.socket.on(\"connect_error\", async (error) => {\n      this.#logger.error(`connect_error: ${error}`);\n\n      if (opts.onError) {\n        await opts.onError(this.socket, error, this.#logger);\n      }\n    });\n\n    this.socket.on(\"connect\", async () => {\n      this.#logger.info(\"connect\");\n\n      if (opts.onConnection) {\n        await opts.onConnection(this.socket, this.#handler, this.#sender, this.#logger);\n      }\n    });\n\n    this.socket.on(\"disconnect\", async (reason, description) => {\n      this.#logger.info(\"disconnect\", { reason, description });\n\n      if (opts.onDisconnect) {\n        await opts.onDisconnect(this.socket, reason, description, this.#logger);\n      }\n    });\n  }\n\n  close() {\n    this.socket.close();\n  }\n\n  connect() {\n    this.socket.connect();\n  }\n\n  get send() {\n    return this.#sender.send.bind(this.#sender);\n  }\n\n  get sendWithAck() {\n    return this.#sender.sendWithAck.bind(this.#sender);\n  }\n}\n\nfunction createLogger(prefix: string) {\n  return (...args: any[]) => console.log(prefix, ...args);\n}\n","type StructuredArgs = (Record<string, unknown> | undefined)[];\n\nexport interface StructuredLogger {\n  log: (message: string, ...args: StructuredArgs) => any;\n  error: (message: string, ...args: StructuredArgs) => any;\n  warn: (message: string, ...args: StructuredArgs) => any;\n  info: (message: string, ...args: StructuredArgs) => any;\n  debug: (message: string, ...args: StructuredArgs) => any;\n  child: (fields: Record<string, unknown>) => StructuredLogger;\n}\n\nexport enum LogLevel {\n  \"log\",\n  \"error\",\n  \"warn\",\n  \"info\",\n  \"debug\",\n}\n\nexport class SimpleStructuredLogger implements StructuredLogger {\n  constructor(\n    private name: string,\n    private level: LogLevel = [\"1\", \"true\"].includes(process.env.DEBUG ?? \"\")\n      ? LogLevel.debug\n      : LogLevel.info,\n    private fields?: Record<string, unknown>\n  ) {}\n\n  child(fields: Record<string, unknown>, level?: LogLevel) {\n    return new SimpleStructuredLogger(this.name, level, { ...this.fields, ...fields });\n  }\n\n  log(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.log) return;\n\n    this.#structuredLog(console.log, message, \"log\", ...args);\n  }\n\n  error(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.error) return;\n\n    this.#structuredLog(console.error, message, \"error\", ...args);\n  }\n\n  warn(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.warn) return;\n\n    this.#structuredLog(console.warn, message, \"warn\", ...args);\n  }\n\n  info(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.info) return;\n\n    this.#structuredLog(console.info, message, \"info\", ...args);\n  }\n\n  debug(message: string, ...args: StructuredArgs) {\n    if (this.level < LogLevel.debug) return;\n\n    this.#structuredLog(console.debug, message, \"debug\", ...args);\n  }\n\n  #structuredLog(\n    loggerFunction: (message: string, ...args: any[]) => void,\n    message: string,\n    level: string,\n    ...args: StructuredArgs\n  ) {\n    const structuredLog = {\n      ...(args.length === 1 ? args[0] : args),\n      ...this.fields,\n      timestamp: new Date(),\n      name: this.name,\n      message,\n      level,\n    };\n\n    loggerFunction(JSON.stringify(structuredLog));\n  }\n}\n","import type { DisconnectReason, Namespace, Server, Socket } from \"socket.io\";\nimport { ZodMessageSender } from \"./zodMessageHandler\";\nimport {\n  ZodMessageCatalogToSocketIoEvents,\n  ZodSocketMessageCatalogSchema,\n  ZodSocketMessageHandler,\n  ZodSocketMessageHandlers,\n} from \"./zodSocket\";\nimport type { DefaultEventsMap, EventsMap } from \"socket.io/dist/typed-events\";\nimport { z } from \"zod\";\nimport { SimpleStructuredLogger, StructuredLogger } from \"./utils/structuredLogger\";\n\ninterface ExtendedError extends Error {\n  data?: any;\n}\n\nexport type ZodNamespaceSocket<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> = Socket<\n  ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n  ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n  TServerSideEvents,\n  z.infer<TSocketData>\n>;\n\ninterface ZodNamespaceOptions<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n> {\n  io: Server;\n  name: string;\n  clientMessages: TClientMessages;\n  serverMessages: TServerMessages;\n  socketData?: TSocketData;\n  handlers?: ZodSocketMessageHandlers<TClientMessages>;\n  authToken?: string;\n  logger?: StructuredLogger;\n  preAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  postAuth?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    next: (err?: ExtendedError) => void,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onConnection?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    handler: ZodSocketMessageHandler<TClientMessages>,\n    sender: ZodMessageSender<TServerMessages>,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onDisconnect?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    reason: DisconnectReason,\n    description: any,\n    logger: StructuredLogger\n  ) => Promise<void>;\n  onError?: (\n    socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>,\n    err: Error,\n    logger: StructuredLogger\n  ) => Promise<void>;\n}\n\nexport class ZodNamespace<\n  TClientMessages extends ZodSocketMessageCatalogSchema,\n  TServerMessages extends ZodSocketMessageCatalogSchema,\n  TSocketData extends z.ZodObject<any, any, any> = any,\n  TServerSideEvents extends EventsMap = DefaultEventsMap,\n> {\n  #logger: StructuredLogger;\n  #handler: ZodSocketMessageHandler<TClientMessages>;\n  sender: ZodMessageSender<TServerMessages>;\n\n  io: Server;\n  namespace: Namespace<\n    ZodMessageCatalogToSocketIoEvents<TClientMessages>,\n    ZodMessageCatalogToSocketIoEvents<TServerMessages>,\n    TServerSideEvents,\n    z.infer<TSocketData>\n  >;\n\n  constructor(\n    opts: ZodNamespaceOptions<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>\n  ) {\n    this.#logger = opts.logger ?? new SimpleStructuredLogger(opts.name);\n\n    this.#handler = new ZodSocketMessageHandler({\n      schema: opts.clientMessages,\n      handlers: opts.handlers,\n    });\n\n    this.io = opts.io;\n\n    this.namespace = this.io.of(opts.name);\n\n    // FIXME: There's a bug here, this sender should not accept Socket schemas with callbacks\n    this.sender = new ZodMessageSender({\n      schema: opts.serverMessages,\n      sender: async (message) => {\n        return new Promise((resolve, reject) => {\n          try {\n            // @ts-expect-error\n            this.namespace.emit(message.type, message.payload);\n            resolve();\n          } catch (err) {\n            reject(err);\n          }\n        });\n      },\n    });\n\n    if (opts.preAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"preAuth\" });\n\n        if (typeof opts.preAuth === \"function\") {\n          await opts.preAuth(socket, next, logger);\n        }\n      });\n    }\n\n    if (opts.authToken) {\n      this.namespace.use((socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        const { auth } = socket.handshake;\n\n        if (!(\"token\" in auth)) {\n          logger.error(\"no token\");\n          return socket.disconnect(true);\n        }\n\n        if (auth.token !== opts.authToken) {\n          logger.error(\"invalid token\");\n          return socket.disconnect(true);\n        }\n\n        logger.info(\"success\");\n\n        next();\n      });\n    }\n\n    if (opts.postAuth) {\n      this.namespace.use(async (socket, next) => {\n        const logger = this.#logger.child({ socketId: socket.id, socketStage: \"auth\" });\n\n        if (typeof opts.postAuth === \"function\") {\n          await opts.postAuth(socket, next, logger);\n        }\n      });\n    }\n\n    this.namespace.on(\"connection\", async (socket) => {\n      const logger = this.#logger.child({ socketId: socket.id, socketStage: \"connection\" });\n      logger.info(\"connected\");\n\n      this.#handler.registerHandlers(socket, logger);\n\n      socket.on(\"disconnect\", async (reason, description) => {\n        logger.info(\"disconnect\", { reason, description });\n\n        if (opts.onDisconnect) {\n          await opts.onDisconnect(socket, reason, description, logger);\n        }\n      });\n\n      socket.on(\"error\", async (error) => {\n        logger.error(\"error\", { error });\n\n        if (opts.onError) {\n          await opts.onError(socket, error, logger);\n        }\n      });\n\n      if (opts.onConnection) {\n        await opts.onConnection(socket, this.#handler, this.sender, logger);\n      }\n    });\n  }\n\n  fetchSockets() {\n    return this.namespace.fetchSockets();\n  }\n}\n"]}

package/dist/v3/zodSocket.js

@@ -2,6 +2,7 @@
 
 var socket_ioClient = require('socket.io-client');
 var zod = require('zod');
+var zodValidationError = require('zod-validation-error');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -94,10 +95,8 @@ structuredLog_fn = /* @__PURE__ */ __name(function(loggerFunction, message, leve
 }, "#structuredLog");
 __name(_SimpleStructuredLogger, "SimpleStructuredLogger");
 var SimpleStructuredLogger = _SimpleStructuredLogger;
-
-// src/v3/zodSocket.ts
 var messageSchema = zod.z.object({
-  version: zod.z.literal("v1").default("v1"),
+  version: zod.z.string(),
   type: zod.z.string(),
   payload: zod.z.unknown()
 });
@@ -131,9 +130,17 @@ var _ZodSocketMessageHandler = class _ZodSocketMessageHandler {
     if (!schema) {
       throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
     }
-    const parsedPayload = schema.safeParse(parsedMessage.data.payload);
+    const messageWithVersion = {
+      version: parsedMessage.data.version,
+      ...typeof parsedMessage.data.payload === "object" ? parsedMessage.data.payload : {}
+    };
+    const parsedPayload = schema.safeParse(messageWithVersion);
     if (!parsedPayload.success) {
-      throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+      console.error("Failed to parse message payload", {
+        message,
+        payload: messageWithVersion
+      });
+      throw parsedPayload.error instanceof zod.ZodError ? zodValidationError.fromZodError(parsedPayload.error) : parsedPayload.error;
     }
     return {
       type: parsedMessage.data.type,
@@ -169,7 +176,10 @@ var _ZodSocketMessageHandler = class _ZodSocketMessageHandler {
           }
         } catch (error) {
           log.error("Error while handling message", {
-            error
+            error: error instanceof Error ? {
+              message: error.message,
+              stack: error.stack
+            } : error
           });
           return;
         }