green-tunnel 1.8.3 → 2.0.0

package/bin/gt.js

@@ -1,17 +1,16 @@
 #!/usr/bin/env node
 
-const updateNotifier = require('update-notifier');
-const chalk = require('chalk');
-const clear = require('clear');
-const ora = require('ora');
-const debug = require('debug');
-const yargs = require('yargs');
-const pkg = require('../package.json');
-const { Proxy, config, getLogger } = require('../src/index.cjs');
+import chalk from 'chalk';
+import clear from 'clear';
+import ora from 'ora';
+import debug from 'debug';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import { Proxy, config, getLogger } from '../src/index.js';
 
 const logger = getLogger('cli');
 
-const { argv } = yargs
+const argv = yargs(hideBin(process.argv))
 	.usage('Usage: green-tunnel [options]')
 	.usage('Usage: gt [options]')
 	.alias('help', 'h')
@@ -76,11 +75,18 @@ const { argv } = yargs
 		default: true,
 	})
 
+	.option('tls-record-fragmentation', {
+		type: 'boolean',
+		describe: 'enable TLS record fragmentation',
+		default: false
+	})
+
 	.example('$0')
 	.example('$0 --ip 127.0.0.1 --port 8000')
 	.example('$0 --dns-server https://doh.securedns.eu/dns-query')
 	.epilog('ISSUES:  https://github.com/SadeghHayeri/GreenTunnel/issues\n' +
-		'DONATE:  https://github.com/SadeghHayeri/GreenTunnel#donation');
+		'DONATE:  https://github.com/SadeghHayeri/GreenTunnel#donation')
+	.parseSync();
 
 const MAIN_COLOR = '84C66F';
 
@@ -128,6 +134,7 @@ async function main() {
 			port: argv['dns-port']
 		},
 		source: 'CLI',
