update websocket events

YeonV · Jan 12, 2025 · c3b1480 · c3b1480
1 parent 76b4726
commit c3b1480
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 30 deletions.
diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx
@@ -67,21 +67,21 @@ export default function Home() {
     const handleWebsockets = () => {
       const req = {
         event_type: 'graph_update',
-        id: 1337,
+        id: 9000,
         type: 'subscribe_event'
       }
       // console.log("Send");
-      ;(ws as any).send(JSON.stringify(++req.id && req))
+      ws.send(JSON.stringify(req.id && req))
     }
     document.addEventListener('subs_device_created', handleWebsockets)
     return () => {
       const removeGetWs = async () => {
         const request = {
-          id: 1337,
+          id: 9000,
           type: 'unsubscribe_event',
           event_type: 'graph_update'
         }
-        ;(ws as any).send(JSON.stringify(++request.id && request))
+        ws.send(JSON.stringify(request.id && request))
       }
       // console.log("Clean Up");
       removeGetWs()
@@ -93,21 +93,21 @@ export default function Home() {
     const handleWebsockets = () => {
       const req = {
         event_type: 'device_created',
-        id: 1337,
+        id: 9001,
         type: 'subscribe_event'
       }
       // console.log("Send");
-      ;(ws as any).send(JSON.stringify(++req.id && req))
+      ws.send(JSON.stringify(req.id && req))
     }
     document.addEventListener('subs_device_created', handleWebsockets)
     return () => {
       const removeGetWs = async () => {
         const request = {
-          id: 1337,
+          id: 9001,
           type: 'unsubscribe_event',
           event_type: 'device_created'
         }
-        ;(ws as any).send(JSON.stringify(++request.id && request))
+        ws.send(JSON.stringify(request.id && request))
       }
       // console.log("Clean Up");
       removeGetWs()

diff --git a/src/pages/Settings/Webaudio.tsx b/src/pages/Settings/Webaudio.tsx
@@ -122,10 +122,10 @@ const Webaudio = ({ style }: { style: CSSProperties }) => {
                       : {})
                   },
                   client: webAudName,
-                  id: i,
+                  id: 8000 + i,
                   type: 'audio_stream_config'
                 }
-                ;(ws as any).ws.send(JSON.stringify(++request.id && request))
+                ws.ws.send(JSON.stringify(++request.id && request))
               }
               sendWs()
             }
@@ -150,20 +150,20 @@ const Webaudio = ({ style }: { style: CSSProperties }) => {
                   const request = {
                     data: base64String,
                     client: webAudName,
-                    id: i,
+                    id: 8500 + i,
                     type: 'audio_stream_data_v2'
                   }
-                  ;(ws as any).ws.send(JSON.stringify(++request.id && request))
+                  ws.ws.send(JSON.stringify(++request.id && request))
                 }
                 const sendWsV1 = async () => {
                   const i = 0
                   const request = {
                     data: e.inputBuffer.getChannelData(0),
                     client: webAudName,
-                    id: i,
+                    id: 8000 + i,
                     type: 'audio_stream_data'
                   }
-                  ;(ws as any).ws.send(JSON.stringify(++request.id && request))
+                  ws.ws.send(JSON.stringify(++request.id && request))
                 }
                 if (webAudType === 'audio_stream_data_v2') {
                   sendWsV2()
@@ -200,10 +200,10 @@ const Webaudio = ({ style }: { style: CSSProperties }) => {
               const i = 0
               const request = {
                 client: webAudName,
-                id: i,
+                id: 8200 + i,
                 type: 'audio_stream_stop'
               }
-              ;(ws as any).ws.send(JSON.stringify(++request.id && request))
+              ws.ws.send(JSON.stringify(++request.id && request))
             }
             sendWs().then(() => getSchemas())
             setWebAud(false)
@@ -356,12 +356,10 @@ const Webaudio = ({ style }: { style: CSSProperties }) => {
                       const request = {
                         data: {},
                         client: webAudName,
-                        id: 1,
+                        id: 8499,
                         type: 'audio_stream_start'
                       }
-                      ;(ws as any).ws.send(
-                        JSON.stringify(++request.id && request)
-                      )
+                      ws.ws.send(JSON.stringify(request.id && request))
                     }
                     sendWs()
                     setTimeout(() => {

diff --git a/src/utils/Websocket.ts b/src/utils/Websocket.ts
@@ -42,34 +42,34 @@ function createSocket() {
         ws.ws = e.target as WebSocket
         const req = {
           event_type: 'devices_updated',
-          id: 1,
+          id: 9002,
           type: 'subscribe_event'
         }
-        ws.send(JSON.stringify(++req.id && req))
+        ws.send(JSON.stringify(req.id && req))
         const requ = {
           event_type: 'device_created',
-          id: 1,
+          id: 9001,
           type: 'subscribe_event'
         }
-        ws.send(JSON.stringify(++requ.id && requ))
+        ws.send(JSON.stringify(requ.id && requ))
         const reque = {
           event_type: 'graph_update',
-          id: 1,
+          id: 9000,
           type: 'subscribe_event'
         }
-        ws.send(JSON.stringify(++reque.id && reque))
+        ws.send(JSON.stringify(reque.id && reque))
         const reqs = {
           event_type: 'scene_activated',
-          id: 1,
+          id: 9003,
           type: 'subscribe_event'
         }
-        ws.send(JSON.stringify(++reqs.id && reqs))
+        ws.send(JSON.stringify(reqs.id && reqs))
         const reqst = {
           event_type: 'effect_set',
-          id: 1,
+          id: 9004,
           type: 'subscribe_event'
         }
-        ws.send(JSON.stringify(++reqst.id && reqst))
+        ws.send(JSON.stringify(reqst.id && reqst))
       },
       onmessage: (event) => {
         if (JSON.parse(event.data).event_type === 'visualisation_update') {