@scrypted/server 0.7.88 → 0.7.90

package/dist/services/addresses.d.ts

@@ -3,5 +3,5 @@ export declare class AddressSettings {
     scrypted: ScryptedRuntime;
     constructor(scrypted: ScryptedRuntime);
     setLocalAddresses(addresses: string[]): Promise<void>;
-    getLocalAddresses(): Promise<string[]>;
+    getLocalAddresses(raw?: boolean): Promise<string[]>;
 }

package/dist/services/addresses.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressSettings = void 0;
 const db_types_1 = require("../db-types");
+const os_1 = __importDefault(require("os"));
 class AddressSettings {
     scrypted;
     constructor(scrypted) {
@@ -13,11 +17,24 @@ class AddressSettings {
         localAddresses.value = addresses;
         await this.scrypted.datastore.upsert(localAddresses);
     }
-    async getLocalAddresses() {
+    async getLocalAddresses(raw) {
         const settings = await this.scrypted.datastore.tryGet(db_types_1.Settings, 'localAddresses');
         if (!settings?.value?.[0])
             return;
-        return settings.value;
+        const ret = [];
+        const networkInterfaces = os_1.default.networkInterfaces();
+        for (const addressOrInterface of settings.value) {
+            const nif = networkInterfaces[addressOrInterface];
+            if (!raw && nif) {
+                for (const addr of nif) {
+                    ret.push(addr.address);
+                }
+            }
+            else {
+                ret.push(addressOrInterface);
+            }
+        }
+        return ret;
     }
 }
 exports.AddressSettings = AddressSettings;

package/dist/services/addresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../src/services/addresses.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAGvC,MAAa,eAAe;IACL;IAAnB,YAAmB,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAmB;QACvC,MAAM,cAAc,GAAG,IAAI,mBAAQ,EAAE,CAAC;QACtC,cAAc,CAAC,GAAG,GAAG,gBAAgB,CAAC;QACtC,cAAc,CAAC,KAAK,GAAG,SAAS,CAAC;QACjC,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAQ,EAAE,gBAAgB,CAAC,CAAC;QAClF,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO;QACX,OAAO,QAAQ,CAAC,KAAiB,CAAC;IACtC,CAAC;CACJ;AAjBD,0CAiBC"}
+{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../src/services/addresses.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAuC;AAEvC,4CAAoB;AAEpB,MAAa,eAAe;IACL;IAAnB,YAAmB,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAmB;QACvC,MAAM,cAAc,GAAG,IAAI,mBAAQ,EAAE,CAAC;QACtC,cAAc,CAAC,GAAG,GAAG,gBAAgB,CAAC;QACtC,cAAc,CAAC,KAAK,GAAG,SAAS,CAAC;QACjC,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAa;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAQ,EAAE,gBAAgB,CAAC,CAAC;QAElF,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO;QAEX,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,MAAM,iBAAiB,GAAG,YAAE,CAAC,iBAAiB,EAAE,CAAC;QACjD,KAAK,MAAM,kBAAkB,IAAI,QAAQ,CAAC,KAAK,EAAE;YAC7C,MAAM,GAAG,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;YAClD,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE;gBACb,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;oBACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC1B;aACJ;iBACI;gBACD,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;aAChC;SACJ;QACD,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAhCD,0CAgCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.88",
+  "version": "0.7.90",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",
@@ -69,8 +69,8 @@
     "prebuild": "rimraf dist",
     "build": "tsc --outDir dist",
     "postbuild": "node test/check-build-output.js",
-    "prebeta": "npm version patch && git add package.json && npm run build && git commit -m prebeta",
     "beta": "npm publish --tag beta",
+    "postbeta": "npm version patch && git add package.json && npm run build && git commit -m postbeta",
     "release": "npm publish",
     "prepublish": "npm run build",
     "postrelease": "git tag v$npm_package_version && git push origin v$npm_package_version && npm version patch && git add package.json && git commit -m postrelease",

package/src/services/addresses.ts

@@ -1,5 +1,6 @@
 import { Settings } from "../db-types";
 import { ScryptedRuntime } from "../runtime";
+import os from 'os';
 
 export class AddressSettings {
     constructor(public scrypted: ScryptedRuntime) {
@@ -12,10 +13,25 @@ export class AddressSettings {
         await this.scrypted.datastore.upsert(localAddresses);
     }
 
-    async getLocalAddresses(): Promise<string[]> {
+    async getLocalAddresses(raw?: boolean): Promise<string[]> {
         const settings = await this.scrypted.datastore.tryGet(Settings, 'localAddresses');
+
         if (!settings?.value?.[0])
             return;
-        return settings.value as string[];
+
+        const ret: string[] = [];
+        const networkInterfaces = os.networkInterfaces();
+        for (const addressOrInterface of settings.value) {
+            const nif = networkInterfaces[addressOrInterface];
+            if (!raw && nif) {
+                for (const addr of nif) {
+                    ret.push(addr.address);
+                }
+            }
+            else {
+                ret.push(addressOrInterface);
+            }
+        }
+        return ret;
     }
 }