Skip to content

Commit 4f1e228

Browse files
author
jin
committed
**
1 parent 89397cf commit 4f1e228

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

rest/server/server.node.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace $ {
2121
} )
2222

2323
server.on( 'upgrade',
24-
( req, sock, head )=> $mol_wire_async( this ).ws_upgrade( req, sock, head )
24+
( req, sock, head: Buffer< ArrayBuffer > )=> $mol_wire_async( this ).ws_upgrade( req, sock, head )
2525
)
2626

2727
server.listen( this.port(), ()=> {
@@ -87,7 +87,7 @@ namespace $ {
8787
ws_upgrade(
8888
req: InstanceType< $node['http']['IncomingMessage'] >,
8989
socket: InstanceType< $node['stream']['Duplex'] >,
90-
head: Buffer,
90+
head: Buffer< ArrayBuffer >,
9191
) {
9292

9393
const port = $mol_rest_port_ws_node.make({ socket })
@@ -146,7 +146,7 @@ namespace $ {
146146
socket.on( 'end', onclose )
147147
socket.on( 'error', onclose )
148148

149-
socket.on( 'data', ( chunk: Buffer )=> this.ws_income( chunk, upgrade, socket ) )
149+
socket.on( 'data', ( chunk: Buffer< ArrayBuffer > )=> this.ws_income( chunk, upgrade, socket ) )
150150

151151
const key_in = req.headers["sec-websocket-key"]
152152
const magic = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
@@ -169,11 +169,11 @@ namespace $ {
169169

170170
}
171171

172-
_ws_income_chunks = new WeakMap< InstanceType< typeof $node.stream.Duplex >, Uint8Array[] >
173-
_ws_income_frames = new WeakMap< InstanceType< typeof $node.stream.Duplex >, ( string | Uint8Array )[] >
172+
_ws_income_chunks = new WeakMap< InstanceType< typeof $node.stream.Duplex >, Uint8Array< ArrayBuffer >[] >
173+
_ws_income_frames = new WeakMap< InstanceType< typeof $node.stream.Duplex >, ( string | Uint8Array< ArrayBuffer > )[] >
174174

175175
async ws_income(
176-
chunk: Buffer,
176+
chunk: Buffer< ArrayBuffer >,
177177
upgrade: $mol_rest_message,
178178
sock: InstanceType< typeof $node.stream.Duplex >,
179179
) {
@@ -209,7 +209,7 @@ namespace $ {
209209
sock.unshift( tail )
210210
}
211211

212-
let data: string | Uint8Array = new Uint8Array( chunk.buffer, chunk.byteOffset + frame.size(), frame.data().size )
212+
let data: string | Uint8Array< ArrayBuffer > = new Uint8Array( chunk.buffer, chunk.byteOffset + frame.size(), frame.data().size )
213213

214214
if( frame.data().mask ) {
215215
const mask = frame.mask()
@@ -235,10 +235,10 @@ namespace $ {
235235
if( typeof frames[0] === 'string' ) {
236236
data = ( frames as string[] ).join( '' )
237237
} else {
238-
const size = ( frames as Uint8Array[] ).reduce( ( s, f )=> s + f.byteLength, 0 )
238+
const size = ( frames as Uint8Array< ArrayBuffer >[] ).reduce( ( s, f )=> s + f.byteLength, 0 )
239239
data = new Uint8Array( size )
240240
let offset = 0
241-
for( const frame of ( frames as Uint8Array[] ) ) {
241+
for( const frame of ( frames as Uint8Array< ArrayBuffer >[] ) ) {
242242
data.set( frame, offset )
243243
offset += frame.byteLength
244244
}

0 commit comments

Comments
 (0)