Merge branch 'main' of https://github.com/MoIzadloo/tsocks.git

Author: MoIzadloo

CHANGELOG.md

@@ -1,3 +1,14 @@
+# [v3.5.0](https://github.com/MoIzadloo/tsocks/compare/v3.4.0...v3.5.0) (2024-10-25)
+
+## ✨ New Features
+
+- [`6166ae9`](https://github.com/MoIzadloo/tsocks/commit/6166ae9) feat: new obfs method
+
+## 🐛 Bug Fixes
+
+- [`15264f9`](https://github.com/MoIzadloo/tsocks/commit/15264f9) fix: husky and build
+- [`29e34c8`](https://github.com/MoIzadloo/tsocks/commit/29e34c8) fix: husky and build
+
 # [v3.4.0](https://github.com/MoIzadloo/tsocks/compare/v3.3.0...v3.4.0) (2023-04-29)
 
 ## ✨ New Features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsocks",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "private": false,
   "browser": false,
   "author": "Mostafa Izadloo <[email protected]>",

src/client/client.ts

@@ -61,7 +61,7 @@ export class Client {
     version: 4 | 5,
     obfs: ObfsBuilder,
     userId?: string,
-    tls?: boolean,
+    tls?: boolean
   ) {
     this.host = host
     this.port = port
@@ -96,8 +96,8 @@ export class Client {
     version?: 4 | 5,
     userId?: string
   ) {
-    let socket;
-    if (this.tls){
+    let socket
+    if (this.tls) {
       socket = tls.connect(this.port, this.host, { rejectUnauthorized: false })
     } else {
       socket = net.connect(this.port, this.host)
@@ -280,7 +280,7 @@ export const connect = (
   host: string,
   version: 4 | 5,
   userId?: string,
-  tls?: boolean,
+  tls?: boolean
 ) => {
   return new Client(port, host, version, none(), userId, tls)
 }

src/obfs/websocket.ts

@@ -98,8 +98,8 @@ class WebSocket extends ObfsMethod {
   }
 
   private generateWebSocketKey(): string {
-    const randomBytes = crypto.randomBytes(16);
-    return randomBytes.toString('base64');
+    const randomBytes = crypto.randomBytes(16)
+    return randomBytes.toString('base64')
   }
 
   /**
@@ -109,10 +109,14 @@ class WebSocket extends ObfsMethod {
    */
   handshake(callback?: () => void): void {
     if (this.connection.type === Connection.CLIENT) {
-      const secWebSocketKey = this.generateWebSocketKey(); // Generate a unique key for the handshake
+      const secWebSocketKey = this.generateWebSocketKey() // Generate a unique key for the handshake
       const handshakeRequest =
         `GET ${this.path} HTTP/1.1\r\n` +
-        `Host: ${this.hostName ? this.hostName : `${this.connection.socket.remoteAddress}:${this.connection.socket.remotePort}`}\r\n` +
+        `Host: ${
+          this.hostName
+            ? this.hostName
+            : `${this.connection.socket.remoteAddress}:${this.connection.socket.remotePort}`
+        }\r\n` +
         'Upgrade: websocket\r\n' +
         'Connection: Upgrade\r\n' +
         `Sec-WebSocket-Key: ${secWebSocketKey}\r\n` +

src/server/state/socks5.ts

@@ -3,7 +3,7 @@ import Request from '../../helper/request'
 import * as socks4 from './socks4'
 import { State } from '../../helper/state'
 import Authenticator from '../auth/authenticator'
-import {  none, websocket } from '../../obfs'
+import { none, websocket } from '../../obfs'
 
 /**
  * The ObfsState class identifies the obfuscation method