From 5625e0bf70b2f6ecd6caa9ded8cfdb3e85438f42 Mon Sep 17 00:00:00 2001 From: Zhao Xiaohong Date: Thu, 14 Mar 2024 18:06:27 +0800 Subject: [PATCH] ss --- config.json | 2 +- local.js | 9 ++------- server.js | 5 ++--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/config.json b/config.json index 8b6a564..40ac287 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,5 @@ { - "server": "http://127.0.0.1", + "server": "tcp://127.0.0.1", "local_address": "127.0.0.1", "local_port": 1080, "remote_port": 8080, diff --git a/local.js b/local.js index ef10af3..b3db979 100644 --- a/local.js +++ b/local.js @@ -1,6 +1,5 @@ import net from 'net'; import fs from 'fs'; -import http2 from 'node:http2'; import parseArgs from 'minimist'; import {Encryptor} from './encrypt.js'; import {inetNtoa, createTransform} from './utils.js'; @@ -72,7 +71,7 @@ var server = net.createServer(async (conn) => { let remoteAddr = null; let remotePort = null; let addrToSend = ''; - const aServer = getServer(); + const aServer = new URL(getServer()); await new Promise((resolve, reject) => { conn.once('readable', resolve); @@ -157,11 +156,7 @@ var server = net.createServer(async (conn) => { conn.write(buf); // connect to remote server - const h2c = http2.connect(aServer); - const out = h2c.request( - {':path': '/', ':method': 'post'}, - {endStream: false}, - ); + const out = net.connect(+aServer.port, aServer.hostname); console.log(`connecting ${remoteAddr} via ${aServer}`); const writable = createTransform(encryptor.encrypt.bind(encryptor)); diff --git a/server.js b/server.js index 6d18bd5..ee08bb9 100644 --- a/server.js +++ b/server.js @@ -1,6 +1,5 @@ import net from 'net'; import fs from 'fs'; -import http2 from 'node:http2'; import parseArgs from 'minimist'; import {Encryptor} from './encrypt.js'; import {inetNtoa, createTransform} from './utils.js'; @@ -45,8 +44,8 @@ const PORT = config.remote_port; const KEY = config.password; let METHOD = config.method; -const server = http2.createServer(); -server.on('stream', async (conn, _) => { +const server = net.createServer(); +server.on('connection', async (conn) => { console.log('server connected'); const encryptor = new Encryptor(KEY, METHOD); let remoteAddr;