@trigger.dev/core 0.0.0-v3-prerelease-20240813130521 → 0.0.0-v3-prerelease-20240913125036

package/dist/commonjs/v3/zodIpc.js

@@ -0,0 +1,206 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZodIpcConnection = void 0;
+const crypto_1 = require("crypto");
+const zod_1 = require("zod");
+const zodMessageHandler_js_1 = require("./zodMessageHandler.js");
+const messageSchema = zod_1.z.object({
+    version: zod_1.z.literal("v1").default("v1"),
+    type: zod_1.z.string(),
+    payload: zod_1.z.unknown(),
+});
+class ZodIpcMessageHandler {
+    #schema;
+    #handlers;
+    #sender;
+    constructor(options) {
+        this.#schema = options.schema;
+        this.#handlers = options.handlers;
+        this.#sender = options.sender;
+    }
+    async handleMessage(message) {
+        const parsedMessage = this.parseMessage(message);
+        if (!this.#handlers) {
+            throw new Error("No handlers provided");
+        }
+        const handler = this.#handlers[parsedMessage.type];
+        if (!handler) {
+            // console.error(`No handler for message type: ${String(parsedMessage.type)}`);
+            return;
+        }
+        const ack = await handler(parsedMessage.payload, this.#sender);
+        return ack;
+    }
+    parseMessage(message) {
+        const parsedMessage = messageSchema.safeParse(message);
+        if (!parsedMessage.success) {
+            throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);
+        }
+        const schema = this.#schema[parsedMessage.data.type]?.["message"];
+        if (!schema) {
+            throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
+        }
+        const parsedPayload = schema.safeParse(parsedMessage.data.payload);
+        if (!parsedPayload.success) {
+            throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+        }
+        return {
+            type: parsedMessage.data.type,
+            payload: parsedPayload.data,
+        };
+    }
+}
+const Packet = zod_1.z.discriminatedUnion("type", [
+    zod_1.z.object({
+        type: zod_1.z.literal("CONNECT"),
+        sessionId: zod_1.z.string().optional(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal("ACK"),
+        message: zod_1.z.any(),
+        id: zod_1.z.number(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal("EVENT"),
+        message: zod_1.z.any(),
+        id: zod_1.z.number().optional(),
+    }),
+]);
+class ZodIpcConnection {
+    opts;
+    #sessionId;
+    #messageCounter = 0;
+    #handler;
+    #acks = new Map();
+    constructor(opts) {
+        this.opts = opts;
+        this.#handler = new ZodIpcMessageHandler({
+            schema: opts.listenSchema,
+            handlers: opts.handlers,
+            sender: {
+                send: this.send.bind(this),
+                sendWithAck: this.sendWithAck.bind(this),
+            },
+        });
+        this.#registerHandlers();
+        // this.connect();
+    }
+    async #registerHandlers() {
+        if (!this.opts.process.on) {
+            return;
+        }
+        this.opts.process.on("message", async (message) => {
+            this.#handlePacket(message);
+        });
+    }
+    async connect() {
+        this.#sendPacket({ type: "CONNECT" });
+    }
+    async #handlePacket(packet) {
+        const parsedPacket = Packet.safeParse(packet);
+        if (!parsedPacket.success) {
+            return;
+        }
+        switch (parsedPacket.data.type) {
+            case "ACK": {
+                // Check our list of ACKs and resolve with the message
+                const ack = this.#acks.get(parsedPacket.data.id);
+                if (!ack) {
+                    return;
+                }
+                clearTimeout(ack.timeout);
+                ack.resolve(parsedPacket.data.message);
+                break;
+            }
+            case "CONNECT": {
+                if (!parsedPacket.data.sessionId) {
+                    // This is a client trying to connect, so we generate and send back a session ID
+                    const id = (0, crypto_1.randomUUID)();
+                    await this.#sendPacket({ type: "CONNECT", sessionId: id });
+                    return;
+                }
+                // This is a server replying to our connect message
+                if (this.#sessionId) {
+                    // We're already connected
+                    return;
+                }
+                this.#sessionId = parsedPacket.data.sessionId;
+                break;
+            }
+            case "EVENT": {
+                const result = await this.#handler.handleMessage(parsedPacket.data.message);
+                if (typeof parsedPacket.data.id === "undefined") {
+                    return;
+                }
+                // There's an ID so we should ACK
+                await this.#sendPacket({
+                    type: "ACK",
+                    id: parsedPacket.data.id,
+                    message: result,
+                });
+                break;
+            }
+            default: {
+                break;
+            }
+        }
+    }
+    async #sendPacket(packet) {
+        await this.opts.process.send?.(packet);
+    }
+    async send(type, payload) {
+        const schema = this.opts.emitSchema[type]?.["message"];
+        if (!schema) {
+            throw new Error(`Unknown message type: ${type}`);
+        }
+        const parsedPayload = schema.safeParse(payload);
+        if (!parsedPayload.success) {
+            throw new zodMessageHandler_js_1.ZodSchemaParsedError(parsedPayload.error, payload);
+        }
+        await this.#sendPacket({
+            type: "EVENT",
+            message: {
+                type,
+                payload,
+                version: "v1",
+            },
+        });
+    }
+    async sendWithAck(type, payload, timeoutInMs) {
+        const currentId = this.#messageCounter++;
+        return new Promise(async (resolve, reject) => {
+            const defaultTimeoutInMs = 2000;
+            // Timeout if the ACK takes too long to get back to us
+            const timeout = setTimeout(() => {
+                reject(JSON.stringify({
+                    reason: "sendWithAck() timeout",
+                    timeoutInMs: timeoutInMs ?? defaultTimeoutInMs,
+                    type,
+                    payload,
+                }));
+            }, timeoutInMs ?? defaultTimeoutInMs);
+            this.#acks.set(currentId, { resolve, reject, timeout });
+            const schema = this.opts.emitSchema[type]?.["message"];
+            if (!schema) {
+                clearTimeout(timeout);
+                return reject(`Unknown message type: ${type}`);
+            }
+            const parsedPayload = schema.safeParse(payload);
+            if (!parsedPayload.success) {
+                clearTimeout(timeout);
+                return reject(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+            }
+            await this.#sendPacket({
+                type: "EVENT",
+                message: {
+                    type,
+                    payload,
+                    version: "v1",
+                },
+                id: currentId,
+            });
+        });
+    }
+}
+exports.ZodIpcConnection = ZodIpcConnection;
+//# sourceMappingURL=zodIpc.js.map

