@laplace.live/ws 6.3.2 → 6.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laplace.live/ws",
-  "version": "6.3.2",
+  "version": "6.3.4",
   "description": "Bilibili Live WebSocket/TCP API",
   "type": "module",
   "main": "./src/index.ts",
@@ -10,6 +10,8 @@
       "browser": "./src/browser.ts",
       "default": "./src/index.ts"
     },
+    "./server": "./src/index.ts",
+    "./client": "./src/browser.ts",
     "./browser": "./src/browser.ts"
   },
   "scripts": {
@@ -39,7 +41,9 @@
     "provenance": true
   },
   "dependencies": {
-    "isomorphic-ws": "^5.0.0",
+    "buffer": "^6.0.3",
+    "events": "^3.3.0",
+    "pako": "^2.1.0",
     "ws": "^8.19.0"
   },
   "devDependencies": {
@@ -48,10 +52,5 @@
     "@types/pako": "^2.0.4",
     "@types/ws": "^8.18.1",
     "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "buffer": "^6.0.3",
-    "events": "^3.3.0",
-    "pako": "^2.1.0"
   }
 }

package/src/browser.ts

@@ -1,9 +1,9 @@
 import { KeepLive } from './common.ts'
 import { inflates } from './inflate/browser.ts'
-import { LiveWSBase, type WSOptions } from './ws.ts'
+import { LiveWSBase, type WSOptions } from './ws-client.ts'
 
 export type { LiveOptions } from './common.ts'
-export type { WSOptions } from './ws.ts'
+export type { WSOptions } from './ws-client.ts'
 
 export { relayEvent } from './common.ts'
 

package/src/index.ts

@@ -1,11 +1,11 @@
 import { KeepLive } from './common.ts'
 import { inflates } from './inflate/node.ts'
 import { LiveTCPBase, type TCPOptions } from './tcp.ts'
-import { LiveWSBase, type WSOptions } from './ws.ts'
+import { LiveWSBase, type WSOptions } from './ws-node.ts'
 
 export type { LiveOptions } from './common.ts'
 export type { TCPOptions } from './tcp.ts'
-export type { WSOptions } from './ws.ts'
+export type { WSOptions } from './ws-node.ts'
 
 export { relayEvent } from './common.ts'
 export { getConf, getRoomid } from './extra.ts'

package/src/tcp.ts

@@ -1,4 +1,4 @@
-import net, { type Socket } from 'net'
+import net, { type Socket } from 'node:net'
 
 import type { Inflates } from './buffer.ts'
 

package/src/ws-client.ts

@@ -0,0 +1,63 @@
+import { EventEmitter } from 'events'
+
+import type { Inflates } from './buffer.ts'
+
+import { Live, type LiveOptions } from './common.ts'
+
+export type WSOptions = LiveOptions & { address?: string }
+
+class WSWrapper extends EventEmitter {
+  ws: WebSocket
+
+  constructor(address: string, inflates: Inflates) {
+    super()
+
+    const ws = new WebSocket(address)
+    this.ws = ws
+
+    ws.binaryType = 'arraybuffer'
+    ws.onopen = () => this.emit('open')
+    ws.onmessage = ({ data }) => this.emit('message', inflates.Buffer.from(data as ArrayBuffer))
+    ws.onerror = () => this.emit('error')
+    ws.onclose = () => this.emit('close')
+  }
+
+  get readyState() {
+    return this.ws.readyState
+  }
+
+  send(data: Buffer) {
+    this.ws.send(data)
+  }
+
+  close(code?: number, reason?: string) {
+    this.ws.close(code, reason)
+  }
+}
+
+export class LiveWSBase extends Live {
+  ws: WSWrapper
+
+  constructor(
+    inflates: Inflates,
+    roomid: number,
+    { address = 'wss://broadcastlv.chat.bilibili.com/sub', ...options }: WSOptions = {}
+  ) {
+    const ws = new WSWrapper(address, inflates)
+    const send = (data: Buffer) => {
+      if (ws.readyState === 1) {
+        ws.send(data)
+      }
+    }
+    const close = () => this.ws.close()
+
+    super(inflates, roomid, { send, close, ...options })
+
+    ws.on('open', (...params) => this.emit('open', ...params))
+    ws.on('message', data => this.emit('message', data as Buffer))
+    ws.on('close', (code, reason) => this.emit('close', code, reason))
+    ws.on('error', error => this.emit('_error', error))
+
+    this.ws = ws
+  }
+}

package/src/{ws.ts → ws-node.ts}

@@ -1,6 +1,6 @@
+import type { Agent } from 'node:http'
 import { EventEmitter } from 'events'
-import type { Agent } from 'http'
-import IsomorphicWebSocket from 'isomorphic-ws'
+import WS from 'ws'
 
 import type { Inflates } from './buffer.ts'
 
@@ -8,25 +8,17 @@ import { Live, type LiveOptions } from './common.ts'
 
 export type WSOptions = LiveOptions & { address?: string; agent?: Agent }
 
-export const isNode = !!IsomorphicWebSocket.Server
+class WSWrapper extends EventEmitter {
+  ws: WS
 
-class WebSocket extends EventEmitter {
-  ws: IsomorphicWebSocket
-
-  constructor(address: string, inflates: Inflates, ...args: any[]) {
+  constructor(address: string, ...args: any[]) {
     super()
 
-    const ws = new IsomorphicWebSocket(address, ...(isNode ? args : []))
+    const ws = new WS(address, ...args)
     this.ws = ws
 
     ws.onopen = () => this.emit('open')
-    ws.onmessage = isNode
-      ? ({ data }) => this.emit('message', data)
-      : async ({ data }) =>
-          this.emit(
-            'message',
-            inflates.Buffer.from(await new Response(data as unknown as InstanceType<typeof Blob>).arrayBuffer())
-          )
+    ws.onmessage = ({ data }) => this.emit('message', data)
     ws.onerror = () => this.emit('error')
     ws.onclose = () => this.emit('close')
   }
@@ -45,14 +37,14 @@ class WebSocket extends EventEmitter {
 }
 
 export class LiveWSBase extends Live {
-  ws: InstanceType<typeof WebSocket>
+  ws: WSWrapper
 
   constructor(
     inflates: Inflates,
     roomid: number,
     { address = 'wss://broadcastlv.chat.bilibili.com/sub', agent, ...options }: WSOptions = {}
   ) {
-    const ws = new WebSocket(address, inflates, { agent })
+    const ws = new WSWrapper(address, { agent })
     const send = (data: Buffer) => {
       if (ws.readyState === 1) {
         ws.send(data)