gemercheung 3 years ago
parent
commit
0e3aa97eda
1 changed files with 19 additions and 18 deletions
  1. 19 18
      src/meta.gateway.ts

+ 19 - 18
src/meta.gateway.ts

@@ -102,34 +102,35 @@ export class MetaGateway
       // return '';
     });
 
+    const replaceToPublic = (candidate) => {
+      console.warn('PRIVATE_IP', process.env.PRIVATE_IP);
+      return candidate.replace(process.env.PRIVATE_IP, process.env.PUBLIC_IP);
+    };
+
     this.peer.onLocalCandidate((candidate, mid) => {
-      if (/172\./.test(candidate) || /192.168\./.test(candidate)) {
+      if (/172\./.test(candidate)) {
         console.error('private Ip process');
-        // 过滤非 192.168.0.x 测试网段
-        if (!/192.168.0\./.test(candidate)) {
-          console.warn('不是192.168.0.测试网段');
-          return;
-        }
 
         if (candidate.includes(process.env.PRIVATE_IP)) {
           console.error('PRIVATE_IP', process.env.PRIVATE_IP);
-          candidate = candidate.replace(
-            process.env.PRIVATE_IP,
-            process.env.PUBLIC_IP,
-          );
+          candidate = replaceToPublic(candidate);
         } else {
           return;
         }
       }
 
-      // if (/192.168\./.test(candidate)) {
-      //   // const all_ips = Array.from(process.env.ALL_IPS);
-      //   if (!/192.168.0\./.test(candidate)) {
-      //     console.warn('不是192.168.0.测试网段');
-      //     return;
-      //   }
-      // }
-      console.warn('onLocalCandidate Candidate:', candidate);
+      if (/192.168\./.test(candidate)) {
+        if (!/192.168.0\./.test(candidate)) {
+          console.warn('不是192.168.0.测试网段', candidate);
+          return;
+        }
+        // if (candidate.includes(process.env.PRIVATE_IP)) {
+        //   console.error('PRIVATE_IP', process.env.PRIVATE_IP);
+        //   candidate = replaceToPublic(candidate);
+        // }
+      }
+      console.warn('onLocalCandidate last Candidate:', candidate);
+
       const iceRes = {
         candidate,
         sdpMid: mid,