From a6d39c048c98c49e8c7d295583719b868ad55d23 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Tue, 1 Feb 2022 22:45:26 +0700 Subject: [PATCH] uncomment getIp --- .gitignore | 2 ++ src/main/base/browserwindow.ts | 29 +++++++++++++---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 34b96fc5..ea1428da 100644 --- a/.gitignore +++ b/.gitignore @@ -310,3 +310,5 @@ src/renderer/workbox-962786f2.js.map #Mac certs *.p12 keys.sh + +package-lock.json diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 996f3bd7..d7729c16 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -550,22 +550,19 @@ export class BrowserWindow { let alias = 0; const ifaces: any = os.networkInterfaces(); for (let dev in ifaces) { - console.log(dev) - console.log(ifaces) - console.log(ifaces[dev]) - // ifaces[dev].forEach((details: any) => { - // if (details.family === 'IPv4') { - // if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ':' + alias : ''))) { - // if (details.address.substring(0, 8) === '192.168.' || - // details.address.substring(0, 7) === '172.16.' || - // details.address.substring(0, 3) === '10.' - // ) { - // ip = details.address; - // ++alias; - // } - // } - // } - // }); + ifaces[dev].forEach((details: any) => { + if (details.family === 'IPv4') { + if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ':' + alias : ''))) { + if (details.address.substring(0, 8) === '192.168.' || + details.address.substring(0, 7) === '172.16.' || + details.address.substring(0, 3) === '10.' + ) { + ip = details.address; + ++alias; + } + } + } + }); } return ip; }