update http proxy

Author: CoNETProject

src/localServer/proxyServer.ts

@@ -15,38 +15,68 @@ import { TransformCallback } from 'stream'
 import { ethers } from 'ethers'
 import EthCrypto from 'eth-crypto'
 import * as Crypto from 'crypto'
-import async from 'async'
-import CONET_Guardian_NodeInfo_ABI from './abi/CONET_Guardian_NodeInfo.json'
+import IP from 'ip'
+import {resolve4} from 'node:dns'
+import {createConnection} from 'node:net'
+
+const _HTTP_200 = ( body: string ) => {
+	const ret = `HTTP/1.1 200 OK\r\n` +
+				`Content-Type: text/html; charset=UTF-8\r\n` + 
+				`Connection: keep-alive\r\n` + 
+				`Content-Length: ${ body.length }\r\n\r\n` +
+				`${ body }`
+	return ret
+}
+
 
 const isSslFromBuffer = ( buffer ) => {
 
 	const request = buffer.toString()
 	return /^CONNECT\ /i.test(request)
 }
+const getHostIpv4: (host: string) => Promise<string> = (host: string) => new Promise(resolve => {
+	return resolve4(host, (err, ipv4s) => {
+		if (err||!ipv4s?.length) {
+			return resolve ('')
+		}
 
-const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, proxyServer: proxyServer) => {
-
-		
-	const httpHead = new HttpProxyHeader ( buffer )
-	const hostName = httpHead.host
+		return resolve(ipv4s[0])
+	})
+})
 
 
-	const connect = ( _, _data?: Buffer ) => {
+const httpProxy = ( clientSocket: Net.Socket, _buffer: Buffer, agent: string, proxyServer: proxyServer) => {
+	const httpHead = new HttpProxyHeader ( _buffer )
+	const hostName = httpHead.host
+	const ssl = isSslFromBuffer ( _buffer )
+	const connect = (_data: Buffer) => {
+		
 		const uuuu : VE_IPptpStream = {
 			uuid: Crypto.randomBytes (10).toString ('hex'),
 			host: hostName,
-			buffer: buffer.toString ( 'base64' ),
+			buffer: _data.toString ( 'base64' ),
 			cmd: httpHead.methods,
 			port: httpHead.Port,
-			ssl: isSslFromBuffer ( _data ),
+			ssl,
 			order: 0
 		}
+		// socks5Connect(uuuu, clientSocket)
+		// clientSocket.resume ()
 		return proxyServer.requestGetWay ( uuuu, clientSocket )
 	}
-		
-	return connect (null, buffer )
-	
 
+	const reqtest = _buffer.toString()
+	if (/^CONNECT /.test(reqtest)) {
+
+		clientSocket.once ('data', data => {
+			return connect (data)
+		})
+
+		const response = _HTTP_200('')
+		return clientSocket.write(response)
+	}
+
+	return connect (_buffer)
 }
 
 const getRandomSaaSNode = (saasNodes: nodes_info[]) => {
@@ -75,8 +105,6 @@ const getRandomNode = (activeNodes: nodes_info[], saasNode: nodes_info) => {
 	return ret
 }
 
-const CoNET_SI_Network_Domain = 'openpgp.online'
-const conet_DL_getSINodes = `https://${ CoNET_SI_Network_Domain }:4001/api/conet-si-list`
 
 const getPac = ( hostIp: string, port: string, http: boolean, sock5: boolean ) => {
 
@@ -117,15 +145,6 @@ const makePrivateKeyObj = async ( privateArmor: string, password = '' ) => {
 	return privateKey
 }
 
-const getNodeByIpaddress = (ipaddress: string, activeNodes: nodes_info[] ) => {
-
-	const index = activeNodes.findIndex(n => n.ip_addr === ipaddress)
-	if (index > -1) {
-		return activeNodes[index]
-	}
-	logger (Colors.red(`proxyServer getNodeByIpaddress [${ipaddress}] hasn't include at activeNodes list!`))
-	
-}
 
 const encrypt_Message = async (encryptionKeys, message: any) => {
 	const encryptObj = {
@@ -159,7 +178,9 @@ const createSock5ConnectCmd = async (currentProfile: profile, SaaSnode: nodes_in
 		walletAddress: currentProfile.keyID.toLowerCase()
 	}
 
-	logger(Colors.blue(`createSock5ConnectCmd`))
+
+	logger(Colors.blue(`createSock5ConnectCmd data = ${inspect(requestData, false, 3, true)}`))
+
 	const message =JSON.stringify(command)
 	const messageHash = ethers.id(message)
 	const signMessage = EthCrypto.sign(currentProfile.privateKeyArmor, messageHash)
@@ -199,36 +220,6 @@ class transferCount extends Transform {
 }
 
 
-const sendTransferDataToLocalHost = (infoData: ITypeTransferCount) => {
-	return new Promise(resolve => {
-		const option: RequestOptions = {
-			host: 'localhost',
-			method: 'POST',
-			port: '3001',
-			path: '/proxyusage',
-			headers: {
-				'Content-Type': 'application/json;charset=UTF-8',
-				'Connection': 'close',
-			}
-		}
-		const req = requestHttp(option, res => {
-			if (res.statusCode !==200) {
-				return logger (Colors.red(`sendTransferDataToLocalHost res.statusCode [${res.statusCode}] !== 200 ERROR`))
-			}
-			logger (Colors.blue(`sendTransferDataToLocalHost SUCCESS`))
-			res.destroy()
-			resolve(null)
-		})
-	
-		req.on('error', err => {
-			logger (Colors.red(`sendTransferDataToLocalHost on Error!`), err)
-		})
-	
-		req.end(JSON.stringify({data:infoData}))
-	})
-
-}
-
 const ConnectToProxyNode = (cmd : SICommandObj, SaaSnode: nodes_info, entryNode: nodes_info, socket: Net.Socket, uuuu: VE_IPptpStream, server: proxyServer) => {
 
 
@@ -344,10 +335,7 @@ export class proxyServer {
 					}
 
 					default: {
-						const logStream = Colors.magenta(`unsupport proxy protocol!`)
-						loggerToStream(this.logStream, logStream)
-						logger(logStream)
-						return socket.end()
+						return httpProxy(socket, data, agent, this)
 					}
 				}
 			})
@@ -393,7 +381,8 @@ export class proxyServer {
 		if (!upChannel_SaaS_node ) {
 			return logger (Colors.red(`proxyServer makeUpChannel upChannel_SaaS_node Null Error!`))
 		}
-		logger(inspect(upChannel_SaaS_node, false, 3, true))
+
+		
 
 		const cmd = await createSock5ConnectCmd (this.currentProfile, upChannel_SaaS_node, [uuuu])
 		if (!cmd) {
@@ -404,9 +393,9 @@ export class proxyServer {
 
 		const streamString = Colors.blue (`Create gateway request, Layer minus random SaaS node [${Colors.magenta(upChannel_SaaS_node.ip_addr)}] entry node [${Colors.magenta(entryNode.ip_addr)}]\n`)
 
-		loggerToStream(this.logStream, streamString)
-		logger(streamString)
-
+		// loggerToStream(this.logStream, streamString)
+		// logger(streamString)
+		// logger(Colors.blue(`entryNode [${entryNode.ip_addr}] => Saas[${upChannel_SaaS_node.ip_addr}]`))
 
 		ConnectToProxyNode (cmd, upChannel_SaaS_node, entryNode, socket, uuuu, this)
 	}
@@ -443,4 +432,4 @@ export class proxyServer {
 	})
 }
 
-
+//		curl -v -x http://10.0.0.252:3002 "https://www.google.com"

src/localServer/socks.ts

@@ -16,9 +16,7 @@
 
 import * as Net from 'net'
 import * as Rfc1928 from './rfc1928'
-import * as res from './res'
 import * as Crypto from 'crypto'
-import httpProxyHeader from './httpProxy'
 import {proxyServer } from './proxyServer'
 import * as Util from 'util'
 import { logger, hexDebug } from './logger'
@@ -36,22 +34,6 @@ const isSslFromBuffer = ( buffer: Buffer ) => {
 	return ret
 }
 
-const getHostNameFromSslConnection = ( buffer: Buffer ) => {
-	
-	if (!isSslFromBuffer(buffer)) {
-		return null
-	}
-	const lengthPoint = buffer.readInt16BE(0x95)
-	const serverName = buffer.slice (0x97, 0x97 +lengthPoint)
-	//	00000090  00 02 01 00 00 0A 00 08 00 06 00 1D 00 17 00 18  ................
-	//	use IP address
-	if (lengthPoint === 0x0A00 && serverName[0] === 0x8 && serverName[1] === 0x0) {
-		return null
-	}
-	hexDebug(serverName)
-	logger(`getHostNameFromSslConnection lengthPoint[${lengthPoint.toString(16)}] === 0x0A ${lengthPoint === 0x0A00} serverName[0] [${serverName[0].toString(16)}] serverName[0] === 0x8 ${serverName[0] === 0x8} && serverName[1] [${serverName[1].toString(16)}]  === 0x06 [${serverName[1] === 0x0}] `)
-	return serverName.toString()
-}
 
 export class socks5 {
 	private host
@@ -134,6 +116,7 @@ export class socks5 {
 				ssl: isSslFromBuffer (_data),
 				order: 0
 			}
+			
 			return this.proxyServer.requestGetWay ( uuuu, this.socket )
 		})
 
@@ -277,6 +260,7 @@ export class sockt4 {
 			}
 
 		}
+
 		if ( ! this.keep ) {
 			this.debug ? logger (colors.red(`STOP session`)): null
 			this.socket.end ( this.req.request_failed )

src/localServer/userMining.ts

@@ -393,12 +393,14 @@ export class miningV2_Class {
 	private init = (privateKeyArmor: string) => {
 		start (privateKeyArmor)
 	}
+	
 
 	constructor(privateKeyArmor: string) {
 		this.init(privateKeyArmor)
 	}
 
 	public changeUsedNodes (region: string) {
+		
 		SaaSNodes = new Map()
 		const nodes = Guardian_Nodes.filter(n => n.region.split('.')[1] === region)
 
@@ -415,6 +417,7 @@ export class miningV2_Class {
 			if (node && isExisting < 0) {
 				exportNodes.push(node)
 			}
+		
 		} while (exportNodes.length < 10 && exportNodes.length < nodes.length)
 
 		exportNodes.forEach(n => {