Fix country code

Author: the2pizza

.gitignore

@@ -7,3 +7,4 @@ dev/config-auth.toml
 target
 snapshots/*.bin
 dev/data/*
+dev/xray-config.json

dev/xray-config.json

@@ -1,160 +0,0 @@
-{
-    "log": {
-        "loglevel": "debug"
-    },
-    "inbounds": [
-        {
-            "tag": "VlessXhttpReality",
-            "listen": "0.0.0.0",
-            "port": 443,
-            "protocol": "vless",
-            "settings": {
-                "clients": [],
-                "decryption": "none"
-            },
-            "streamSettings": {
-                "network": "xhttp",
-                "security": "reality",
-                "realitySettings": {
-                    "xver": 0,
-                    "target": "ya.ru:443",
-                    "serverNames": [
-                        "ya.ru"
-                    ],
-                    "privateKey": "0EtqcOKG4wJsURvTfzSWRvH0dPeECVL1TXY21Ydx6Ho",
-                    "publicKey": "jgdqVgUnunocvov5MtuGKh9fVHCpSXIWega-VsHGXAE",
-                    "shortIds": [
-                        "0498897564df"
-                    ]
-                },
-                "xhttpSettings": {
-                    "path": "/"
-                }
-            },
-            "sniffing": {
-                "enabled": true,
-                "destOverride": [
-                    "http",
-                    "tls",
-                    "quic"
-                ]
-            }
-        },
-        {
-            "tag": "VlessGrpcReality",
-            "listen": "0.0.0.0",
-            "port": 8443,
-            "protocol": "vless",
-            "settings": {
-                "clients": [],
-                "decryption": "none"
-            },
-            "streamSettings": {
-                "network": "grpc",
-                "security": "reality",
-                "realitySettings": {
-                    "xver": 0,
-                    "target": "ya.ru:443",
-                    "serverNames": [
-                        "ya.ru"
-                    ],
-                    "privateKey": "0EtqcOKG4wJsURvTfzSWRvH0dPeECVL1TXY21AAAAAA",
-                    "publicKey": "jgdqVgUnunocvov5MtuGKh9fVHCpSXIWega-AAAAAAA",
-                    "shortIds": [
-                        "0498897564df"
-                    ]
-                },
-                "grpcSettings": {
-                    "serviceName": "api.v1"
-                }
-            }
-        },
-        {
-            "tag": "VlessTcpReality",
-            "listen": "0.0.0.0",
-            "port": 8444,
-            "protocol": "vless",
-            "settings": {
-                "clients": [],
-                "decryption": "none"
-            },
-            "streamSettings": {
-                "network": "tcp",
-                "security": "reality",
-                "realitySettings": {
-                    "serverNames": [
-                        "cdn.discordapp.com",
-                        "discordapp.com"
-                    ],
-                    "privateKey": "0EtqcOKG4wJsURvTfzSWRvH0dPeECVL1AAAAAAAA",
-                    "publicKey": "jgdqVgUnunocvov5MtuGKh9fVHCpSXIWega-AAAAAA",
-                    "shortIds": [
-                        "e5c4d84fb339fb92"
-                    ],
-                    "target": "discordapp.com:443"
-                }
-            }
-        }
-    ],
-    "outbounds": [
-        {
-            "protocol": "freedom",
-            "tag": "DIRECT"
-        },
-        {
-            "protocol": "blackhole",
-            "tag": "BLOCK"
-        }
-    ],
-    "routing": {
-        "rules": [
-            {
-                "ip": [
-                    "geoip:private"
-                ],
-                "outboundTag": "BLOCK",
-                "type": "field"
-            },
-            {
-                "domain": [
-                    "geosite:private"
-                ],
-                "outboundTag": "BLOCK",
-                "type": "field"
-            },
-            {
-                "protocol": [
-                    "bittorrent"
-                ],
-                "outboundTag": "BLOCK",
-                "type": "field"
-            }
-        ]
-    },
-    "api": {
-        "listen": "127.0.0.1:23456",
-        "services": [
-            "HandlerService",
-            "StatsService",
-            "LoggerService",
-            "ReflectionService"
-        ],
-        "tag": "API"
-    },
-    "stats": {},
-    "policy": {
-        "levels": {
-            "0": {
-                "statsUserUplink": true,
-                "statsUserDownlink": true,
-                "statsUserOnline": true
-            }
-        },
-        "system": {
-            "statsInboundDownlink": false,
-            "statsInboundUplink": false,
-            "statsOutboundDownlink": true,
-            "statsOutboundUplink": true
-        }
-    }
-}

src/bin/api/core/postgres/node.rs

@@ -37,10 +37,10 @@ impl PgNode {
 
         let node_query = "
         INSERT INTO nodes (
-            id, uuid, env, hostname, address, status, created_at, modified_at, label, interface, cores, max_bandwidth_bps
+            id, uuid, env, hostname, address, status, created_at, modified_at, label, interface, cores, max_bandwidth_bps, country
         )
         VALUES (
-            $1, $2, $3, $4, $5, $6::node_status, $7, $8, $9, $10, $11, $12
+            $1, $2, $3, $4, $5, $6::node_status, $7, $8, $9, $10, $11, $12, $13
         )
         ON CONFLICT (id) DO UPDATE SET
             uuid = EXCLUDED.uuid,
@@ -52,7 +52,8 @@ impl PgNode {
             label = EXCLUDED.label,
             interface = EXCLUDED.interface,
             cores = EXCLUDED.cores,
-            max_bandwidth_bps = EXCLUDED.max_bandwidth_bps
+            max_bandwidth_bps = EXCLUDED.max_bandwidth_bps,
+            country = EXCLUDED.country
     ";
 
         tx.execute(
@@ -70,6 +71,7 @@ impl PgNode {
                 &node.interface,
                 &cores,
                 &node.max_bandwidth_bps,
+                &node.country,
             ],
         )
         .await?;