update nat score

src/inventory.ts

@@ -23,6 +23,7 @@ class InventoryBuilder {
   async loadGateways() {
     const gateways = await this.load('gateways2');
     for (let gateway of gateways) {
+      gateway.isCN = this.hosts[gateway.router].location.startsWith("CN");
       if (gateway.mark) {
         gateway.selectionMark = gateway.mark + 50;
       } else {
@@ -231,21 +232,23 @@ class InventoryBuilder {
 
   // frps还是frpc的积分，NAT越有利分越高
   gatewayCompareScore(gateway: any): number {
-    let score: number = 0xff - gateway.id;
-    const ipv4Score = ({
-      "static": 2,
-      "dynamic": 1
-    })[gateway.ipv4] || 0;
-    score |= ipv4Score << 12;
-    const ipv4NatScore = ({
+    let score: number = 0xff - gateway.id; // 8 bits
+    const isCNScore = gateway.isCN ? 1 : 0; // 1 bit
+    score |= isCNScore << 8;
+    const ipv4NatScore = ({ // 2 bits
       "ports": 0,
       "dmz": 1
     })[gateway.ipv4Nat] || 2;
-    score |= ipv4NatScore << 10;
-    const globalSSHScore = ({
+    score |= ipv4NatScore << 9;
+    const ipv4Score = ({ // 2 bits
+      "static": 2,
+      "dynamic": 1
+    })[gateway.ipv4] || 0;
+    score |= ipv4Score << 11;
+    const globalSSHScore = ({ // 1 bit
       "globalssh": 1
     })[gateway.ssh] || 0;
-    score |= globalSSHScore << 13;
+    score |= globalSSHScore << 12;
     return score;
   }