mirror of
https://github.com/ditatompel/xmr-remote-nodes.git
synced 2025-01-08 05:52:10 +07:00
Compare commits
1 commit
b4b13728b0
...
da61d132b5
| Author | SHA1 | Date | |
|---|---|---|---|
|
da61d132b5 |
21 changed files with 332 additions and 334 deletions
|
|
@ -8,7 +8,6 @@ SERVER_ENDPOINT="http://127.0.0.1:18901"
|
|||
API_KEY=
|
||||
ACCEPT_TOR=false
|
||||
TOR_SOCKS="127.0.0.1:9050"
|
||||
IPV6_CAPABLE=false
|
||||
|
||||
# Server Config
|
||||
# #############
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@ To build the executable binaries, you need:
|
|||
|
||||
- MySQL/MariaDB
|
||||
- [GeoIP Database][geoip_doc] (optional). Place it to `./assets/geoip`,
|
||||
see [./internal/ip/geo/geoip.go](./internal/ip/geo/geoip.go).
|
||||
see [./internal/geo/ip.go](./internal/geo/ip.go).
|
||||
|
||||
## Installation
|
||||
|
||||
### For initial server setup:
|
||||
|
||||
1. Download [GeoIP Database][geoip_doc] and place it to `./assets/geoip`.
|
||||
(see [./internal/ip/geo/geoip.go](./internal/ip/geo/geoip.go)).
|
||||
(see [./internal/geo/ip.go](./internal/geo/ip.go)).
|
||||
2. Pepare your MySQL/MariaDB.
|
||||
3. Copy `.env.example` to `.env` and edit it to match with server environment.
|
||||
4. Build the binary with `make server` (or `make build` to build both
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/config"
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/ip"
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/monero"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
|
@ -41,7 +40,6 @@ type proberClient struct {
|
|||
apiKey string // prober api key
|
||||
acceptTor bool // accept tor
|
||||
torSOCKS string // IP:Port of tor socks
|
||||
acceptIPv6 bool // accept ipv6
|
||||
message string // message to include when reporting back to server
|
||||
}
|
||||
|
||||
|
|
@ -52,7 +50,6 @@ func newProber() *proberClient {
|
|||
apiKey: cfg.APIKey,
|
||||
acceptTor: cfg.AcceptTor,
|
||||
torSOCKS: cfg.TorSOCKS,
|
||||
acceptIPv6: cfg.IPv6Capable,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -88,10 +85,6 @@ func (p *proberClient) SetAcceptTor(acceptTor bool) {
|
|||
p.acceptTor = acceptTor
|
||||
}
|
||||
|
||||
func (p *proberClient) SetAcceptIPv6(acceptIPv6 bool) {
|
||||
p.acceptIPv6 = acceptIPv6
|
||||
}
|
||||
|
||||
// Fetch a new job from the server, fetches node info, and sends it to the server
|
||||
func (p *proberClient) Run() error {
|
||||
if err := p.validateConfig(); err != nil {
|
||||
|
|
@ -128,26 +121,20 @@ func (p *proberClient) validateConfig() error {
|
|||
|
||||
// Get monero node info to fetch from the server
|
||||
func (p *proberClient) fetchJob() (monero.Node, error) {
|
||||
acceptTor := 0
|
||||
queryParams := ""
|
||||
if p.acceptTor {
|
||||
acceptTor = 1
|
||||
}
|
||||
|
||||
acceptIPv6 := 0
|
||||
if p.acceptIPv6 {
|
||||
acceptIPv6 = 1
|
||||
queryParams = "?accept_tor=1"
|
||||
}
|
||||
|
||||
var node monero.Node
|
||||
|
||||
uri := fmt.Sprintf("%s/api/v1/job?accept_tor=%d&accept_ipv6=%d", p.endpoint, acceptTor, acceptIPv6)
|
||||
uri := fmt.Sprintf("%s/api/v1/job%s", p.endpoint, queryParams)
|
||||
slog.Info(fmt.Sprintf("[PROBE] Getting node from %s", uri))
|
||||
|
||||
req, err := http.NewRequest(http.MethodGet, uri, nil)
|
||||
if err != nil {
|
||||
return node, err
|
||||
}
|
||||
|
||||
req.Header.Add(monero.ProberAPIKey, p.apiKey)
|
||||
req.Header.Set("User-Agent", RPCUserAgent)
|
||||
|
||||
|
|
@ -335,13 +322,6 @@ func (p *proberClient) fetchFee(client http.Client, endpoint string) (uint, erro
|
|||
}
|
||||
|
||||
func (p *proberClient) reportResult(node monero.Node, tookTime float64) error {
|
||||
if !node.IsTor {
|
||||
if hostIps, err := net.LookupIP(node.Hostname); err == nil {
|
||||
node.IPv6Only = ip.IsIPv6Only(hostIps)
|
||||
node.IPAddresses = ip.SliceToString(hostIps)
|
||||
}
|
||||
}
|
||||
|
||||
jsonData, err := json.Marshal(monero.ProbeReport{
|
||||
TookTime: tookTime,
|
||||
Message: p.message,
|
||||
|
|
|
|||
323
frontend/package-lock.json
generated
323
frontend/package-lock.json
generated
|
|
@ -12,7 +12,7 @@
|
|||
"@skeletonlabs/skeleton": "^2.10.2",
|
||||
"@skeletonlabs/tw-plugin": "^0.4.0",
|
||||
"@sveltejs/adapter-static": "^3.0.4",
|
||||
"@sveltejs/kit": "^2.5.26",
|
||||
"@sveltejs/kit": "^2.5.25",
|
||||
"@sveltejs/vite-plugin-svelte": "^3.1.2",
|
||||
"@tailwindcss/forms": "^0.5.8",
|
||||
"@types/eslint": "^9.6.1",
|
||||
|
|
@ -22,14 +22,14 @@
|
|||
"eslint": "^9.10.0",
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-plugin-svelte": "^2.43.0",
|
||||
"postcss": "^8.4.45",
|
||||
"postcss": "^8.4.43",
|
||||
"prettier": "^3.3.3",
|
||||
"prettier-plugin-svelte": "^3.2.6",
|
||||
"svelte": "^4.2.19",
|
||||
"svelte-check": "^4.0.1",
|
||||
"svelte-check": "^3.8.6",
|
||||
"tailwindcss": "^3.4.10",
|
||||
"typescript": "^5.5.4",
|
||||
"vite": "^5.4.4"
|
||||
"vite": "^5.4.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@alloc/quick-lru": {
|
||||
|
|
@ -961,9 +961,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@sveltejs/kit": {
|
||||
"version": "2.5.26",
|
||||
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.26.tgz",
|
||||
"integrity": "sha512-8l1JTIM2L+bS8ebq1E+nGjv/YSKSnD9Q19bYIUkc41vaEG2JjVUx6ikvPIJv2hkQAuqJLzoPrXlKk4KcyWOv3Q==",
|
||||
"version": "2.5.25",
|
||||
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.25.tgz",
|
||||
"integrity": "sha512-5hBSEN8XEjDZ5+2bHkFh8Z0QyOk0C187cyb12aANe1c8aeKbfu5ZD5XaC2vEH4h0alJFDXPdUkXQBmeeXeMr1A==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
|
|
@ -1071,6 +1071,12 @@
|
|||
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/pug": {
|
||||
"version": "2.0.10",
|
||||
"resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.10.tgz",
|
||||
"integrity": "sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@vincjo/datatables": {
|
||||
"version": "1.14.10",
|
||||
"resolved": "https://registry.npmjs.org/@vincjo/datatables/-/datatables-1.14.10.tgz",
|
||||
|
|
@ -1299,6 +1305,15 @@
|
|||
"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
|
||||
}
|
||||
},
|
||||
"node_modules/buffer-crc32": {
|
||||
"version": "0.2.13",
|
||||
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
|
||||
"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/callsites": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
|
||||
|
|
@ -1534,6 +1549,15 @@
|
|||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/detect-indent": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
|
||||
"integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/devalue": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.0.0.tgz",
|
||||
|
|
@ -1570,6 +1594,12 @@
|
|||
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/es6-promise": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
|
||||
"integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/esbuild": {
|
||||
"version": "0.21.5",
|
||||
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
|
||||
|
|
@ -1994,6 +2024,12 @@
|
|||
"url": "https://github.com/sponsors/rawify"
|
||||
}
|
||||
},
|
||||
"node_modules/fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
||||
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
|
||||
|
|
@ -2017,6 +2053,27 @@
|
|||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/glob": {
|
||||
"version": "7.2.3",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
|
||||
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
|
||||
"deprecated": "Glob versions prior to v9 are no longer supported",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"fs.realpath": "^1.0.0",
|
||||
"inflight": "^1.0.4",
|
||||
"inherits": "2",
|
||||
"minimatch": "^3.1.1",
|
||||
"once": "^1.3.0",
|
||||
"path-is-absolute": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/glob-parent": {
|
||||
"version": "6.0.2",
|
||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
|
||||
|
|
@ -2053,6 +2110,12 @@
|
|||
"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/graceful-fs": {
|
||||
"version": "4.2.11",
|
||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
|
||||
"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/has-flag": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
||||
|
|
@ -2118,6 +2181,23 @@
|
|||
"node": ">=0.8.19"
|
||||
}
|
||||
},
|
||||
"node_modules/inflight": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
|
||||
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
|
||||
"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"once": "^1.3.0",
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/inherits": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/is-binary-path": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
|
||||
|
|
@ -2387,6 +2467,15 @@
|
|||
"node": ">=8.6"
|
||||
}
|
||||
},
|
||||
"node_modules/min-indent": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
|
||||
"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/mini-svg-data-uri": {
|
||||
"version": "1.4.4",
|
||||
"resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
|
||||
|
|
@ -2408,6 +2497,15 @@
|
|||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
|
||||
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
|
||||
"dev": true,
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/minipass": {
|
||||
"version": "7.1.2",
|
||||
"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
|
||||
|
|
@ -2417,6 +2515,18 @@
|
|||
"node": ">=16 || 14 >=14.17"
|
||||
}
|
||||
},
|
||||
"node_modules/mkdirp": {
|
||||
"version": "0.5.6",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
|
||||
"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"minimist": "^1.2.6"
|
||||
},
|
||||
"bin": {
|
||||
"mkdirp": "bin/cmd.js"
|
||||
}
|
||||
},
|
||||
"node_modules/mri": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
|
||||
|
|
@ -2518,6 +2628,15 @@
|
|||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/once": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
||||
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/optionator": {
|
||||
"version": "0.9.4",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
|
||||
|
|
@ -2586,6 +2705,15 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/path-is-absolute": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
|
||||
"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/path-key": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||
|
|
@ -2665,9 +2793,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/postcss": {
|
||||
"version": "8.4.45",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
|
||||
"integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
|
||||
"version": "8.4.43",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz",
|
||||
"integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2957,6 +3085,19 @@
|
|||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf": {
|
||||
"version": "2.7.1",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
|
||||
"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"glob": "^7.1.3"
|
||||
},
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
}
|
||||
},
|
||||
"node_modules/rollup": {
|
||||
"version": "4.21.0",
|
||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
|
||||
|
|
@ -3027,6 +3168,18 @@
|
|||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/sander": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz",
|
||||
"integrity": "sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"es6-promise": "^3.1.2",
|
||||
"graceful-fs": "^4.1.3",
|
||||
"mkdirp": "^0.5.1",
|
||||
"rimraf": "^2.5.2"
|
||||
}
|
||||
},
|
||||
"node_modules/semver": {
|
||||
"version": "7.6.2",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
|
||||
|
|
@ -3092,6 +3245,21 @@
|
|||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/sorcery": {
|
||||
"version": "0.11.0",
|
||||
"resolved": "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz",
|
||||
"integrity": "sha512-J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@jridgewell/sourcemap-codec": "^1.4.14",
|
||||
"buffer-crc32": "^0.2.5",
|
||||
"minimist": "^1.2.0",
|
||||
"sander": "^0.5.0"
|
||||
},
|
||||
"bin": {
|
||||
"sorcery": "bin/sorcery"
|
||||
}
|
||||
},
|
||||
"node_modules/source-map-js": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
|
||||
|
|
@ -3191,6 +3359,18 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/strip-indent": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
|
||||
"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"min-indent": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/strip-json-comments": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
|
||||
|
|
@ -3321,54 +3501,23 @@
|
|||
}
|
||||
},
|
||||
"node_modules/svelte-check": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.0.1.tgz",
|
||||
"integrity": "sha512-AuWnCZdREoOzMhoptHPUUPYUxLNdXSkoZnPnlv19SZJJimRzLmjjZLKsOiRB4AnhgX+56/WSEdvkWXI/q2BSsA==",
|
||||
"version": "3.8.6",
|
||||
"resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.6.tgz",
|
||||
"integrity": "sha512-ij0u4Lw/sOTREP13BdWZjiXD/BlHE6/e2e34XzmVmsp5IN4kVa3PWP65NM32JAgwjZlwBg/+JtiNV1MM8khu0Q==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@jridgewell/trace-mapping": "^0.3.25",
|
||||
"@jridgewell/trace-mapping": "^0.3.17",
|
||||
"chokidar": "^3.4.1",
|
||||
"fdir": "^6.2.0",
|
||||
"picocolors": "^1.0.0",
|
||||
"sade": "^1.7.4"
|
||||
"sade": "^1.7.4",
|
||||
"svelte-preprocess": "^5.1.3",
|
||||
"typescript": "^5.0.3"
|
||||
},
|
||||
"bin": {
|
||||
"svelte-check": "bin/svelte-check"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 18.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"svelte": "^4.0.0 || ^5.0.0-next.0",
|
||||
"typescript": ">=5.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/svelte-check/node_modules/fdir": {
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.3.0.tgz",
|
||||
"integrity": "sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==",
|
||||
"dev": true,
|
||||
"peerDependencies": {
|
||||
"picomatch": "^3 || ^4"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"picomatch": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/svelte-check/node_modules/picomatch": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
|
||||
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
"svelte": "^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0"
|
||||
}
|
||||
},
|
||||
"node_modules/svelte-eslint-parser": {
|
||||
|
|
@ -3455,6 +3604,68 @@
|
|||
"svelte": "^3.19.0 || ^4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/svelte-preprocess": {
|
||||
"version": "5.1.4",
|
||||
"resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.4.tgz",
|
||||
"integrity": "sha512-IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@types/pug": "^2.0.6",
|
||||
"detect-indent": "^6.1.0",
|
||||
"magic-string": "^0.30.5",
|
||||
"sorcery": "^0.11.0",
|
||||
"strip-indent": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 16.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@babel/core": "^7.10.2",
|
||||
"coffeescript": "^2.5.1",
|
||||
"less": "^3.11.3 || ^4.0.0",
|
||||
"postcss": "^7 || ^8",
|
||||
"postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
|
||||
"pug": "^3.0.0",
|
||||
"sass": "^1.26.8",
|
||||
"stylus": "^0.55.0",
|
||||
"sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0",
|
||||
"svelte": "^3.23.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0",
|
||||
"typescript": ">=3.9.5 || ^4.0.0 || ^5.0.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"@babel/core": {
|
||||
"optional": true
|
||||
},
|
||||
"coffeescript": {
|
||||
"optional": true
|
||||
},
|
||||
"less": {
|
||||
"optional": true
|
||||
},
|
||||
"postcss": {
|
||||
"optional": true
|
||||
},
|
||||
"postcss-load-config": {
|
||||
"optional": true
|
||||
},
|
||||
"pug": {
|
||||
"optional": true
|
||||
},
|
||||
"sass": {
|
||||
"optional": true
|
||||
},
|
||||
"stylus": {
|
||||
"optional": true
|
||||
},
|
||||
"sugarss": {
|
||||
"optional": true
|
||||
},
|
||||
"typescript": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/tailwindcss": {
|
||||
"version": "3.4.10",
|
||||
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz",
|
||||
|
|
@ -3686,13 +3897,13 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "5.4.4",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.4.tgz",
|
||||
"integrity": "sha512-RHFCkULitycHVTtelJ6jQLd+KSAAzOgEYorV32R2q++M6COBjKJR6BxqClwp5sf0XaBDjVMuJ9wnNfyAJwjMkA==",
|
||||
"version": "5.4.2",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
|
||||
"integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"esbuild": "^0.21.3",
|
||||
"postcss": "^8.4.43",
|
||||
"postcss": "^8.4.41",
|
||||
"rollup": "^4.20.0"
|
||||
},
|
||||
"bin": {
|
||||
|
|
@ -3876,6 +4087,12 @@
|
|||
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/wrappy": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
|
||||
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/yaml": {
|
||||
"version": "1.10.2",
|
||||
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
"@skeletonlabs/skeleton": "^2.10.2",
|
||||
"@skeletonlabs/tw-plugin": "^0.4.0",
|
||||
"@sveltejs/adapter-static": "^3.0.4",
|
||||
"@sveltejs/kit": "^2.5.26",
|
||||
"@sveltejs/kit": "^2.5.25",
|
||||
"@sveltejs/vite-plugin-svelte": "^3.1.2",
|
||||
"@tailwindcss/forms": "^0.5.8",
|
||||
"@types/eslint": "^9.6.1",
|
||||
|
|
@ -26,14 +26,14 @@
|
|||
"eslint": "^9.10.0",
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-plugin-svelte": "^2.43.0",
|
||||
"postcss": "^8.4.45",
|
||||
"postcss": "^8.4.43",
|
||||
"prettier": "^3.3.3",
|
||||
"prettier-plugin-svelte": "^3.2.6",
|
||||
"svelte": "^4.2.19",
|
||||
"svelte-check": "^4.0.1",
|
||||
"svelte-check": "^3.8.6",
|
||||
"tailwindcss": "^3.4.10",
|
||||
"typescript": "^5.5.4",
|
||||
"vite": "^5.4.4"
|
||||
"vite": "^5.4.2"
|
||||
},
|
||||
"type": "module"
|
||||
}
|
||||
|
|
|
|||
1
frontend/src/app.d.ts
vendored
1
frontend/src/app.d.ts
vendored
|
|
@ -21,7 +21,6 @@ declare global {
|
|||
is_tor: boolean;
|
||||
is_available: boolean;
|
||||
nettype: string;
|
||||
ip_addresses: string;
|
||||
}
|
||||
|
||||
interface ApiResponse {
|
||||
|
|
|
|||
|
|
@ -1,23 +1,19 @@
|
|||
<script>
|
||||
import { getModalStore } from '@skeletonlabs/skeleton';
|
||||
import { formatHostname } from '$lib/utils/strings';
|
||||
|
||||
const modalStore = getModalStore();
|
||||
|
||||
/**
|
||||
* @type {{
|
||||
* is_tor: boolean,
|
||||
* hostname: string,
|
||||
* port: number,
|
||||
* ipv6_only: boolean
|
||||
* }}
|
||||
*/
|
||||
export let is_tor;
|
||||
export let hostname;
|
||||
export let port;
|
||||
export let ipv6_only;
|
||||
/** @type {string} */
|
||||
export let ip_addresses;
|
||||
export let ip;
|
||||
/** @type {boolean} */
|
||||
export let is_tor;
|
||||
/** @type {string} */
|
||||
export let hostname;
|
||||
/** @type {number} */
|
||||
export let port;
|
||||
|
||||
// if (is_tor) {
|
||||
// hostname = hostname.substring(0, 8) + '[...].onion';
|
||||
// }
|
||||
|
||||
/**
|
||||
* @param {string} onionAddr
|
||||
|
|
@ -37,20 +33,15 @@
|
|||
|
||||
{#if is_tor}
|
||||
<button
|
||||
class="max-w-40 truncate text-orange-800 dark:text-orange-300"
|
||||
class="max-w-32 truncate text-orange-800 dark:text-orange-300"
|
||||
on:click={() => modalAlert(hostname, port)}
|
||||
>
|
||||
👁 {hostname}
|
||||
</button><br />.onion:<span class="text-indigo-800 dark:text-indigo-400">{port}</span>
|
||||
<span class="text-gray-700 dark:text-gray-400">(TOR)</span>
|
||||
{:else}
|
||||
{formatHostname(hostname)}:<span class="text-indigo-800 dark:text-indigo-400">{port}</span><br />
|
||||
<div class="max-w-40 text-ellipsis overflow-x-auto md:overflow-hidden hover:overflow-visible">
|
||||
<span class="whitespace-break-spaces text-gray-700 dark:text-gray-400"
|
||||
>{ip_addresses.replace(/,/g, ' ')}</span
|
||||
>
|
||||
{#if ipv6_only}
|
||||
<span class="text-rose-800 dark:text-rose-400">(IPv6 only)</span>
|
||||
{hostname}:<span class="text-indigo-800 dark:text-indigo-400">{port}</span>
|
||||
{#if ip !== ''}
|
||||
<br /><span class="text-gray-700 dark:text-gray-400">{ip}</span>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,3 @@
|
|||
/**
|
||||
* Modifies the input string based on whether it is an IPv6 address.
|
||||
* If the input is an IPv6 address, it wraps it in square brackets `[ ]`.
|
||||
* Otherwise, it returns the input string as-is (for domain names or
|
||||
* IPv4 addresses). AND I'M SORRY USING REGEX FOR THIS!
|
||||
*
|
||||
* @param {string} hostname
|
||||
* @returns {string} - The modified string, IPv6 addresses wrapped in `[ ]`.
|
||||
*/
|
||||
export const formatHostname = (hostname) => {
|
||||
// const ipv6Pattern = /^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/; // full
|
||||
// pattern for both full and compressed IPv6 addresses.
|
||||
// source: https://regex101.com/library/cP9mH9?filterFlavors=dotnet&filterFlavors=javascript&orderBy=RELEVANCE&search=ip
|
||||
// This may be incorrect, but let's assume it's correct. xD
|
||||
const ipv6Pattern =
|
||||
/^(([0-9A-Fa-f]{1,4}:){7})([0-9A-Fa-f]{1,4})$|(([0-9A-Fa-f]{1,4}:){1,6}:)(([0-9A-Fa-f]{1,4}:){0,4})([0-9A-Fa-f]{1,4})$/;
|
||||
if (ipv6Pattern.test(hostname)) {
|
||||
return `[${hostname}]`;
|
||||
}
|
||||
|
||||
return hostname;
|
||||
};
|
||||
|
||||
/**
|
||||
* @param {number} bytes
|
||||
* @param {number} decimals
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ export async function load() {
|
|||
meta: {
|
||||
title: 'Monero Remote Node',
|
||||
description:
|
||||
'A website that helps you monitor your favourite Monero remote nodes, but YOU BETTER RUN AND USE YOUR OWN NODE.',
|
||||
'A website that helps you monitor your favourite Monero remote nodes, a device on the internet running the Monero software with copy of the Monero blockchain.',
|
||||
keywords:
|
||||
'monero,monero,xmr,monero node,xmrnode,cryptocurrency,monero remote node,monero testnet,monero stagenet'
|
||||
},
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
<section id="form-add-monero-node">
|
||||
<div class="section-container text-center">
|
||||
<p>Enter your Monero node information below (IPv6 host check is experimental):</p>
|
||||
<p>Enter your Monero node information below (IPv4 host only):</p>
|
||||
|
||||
<form
|
||||
class="mx-auto w-full max-w-3xl py-2"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ export async function load() {
|
|||
// prettier-ignore
|
||||
meta: {
|
||||
title: 'Public Monero Remote Nodes List',
|
||||
description: "Although it's possible to use these existing public Monero nodes, you're MUST RUN AND USE YOUR OWN NODE!",
|
||||
description: 'List of public Monero remote nodes that you can use with your favourite Monero wallet. You can filter by country, protocol, or CORS capable nodes.',
|
||||
keywords: 'monero remote nodes,public monero nodes,monero public nodes,monero wallet,tor monero node,monero cors rpc'
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
<section id="introduction ">
|
||||
<div class="section-container text-center !max-w-4xl">
|
||||
<p>Remote node can be used by people who, for their own reasons (usually because of hardware requirements, disk space, or technical abilities), cannot/don't want to run their own node and prefer to relay on one publicly available on the Monero network.</p>
|
||||
<p>Using an open node will allow to make a transaction instantaneously, without the need to download the blockchain and sync to the Monero network first, but at the cost of the control over your privacy. the <strong>Monero community suggests to <span class="font-extrabold text-2xl underline decoration-double decoration-2 decoration-pink-500">always run and use your own node</span></strong> to obtain the maximum possible privacy and to help decentralize the network.</p>
|
||||
<p>Using an open node will allow to make a transaction instantaneously, without the need to download the blockchain and sync to the Monero network first, but at the cost of the control over your privacy. the <strong>Monero community suggests to always run your own node</strong> to obtain the maximum possible privacy and to help decentralize the network.</p>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
|
@ -211,12 +211,12 @@
|
|||
<tr>
|
||||
<td
|
||||
><HostPortCell
|
||||
ip_addresses={row.ip_addresses}
|
||||
ip={row.ip}
|
||||
is_tor={row.is_tor}
|
||||
hostname={row.hostname}
|
||||
port={row.port}
|
||||
ipv6_only={row.ipv6_only}
|
||||
/>
|
||||
<a class="anchor" href="/remote-nodes/logs/?node_id={row.id}">[Logs]</a>
|
||||
</td>
|
||||
<td><NetTypeCell nettype={row.nettype} height={row.height} /></td>
|
||||
<td><ProtocolCell protocol={row.protocol} cors={row.cors} /></td>
|
||||
|
|
@ -241,13 +241,7 @@
|
|||
majority_fee={majorityFee[row.nettype]}
|
||||
/>
|
||||
</td>
|
||||
<td
|
||||
><UptimeCell uptime={row.uptime} /><br />
|
||||
<a
|
||||
class="anchor !text-purple-800 dark:!text-purple-400"
|
||||
href="/remote-nodes/logs/?node_id={row.id}">[Logs]</a
|
||||
>
|
||||
</td>
|
||||
<td><UptimeCell uptime={row.uptime} /></td>
|
||||
<td>
|
||||
{format(row.last_checked * 1000, 'PP HH:mm')}<br />
|
||||
{formatDistance(row.last_checked * 1000, new Date(), { addSuffix: true })}
|
||||
|
|
@ -284,12 +278,7 @@
|
|||
rel="noopener">still can return high fee only if you about to create a transactions</a
|
||||
>.
|
||||
</li>
|
||||
<li>
|
||||
<strong
|
||||
class="font-extrabold text-2xl underline decoration-double decoration-2 decoration-pink-500"
|
||||
>The best and safest way is running your own node!</strong
|
||||
>
|
||||
</li>
|
||||
<li><strong>The best and safest way is running your own node</strong>!</li>
|
||||
<li>
|
||||
Nodes with 0% uptime within 1 month with more than 300 check attempt will be removed. You
|
||||
can always add your node again latter.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
import { format, formatDistance } from 'date-fns';
|
||||
import { loadData, loadNodeInfo } from './api-handler';
|
||||
import { onMount } from 'svelte';
|
||||
import { formatHostname, formatHashes, formatBytes } from '$lib/utils/strings';
|
||||
import { formatHashes, formatBytes } from '$lib/utils/strings';
|
||||
import {
|
||||
DtSrRowsPerPage,
|
||||
DtSrThSort,
|
||||
|
|
@ -71,11 +71,11 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<td class="font-bold">Hostname:Port</td>
|
||||
<td>{formatHostname(nodeInfo?.hostname)}:{nodeInfo?.port}</td>
|
||||
<td>{nodeInfo?.hostname}:{nodeInfo?.port}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font-bold">Public IP</td>
|
||||
<td>{nodeInfo?.ip_addresses.replace(/,/g, ', ')}</td>
|
||||
<td>{nodeInfo?.ip}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font-bold">Net Type</td>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ type App struct {
|
|||
APIKey string
|
||||
AcceptTor bool
|
||||
TorSOCKS string
|
||||
IPv6Capable bool
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
|
@ -66,5 +65,4 @@ func LoadApp() {
|
|||
app.APIKey = os.Getenv("API_KEY")
|
||||
app.AcceptTor, _ = strconv.ParseBool(os.Getenv("ACCEPT_TOR"))
|
||||
app.TorSOCKS = os.Getenv("TOR_SOCKS")
|
||||
app.IPv6Capable, _ = strconv.ParseBool(os.Getenv("IPV6_CAPABLE"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
|
||||
type migrateFn func(*DB) error
|
||||
|
||||
var dbMigrate = [...]migrateFn{v1, v2, v3}
|
||||
var dbMigrate = [...]migrateFn{v1, v2}
|
||||
|
||||
func MigrateDb(db *DB) error {
|
||||
version := getSchemaVersion(db)
|
||||
|
|
@ -256,19 +256,3 @@ func v2(db *DB) error {
|
|||
|
||||
return nil
|
||||
}
|
||||
|
||||
func v3(db *DB) error {
|
||||
slog.Debug("[DB] Migrating database schema version 3")
|
||||
|
||||
// table: tbl_node
|
||||
slog.Debug("[DB] Adding additional columns to tbl_node")
|
||||
_, err := db.Exec(`
|
||||
ALTER TABLE tbl_node
|
||||
ADD COLUMN ipv6_only TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER cors_capable,
|
||||
ADD COLUMN ip_addresses TEXT NOT NULL DEFAULT '' AFTER cors_capable;`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,10 +171,9 @@ func Countries(c *fiber.Ctx) error {
|
|||
// This handler should protected by `CheckProber` middleware.
|
||||
func GiveJob(c *fiber.Ctx) error {
|
||||
acceptTor := c.QueryInt("accept_tor", 0)
|
||||
acceptIPv6 := c.QueryInt("accept_ipv6", 0)
|
||||
|
||||
moneroRepo := monero.New()
|
||||
node, err := moneroRepo.GiveJob(acceptTor, acceptIPv6)
|
||||
node, err := moneroRepo.GiveJob(acceptTor)
|
||||
if err != nil {
|
||||
return c.JSON(fiber.Map{
|
||||
"status": "error",
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
// Package ip provides IP address related functions
|
||||
package ip
|
||||
|
||||
import (
|
||||
"net"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// IsIPv6Only returns true if all given IPs are IPv6
|
||||
func IsIPv6Only(ips []net.IP) bool {
|
||||
for _, ip := range ips {
|
||||
if ip.To4() != nil {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// SliceToString converts []net.IP to a string separated by comma.
|
||||
// If the separator is empty, it defaults to ",".
|
||||
func SliceToString(ips []net.IP) string {
|
||||
r := make([]string, len(ips))
|
||||
for i, j := range ips {
|
||||
r[i] = j.String()
|
||||
}
|
||||
|
||||
return strings.Join(r, ",")
|
||||
}
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
package ip
|
||||
|
||||
import (
|
||||
"net"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// Single test: go test ./internal/ip -bench TestIsIPv6Only -benchmem -run=^$ -v
|
||||
func TestIsIPv6Only(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
ips []net.IP
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "IPv4",
|
||||
ips: []net.IP{
|
||||
net.ParseIP("1.1.1.1"),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "IPv6",
|
||||
ips: []net.IP{
|
||||
net.ParseIP("2606:4700::6810:85e5"),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "IPv6 and IPv4",
|
||||
ips: []net.IP{
|
||||
net.ParseIP("1.1.1.1"),
|
||||
net.ParseIP("2606:4700::6810:84e5"),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := IsIPv6Only(tt.ips); got != tt.want {
|
||||
t.Errorf("IsIPv6Only() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Single test: go test ./internal/ip -bench TestSliceToString -benchmem -run=^$ -v
|
||||
func TestSliceToString(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
ips []net.IP
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "IPv4",
|
||||
ips: []net.IP{
|
||||
net.ParseIP("1.1.1.1"),
|
||||
},
|
||||
want: "1.1.1.1",
|
||||
},
|
||||
{
|
||||
name: "IPv6",
|
||||
ips: []net.IP{
|
||||
net.ParseIP("2606:4700::6810:85e5"),
|
||||
},
|
||||
want: "2606:4700::6810:85e5",
|
||||
},
|
||||
{
|
||||
name: "IPv6 and IPv4",
|
||||
ips: []net.IP{
|
||||
net.ParseIP("1.1.1.1"),
|
||||
net.ParseIP("2606:4700::6810:85e5"),
|
||||
},
|
||||
want: "1.1.1.1,2606:4700::6810:85e5",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := SliceToString(tt.ips); got != tt.want {
|
||||
t.Errorf("SliceToString() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/database"
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/ip"
|
||||
|
||||
"github.com/jmoiron/sqlx/types"
|
||||
)
|
||||
|
||||
|
|
@ -54,8 +54,6 @@ type Node struct {
|
|||
FailedCount uint `json:"failed_count,omitempty" db:"failed_count"`
|
||||
LastCheckStatus types.JSONText `json:"last_check_statuses" db:"last_check_status"`
|
||||
CORSCapable bool `json:"cors" db:"cors_capable"`
|
||||
IPv6Only bool `json:"ipv6_only" db:"ipv6_only"`
|
||||
IPAddresses string `json:"ip_addresses" db:"ip_addresses"`
|
||||
}
|
||||
|
||||
// Get node from database by id
|
||||
|
|
@ -197,10 +195,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
|
|||
if strings.HasSuffix(hostname, ".onion") {
|
||||
is_tor = true
|
||||
}
|
||||
|
||||
ipAddr := ""
|
||||
ips := ""
|
||||
ipv6_only := false
|
||||
ip := ""
|
||||
|
||||
if !is_tor {
|
||||
hostIps, err := net.LookupIP(hostname)
|
||||
|
|
@ -208,9 +203,10 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
|
|||
return err
|
||||
}
|
||||
|
||||
ipv6_only = ip.IsIPv6Only(hostIps)
|
||||
|
||||
hostIp := hostIps[0]
|
||||
hostIp := hostIps[0].To4()
|
||||
if hostIp == nil {
|
||||
return errors.New("Host IP is not IPv4")
|
||||
}
|
||||
if hostIp.IsPrivate() {
|
||||
return errors.New("IP address is private")
|
||||
}
|
||||
|
|
@ -218,8 +214,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
|
|||
return errors.New("IP address is loopback address")
|
||||
}
|
||||
|
||||
ipAddr = hostIp.String()
|
||||
ips = ip.SliceToString(hostIps)
|
||||
ip = hostIp.String()
|
||||
}
|
||||
|
||||
row, err := r.db.Query(`
|
||||
|
|
@ -253,9 +248,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
|
|||
lon,
|
||||
date_entered,
|
||||
last_checked,
|
||||
last_check_status,
|
||||
ip_addresses,
|
||||
ipv6_only
|
||||
last_check_status
|
||||
) VALUES (
|
||||
?,
|
||||
?,
|
||||
|
|
@ -267,8 +260,6 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
|
|||
?,
|
||||
?,
|
||||
?,
|
||||
?,
|
||||
?,
|
||||
?
|
||||
)`,
|
||||
protocol,
|
||||
|
|
@ -276,14 +267,12 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
|
|||
port,
|
||||
is_tor,
|
||||
"",
|
||||
ipAddr,
|
||||
ip,
|
||||
0,
|
||||
0,
|
||||
time.Now().Unix(),
|
||||
0,
|
||||
string(statusDb),
|
||||
ips,
|
||||
ipv6_only)
|
||||
string(statusDb))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/ip/geo"
|
||||
"github.com/ditatompel/xmr-remote-nodes/internal/geo"
|
||||
)
|
||||
|
||||
type QueryLogs struct {
|
||||
|
|
@ -108,7 +108,7 @@ func (r *moneroRepo) Logs(q QueryLogs) (FetchLogs, error) {
|
|||
}
|
||||
|
||||
// GiveJob returns node that should be probed for the next time
|
||||
func (r *moneroRepo) GiveJob(acceptTor, acceptIPv6 int) (Node, error) {
|
||||
func (r *moneroRepo) GiveJob(acceptTor int) (Node, error) {
|
||||
args := []interface{}{}
|
||||
wq := []string{}
|
||||
where := ""
|
||||
|
|
@ -117,10 +117,6 @@ func (r *moneroRepo) GiveJob(acceptTor, acceptIPv6 int) (Node, error) {
|
|||
wq = append(wq, "is_tor = ?")
|
||||
args = append(args, 0)
|
||||
}
|
||||
if acceptIPv6 != 1 {
|
||||
wq = append(wq, "ipv6_only = ?")
|
||||
args = append(args, 0)
|
||||
}
|
||||
|
||||
if len(wq) > 0 {
|
||||
where = "WHERE " + strings.Join(wq, " AND ")
|
||||
|
|
@ -308,9 +304,7 @@ func (r *moneroRepo) ProcessJob(report ProbeReport, proberId int64) error {
|
|||
city = ?,
|
||||
last_checked = ?,
|
||||
last_check_status = ?,
|
||||
cors_capable = ?,
|
||||
ip_addresses = ?,
|
||||
ipv6_only = ?
|
||||
cors_capable = ?
|
||||
WHERE
|
||||
id = ?`
|
||||
_, err := r.db.Exec(update,
|
||||
|
|
@ -332,8 +326,6 @@ func (r *moneroRepo) ProcessJob(report ProbeReport, proberId int64) error {
|
|||
now.Unix(),
|
||||
statuses,
|
||||
report.Node.CORSCapable,
|
||||
report.Node.IPAddresses,
|
||||
report.Node.IPv6Only,
|
||||
report.Node.ID)
|
||||
if err != nil {
|
||||
slog.Warn(err.Error())
|
||||
|
|
@ -345,12 +337,10 @@ func (r *moneroRepo) ProcessJob(report ProbeReport, proberId int64) error {
|
|||
is_available = ?,
|
||||
uptime = ?,
|
||||
last_checked = ?,
|
||||
last_check_status = ?,
|
||||
ip_addresses = ?,
|
||||
ipv6_only = ?
|
||||
last_check_status = ?
|
||||
WHERE
|
||||
id = ?`
|
||||
if _, err := r.db.Exec(u, 0, report.Node.Uptime, now.Unix(), statuses, report.Node.IPAddresses, report.Node.IPv6Only, report.Node.ID); err != nil {
|
||||
if _, err := r.db.Exec(u, 0, report.Node.Uptime, now.Unix(), statuses, report.Node.ID); err != nil {
|
||||
slog.Warn(err.Error())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue