Skip to content

Commit

Permalink
ss
Browse files Browse the repository at this point in the history
  • Loading branch information
mrluanma committed Mar 14, 2024
1 parent b42bf17 commit 2d5e7cf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
11 changes: 2 additions & 9 deletions local.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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());

conn.on('error', (err) => console.error(`local: ${err}`));

Expand Down Expand Up @@ -164,13 +163,7 @@ var server = net.createServer(async (conn) => {
conn.write(buf);

// connect to remote server
const h2c = http2.connect(aServer);
h2c.on('error', (err) => console.error(`local: ${err}`));

const out = h2c.request(
{':path': '/', ':method': 'post'},
{endStream: false},
);
const out = net.connect(+aServer.port, aServer.hostname);
out.on('error', (err) => console.error(`local: ${err}`));
console.log(`connecting ${remoteAddr} via ${aServer}`);

Expand Down
5 changes: 2 additions & 3 deletions server.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -45,9 +44,9 @@ const PORT = config.remote_port;
const KEY = config.password;
let METHOD = config.method;

const server = http2.createServer();
const server = net.createServer();
server.on('error', (err) => console.error(`server: ${err}`));
server.on('stream', async (conn, _) => {
server.on('connection', async (conn) => {
console.log('server connected');
const encryptor = new Encryptor(KEY, METHOD);
let remoteAddr;
Expand Down

0 comments on commit 2d5e7cf

Please sign in to comment.