Merge branch 'main' of github.com:koush/scrypted

koush · Apr 19, 2024 · 9b349fd · 9b349fd
2 parents 7cf0c42 + 2fb4fba
commit 9b349fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-plugins-changed.yml b/.github/workflows/build-plugins-changed.yml
@@ -1,11 +1,11 @@
 name: Build changed plugins
 
 on:
-  push:
-    branches: ["main"]
-    paths: ["plugins/**"]
-  pull_request:
-    paths: ["plugins/**"]
+#   push:
+#     branches: ["main"]
+#     paths: ["plugins/**"]
+#   pull_request:
+#     paths: ["plugins/**"]
   workflow_dispatch:
 
 jobs:

diff --git a/plugins/core/src/main.ts b/plugins/core/src/main.ts
@@ -18,7 +18,7 @@ const { systemManager, deviceManager, endpointManager } = sdk;
 export function getAddresses() {
     const addresses: string[] = [];
     for (const [iface, nif] of Object.entries(os.networkInterfaces())) {
-        if (iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan')) {
+        if (iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan') || iface.startsWith('net')) {
             addresses.push(iface);
             addresses.push(...nif.map(addr => addr.address));
         }

diff --git a/plugins/homekit/src/hap-utils.ts b/plugins/homekit/src/hap-utils.ts
@@ -66,7 +66,7 @@ export function createHAPUsername() {
 }
 
 export function getAddresses() {
-    const addresses = Object.entries(os.networkInterfaces()).filter(([iface]) => iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan')).map(([_, addr]) => addr).flat().map(info => info.address).filter(address => address);
+    const addresses = Object.entries(os.networkInterfaces()).filter(([iface]) => iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan') || iface.startsWith('net')).map(([_, addr]) => addr).flat().map(info => info.address).filter(address => address);
     return addresses;
 }