v6

src/inventory.ts

@@ -78,8 +78,8 @@ class InventoryBuilder {
 
   async resolveDomainProcess(domain: string, ipv6: boolean) {
     const cacheKey = `${domain}-${ipv6 ? ':v6' : 'v4'}`;
-    if (this.resolveCache.has(domain)) {
-      return this.resolveCache.get(domain);
+    if (this.resolveCache.has(cacheKey)) {
+      return this.resolveCache.get(cacheKey);
     }
     const rrtype = (domain.includes('-v6') || ipv6) ? 'AAAA' : 'A';
     let resolvedIP: string;
@@ -95,7 +95,7 @@ class InventoryBuilder {
       resolvedIP = `[${resolvedIP}]`;
     }
     console.log(`${domain} => ${resolvedIP}`);
-    this.resolveCache.set(domain, resolvedIP);
+    this.resolveCache.set(cacheKey, resolvedIP);
     return resolvedIP;
   }
 
@@ -421,6 +421,12 @@ class InventoryBuilder {
     };
   }
 
+  makeV6Domain(domain: string) {
+    const domainParts = domain.split('.');
+    domainParts[domainParts.length - 3] += '-v6';
+    return domainParts.join('.');
+  }
+
   async parse_connection(local: any, remote: any, connstr: string, inbound: boolean, outbound: boolean, reverse: boolean) {
     const leftbottom = local.id > remote.id; // true 条目位于左下，false 条目位于右上
     const cis = !reverse; // true 无需翻转，false 需要翻转。
@@ -443,10 +449,13 @@ class InventoryBuilder {
     //const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined;
     //console.log(remoteGateway.name);
     let remoteAddress = remoteGateway.address || null;
-    const preferV6 = (!remoteGateway.ipv4 || params.ipv6 === 'on') && remoteGateway.ipv6 && params.ipv6 !== 'off';
+    const preferV6 = (!remoteGateway.ipv4 || params.ipv6 === 'on' || params.ipv6 === 'force') && remoteGateway.ipv6 && params.ipv6 !== 'off';
     if (!localGateway.ipv6 && preferV6) {
       remoteAddress = null;
     }
+    if (remoteAddress && params.ipv6 === 'force') {
+      remoteAddress = this.makeV6Domain(remoteAddress);
+    }
     const resolvedRemoteAddress = remoteAddress ? await this.resolveDomain(remoteAddress, preferV6) : null;
     const remoteLocalAddress = remote.address;
     const remoteNextMark = remote.nextMark;