Event value can be a non-object, so fix that and add debug hook while…

… we are at it. - debug hook to WsHadlerConfig - check if value is string or number in WsEventHandler
floodfx · Jan 13, 2023 · c434210 · c434210
1 parent f2ba76d
commit c434210
Show file tree

Hide file tree

Showing 7 changed files with 220 additions and 180 deletions.
diff --git a/packages/core/coverage/clover.xml b/packages/core/coverage/clover.xml
diff --git a/packages/core/coverage/coverage-final.json b/packages/core/coverage/coverage-final.json
diff --git a/packages/core/dist/liveview.d.ts b/packages/core/dist/liveview.d.ts
@@ -1330,6 +1330,7 @@ interface WsHandlerConfig {
     flashAdaptor: FlashAdaptor;
     pubSub: PubSub;
     onError?: (err: any) => void;
+    debug?(msg: string): void;
 }
 declare class WsHandlerContext {
     #private;

diff --git a/packages/core/dist/liveview.js b/packages/core/dist/liveview.js
@@ -2973,6 +2973,9 @@ async function handleEvent(ctx, payload) {
         ctx.clearFlash(key);
     }
     else {
+        if (typeof value === "string" || typeof value === "number") {
+            value = { value };
+        }
         await ctx.liveView.handleEvent({ type: event, ...value }, ctx.socket);
     }
     return await ctx.liveView.render(ctx.socket.context, ctx.defaultLiveViewMeta());
@@ -3190,6 +3193,14 @@ class WsHandler {
         this.#ws.subscribeToClose(() => this.close);
     }
     async handleMsg(msg) {
+        if (this.#config.debug) {
+            try {
+                this.#config.debug(JSON.stringify(msg));
+            }
+            catch (e) {
+                console.error("error debugging message", e);
+            }
+        }
         try {
             // attempt to prevent race conditions by queuing messages
             // if we are already processing a message

diff --git a/packages/core/dist/liveview.mjs b/packages/core/dist/liveview.mjs
@@ -2966,6 +2966,9 @@ async function handleEvent(ctx, payload) {
         ctx.clearFlash(key);
     }
     else {
+        if (typeof value === "string" || typeof value === "number") {
+            value = { value };
+        }
         await ctx.liveView.handleEvent({ type: event, ...value }, ctx.socket);
     }
     return await ctx.liveView.render(ctx.socket.context, ctx.defaultLiveViewMeta());
@@ -3183,6 +3186,14 @@ class WsHandler {
         this.#ws.subscribeToClose(() => this.close);
     }
     async handleMsg(msg) {
+        if (this.#config.debug) {
+            try {
+                this.#config.debug(JSON.stringify(msg));
+            }
+            catch (e) {
+                console.error("error debugging message", e);
+            }
+        }
         try {
             // attempt to prevent race conditions by queuing messages
             // if we are already processing a message

diff --git a/packages/core/src/server/socket/ws/wsEventHandler.ts b/packages/core/src/server/socket/ws/wsEventHandler.ts
@@ -51,7 +51,7 @@ type HookPayload = Phx.EventPayload<"hook", Record<string, string>>;
 export async function handleEvent(ctx: WsHandlerContext, payload: Phx.EventPayload): Promise<LiveViewTemplate> {
   const { type, event, cid } = payload;
 
-  let value: { [key: string]: unknown } = {};
+  let value: { [key: string]: unknown } | string = {};
   switch (type) {
     case "click":
     case "keyup":
@@ -106,6 +106,9 @@ export async function handleEvent(ctx: WsHandlerContext, payload: Phx.EventPaylo
     const key = clearFlashPayload.value.key;
     ctx.clearFlash(key);
   } else {
+    if (typeof value === "string" || typeof value === "number") {
+      value = { value };
+    }
     await ctx.liveView.handleEvent({ type: event, ...value }, ctx.socket);
   }
 

diff --git a/packages/core/src/server/socket/ws/wsHandler.ts b/packages/core/src/server/socket/ws/wsHandler.ts
@@ -33,6 +33,7 @@ export interface WsHandlerConfig {
   flashAdaptor: FlashAdaptor;
   pubSub: PubSub;
   onError?: (err: any) => void;
+  debug?(msg: string): void;
 }
 
 export class WsHandlerContext {
@@ -152,6 +153,13 @@ export class WsHandler {
   }
 
   async handleMsg(msg: Phx.Msg<unknown>) {
+    if (this.#config.debug) {
+      try {
+        this.#config.debug(JSON.stringify(msg));
+      } catch (e) {
+        console.error("error debugging message", e);
+      }
+    }
     try {
       // attempt to prevent race conditions by queuing messages
       // if we are already processing a message