From 079fe9b0e7c1eefe2b711d043dc85f1c2e555064 Mon Sep 17 00:00:00 2001
From: surunzi <surunzi@foxmail.com>
Date: Sat, 10 Aug 2024 22:59:30 +0800
Subject: [PATCH] release: v1.5.1

---
 CHANGELOG.md           |  4 ++++
 devtools/target.html   | 14 ++++++++++++++
 package.json           |  2 +-
 src/domains/Network.ts | 28 ++++++++++++++++++++++++----
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ee45c9..28c568b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.5.1 (10 Aug 2024)
+
+* fix: WebSocket message base64 encoded
+
 ## 1.5.0 (31 Jul 2024)
 
 * feat: support IndexedDB
diff --git a/devtools/target.html b/devtools/target.html
index 760ebed..214eb16 100644
--- a/devtools/target.html
+++ b/devtools/target.html
@@ -25,6 +25,20 @@
         location.reload()
       }
     </script>
+    <script>
+      function testWs() {
+        const text = 'This is the text used for testing!'
+
+        const enc = new TextEncoder()
+        const ws = new WebSocket('wss://echo.websocket.org')
+
+        ws.onopen = function () {
+          ws.send(text)
+          ws.send(enc.encode(text))
+        }
+      }
+      setTimeout(() => testWs(), 5000)
+    </script>
     <script>
       // https://gist.github.com/enjalot/6472041
       var indexedDB = window.indexedDB
diff --git a/package.json b/package.json
index 4739d14..2fc8825 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chobitsu",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Chrome devtools protocol JavaScript implementation",
   "main": "dist/chobitsu.js",
   "exports": {
diff --git a/src/domains/Network.ts b/src/domains/Network.ts
index f6f27af..8ef42d1 100644
--- a/src/domains/Network.ts
+++ b/src/domains/Network.ts
@@ -7,6 +7,8 @@ import isNative from 'licia/isNative'
 import contain from 'licia/contain'
 import now from 'licia/now'
 import isStr from 'licia/isStr'
+import isBlob from 'licia/isBlob'
+import isUndef from 'licia/isUndef'
 import convertBin from 'licia/convertBin'
 import { XhrRequest, FetchRequest } from '../lib/request'
 import connector from '../lib/connector'
@@ -222,11 +224,18 @@ function enableWebSocket() {
       })
     })
 
-    ws.addEventListener('message', function (e) {
+    ws.addEventListener('message', async function (e) {
       let payloadData = e.data
+      if (isUndef(payloadData)) {
+        return
+      }
+
       let opcode = 1
       if (!isStr(payloadData)) {
         opcode = 2
+        if (isBlob(payloadData)) {
+          payloadData = await convertBin.blobToArrBuffer(payloadData)
+        }
         payloadData = convertBin(payloadData, 'base64')
       }
 
@@ -242,10 +251,22 @@ function enableWebSocket() {
 
     const origSend = ws.send
     ws.send = function (data: any) {
+      if (!isUndef(data)) {
+        frameSent(data)
+      }
+
+      return origSend.call(this, data)
+    }
+
+    async function frameSent(data: any) {
       let opcode = 1
+      let payloadData = data
       if (!isStr(data)) {
         opcode = 2
-        data = convertBin(data, 'base64')
+        if (isBlob(payloadData)) {
+          payloadData = await convertBin.blobToArrBuffer(payloadData)
+        }
+        payloadData = convertBin(data, 'base64')
       }
 
       connector.trigger('Network.webSocketFrameSent', {
@@ -253,10 +274,9 @@ function enableWebSocket() {
         timestamp: now() / 1000,
         response: {
           opcode,
-          payloadData: data,
+          payloadData,
         },
       })
-      return origSend.call(this, data)
     }
 
     ws.addEventListener('close', function () {