Added listeners to the constructing kw options (#2044)

WebReflection · web-flow · commit c49cb9231b1c · 2024-05-03T16:34:21.000+02:00
diff --git a/pyscript.core/package-lock.json b/pyscript.core/package-lock.json
diff --git a/pyscript.core/package.json b/pyscript.core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pyscript/core",
-    "version": "0.4.26",
+    "version": "0.4.27",
     "type": "module",
     "description": "PyScript",
     "module": "./index.js",
diff --git a/pyscript.core/src/stdlib/pyscript/websocket.py b/pyscript.core/src/stdlib/pyscript/websocket.py
@@ -30,21 +30,24 @@ class WebSocket(object):
 
     def __init__(self, **kw):
         url = kw["url"]
-        socket = None
         if protocols in kw:
             socket = js.WebSocket.new(url, kw[protocols])
         else:
             socket = js.WebSocket.new(url)
         object.__setattr__(self, "_ws", socket)
 
+        for t in ["onclose", "onerror", "onmessage", "onopen"]:
+            if t in kw:
+                socket[t] = kw[t]
+
     def __getattr__(self, attr):
         return getattr(self._ws, attr)
 
     def __setattr__(self, attr, value):
         if attr == "onmessage":
-            setattr(self._ws, attr, lambda e: value(EventMessage(e)))
+            self._ws[attr] = lambda e: value(EventMessage(e))
         else:
-            setattr(self._ws, attr, value)
+            self._ws[attr] = value
 
     def close(self, **kw):
         if code in kw and reason in kw:
diff --git a/pyscript.core/test/ws/index.html b/pyscript.core/test/ws/index.html
@@ -22,10 +22,12 @@
         print(event.type)
         document.documentElement.classList.add("ok")
 
-    ws = WebSocket(url="ws://localhost:5037/")
-    ws.onopen = onopen
-    ws.onmessage = onmessage
-    ws.onclose = onclose
+    ws = WebSocket(
+      url="ws://localhost:5037/",
+      onopen=onopen,
+      onmessage=onmessage,
+      onclose=onclose
+    )
   </script>
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pyscript/core",`
`3`		`- "version": "0.4.26",`
	`3`	`+ "version": "0.4.27",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "PyScript",`
`6`	`6`	`"module": "./index.js",`