package/dist/commonjs/v3/zodIpc.js.map

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

package/dist/{v3 → commonjs/v3}/zodMessageHandler.d.ts

@@ -1,31 +1,31 @@
-import { z } from 'zod';
-import { StructuredLogger } from './utils/structuredLogger.js';
-
-declare class ZodSchemaParsedError extends Error {
+import { z } from "zod";
+import { StructuredLogger } from "./utils/structuredLogger.js";
+export declare class ZodSchemaParsedError extends Error {
     error: z.ZodError;
     payload: unknown;
     constructor(error: z.ZodError, payload: unknown);
 }
-type ZodMessageValueSchema<TDiscriminatedUnion extends z.ZodDiscriminatedUnion<any, any>> = z.ZodFirstPartySchemaTypes | TDiscriminatedUnion;
-interface ZodMessageCatalogSchema {
+export type ZodMessageValueSchema<TDiscriminatedUnion extends z.ZodDiscriminatedUnion<any, any>> = z.ZodFirstPartySchemaTypes | TDiscriminatedUnion;
+export interface ZodMessageCatalogSchema {
     [key: string]: ZodMessageValueSchema<any>;
 }
-type ZodMessageHandlers<TCatalogSchema extends ZodMessageCatalogSchema> = Partial<{
+export type ZodMessageHandlers<TCatalogSchema extends ZodMessageCatalogSchema> = Partial<{
     [K in keyof TCatalogSchema]: (payload: z.infer<TCatalogSchema[K]>) => Promise<any>;
 }>;
-type ZodMessageHandlerOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {
+export type ZodMessageHandlerOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {
     schema: TMessageCatalog;
     messages?: ZodMessageHandlers<TMessageCatalog>;
     logger?: StructuredLogger;
 };
-type MessageFromSchema<K extends keyof TMessageCatalog, TMessageCatalog extends ZodMessageCatalogSchema> = {
+export type MessageFromSchema<K extends keyof TMessageCatalog, TMessageCatalog extends ZodMessageCatalogSchema> = {
     type: K;
     payload: z.input<TMessageCatalog[K]>;
 };
-type MessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema> = {
+export type MessagePayloadFromSchema<K extends keyof TMessageCatalog, TMessageCatalog extends ZodMessageCatalogSchema> = z.output<TMessageCatalog[K]>;
+export type MessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema> = {
     [K in keyof TMessageCatalog]: MessageFromSchema<K, TMessageCatalog>;
 }[keyof TMessageCatalog];
-declare const ZodMessageSchema: z.ZodObject<{
+export declare const ZodMessageSchema: z.ZodObject<{
     version: z.ZodDefault<z.ZodLiteral<"v1">>;
     type: z.ZodString;
     payload: z.ZodUnknown;
@@ -38,10 +38,10 @@ declare const ZodMessageSchema: z.ZodObject<{
     version?: "v1" | undefined;
     payload?: unknown;
 }>;
-interface EventEmitterLike {
+export interface EventEmitterLike {
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;
 }
-declare class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema> {
+export declare class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema> {
     #private;
     constructor(options: ZodMessageHandlerOptions<TMessageCatalog>);
     handleMessage(message: unknown): Promise<{
@@ -60,23 +60,24 @@ declare class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema>
     };
     registerHandlers(emitter: EventEmitterLike, logger?: StructuredLogger): void;
 }
+export declare function parseMessageFromCatalog<TMessageCatalog extends ZodMessageCatalogSchema>(message: unknown, schema: TMessageCatalog): MessageFromCatalog<TMessageCatalog>;
 type ZodMessageSenderCallback<TMessageCatalog extends ZodMessageCatalogSchema> = (message: {
     type: keyof TMessageCatalog;
     payload: z.infer<TMessageCatalog[keyof TMessageCatalog]>;
     version: "v1";
 }) => Promise<void>;
-type ZodMessageSenderOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {
+export type ZodMessageSenderOptions<TMessageCatalog extends ZodMessageCatalogSchema> = {
     schema: TMessageCatalog;
     sender: ZodMessageSenderCallback<TMessageCatalog>;
 };
-declare class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {
+export declare class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {
     #private;
     constructor(options: ZodMessageSenderOptions<TMessageCatalog>);
     send<K extends keyof TMessageCatalog>(type: K, payload: z.input<TMessageCatalog[K]>): Promise<void>;
     forwardMessage(message: unknown): Promise<void>;
 }
-type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {
+export declare function sendMessageInCatalog<TMessageCatalog extends ZodMessageCatalogSchema>(catalog: TMessageCatalog, type: keyof TMessageCatalog, payload: z.input<TMessageCatalog[keyof TMessageCatalog]>, sender: ZodMessageSenderCallback<TMessageCatalog>): Promise<void>;
+export type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {
     [K in keyof TCatalog]: (message: z.infer<TCatalog[K]>) => void;
 };
-
-export { type EventEmitterLike, type MessageCatalogToSocketIoEvents, type MessageFromCatalog, type MessageFromSchema, type ZodMessageCatalogSchema, ZodMessageHandler, type ZodMessageHandlerOptions, type ZodMessageHandlers, ZodMessageSchema, ZodMessageSender, type ZodMessageSenderOptions, type ZodMessageValueSchema, ZodSchemaParsedError };
+export {};

package/dist/commonjs/v3/zodMessageHandler.js

@@ -0,0 +1,205 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZodMessageSender = exports.ZodMessageHandler = exports.ZodMessageSchema = exports.ZodSchemaParsedError = void 0;
+exports.parseMessageFromCatalog = parseMessageFromCatalog;
+exports.sendMessageInCatalog = sendMessageInCatalog;
+const zod_1 = require("zod");
+class ZodSchemaParsedError extends Error {
+    error;
+    payload;
+    constructor(error, payload) {
+        super(error.message);
+        this.error = error;
+        this.payload = payload;
+    }
+}
+exports.ZodSchemaParsedError = ZodSchemaParsedError;
+exports.ZodMessageSchema = zod_1.z.object({
+    version: zod_1.z.literal("v1").default("v1"),
+    type: zod_1.z.string(),
+    payload: zod_1.z.unknown(),
+});
+class ZodMessageHandler {
+    #schema;
+    #handlers;
+    #logger;
+    constructor(options) {
+        this.#schema = options.schema;
+        this.#handlers = options.messages;
+        this.#logger = options.logger ?? console;
+    }
+    async handleMessage(message) {
+        const parsedMessage = this.parseMessage(message);
+        if (!parsedMessage.success) {
+            this.#logger.error(parsedMessage.error, { message });
+            return {
+                success: false,
+                error: parsedMessage.error,
+            };
+        }
+        if (!this.#handlers) {
+            this.#logger.error("No handlers provided", { message });
+            return {
+                success: false,
+                error: "No handlers provided",
+            };
+        }
+        const handler = this.#handlers[parsedMessage.data.type];
+        if (!handler) {
+            const error = `No handler for message type: ${String(parsedMessage.data.type)}`;
+            this.#logger.error(error, { message });
+            return {
+                success: false,
+                error,
+            };
+        }
+        const ack = await handler(parsedMessage.data.payload);
+        return {
+            success: true,
+            data: ack,
+        };
+    }
+    parseMessage(message) {
+        const parsedMessage = exports.ZodMessageSchema.safeParse(message);
+        if (!parsedMessage.success) {
+            return {
+                success: false,
+                error: `Failed to parse message: ${JSON.stringify(parsedMessage.error)}`,
+            };
+        }
+        const schema = this.#schema[parsedMessage.data.type];
+        if (!schema) {
+            return {
+                success: false,
+                error: `Unknown message type: ${parsedMessage.data.type}`,
+            };
+        }
+        const parsedPayload = schema.safeParse(parsedMessage.data.payload);
+        if (!parsedPayload.success) {
+            return {
+                success: false,
+                error: `Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`,
+            };
+        }
+        return {
+            success: true,
+            data: {
+                type: parsedMessage.data.type,
+                payload: parsedPayload.data,
+            },
+        };
+    }
+    registerHandlers(emitter, logger) {
+        const log = logger ?? console;
+        if (!this.#handlers) {
+            log.info("No handlers provided");
+            return;
+        }
+        for (const eventName of Object.keys(this.#schema)) {
+            emitter.on(eventName, async (message, callback) => {
+                log.info(`handling ${eventName}`, {
+                    payload: message,
+                    hasCallback: !!callback,
+                });
+                let ack;
+                // FIXME: this only works if the message doesn't have genuine payload prop
+                if ("payload" in message) {
+                    ack = await this.handleMessage({ type: eventName, ...message });
+                }
+                else {
+                    // Handle messages not sent by ZodMessageSender
+                    const { version, ...payload } = message;
+                    ack = await this.handleMessage({ type: eventName, version, payload });
+                }
+                if (callback && typeof callback === "function") {
+                    if (!ack.success) {
+                        // We don't know the callback type, so we can't do anything else - not all callbacks may accept a success prop
+                        log.error("Failed to handle message, skipping callback", { message, error: ack.error });
+                        return;
+                    }
+                    callback(ack.data);
+                }
+            });
+        }
+    }
+}
+exports.ZodMessageHandler = ZodMessageHandler;
+function parseMessageFromCatalog(message, schema) {
+    const parsedMessage = exports.ZodMessageSchema.safeParse(message);
+    if (!parsedMessage.success) {
+        throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);
+    }
+    const messageSchema = schema[parsedMessage.data.type];
+    if (!messageSchema) {
+        throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
+    }
+    const parsedPayload = messageSchema.safeParse(parsedMessage.data.payload);
+    if (!parsedPayload.success) {
+        throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+    }
+    return {
+        type: parsedMessage.data.type,
+        payload: parsedPayload.data,
+    };
+}
+class ZodMessageSender {
+    #schema;
+    #sender;
+    constructor(options) {
+        this.#schema = options.schema;
+        this.#sender = options.sender;
+    }
+    async send(type, payload) {
+        const schema = this.#schema[type];
+        if (!schema) {
+            throw new Error(`Unknown message type: ${type}`);
+        }
+        const parsedPayload = schema.safeParse(payload);
+        if (!parsedPayload.success) {
+            throw new ZodSchemaParsedError(parsedPayload.error, payload);
+        }
+        try {
+            await this.#sender({ type, payload, version: "v1" });
+        }
+        catch (error) {
+            console.error("[ZodMessageSender] Failed to send message", error);
+        }
+    }
+    async forwardMessage(message) {
+        const parsedMessage = exports.ZodMessageSchema.safeParse(message);
+        if (!parsedMessage.success) {
+            throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);
+        }
+        const schema = this.#schema[parsedMessage.data.type];
+        if (!schema) {
+            throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
+        }
+        const parsedPayload = schema.safeParse(parsedMessage.data.payload);
+        if (!parsedPayload.success) {
+            throw new Error(`Failed to parse message payload: ${JSON.stringify(parsedPayload.error)}`);
+        }
+        try {
+            await this.#sender({
+                type: parsedMessage.data.type,
+                payload: parsedPayload.data,
+                version: "v1",
+            });
+        }
+        catch (error) {
+            console.error("[ZodMessageSender] Failed to forward message", error);
+        }
+    }
+}
+exports.ZodMessageSender = ZodMessageSender;
+async function sendMessageInCatalog(catalog, type, payload, sender) {
+    const schema = catalog[type];
+    if (!schema) {
+        throw new Error(`Unknown message type: ${type}`);
+    }
+    const parsedPayload = schema.safeParse(payload);
+    if (!parsedPayload.success) {
+        throw new ZodSchemaParsedError(parsedPayload.error, payload);
+    }
+    await sender({ type, payload, version: "v1" });
+}
+//# sourceMappingURL=zodMessageHandler.js.map

package/dist/commonjs/v3/zodMessageHandler.js.map

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

package/dist/commonjs/v3/zodNamespace.d.ts

@@ -0,0 +1,34 @@
+import type { DisconnectReason, Namespace, Server, Socket } from "socket.io";
+import { ZodMessageSender } from "./zodMessageHandler.js";
+import { ZodMessageCatalogToSocketIoEvents, ZodSocketMessageCatalogSchema, ZodSocketMessageHandler, ZodSocketMessageHandlers } from "./zodSocket.js";
+import type { DefaultEventsMap, EventsMap } from "socket.io/dist/typed-events";
+import { z } from "zod";
+import { StructuredLogger } from "./utils/structuredLogger.js";
+interface ExtendedError extends Error {
+    data?: any;
+}
+export type ZodNamespaceSocket<TClientMessages extends ZodSocketMessageCatalogSchema, TServerMessages extends ZodSocketMessageCatalogSchema, TServerSideEvents extends EventsMap = DefaultEventsMap, TSocketData extends z.ZodObject<any, any, any> = any> = Socket<ZodMessageCatalogToSocketIoEvents<TClientMessages>, ZodMessageCatalogToSocketIoEvents<TServerMessages>, TServerSideEvents, z.infer<TSocketData>>;
+interface ZodNamespaceOptions<TClientMessages extends ZodSocketMessageCatalogSchema, TServerMessages extends ZodSocketMessageCatalogSchema, TServerSideEvents extends EventsMap = DefaultEventsMap, TSocketData extends z.ZodObject<any, any, any> = any> {
+    io: Server;
+    name: string;
+    clientMessages: TClientMessages;
+    serverMessages: TServerMessages;
+    socketData?: TSocketData;
+    handlers?: ZodSocketMessageHandlers<TClientMessages>;
+    authToken?: string;
+    logger?: StructuredLogger;
+    preAuth?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, next: (err?: ExtendedError) => void, logger: StructuredLogger) => Promise<void>;
+    postAuth?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, next: (err?: ExtendedError) => void, logger: StructuredLogger) => Promise<void>;
+    onConnection?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, handler: ZodSocketMessageHandler<TClientMessages>, sender: ZodMessageSender<TServerMessages>, logger: StructuredLogger) => Promise<void>;
+    onDisconnect?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, reason: DisconnectReason, description: any, logger: StructuredLogger) => Promise<void>;
+    onError?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, err: Error, logger: StructuredLogger) => Promise<void>;
+}
+export declare class ZodNamespace<TClientMessages extends ZodSocketMessageCatalogSchema, TServerMessages extends ZodSocketMessageCatalogSchema, TSocketData extends z.ZodObject<any, any, any> = any, TServerSideEvents extends EventsMap = DefaultEventsMap> {
+    #private;
+    sender: ZodMessageSender<TServerMessages>;
+    io: Server;
+    namespace: Namespace<ZodMessageCatalogToSocketIoEvents<TClientMessages>, ZodMessageCatalogToSocketIoEvents<TServerMessages>, TServerSideEvents, z.infer<TSocketData>>;
+    constructor(opts: ZodNamespaceOptions<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>);
+    fetchSockets(): Promise<import("socket.io").RemoteSocket<ZodMessageCatalogToSocketIoEvents<TServerMessages>, z.TypeOf<TSocketData>>[]>;
+}
+export {};

package/dist/commonjs/v3/zodNamespace.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZodNamespace = void 0;
+const zodMessageHandler_js_1 = require("./zodMessageHandler.js");
+const zodSocket_js_1 = require("./zodSocket.js");
+const structuredLogger_js_1 = require("./utils/structuredLogger.js");
+class ZodNamespace {
+    #logger;
+    #handler;
+    sender;
+    io;
+    namespace;
+    constructor(opts) {
+        this.#logger = opts.logger ?? new structuredLogger_js_1.SimpleStructuredLogger(opts.name);
+        this.#handler = new zodSocket_js_1.ZodSocketMessageHandler({
+            schema: opts.clientMessages,
+            handlers: opts.handlers,
+        });
+        this.io = opts.io;
+        this.namespace = this.io.of(opts.name);
+        // FIXME: There's a bug here, this sender should not accept Socket schemas with callbacks
+        this.sender = new zodMessageHandler_js_1.ZodMessageSender({
+            schema: opts.serverMessages,
+            sender: async (message) => {
+                return new Promise((resolve, reject) => {
+                    try {
+                        // @ts-expect-error
+                        this.namespace.emit(message.type, message.payload);
+                        resolve();
+                    }
+                    catch (err) {
+                        reject(err);
+                    }
+                });
+            },
+        });
+        if (opts.preAuth) {
+            this.namespace.use(async (socket, next) => {
+                const logger = this.#logger.child({ socketId: socket.id, socketStage: "preAuth" });
+                if (typeof opts.preAuth === "function") {
+                    await opts.preAuth(socket, next, logger);
+                }
+            });
+        }
+        if (opts.authToken) {
+            this.namespace.use((socket, next) => {
+                const logger = this.#logger.child({ socketId: socket.id, socketStage: "auth" });
+                const { auth } = socket.handshake;
+                if (!("token" in auth)) {
+                    logger.error("no token");
+                    return socket.disconnect(true);
+                }
+                if (auth.token !== opts.authToken) {
+                    logger.error("invalid token");
+                    return socket.disconnect(true);
+                }
+                logger.info("success");
+                next();
+                return;
+            });
+        }
+        if (opts.postAuth) {
+            this.namespace.use(async (socket, next) => {
+                const logger = this.#logger.child({ socketId: socket.id, socketStage: "auth" });
+                if (typeof opts.postAuth === "function") {
+                    await opts.postAuth(socket, next, logger);
+                }
+            });
+        }
+        this.namespace.on("connection", async (socket) => {
+            const logger = this.#logger.child({ socketId: socket.id, socketStage: "connection" });
+            logger.info("connected");
+            this.#handler.registerHandlers(socket, logger);
+            socket.on("disconnect", async (reason, description) => {
+                logger.info("disconnect", { reason, description });
+                if (opts.onDisconnect) {
+                    await opts.onDisconnect(socket, reason, description, logger);
+                }
+            });
+            socket.on("error", async (error) => {
+                logger.error("error", { error });
+                if (opts.onError) {
+                    await opts.onError(socket, error, logger);
+                }
+            });
+            if (opts.onConnection) {
+                await opts.onConnection(socket, this.#handler, this.sender, logger);
+            }
+        });
+    }
+    fetchSockets() {
+        return this.namespace.fetchSockets();
+    }
+}
+exports.ZodNamespace = ZodNamespace;
+//# sourceMappingURL=zodNamespace.js.map

package/dist/commonjs/v3/zodNamespace.js.map

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