js-tcp-tunnel 1.1.1 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-tcp-tunnel",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "js tcp tunnel",
   "main": "index.js",
   "type": "module",

package/src/lib.js

@@ -308,7 +308,6 @@ export function printTcpTunnelData(data) {
         [TUNNEL_TCP_TYPE_CLOSE]: 'TUNNEL_TCP_TYPE_CLOSE     ',
         [TUNNEL_TCP_TYPE_PING]: 'TUNNEL_TCP_TYPE_PING      ',
         [TUNNEL_TCP_TYPE_PONG]: 'TUNNEL_TCP_TYPE_PONG      ',
-        [TUNNEL_TCP_TYPE_ACK]: 'TUNNEL_TCP_TYPE_ACK       ',
     }[data.type]} recv: ${(tcpTunnelDataRecv)} send: ${(tcpTunnelDataSend)} size:${data.buffer.length}`
 }
 
@@ -421,7 +420,6 @@ export const TUNNEL_TCP_TYPE_ERROR = 0x8117f762
 export const TUNNEL_TCP_TYPE_CLOSE = 0x72fd6470
 export const TUNNEL_TCP_TYPE_PING = 0x4768e1ba
 export const TUNNEL_TCP_TYPE_PONG = 0x106f43fb
-export const TUNNEL_TCP_TYPE_ACK = 0xc5870539
 
 /**
  * @param {TCP_TUNNEL_DATA} box
@@ -532,46 +530,15 @@ export function createTimeBufferedTransformStream(bufferTime) {
 export function pipeSocketDataWithChannel(channelMap, channelId, encodeWriter) {
     let channel = channelMap.get(channelId)
     let socket = channel.socket
-    let signal = Promise_withResolvers()
-    signal.resolve()
     let sendPackSize = 0
-    let remoteRecvPackSize = 0
-    channel.notify = (size) => {
-        remoteRecvPackSize = size
-        signal.resolve()
-    }
     let [clientKey, clientIv] = channel.key_iv
     let bufferedTransform = createTimeBufferedTransformStream(50)
-    let backPressureTimer = null
     Readable.toWeb(socket).pipeThrough(bufferedTransform).pipeTo(new WritableStream({
         /**
          * @param {Uint8Array<ArrayBuffer>} chunk
          */
         async write(chunk) {
             const buffer = await encrypt(chunk, clientKey, clientIv)
-            let bufferPackSize = sendPackSize - remoteRecvPackSize
-            if (DEBUG_TUNNEL_TCP) {
-                console.warn('bufferPackSize:', bufferPackSize)
-            }
-            if (bufferPackSize > 10) {
-                signal.resolve()
-                signal = Promise_withResolvers()
-                const s = signal
-                backPressureTimer = setTimeout(() => {
-                    s.resolve()
-                    console.error('pipeSocketDataWithChannel timeout close channel')
-                    sendPackSize = 0
-                    this.close()
-                }, 10_000).unref()
-                if (DEBUG_TUNNEL_TCP) {
-                    console.info('stop wait signal', ' sendPackSize:', sendPackSize, ' recvPackSize:', remoteRecvPackSize, ' bufferPackSize:', bufferPackSize)
-                }
-            }
-            await signal.promise
-            if (backPressureTimer) {
-                clearTimeout(backPressureTimer)
-                backPressureTimer = null
-            }
             await encodeWriter.write(buildTcpTunnelData({
                 type: TUNNEL_TCP_TYPE_DATA,
                 srcId: channel.srcId,
@@ -579,10 +546,12 @@ export function pipeSocketDataWithChannel(channelMap, channelId, encodeWriter) {
                 dstId: channel.dstId,
                 dstChannel: channel.dstChannel,
                 buffer: buffer,
-            })).catch((err) => { console.error('web stream write error', err.message) })
+            })).catch((err) => { console.error(channelId, 'web stream write error', err.message) })
             sendPackSize++
         },
         async close() {
+            channelMap.delete(channelId)
+            socket.destroy()
             encodeWriter.write(buildTcpTunnelData({
                 type: TUNNEL_TCP_TYPE_CLOSE,
                 srcId: channel.srcId,
@@ -590,15 +559,24 @@ export function pipeSocketDataWithChannel(channelMap, channelId, encodeWriter) {
                 dstId: channel.dstId,
                 dstChannel: channel.dstChannel,
                 buffer: new Uint8Array(0),
-            })).catch((err) => { console.error('web stream write error', err.message) })
-            channelMap.delete(channelId)
-            socket.destroy()
+            })).catch((err) => { console.error(channelId, 'pipeSocketDataWithChannel.close web stream write error', err.message) })
         }
     })).catch((err) => {
-        console.error('web stream error', err.message)
+        console.error(channelId, 'pipeSocketDataWithChannel web stream error', err.message, encodeWriter.desiredSize)
+        channelMap.delete(channelId)
+        socket.destroy()
+        encodeWriter.write(buildTcpTunnelData({
+            type: TUNNEL_TCP_TYPE_CLOSE,
+            srcId: channel.srcId,
+            srcChannel: channel.srcChannel,
+            dstId: channel.dstId,
+            dstChannel: channel.dstChannel,
+            buffer: new Uint8Array(0),
+        })).catch((err) => { console.error(channelId, 'web stream write error', err.message) })
     })
     socket.on('error', (err) => {
-        console.error('pipeSocketDataWithChannel on error ', err.message)
+        console.error(channelId, 'pipeSocketDataWithChannel on error ', err.message)
+        channelMap.delete(channelId)
         encodeWriter.write(buildTcpTunnelData({
             type: TUNNEL_TCP_TYPE_ERROR,
             srcId: channel.srcId,
@@ -606,7 +584,18 @@ export function pipeSocketDataWithChannel(channelMap, channelId, encodeWriter) {
             dstId: channel.dstId,
             dstChannel: channel.dstChannel,
             buffer: new Uint8Array(0),
-        })).catch((err) => { console.error('web stream write error', err.message) })
+        })).catch((err) => { console.error(channelId, 'web stream write error', err.message) })
+    })
+    socket.on('close', () => {
+        console.error(channelId, 'pipeSocketDataWithChannel on close ')
+        encodeWriter.write(buildTcpTunnelData({
+            type: TUNNEL_TCP_TYPE_CLOSE,
+            srcId: channel.srcId,
+            srcChannel: channel.srcChannel,
+            dstId: channel.dstId,
+            dstChannel: channel.dstChannel,
+            buffer: new Uint8Array(0),
+        })).catch((err) => { console.error(channelId, 'pipeSocketDataWithChannel web stream write error', err.message) })
         channelMap.delete(channelId)
     })
 }
@@ -710,8 +699,8 @@ async function dispatchClientBufferData(param, setup, listenKeyParamMap, channel
             srcChannel: channelId,
             dstChannel: data.srcChannel,
             recvPackSize: 0,
+            writableNeedDrainCount: 0,
             key_iv,
-            notify: null,
         }
         channelMap.set(channelId, channel)
         connectSocket.on('connect', () => {
@@ -803,48 +792,25 @@ async function dispatchClientBufferData(param, setup, listenKeyParamMap, channel
             let [clientKey, clientIv] = channel.key_iv
             let buffer = await decrypt(data.buffer, clientKey, clientIv)
             if (buffer.length > 0) {
-                await channel.writer.write(buffer)
+                channel.socket.write(buffer)
+                if (channel.socket.writableNeedDrain) {
+                    channel.writableNeedDrainCount++
+                } else {
+                    channel.writableNeedDrainCount = 0
+                }
+                if (channel.writableNeedDrainCount > 100) {
+                    console.error(channelId, 'scoket.destroy() on writableNeedDrainCount>100', channel.writableNeedDrainCount)
+                    channelMap.delete(channelId)
+                    channel.socket.destroy()
+                }
             }
             channel.recvPackSize++
-            await sendAck(encodeWriter, channel)
-        } else {
-            await closeRemoteChannel(encodeWriter, data)
-        }
-    }
-    if (data.type == TUNNEL_TCP_TYPE_ACK) {
-        let channelId = data.dstChannel
-        let channel = channelMap.get(channelId)
-        if (channel) {
-            channel.srcId = data.dstId
-            channel.dstId = data.srcId
-            let size = readUInt32LE(data.buffer, 0)
-            channel.notify(size)
         } else {
             await closeRemoteChannel(encodeWriter, data)
         }
     }
 }
 
-/**
- * @param {WritableStreamDefaultWriter<Uint8Array>} encodeWriter
- * @param {SocketChannel} channel
- */
-export async function sendAck(encodeWriter, channel) {
-    if (channel.recvPackSize % 5 != 0) {
-        return
-    }
-    let sizeBuffer = new Uint8Array(4)
-    writeUInt32LE(sizeBuffer, channel.recvPackSize, 0)
-    await encodeWriter.write(buildTcpTunnelData({
-        type: TUNNEL_TCP_TYPE_ACK,
-        srcId: channel.srcId,
-        srcChannel: channel.srcChannel,
-        dstId: channel.dstId,
-        dstChannel: channel.dstChannel,
-        buffer: sizeBuffer,
-    }))
-}
-
 /**
  * @param {WritableStreamDefaultWriter<Uint8Array>} encodeWriter
  * @param {TCP_TUNNEL_DATA} data
@@ -1060,9 +1026,15 @@ export class TunnelTcpClientHelper {
         let server = net.createServer((socket) => {
             let channelId = this.param.uniqueId++
             socket.on('error', (err) => {
-                console.error('createTunnelTcpClientHelper on socket error', err.message)
+                console.error(channelId, 'TunnelTcpClientHelper.connect.onconnect socket error', err.message)
                 this.channelMap.delete(channelId)
             })
+            socket.on('end', () => {
+                console.info(channelId, 'TunnelTcpClientHelper.connect.onconnect socket end')
+            })
+            socket.on('close', () => {
+                console.info(channelId, 'TunnelTcpClientHelper.connect.onconnect socket close')
+            })
             /** @type{TUNNEL_TCP_DATA_CONNECT} */
             let connectData = { key: sha512(param.tunnelKey) }
             /** @type{SocketChannel} */
@@ -1074,8 +1046,8 @@ export class TunnelTcpClientHelper {
                 dstId: 0,
                 dstChannel: 0,
                 recvPackSize: 0,
+                writableNeedDrainCount: 0,
                 key_iv,
-                notify: null,
             }
             this.channelMap.set(channelId, channel)
             this.encodeWriter.write(buildTcpTunnelData({
@@ -1088,7 +1060,7 @@ export class TunnelTcpClientHelper {
             }))
         }).listen(param.port)
         server.on('error', (err) => {
-            console.error('createTunnelTcpClientHelper connect on server error', err.message)
+            console.error('TunnelTcpClientHelper.connect server error', err.message)
         })
         this.param.signal.addEventListener('abort', () => { server.close() })
     }