重构 async

examples/js_ws/index.js

@@ -1,7 +1,8 @@
+async function run() {
     let ws = websocket();
     let shouldExit = false;
     while (!shouldExit) {
-    let data = ws.readText();
+        let data = await ws.readText();
         switch (data) {
             case "exit":
                 shouldExit = true;
@@ -16,3 +17,5 @@ while (!shouldExit) {
                 break;
         }
     }
+}
+run().then(r => {});

examples/js_ws_event/.pages.yaml

@@ -1,7 +1,4 @@
 routes:
-  - path: "sender"
-    js:
-      exec: "sender.js"
   - path: "event"
     js:
       exec: "event.js"

examples/js_ws_event/event.js

@@ -1,23 +1,28 @@
-let name=request.getQuery("name")
-if (name===""){
-    throw Error(`Missing name "${name}"`)
+const name = (await request.getQuery("name"))?.trim();
+
+if (!name) {
+    throw new Error(`Missing or empty name parameter`);
 }
-let ws = websocket();
-event.subscribe("messages").on(function (msg){
-    ws.writeText(msg)
-})
-let shouldExit = false;
-while (!shouldExit) {
-    let data = ws.readText();
-    switch (data) {
-        case "exit":
-            shouldExit = true;
-            break;
-        default:
-            event.put("messages",JSON.stringify({
-                name:name,
-                data:data
+
+const ws = websocket();
+
+try {
+    // 事件处理
+    event.subscribe("messages").on((msg) => {
+        ws.writeText(msg);
+    });
+
+    // 主循环
+    for await (const data of ws.readText()) {
+        if (data === "exit") break;
+
+        if (data?.trim()) {
+            await event.put("messages", JSON.stringify({
+                name,
+                data: data.trim()
             }));
-            break;
         }
     }
+} finally {
+    ws.close();
+}

examples/js_ws_event/sender.js

@@ -1,8 +0,0 @@
-let name=request.getQuery("name")
-let message=request.getQuery("data")
-event.put("messages", JSON.stringify({
-    name:name,
-    data:message
-}));
-
-// response.write(event.subscribe("messages").get())

pkg/filters/goja/goja.go

@@ -89,7 +89,7 @@ func FilterInstGoJa(gl core.Params) (core.FilterInstance, error) {
 				}
 				if global.EnableWebsocket {
 					var closer io.Closer
-					closer, err = WebsocketInject(ctx, vm, debug, request, timeoutCancelFunc)
+					closer, err = WebsocketInject(ctx, vm, debug, request, loop, timeoutCancelFunc)
 					if err != nil {
 						panic(err)
 					}

pkg/filters/goja/var_websocket.go

@@ -7,13 +7,14 @@ import (
 	"time"
 
 	"github.com/dop251/goja"
+	"github.com/dop251/goja_nodejs/eventloop"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"gopkg.d7z.net/gitea-pages/pkg/core"
 )
 
-func WebsocketInject(ctx core.FilterContext, jsCtx *goja.Runtime, w http.ResponseWriter, request *http.Request, cancelFunc context.CancelFunc) (io.Closer, error) {
+func WebsocketInject(ctx core.FilterContext, jsCtx *goja.Runtime, w http.ResponseWriter, request *http.Request, loop *eventloop.EventLoop, cancelFunc context.CancelFunc) (io.Closer, error) {
 	closers := NewClosers()
 	return closers, jsCtx.GlobalObject().Set("websocket", func() (any, error) {
 		upgrader := websocket.Upgrader{}
@@ -62,12 +63,32 @@ func WebsocketInject(ctx core.FilterContext, jsCtx *goja.Runtime, w http.Respons
 			},
 			"TypeTextMessage":   websocket.TextMessage,
 			"TypeBinaryMessage": websocket.BinaryMessage,
-			"readText": func() (string, error) {
-				_, p, err := conn.ReadMessage()
-				if err != nil {
-					return "", err
+			"readText": func() goja.Value {
+				promise, resolve, reject := jsCtx.NewPromise()
+				go func() {
+					select {
+					case <-ctx.Done():
+						return
+					default:
 					}
-				return string(p), nil
+					defer func() {
+						if r := recover(); r != nil {
+							zap.L().Debug("websocket panic", zap.Any("panic", r))
+							loop.Run(func(runtime *goja.Runtime) {
+								_ = reject(runtime.ToValue(r))
+							})
+						}
+					}()
+					_, p, err := conn.ReadMessage()
+					loop.Run(func(runtime *goja.Runtime) {
+						if err != nil {
+							_ = reject(runtime.ToValue(err))
+						} else {
+							_ = resolve(runtime.ToValue(string(p)))
+						}
+					})
+				}()
+				return promise.Result()
 			},
 			"read": func() (any, error) {
 				messageType, p, err := conn.ReadMessage()