@zap-socket/server 0.0.1 → 0.0.2

package/dist/events.d.ts

@@ -8,7 +8,7 @@ export type ZapEvent<T extends EventInput, R = any> = T extends z.ZodTypeAny ? {
     process: () => R;
 };
 export type EventMap = Record<string, ZapEvent<any, any>>;
-export declare const createZapEvent: <T extends EventInput, R>(eventObj: T extends z.ZodTypeAny ? {
+export declare const zapEvent: <T extends EventInput, R>(eventObj: T extends z.ZodTypeAny ? {
     input: T;
     process: (input: z.infer<T>) => R;
 } : {

package/dist/events.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-export const createZapEvent = (eventObj) => {
+export const zapEvent = (eventObj) => {
     if ("input" in eventObj) {
         return eventObj;
     }

package/dist/server.js

@@ -1,5 +1,5 @@
 import { WebSocketServer } from "ws";
-import { generateId } from "./utils";
+import { serialize, deserialize, generateId } from "./utils";
 export class ZapServer {
     wss;
     wsToId;
@@ -10,22 +10,29 @@ export class ZapServer {
         this.wsToId = new Map();
         this.idToWs = new Map();
         this.wss.on("connection", (ws) => {
-            const clientId = generateId();
-            console.log(`client ${clientId} connected`);
-            this.wsToId.set(ws, clientId);
-            this.idToWs.set(clientId, ws);
             ws.on("message", (message) => {
+                const parsedMessage = deserialize(message.toString());
+                console.log("got message: ", parsedMessage);
                 if (!this.wsToId.get(ws)) {
                     const id = generateId();
                     this.wsToId.set(ws, id);
                     this.idToWs.set(id, ws);
                     ws.send("ID " + id);
+                    console.log(`client ${id} connected.`);
+                    return;
                 }
                 for (const [event, { process }] of Object.entries(this.events)) {
-                    const parsedMessage = JSON.parse(message.toString());
-                    if (parsedMessage["type"] === event) {
-                        const { input } = parsedMessage;
-                        process(input);
+                    const parsedMessage = deserialize(message.toString());
+                    if (parsedMessage &&
+                        parsedMessage["event"] === event) {
+                        const { data, requestId } = parsedMessage;
+                        const result = process(data);
+                        const serialized = serialize({ requestId, event, data: result });
+                        //  TODO: throw some nice error: only return stuff that is serializable
+                        // i.e. primary data types and objects
+                        if (!serialized)
+                            return;
+                        ws.send(serialized);
                     }
                 }
             });
@@ -33,7 +40,7 @@ export class ZapServer {
                 this.removeClient(ws);
             });
             ws.on("error", (err) => {
-                console.error(`WebSocket error for ${clientId}:`, err);
+                console.error(`WebSocket error for ${this.wsToId.get(ws)}:`, err);
             });
         });
     }

package/dist/utils.d.ts

@@ -1 +1,4 @@
 export declare const generateId: (length?: number) => string;
+export declare const safeJsonParse: (jsonString: string) => Record<string, any> | null;
+export declare const serialize: <T>(data: T) => string | null;
+export declare const deserialize: <T>(data: string) => T | null;

package/dist/utils.js

@@ -1,10 +1,25 @@
-export const generateId = (length = 6) => {
+export const generateId = (length = 8) => {
     const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-    let id = "";
     const randomValues = new Uint8Array(length);
     crypto.getRandomValues(randomValues);
-    randomValues.forEach((num) => {
-        id += chars[num % chars.length];
-    });
-    return id;
+    return Array.from(randomValues, (num) => chars[num % chars.length]).join('');
+};
+export const safeJsonParse = (jsonString) => {
+    try {
+        return JSON.parse(jsonString);
+    }
+    catch {
+        return null;
+    }
+};
+export const serialize = (data) => {
+    try {
+        return JSON.stringify(data);
+    }
+    catch {
+        return null;
+    }
+};
+export const deserialize = (data) => {
+    return safeJsonParse(data);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zap-socket/server",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "A fully typesafe tRPC-inspired WebSocket library with Zod validation, req-res model, and native subscriptions.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",