update

Author: CoNETProject

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@conet.project/conet-proxy",
 
-    "version": "0.5.0",
+    "version": "0.5.1",
 
     "license": "UNLICENSED",
     "files": [

src/index.ts

@@ -36,7 +36,7 @@ export const launchDaemon = (port: number, path: string) => {
     new Daemon ( port, path )
 }
 
-export const proxyServer = (post: string, entryNode: nodes_info, _egressNode: nodes_info, profile: profile) => new proxyServer_class(post, [entryNode], [_egressNode], profile, false, '')
+export const proxyServer = (post: string, entryNode: nodes_info, _egressNode: nodes_info, privateKey: string) => new proxyServer_class(post, [entryNode], [_egressNode], privateKey, false, '')
 
 if (argv.port || argv.path) {
     PATH = argv.path

src/localServer/localServer.ts

@@ -178,23 +178,12 @@ const joinMetadata = (metadata: any ) => {
 
 let _proxyServer: proxyServer
 
-const changeRegion = (selectedCountry: string) => {
 
-	const result = miningClass.changeUsedNodes (selectedCountry)
-	if (!result || !result.length) {
-		return false
-	}
-
-	const activeNodes = result.slice(0, result.length/2)
-	const egressNodes = result.slice(result.length/2)
-
-	if (_proxyServer) {
-		_proxyServer.restart(profile, activeNodes, egressNodes)
-	} else {
-		_proxyServer = new proxyServer((3002).toString(), activeNodes, egressNodes, profile, true, '')
-	}
+const startSilentPass = (vpnObj: Native_StartVPNObj) => {
+	logger(inspect(vpnObj, false, 3, true))
 
-	return result
+	new proxyServer((3002).toString(), vpnObj.entryNodes, vpnObj.exitNode, vpnObj.privateKey, true, '')
+	return true
 }
 
 
@@ -221,6 +210,13 @@ export const return404 = () => {
 }
 
 
+type Native_StartVPNObj = {
+	entryNodes: nodes_info[]
+	privateKey: string
+	exitNode: nodes_info[]
+}
+
+
 export class Daemon {
     private logsPool: proxyLogs[] = []
 
@@ -454,20 +450,16 @@ export class Daemon {
 
 
      	app.post('/startSilentPass', async (req: any, res: any) => {
-            const selectedCountry = req.body.selectedCountry;
+            const vpnObj: Native_StartVPNObj = req.body.vpnInfo
 
-            console.log('selectedCountry', selectedCountry)
 
-			if (!selectedCountry) {
+			if (!vpnObj) {
 				return res.status(400).send({ error: "No country selected" })
 			}
-			const ret = changeRegion (selectedCountry)
 
-			if (!ret) {
-				return res.status(400).send({ error: `No nodes find in region ${selectedCountry}` })
-			}
+			startSilentPass (vpnObj)
 
-			res.json(ret).end()
+			res.status(200).json({}).end()
 
         })
 

src/localServer/proxyServer.ts

@@ -13,7 +13,6 @@ import type {RequestOptions} from 'node:https'
 import * as openpgp from 'openpgp'
 import { TransformCallback } from 'stream'
 import { ethers } from 'ethers'
-import EthCrypto from 'eth-crypto'
 import * as Crypto from 'crypto'
 import IP from 'ip'
 import {resolve4} from 'node:dns'
@@ -160,11 +159,8 @@ const encrypt_Message = async (encryptionKeys, message: any) => {
 }
 
 
-const createSock5ConnectCmd = async (currentProfile: profile, SaaSnode: nodes_info, requestData: any[]) => {
-	if (!currentProfile.pgpKey|| !SaaSnode.armoredPublicKey ) {
-		logger (Colors.red(`currentProfile?.pgpKey[${currentProfile?.pgpKey}]|| !SaaSnode?.armoredPublicKey[${SaaSnode?.armoredPublicKey}] Error`))
-		return null
-	}
+const createSock5ConnectCmd = async (wallet: ethers.Wallet, SaaSnode: nodes_info, requestData: any[]) => {
+
 
 	if  (!SaaSnode?.publicKeyObj) {
 		SaaSnode.publicKeyObj = await openpgp.readKey ({ armoredKey: SaaSnode.armoredPublicKey })
@@ -177,19 +173,18 @@ const createSock5ConnectCmd = async (currentProfile: profile, SaaSnode: nodes_in
 		algorithm: 'aes-256-cbc',
 		Securitykey: key,
 		requestData,
-		walletAddress: currentProfile.keyID.toLowerCase()
+		walletAddress: wallet.address.toLowerCase()
 	}
 
 
 	logger(Colors.blue(`createSock5ConnectCmd data = ${inspect(requestData, false, 3, true)}`))
 	logger(Colors.blue(`createSock5ConnectCmd data length = ${requestData[0].buffer.length}`))
 
 	const message =JSON.stringify(command)
-	const messageHash = ethers.id(message)
-	const signMessage = EthCrypto.sign(currentProfile.privateKeyArmor, messageHash)
-
+	const signMessage = await wallet.signMessage(message)
 
 	const encryptedCommand = await encrypt_Message( SaaSnode.publicKeyObj, {message, signMessage})
+	logger(inspect({message, signMessage}, false, 3, true))
 	command.requestData = [encryptedCommand, '', key]
 	return (command)
 }
@@ -297,6 +292,7 @@ export class proxyServer {
 	public connectHostTimeOut = 1000 * 5
 	public useGatWay = true
 	public clientSockets: Set<Net.Socket> = new Set()
+	public currentWallet: ethers.Wallet
 
 	private startLocalProxy = async () => {
 
@@ -363,16 +359,6 @@ export class proxyServer {
 		this.server.listen ( this.proxyPort, () => {
 			return logger ( Colors.blue(`Proxy SERVER success on port : [${ this.proxyPort }] entry nodes length =[${this._egressNodes?.length}] SaaS nodes = [${this._egressNodes?.length}]`))
 		})
-
-		if (!this.currentProfile?.keyObj) {
-			this.currentProfile.keyObj = {
-				privateKeyObj: null,
-				publicKeyObj: null
-			}
-		}
-		if (this.currentProfile.pgpKey?.privateKeyArmor) {
-			this.currentProfile.keyObj.privateKeyObj = await makePrivateKeyObj (this.currentProfile.pgpKey.privateKeyArmor)
-		}
 
 	}
 
@@ -387,7 +373,7 @@ export class proxyServer {
 
 
 
-		const cmd = await createSock5ConnectCmd (this.currentProfile, upChannel_SaaS_node, [uuuu])
+		const cmd = await createSock5ConnectCmd (this.currentWallet, upChannel_SaaS_node, [uuuu])
 		if (!cmd) {
 			return logger (Colors.red(`requestGetWay createSock5Connect return Null Error!`))
 		}
@@ -403,8 +389,8 @@ export class proxyServer {
 		ConnectToProxyNode (cmd, upChannel_SaaS_node, entryNode, socket, uuuu, this)
 	}
 
-	public restart = (currentProfile: profile, entryNodes: nodes_info[], egressNodes: nodes_info[]) => {
-		this.currentProfile = currentProfile
+	public restart = (privateKey: string, entryNodes: nodes_info[], egressNodes: nodes_info[]) => {
+		this.privateKey = privateKey
 		this._entryNodes = entryNodes
 		this._egressNodes = egressNodes
 	}
@@ -413,7 +399,7 @@ export class proxyServer {
 		public proxyPort: string,						//			Proxy server listening port number
 		private _entryNodes: nodes_info[],	 				//			gateway nodes information
 		private _egressNodes: nodes_info[],
-		private currentProfile: profile,
+		private privateKey: string,
 		public debug = false,
 		public logStream: string
 
@@ -422,7 +408,7 @@ export class proxyServer {
 
 		logger(Colors.magenta(`${proxyPort} Entry Nodes\n${_entryNodes.map(n => [n.ip_addr, n.region])}`))
 		logger(Colors.magenta(`${proxyPort} Egress Nodes\n${ _egressNodes.map(n =>[n.ip_addr, n.region])}`))
-
+		this.currentWallet = new ethers.Wallet(privateKey)
 		this.startLocalProxy()
 	}
 
@@ -435,4 +421,4 @@ export class proxyServer {
 	})
 }
 
-//		curl -v -x http://10.0.0.252:3002 "https://www.google.com"
+//		curl -v -x http://127.0.0.1:3002 "https://www.google.com"

src/localServer/workers/asset-manifest.json

@@ -1,15 +1,45 @@
 {
   "files": {
-    "main.css": "/static/css/main.673e4c55.css",
-    "main.js": "/static/js/main.f4bf2749.js",
+    "main.css": "/static/css/main.455a79af.css",
+    "main.js": "/static/js/main.f6ddc4ce.js",
     "static/js/453.9af89cb1.chunk.js": "/static/js/453.9af89cb1.chunk.js",
+    "static/media/silent-pass-benefits-table.svg": "/static/media/silent-pass-benefits-table.db3e4d9038c74e4db61d77082607294a.svg",
+    "static/media/silent-pass-service-table.svg": "/static/media/silent-pass-service-table.21f5b4345d1ad5863f9b8ca55363555a.svg",
+    "static/media/solana-token.svg": "/static/media/solana-token.b77c9030d92aee4550b3ce4f4e946c93.svg",
+    "static/media/sp-token.svg": "/static/media/sp-token.01da7809f36c2002dfb6fd98f3827a44.svg",
+    "static/media/conet-token.svg": "/static/media/conet-token.bfd058b390550a59eb001c3a061be91e.svg",
+    "static/media/support-icon-blue.svg": "/static/media/support-icon-blue.fc618a7a2e712f8d06452a587b8c3c58.svg",
+    "static/media/support-icon-grey.svg": "/static/media/support-icon-grey.ce648861de23558a27a367d4c1b1f552.svg",
+    "static/media/visibility-off.svg": "/static/media/visibility-off.12c2f0679ae08f45f758744e3ed0fce8.svg",
+    "static/media/settings-icon-blue.svg": "/static/media/settings-icon-blue.a9f308f21753ac8e4c79a4692e266781.svg",
+    "static/media/settings-icon-grey.svg": "/static/media/settings-icon-grey.4efb1fee571c250dac8b77a075c77a71.svg",
+    "static/media/extra-reward.svg": "/static/media/extra-reward.25c85d3bfc3b9df10349de5fbcecf30e.svg",
+    "static/media/proxy-information.svg": "/static/media/proxy-information.a87fdb94d52988a7fd427524bea13837.svg",
+    "static/media/faq-icon.svg": "/static/media/faq-icon.e84a33a3a76e89bf3daf58baf1189fe8.svg",
+    "static/media/help.svg": "/static/media/help.e84a33a3a76e89bf3daf58baf1189fe8.svg",
+    "static/media/visibility-on.svg": "/static/media/visibility-on.f5df4f90160c7c5a31897a7432ef7c6a.svg",
+    "static/media/application.svg": "/static/media/application.43d120a2e74e3c4818090a317f997652.svg",
+    "static/media/language.svg": "/static/media/language.43d120a2e74e3c4818090a317f997652.svg",
+    "static/media/progress-activity.svg": "/static/media/progress-activity.9abf838e0c87127f49cc95fa63508d0f.svg",
+    "static/media/lock-icon.svg": "/static/media/lock-icon.5792ac0be414f7efee34e8ab32edf1b2.svg",
+    "static/media/usdt-icon.svg": "/static/media/usdt-icon.863996f3459b58076acd013b84f66f57.svg",
+    "static/media/eth-token.svg": "/static/media/eth-token.a01de1155563ab3775bad55ce05a7957.svg",
+    "static/media/right-chevron.svg": "/static/media/right-chevron.c19265445e3b2c1f01ac246a3bd9f75a.svg",
     "index.html": "/index.html",
-    "main.673e4c55.css.map": "/static/css/main.673e4c55.css.map",
-    "main.f4bf2749.js.map": "/static/js/main.f4bf2749.js.map",
+    "static/media/quotes-icon.svg": "/static/media/quotes-icon.73e155d019de520a603406dff24a2a34.svg",
+    "static/media/wallet-icon-blue.svg": "/static/media/wallet-icon-blue.254e02dcba55c027e5c692f8df78c573.svg",
+    "static/media/wallet-icon-grey.svg": "/static/media/wallet-icon-grey.a9ec9c11f1a47711d8b76924c4961495.svg",
+    "static/media/ads-block.svg": "/static/media/ads-block.47d4110dcba7c665d18aca0342e609ad.svg",
+    "static/media/wallet-icon.svg": "/static/media/wallet-icon.74ec366fac4e5645a70e6276346e9413.svg",
+    "static/media/home-icon-blue.svg": "/static/media/home-icon-blue.45c1c9a5a853e7916aead3e3f6609425.svg",
+    "static/media/home-icon-grey.svg": "/static/media/home-icon-grey.4aa751c909129f6c3b4ba9fa19c15715.svg",
+    "static/media/split-tunneling.svg": "/static/media/split-tunneling.9e6f6574614b30a8fa5483b6e26b49af.svg",
+    "main.455a79af.css.map": "/static/css/main.455a79af.css.map",
+    "main.f6ddc4ce.js.map": "/static/js/main.f6ddc4ce.js.map",
     "453.9af89cb1.chunk.js.map": "/static/js/453.9af89cb1.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.673e4c55.css",
-    "static/js/main.f4bf2749.js"
+    "static/css/main.455a79af.css",
+    "static/js/main.f6ddc4ce.js"
   ]
 }