Skip to content

Commit bf361e8

Browse files
CoNETProjectCoNETProject
committed
update
1 parent b51dd3f commit bf361e8

File tree

73 files changed

+420
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+420
-56
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@conet.project/conet-proxy",
33

4-
"version": "0.5.1",
4+
"version": "0.5.2",
55

66
"license": "UNLICENSED",
77
"files": [

‎src/localServer/localServer.ts‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,30 @@ import {logger} from './logger'
1111
import Ip from "ip"
1212
import {ethers} from 'ethers'
1313
import * as openpgp from 'openpgp'
14+
import os from 'node:os'
1415
import CONET_Guardian_NodeInfo_ABI from './CONET_Guardian_NodeInfo_ABI.json'
1516

1617
import {miningV2_Class} from './userMining'
1718

1819

20+
1921
const ver = '0.1.4'
2022

23+
const getLocalNetworkIpaddress = () => {
24+
const interfaceAll = os.networkInterfaces()
25+
let ipv4: string[] = []
26+
27+
Object.keys(interfaceAll).map(n => {
28+
const _address = interfaceAll[n]?.filter((n:os.NetworkInterfaceInfo) => n.family === 'IPv4')
29+
if (_address) {
30+
ipv4 = [...ipv4, ..._address.map(n => n.address)]
31+
}
32+
33+
})
34+
35+
const ret = ipv4.filter(n => !/^127\.|^169\./.test(n))
36+
return ret[0]
37+
}
2138

2239
const CONET_Guardian_NodeInfoV6 = "0x9e213e8B155eF24B466eFC09Bcde706ED23C537a"
2340
const conet_rpc = 'https://rpc.conet.network'
@@ -299,8 +316,8 @@ export class Daemon {
299316
})
300317

301318
app.get('/ipaddress', (req: any, res: any) => {
302-
303-
return res.json ({ip:Ip.address()}).end()
319+
320+
return res.json ({ip:getLocalNetworkIpaddress()}).end()
304321
})
305322