+		'tlsRecordFragmentation': argv['tls-record-fragmentation']
 	});
 
 	const exitTrap = async () => {
@@ -155,7 +162,6 @@ async function main() {
 	if (!argv['silent'] && !argv['verbose']) {
 		clear();
 		printBanner();
-		updateNotifier({ pkg }).notify();
 		printAlert(proxy);
 		showSpinner();
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "green-tunnel",
-  "version": "1.8.3",
+  "version": "2.0.0",
   "description": "",
   "keywords": [
     "HTTPS",
@@ -21,38 +21,35 @@
     "bin",
     "src"
   ],
-  "main": "src/index.cjs.js",
-  "module": "src/index.js",
+  "type": "module",
+  "main": "src/index.js",
+  "exports": {
+    ".": "./src/index.js"
+  },
   "bin": {
     "green-tunnel": "bin/gt.js",
     "gt": "bin/gt.js"
   },
+  "engines": {
+    "node": ">=20.0.0"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "app-data-folder": "^1.0.0",
-    "chalk": "^2.4.2",
+    "chalk": "^5.6.2",
     "clear": "^0.1.0",
-    "consola": "^2.11.0",
-    "debug": "^4.1.1",
-    "dns-over-http": "^0.1.2",
-    "dns-over-tls": "0.0.6",
+    "debug": "^4.4.0",
+    "dns-over-tls": "^0.0.9",
     "dns-socket": "^4.2.2",
-    "esm": "^3.2.22",
-    "is-docker": "^2.0.0",
-    "lru-cache": "^5.1.1",
-    "node-localstorage": "^2.1.5",
-    "ora": "^3.2.0",
-    "std-env": "^2.2.1",
-    "universal-analytics": "^0.4.20",
-    "update-notifier": "^2.5.0",
-    "validator": "^10.11.0",
-    "winreg": "^1.2.4",
-    "yargs": "^13.2.2"
+    "lru-cache": "^11.2.6",
+    "ora": "^9.3.0",
+    "validator": "^13.15.26",
+    "winreg": "^1.2.5",
+    "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-xo": "^0.26.0"
+    "eslint": "^9.39.3",
+    "eslint-config-xo": "^0.49.0"
   }
 }

package/src/dns/base.js

@@ -1,7 +1,8 @@
-import LRU from 'lru-cache';
-import { isIP } from 'validator';
-import getLogger from '../logger';
-import config from '../config';
+import { LRUCache } from 'lru-cache';
+import validator from 'validator';
+const { isIP } = validator;
+import getLogger from '../logger.js';
+import config from '../config.js';
 
 const logger = getLogger('dns');
 
@@ -11,7 +12,7 @@ function _isIP(v) {
 
 export default class BaseDNS {
 	constructor() {
-		this.cache = new LRU(config.dns.cacheSize);
+		this.cache = new LRUCache({max: config.dns.cacheSize});
 	}
 
 	async lookup(hostname) {

package/src/dns/https.js

@@ -1,8 +1,4 @@
-import {promisify} from 'util';
-import doh from 'dns-over-http';
-import BaseDNS from './base';
-
-const dohQueryAsync = promisify(doh.query);
+import BaseDNS from './base.js';
 
 export default class DNSOverHTTPS extends BaseDNS {
 	constructor(dnsServer) {
@@ -11,7 +7,24 @@ export default class DNSOverHTTPS extends BaseDNS {
 	}
 
 	async _lookup(hostname) {
-		const result = await dohQueryAsync({url: this.dnsServer}, [{type: 'A', name: hostname}]);
-		return result.answers[0].data;
+		const url = new URL(this.dnsServer);
+		url.searchParams.set('name', hostname);
+		url.searchParams.set('type', 'A');
+
+		const response = await fetch(url.toString(), {
+			headers: {Accept: 'application/dns-json'},
+		});
+
+		if (!response.ok) {
+			throw new Error(`DoH request failed: ${response.status}`);
+		}
+
+		const result = await response.json();
+
+		if (!result.Answer || result.Answer.length === 0) {
+			throw new Error(`No DNS answers for ${hostname}`);
+		}
+
+		return result.Answer[0].data;
 	}
 }

package/src/dns/tls.js

@@ -1,5 +1,5 @@
 import dnstls from 'dns-over-tls';
-import BaseDNS from './base';
+import BaseDNS from './base.js';
 
 export default class DNSOverTLS extends BaseDNS {
 	async _lookup(hostname) {

package/src/dns/unencrypted.js

@@ -1,5 +1,5 @@
 import dnsSocket from 'dns-socket';
-import BaseDNS from './base';
+import BaseDNS from './base.js';
 
 const socket = dnsSocket()
 

package/src/handlers/http.js

@@ -1,8 +1,8 @@
 import {URL} from 'url';
-import {isStartOfHTTPRequest} from '../http/utils';
-import {createConnection, closeSocket, tryWrite} from '../utils/socket';
-import HTTPRequest from '../http/request';
-import getLogger from '../logger';
+import {isStartOfHTTPRequest} from '../http/utils.js';
+import {createConnection, closeSocket, tryWrite} from '../utils/socket.js';
+import HTTPRequest from '../http/request.js';
+import getLogger from '../logger.js';
 
 const logger = getLogger('https-handler');
 

package/src/handlers/https.js

@@ -1,8 +1,8 @@
 import {URL} from 'url';
-import {bufferToChunks} from '../utils/buffer';
-import {createConnection, closeSocket, tryWrite} from '../utils/socket';
-import HTTPResponse from '../http/response';
-import getLogger from '../logger';
+import {bufferToChunks} from '../utils/buffer.js';
+import {createConnection, closeSocket, tryWrite} from '../utils/socket.js';
+import HTTPResponse from '../http/response.js';
+import getLogger from '../logger.js';
 
 const logger = getLogger('https-handler');
 
@@ -43,7 +43,7 @@ export default async function handleHTTPS(clientSocket, firstChunk, proxy) {
 	// -- clientSocket --
 
 	clientSocket.once('data', clientHello => {
-		const chunks = bufferToChunks(clientHello, proxy.config.clientHelloMTU);
+		const chunks = bufferToChunks(clientHello, proxy.config.clientHelloMTU, proxy.config.tlsRecordFragmentation);
 		for (const chunk of chunks) {
 			logger.debug(`[HTTPS HELLO] ${url.host} (length: ${chunk.length})`);
 			tryWrite(serverSocket, chunk, close);

package/src/handlers/request.js

@@ -1,6 +1,6 @@
-import {isStartOfHTTPRequest, isConnectMethod} from '../http/utils';
-import handleHTTP from './http';
-import handleHTTPS from './https';
+import {isStartOfHTTPRequest, isConnectMethod} from '../http/utils.js';
+import handleHTTP from './http.js';
+import handleHTTPS from './https.js';
 
 export default async function handleRequest(clientSocket, proxy) {
 	clientSocket.resume();

package/src/http/request.js

@@ -1,4 +1,4 @@
-import {parseRequest} from './utils';
+import {parseRequest} from './utils.js';
 
 export default class HTTPRequest {
 	constructor(rawReq) {

package/src/http/response.js

@@ -1,4 +1,4 @@
-import {parseRequest} from './utils';
+import {parseRequest} from './utils.js';
 
 export default class HTTPResponse {
 	constructor(rawReq) {

package/src/index.cjs

@@ -0,0 +1,7 @@
+'use strict';
+// CJS interop shim — green-tunnel is now an ES module.
+// CommonJS callers must use dynamic import:
+//   const gt = await import('green-tunnel');
+throw new Error(
+  'green-tunnel is an ES module. Use `import` (or dynamic `await import(\'green-tunnel\')`) instead of `require()`.'
+);

package/src/index.js

@@ -1,4 +1,4 @@
-export {default as Proxy} from './proxy';
-export {default as config} from './config';
-export {default as handleRequest} from './handlers/request';
-export {default as getLogger} from './logger';
+export {default as Proxy} from './proxy.js';
+export {default as config} from './config.js';
+export {default as handleRequest} from './handlers/request.js';
+export {default as getLogger} from './logger.js';

package/src/proxy.js

@@ -1,12 +1,12 @@
 import net from 'net';
-import { setProxy, unsetProxy } from './utils/system-proxy';
-import handleRequest from './handlers/request';
-import DNSOverTLS from './dns/tls';
-import DNSOverHTTPS from './dns/https';
-import DNSUnencrypted from './dns/unencrypted';
-import config from './config';
-import getLogger from './logger';
-import { appInit } from './utils/analytics';
+import { setProxy, unsetProxy } from './utils/system-proxy.js';
+import handleRequest from './handlers/request.js';
+import DNSOverTLS from './dns/tls.js';
+import DNSOverHTTPS from './dns/https.js';
+import DNSUnencrypted from './dns/unencrypted.js';
+import config from './config.js';
+import getLogger from './logger.js';
+import { appInit } from './utils/analytics.js';
 
 const logger = getLogger('proxy');
 

package/src/utils/analytics.js

@@ -1,28 +1,59 @@
-import ua from 'universal-analytics';
-import uuid from 'uuid/v4';
-import { JSONStorage } from 'node-localstorage';
-import appData from 'app-data-folder';
-import os from 'os';
-import packageJson from '../../package.json'
-import isDocker from 'is-docker';
-
-const nodeStorage = new JSONStorage(appData('greentunnel'));
-const userId = nodeStorage.getItem('userid') || uuid();
-nodeStorage.setItem('userid', userId);
-
-var visitor = ua('UA-160385585-1', userId);
-
-function appInit(source = 'OTHER') {
-  const osPlatform = os.platform() + (isDocker() ? '-docker' : '')
-
-  visitor.set('version', packageJson.version);
-  visitor.set('os', osPlatform);
-  visitor.set('source', source);
-
-  visitor.event('gt-total', 'init').send();
-  visitor.event(`gt-${source}`, 'init').send();
-  visitor.event(`gt-${osPlatform}`, 'init').send();
-  visitor.event(`gt-${packageJson.version}`, 'init').send();
+import { homedir } from 'os';
+import { join } from 'path';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { randomUUID } from 'crypto';
+import packageJson from '../../package.json' with { type: 'json' };
+
+const MEASUREMENT_ID = 'G-D1R7M2YZ8Q';
+
+// Get this from: GA4 Admin → Data Streams → select stream → Measurement Protocol API secrets → Create
+const API_SECRET = 'Y_lvWjBxSG2-k5UYBJQQ7Q';
+
+const CONFIG_DIR = join(homedir(), '.config', 'greentunnel');
+const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
+
+function getClientId() {
+	try {
+		mkdirSync(CONFIG_DIR, {recursive: true});
+		let config = {};
+		if (existsSync(CONFIG_FILE)) {
+			config = JSON.parse(readFileSync(CONFIG_FILE, 'utf8'));
+		}
+
+		if (!config.clientId) {
+			config.clientId = randomUUID();
+			writeFileSync(CONFIG_FILE, JSON.stringify(config));
+		}
+
+		return config.clientId;
+	} catch {
+		return randomUUID();
+	}
 }
 
-export {appInit};
+async function sendEvent(name, params = {}) {
+	if (!API_SECRET) return;
+
+	try {
+		await fetch(
+			`https://www.google-analytics.com/mp/collect?measurement_id=${MEASUREMENT_ID}&api_secret=${API_SECRET}`,
+			{
+				method: 'POST',
+				body: JSON.stringify({
+					client_id: getClientId(),
+					events: [{name, params}],
+				}),
+			},
+		);
+	} catch {
+		// Analytics failures must never crash the app
+	}
+}
+
+export function appInit(source = 'OTHER') {
+	sendEvent('app_init', {
+		source,
+		version: packageJson.version,
+		platform: process.platform,
+	});
+}

package/src/utils/buffer.js

@@ -1,4 +1,5 @@
-export function bufferToChunks(buffer, chunkSize) {
+export function bufferToChunks(buffer, chunkSize, recordFragmentation) {
+	if(recordFragmentation) buffer=tlsRecordFragmentation(buffer, chunkSize)
 	const result = [];
 	const len = buffer.length;
 	let i = 0;
@@ -9,3 +10,26 @@ export function bufferToChunks(buffer, chunkSize) {
 
 	return result;
 }
+/**
+ * @param {Buffer} buffer
+ * @param {number} chunkSize
+ */
+function tlsRecordFragmentation(buffer, chunkSize) {
+	const list = []
+	const header = buffer.subarray(0,3)
+	const fullRecord = buffer.subarray(5)
+	const len = fullRecord.length
+	let i = 0
+
+	while (i < len) {
+		const record = fullRecord.subarray(i, i+chunkSize)
+		const recordLength = record.length
+		const buf = Buffer.alloc(recordLength+5)
+		header.copy(buf)
+		buf.writeUInt16BE(recordLength,3)
+		record.copy(buf,5)
+		list.push(buf)
+		i+=chunkSize
+	}
+	return Buffer.concat(list)
+}

package/src/utils/socket.js

@@ -1,5 +1,5 @@
 import net from 'net';
-import getLogger from '../logger';
+import getLogger from '../logger.js';
 
 const logger = getLogger('socket');
 

package/src/utils/system-proxy.js

@@ -1,9 +1,12 @@
 import util from 'util';
 import os from 'os';
 import path from 'path';
+import { fileURLToPath } from 'url';
 import {exec as _exec, spawn} from 'child_process';
 import Registry from 'winreg';
-import getLogger from '../logger';
+import getLogger from '../logger.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const logger = getLogger('system-proxy');
 const exec = util.promisify(_exec);

package/src/index.cjs.js

@@ -1,3 +0,0 @@
-const esm = require('esm')(module);
-
-module.exports = esm('./index.js');