extra options

#397

README.md

@@ -49,9 +49,9 @@ live.on('live', () => {
 
 (Keep)LiveWS 和 (Keep)LiveTCP 的大部分API基本上一样, 区别在本文末尾有注明
 
-### new LiveWS(roomid [, { address, protover, key, authBody }])
+### new LiveWS(roomid [, { address, protover, key, authBody, uid, buvid }])
 
-### new LiveTCP(roomid [, { host, port, protover, key, authBody }])
+### new LiveTCP(roomid [, { host, port, protover, key, authBody, uid, buvid }])
 
 - `roomid` 房间号
 
@@ -73,13 +73,17 @@ live.on('live', () => {
 
   默认 `2`
 
-  * 1 (见 #17)
+  * 1 (见 [#17](https://github.com/simon300000/bilibili-live-ws/issues/17))
   * 2 (zlib.inflate)
   * 3 (brotliDecompress)
 
-- `key` 可选, WS握手的Token
+- `uid` 可选, WS握手的 uid [#397](https://github.com/simon300000/bilibili-live-ws/issues/397)
 
-- `authBody` 可选, 可以和 <https://open-live.bilibili.com/document/> 配合使用, 会覆盖掉 `protover` `roomid` `key`
+- `key` 可选, WS握手的 Token [#397](https://github.com/simon300000/bilibili-live-ws/issues/397)
+
+- `buvid` 可选, WS握手的 Token [#397](https://github.com/simon300000/bilibili-live-ws/issues/397)
+
+- `authBody` 可选, 可以和 <https://open-live.bilibili.com/document/> 配合使用, 会覆盖掉 `protover` `roomid` `key` `uid` `buvid`
 
 #### live.on('open')
 

src/buffer.ts

@@ -60,7 +60,9 @@ export const makeDecoder = ({ inflateAsync, brotliDecompressAsync }: Inflates) =
   return decoder
 }
 
-export const encoder = (type: string, { Buffer }: Inflates, body: any = '') => {
+type EncodeType = 'heartbeat' | 'join'
+
+export const encoder = (type: EncodeType, { Buffer }: Inflates, body: any = '') => {
   const blank = Buffer.alloc(16)
   if (typeof body !== 'string') {
     body = JSON.stringify(body)

src/common.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'events'
 
 import { encoder, makeDecoder, Inflates } from './buffer'
 
-export type LiveOptions = { protover?: 1 | 2 | 3, key?: string, authBody?: any }
+export type LiveOptions = { protover?: 1 | 2 | 3, key?: string, authBody?: any, uid?: number, buvid?: string }
 
 export const relayEvent = Symbol('relay')
 
@@ -26,7 +26,7 @@ export class Live extends NiceEventEmitter {
   send: (data: Buffer) => void
   close: () => void
 
-  constructor(inflates: Inflates, roomid: number, { send, close, protover = 2, key, authBody }: { send: (data: Buffer) => void, close: () => void } & LiveOptions) {
+  constructor(inflates: Inflates, roomid: number, { send, close, protover = 2, key, authBody, uid = 0, buvid }: { send: (data: Buffer) => void, close: () => void } & LiveOptions) {
     if (typeof roomid !== 'number' || Number.isNaN(roomid)) {
       throw new Error(`roomid ${roomid} must be Number not NaN`)
     }
@@ -75,12 +75,18 @@ export class Live extends NiceEventEmitter {
 
     this.on('open', () => {
       if (authBody) {
+        if (typeof authBody === 'object') {
+          authBody = encoder('join', inflates, authBody)
+        }
         this.send(authBody)
       } else {
-        const hi: { uid: number, roomid: number, protover: number, platform: string, clientver: string, type: number, key?: string } = { uid: 0, roomid, protover, platform: 'web', clientver: '2.0.11', type: 2 }
+        const hi: { uid: number, roomid: number, protover: number, platform: string, type: number, key?: string, buvid?: string } = { uid: uid, roomid, protover, platform: 'web', type: 2 }
         if (key) {
           hi.key = key
         }
+        if (buvid) {
+          hi.buvid = buvid
+        }
         const buf = encoder('join', inflates, hi)
         this.send(buf)
       }