306323
app.post ('/proxyusage', (req, res) => {
@@ -463,12 +480,12 @@ export class Daemon {
463480

464481
})
465482

466-
app.get('/stopSilentPass'), async (req: any, res: any) => {
483+
app.get('/stopSilentPass', async (req: any, res: any) => {
467484
if (_proxyServer) {
468485
await _proxyServer.end()
469486
}
470487
res.status(200).end()
471-
}
488+
})
472489

473490
app.post('/loginRequest', (req: any, res: any) =>{
474491

@@ -528,5 +545,4 @@ export class Daemon {
528545
// curl -v localhost:3001/getAllRegions
529546
// curl -X POST -H "Content-Type: application/json" --data '{"selectedCountry": "US"}' "http://localhost:3001/startSilentPass"
530547
// Proxy server test
531-
// curl -v -4 -x socks5h://localhost:3002 "https://www.google.com"
532-
548+
// curl -v -4 -x socks5h://localhost:3002 "https://www.google.com"

‎src/localServer/workers/asset-manifest.json‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
{
2-
"files": {
3-
"main.css": "/static/css/main.455a79af.css",
4-
"main.js": "/static/js/main.f6ddc4ce.js",
5-
"static/js/453.9af89cb1.chunk.js": "/static/js/453.9af89cb1.chunk.js",
6-
"static/media/silent-pass-benefits-table.svg": "/static/media/silent-pass-benefits-table.db3e4d9038c74e4db61d77082607294a.svg",
7-
"static/media/silent-pass-service-table.svg": "/static/media/silent-pass-service-table.21f5b4345d1ad5863f9b8ca55363555a.svg",
8-
"static/media/solana-token.svg": "/static/media/solana-token.b77c9030d92aee4550b3ce4f4e946c93.svg",
9-
"static/media/sp-token.svg": "/static/media/sp-token.01da7809f36c2002dfb6fd98f3827a44.svg",
10-
"static/media/conet-token.svg": "/static/media/conet-token.bfd058b390550a59eb001c3a061be91e.svg",
11-
"static/media/support-icon-blue.svg": "/static/media/support-icon-blue.fc618a7a2e712f8d06452a587b8c3c58.svg",
12-
"static/media/support-icon-grey.svg": "/static/media/support-icon-grey.ce648861de23558a27a367d4c1b1f552.svg",
13-
"static/media/visibility-off.svg": "/static/media/visibility-off.12c2f0679ae08f45f758744e3ed0fce8.svg",
14-
"static/media/settings-icon-blue.svg": "/static/media/settings-icon-blue.a9f308f21753ac8e4c79a4692e266781.svg",
15-
"static/media/settings-icon-grey.svg": "/static/media/settings-icon-grey.4efb1fee571c250dac8b77a075c77a71.svg",
16-
"static/media/extra-reward.svg": "/static/media/extra-reward.25c85d3bfc3b9df10349de5fbcecf30e.svg",
17-
"static/media/proxy-information.svg": "/static/media/proxy-information.a87fdb94d52988a7fd427524bea13837.svg",
18-
"static/media/faq-icon.svg": "/static/media/faq-icon.e84a33a3a76e89bf3daf58baf1189fe8.svg",
19-
"static/media/help.svg": "/static/media/help.e84a33a3a76e89bf3daf58baf1189fe8.svg",
20-
"static/media/visibility-on.svg": "/static/media/visibility-on.f5df4f90160c7c5a31897a7432ef7c6a.svg",
21-
"static/media/application.svg": "/static/media/application.43d120a2e74e3c4818090a317f997652.svg",
22-
"static/media/language.svg": "/static/media/language.43d120a2e74e3c4818090a317f997652.svg",
23-
"static/media/progress-activity.svg": "/static/media/progress-activity.9abf838e0c87127f49cc95fa63508d0f.svg",
24-
"static/media/lock-icon.svg": "/static/media/lock-icon.5792ac0be414f7efee34e8ab32edf1b2.svg",
25-
"static/media/usdt-icon.svg": "/static/media/usdt-icon.863996f3459b58076acd013b84f66f57.svg",
26-
"static/media/eth-token.svg": "/static/media/eth-token.a01de1155563ab3775bad55ce05a7957.svg",
27-
"static/media/right-chevron.svg": "/static/media/right-chevron.c19265445e3b2c1f01ac246a3bd9f75a.svg",
28-
"index.html": "/index.html",
29-
"static/media/quotes-icon.svg": "/static/media/quotes-icon.73e155d019de520a603406dff24a2a34.svg",
30-
"static/media/wallet-icon-blue.svg": "/static/media/wallet-icon-blue.254e02dcba55c027e5c692f8df78c573.svg",
31-
"static/media/wallet-icon-grey.svg": "/static/media/wallet-icon-grey.a9ec9c11f1a47711d8b76924c4961495.svg",
32-
"static/media/ads-block.svg": "/static/media/ads-block.47d4110dcba7c665d18aca0342e609ad.svg",
33-
"static/media/wallet-icon.svg": "/static/media/wallet-icon.74ec366fac4e5645a70e6276346e9413.svg",
34-
"static/media/home-icon-blue.svg": "/static/media/home-icon-blue.45c1c9a5a853e7916aead3e3f6609425.svg",
35-
"static/media/home-icon-grey.svg": "/static/media/home-icon-grey.4aa751c909129f6c3b4ba9fa19c15715.svg",
36-
"static/media/split-tunneling.svg": "/static/media/split-tunneling.9e6f6574614b30a8fa5483b6e26b49af.svg",
37-
"main.455a79af.css.map": "/static/css/main.455a79af.css.map",
38-
"main.f6ddc4ce.js.map": "/static/js/main.f6ddc4ce.js.map",
39-
"453.9af89cb1.chunk.js.map": "/static/js/453.9af89cb1.chunk.js.map"
40-
},
41-
"entrypoints": [
42-
"static/css/main.455a79af.css",
43-
"static/js/main.f6ddc4ce.js"
44-
]
45-
}
2+
"files": {
3+
"main.css": "/static/css/main.493de5c3.css",
4+
"main.js": "/static/js/main.4ee174f8.js",
5+
"static/js/453.9af89cb1.chunk.js": "/static/js/453.9af89cb1.chunk.js",
6+
"static/media/silent-pass-benefits-table.svg": "/static/media/silent-pass-benefits-table.db3e4d9038c74e4db61d77082607294a.svg",
7+
"static/media/silent-pass-service-table.svg": "/static/media/silent-pass-service-table.21f5b4345d1ad5863f9b8ca55363555a.svg",
8+
"static/media/solana-token.svg": "/static/media/solana-token.b77c9030d92aee4550b3ce4f4e946c93.svg",
9+
"static/media/sp-token.svg": "/static/media/sp-token.01da7809f36c2002dfb6fd98f3827a44.svg",
10+
"static/media/conet-eth-token.svg": "/static/media/conet-eth-token.763f3ac06de50279d94c14fe31bdb71d.svg",
11+
"static/media/conet-token.svg": "/static/media/conet-token.bfd058b390550a59eb001c3a061be91e.svg",
12+
"static/media/support-icon-blue.svg": "/static/media/support-icon-blue.fc618a7a2e712f8d06452a587b8c3c58.svg",
13+
"static/media/support-icon-grey.svg": "/static/media/support-icon-grey.ce648861de23558a27a367d4c1b1f552.svg",
14+
"static/media/visibility-off.svg": "/static/media/visibility-off.12c2f0679ae08f45f758744e3ed0fce8.svg",
15+
"static/media/settings-icon-blue.svg": "/static/media/settings-icon-blue.a9f308f21753ac8e4c79a4692e266781.svg",
16+
"static/media/settings-icon-grey.svg": "/static/media/settings-icon-grey.4efb1fee571c250dac8b77a075c77a71.svg",
17+
"static/media/extra-reward.svg": "/static/media/extra-reward.25c85d3bfc3b9df10349de5fbcecf30e.svg",
18+
"static/media/proxy-information.svg": "/static/media/proxy-information.a87fdb94d52988a7fd427524bea13837.svg",
19+
"static/media/faq-icon.svg": "/static/media/faq-icon.e84a33a3a76e89bf3daf58baf1189fe8.svg",
20+
"static/media/help.svg": "/static/media/help.e84a33a3a76e89bf3daf58baf1189fe8.svg",
21+
"static/media/visibility-on.svg": "/static/media/visibility-on.f5df4f90160c7c5a31897a7432ef7c6a.svg",
22+
"static/media/application.svg": "/static/media/application.43d120a2e74e3c4818090a317f997652.svg",
23+
"static/media/language.svg": "/static/media/language.43d120a2e74e3c4818090a317f997652.svg",
24+
"static/media/progress-activity.svg": "/static/media/progress-activity.9abf838e0c87127f49cc95fa63508d0f.svg",
25+
"static/media/lock-icon.svg": "/static/media/lock-icon.5792ac0be414f7efee34e8ab32edf1b2.svg",
26+
"static/media/usdt-icon.svg": "/static/media/usdt-icon.863996f3459b58076acd013b84f66f57.svg",
27+
"static/media/right-chevron.svg": "/static/media/right-chevron.c19265445e3b2c1f01ac246a3bd9f75a.svg",
28+
"index.html": "/index.html",
29+
"static/media/quotes-icon.svg": "/static/media/quotes-icon.73e155d019de520a603406dff24a2a34.svg",
30+
"static/media/wallet-icon-blue.svg": "/static/media/wallet-icon-blue.254e02dcba55c027e5c692f8df78c573.svg",
31+
"static/media/wallet-icon-grey.svg": "/static/media/wallet-icon-grey.a9ec9c11f1a47711d8b76924c4961495.svg",
32+
"static/media/ads-block.svg": "/static/media/ads-block.47d4110dcba7c665d18aca0342e609ad.svg",
33+
"static/media/wallet-icon.svg": "/static/media/wallet-icon.74ec366fac4e5645a70e6276346e9413.svg",
34+
"static/media/home-icon-blue.svg": "/static/media/home-icon-blue.45c1c9a5a853e7916aead3e3f6609425.svg",
35+
"static/media/home-icon-grey.svg": "/static/media/home-icon-grey.4aa751c909129f6c3b4ba9fa19c15715.svg",
36+
"static/media/split-tunneling.svg": "/static/media/split-tunneling.9e6f6574614b30a8fa5483b6e26b49af.svg",
37+
"main.493de5c3.css.map": "/static/css/main.493de5c3.css.map",
38+
"main.4ee174f8.js.map": "/static/js/main.4ee174f8.js.map",
39+
"453.9af89cb1.chunk.js.map": "/static/js/453.9af89cb1.chunk.js.map"
40+
},
41+
"entrypoints": [
42+
"static/css/main.493de5c3.css",
43+
"static/js/main.4ee174f8.js"
44+
]
45+
}

src/localServer/workers/assets/about.svg renamed to src/localServer/workers/electron/assets/about.svg

File renamed without changes.

src/localServer/workers/assets/auto.png renamed to src/localServer/workers/electron/assets/auto.png

File renamed without changes.

src/localServer/workers/assets/check.svg renamed to src/localServer/workers/electron/assets/check.svg

File renamed without changes.

src/localServer/workers/assets/chevron-blue.svg renamed to src/localServer/workers/electron/assets/chevron-blue.svg

File renamed without changes.

src/localServer/workers/assets/conet-gray.svg renamed to src/localServer/workers/electron/assets/conet-gray.svg

File renamed without changes.

src/localServer/workers/assets/conet-outline-blue.svg renamed to src/localServer/workers/electron/assets/conet-outline-blue.svg

File renamed without changes.

src/localServer/workers/assets/conet-outline-gray.svg renamed to src/localServer/workers/electron/assets/conet-outline-gray.svg

File renamed without changes.

0 commit comments

Comments
 (0)