@bobfrankston/miscassists 1.0.24 → 1.0.26

package/README.md

@@ -0,0 +1,21 @@
+# @bobfrankston/miscassists
+
+<!-- Reminder: See c:\users\bob\onedrive\documents\ai\programming.md -->
+
+Miscellaneous Node.js utilities including DNS helpers, port definitions, and server utilities.
+
+## Installation
+
+```bash
+npm install @bobfrankston/miscassists
+```
+
+## Usage
+
+```javascript
+import { resolve4, isLocalIP, ports, jprivs, values} from '@bobfrankston/miscassists';
+```
+
+## License
+
+ISC

package/index.js

@@ -1,6 +1,10 @@
 import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js';
 import { ports, mqtt } from './ports.js';
 import { jprivs } from './jserve.js';
+// Misc values
+export const values = {
+    exitRunit: 99
+};
 export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, jprivs };
 export default {
     resolve4,
@@ -10,6 +14,7 @@ export default {
     default_fqdn,
     ports,
     mqtt,
-    jprivs
+    jprivs,
+    values
 };
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAChG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAuB,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACH,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAC/D,KAAK,EAAE,IAAI,EAAE,MAAM,EACtB,CAAC;AAGF,eAAe;IACX,QAAQ;IACR,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,KAAK;IACL,IAAI;IACJ,MAAM;CACT,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAChG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAuB,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1D,cAAc;AAEd,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,SAAS,EAAE,EAAE;CAChB,CAAA;AAED,OAAO,EACH,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAC/D,KAAK,EAAE,IAAI,EAAE,MAAM,EACtB,CAAC;AAGF,eAAe;IACX,QAAQ;IACR,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,KAAK;IACL,IAAI;IACJ,MAAM;IACN,MAAM;CACT,CAAA"}

package/package.json

@@ -1,14 +1,22 @@
 {
   "name": "@bobfrankston/miscassists",
-  "version": "1.0.24",
-  "description": "",
+  "version": "1.0.26",
+  "description": "Miscellaneous Node.js utilities",
   "main": "index.js",
   "module": "main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "preversion": "git add -A && git commit -m \"Pre-release commit\" --allow-empty",
+    "release": "git add -A && git commit -m \"Pre-release commit\" --allow-empty && npm version patch && git push && git push --tags && npm publish"
   },
-  "keywords": [],
-  "author": "",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "misc",
+    "constants"
+  ],
+  "author": "Bob Frankston",
   "license": "ISC",
   "type": "module",
   "dependencies": {

package/ports.js

@@ -37,6 +37,7 @@ export const ports = {
     // 9322 is used by Windows
     psyncer: 9324, // Used for the powershell version
     rmfAlpha2: 9325, // So we can try alternative clients.
+    carder: 9326
 };
 const mqttHost = "pi4c";
 const mqttPort = 1883;

package/ports.js.map

@@ -1 +1 @@
-{"version":3,"file":"ports.js","sourceRoot":"","sources":["ports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,KAAK,GAAG;IACjB,OAAO,EAAG,KAAK;IACf,QAAQ,EAAE,KAAK,EAAS,mDAAmD;IAE3E,SAAS,EAAE,IAAI,EAAS,+BAA+B;IACvD,QAAQ,EAAE,IAAI,EAAU,sCAAsC;IAE9D,OAAO,EAAE,IAAI,EAAW,+CAA+C;IACvE,QAAQ,EAAE,IAAI,EAAU,oDAAoD;IAE5E,OAAO,EAAE,IAAI,EAAW,oDAAoD;IAC5E,OAAO,EAAE,IAAI,EAAW,8CAA8C;IACtE,QAAQ,EAAE,IAAI,EAAU,uCAAuC;IAE/D,IAAI,EAAE,IAAI,EAAc,0CAA0C;IAClE,KAAK,EAAE,IAAI,EAAa,GAAG;IAE3B,MAAM,EAAE,IAAI,EAAY,2BAA2B;IACnD,OAAO,EAAE,IAAI;IAEb,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI,EAAW,UAAU;IAElC,SAAS,EAAE,IAAI,EAAS,mDAAmD;IAE3E,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IAEf,KAAK,EAAE,IAAI,EAAa,sGAAsG;IAE9H,QAAQ,EAAE,IAAI,EAAU,uEAAuE;IAC/F,QAAQ,EAAE,IAAI;IAEd,MAAM,EAAE,IAAI,EAAY,mEAAmE;IAE3F,MAAM,EAAE,IAAI,EAAY,eAAe;IACvC,MAAM,EAAE,IAAI,EAAY,wBAAwB;IAChD,SAAS,EAAE,IAAI;IAEf,GAAG,EAAE,IAAI,EAAe,0BAA0B;IAClD,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IAEf,MAAM,EAAE,IAAI;IAEZ,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IAEX,SAAS,EAAE,IAAI,EAAS,qCAAqC;IAC7D,OAAO,EAAE,IAAI;IACW,0BAA0B;IAClD,OAAO,EAAE,IAAI,EAAW,kCAAkC;IAE1D,SAAS,EAAE,IAAI,EAAS,qCAAqC;CAChE,CAAA;AAED,MAAM,QAAQ,GAAG,MAAM,CAAC;AACxB,MAAM,QAAQ,GAAG,IAAI,CAAC;AAEtB,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE;QACH,GAAG,EAAE,KAAK;QACV,SAAS,EAAE;YACP,OAAO,EAAE,SAAS;SACrB;QACD,MAAM,EAAE;YACJ,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,QAAQ;SAChB;KACJ;IACD,GAAG,EAAE,UAAU,QAAQ,IAAI,YAAY,IAAI,QAAQ,EAAE;CACxD,CAAA;AAED,iEAAiE;AACjE,2CAA2C;AAC3C,+DAA+D;AAC/D,uEAAuE;AACvE,4DAA4D;AAC5D,4CAA4C;AAC5C,2DAA2D;AAC3D,uCAAuC;AACvC,qDAAqD;AACrD,oDAAoD;AACpD,2DAA2D;AAC3D,6CAA6C;AAC7C,sCAAsC;AACtC,wDAAwD;AACxD,oDAAoD;AACpD,6DAA6D;AAC7D,uCAAuC;AACvC,yCAAyC;AACzC,uCAAuC;AACvC,8CAA8C;AAC9C,gDAAgD;AAChD,EAAE"}
+{"version":3,"file":"ports.js","sourceRoot":"","sources":["ports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,KAAK,GAAG;IACjB,OAAO,EAAG,KAAK;IACf,QAAQ,EAAE,KAAK,EAAS,mDAAmD;IAE3E,SAAS,EAAE,IAAI,EAAS,+BAA+B;IACvD,QAAQ,EAAE,IAAI,EAAU,sCAAsC;IAE9D,OAAO,EAAE,IAAI,EAAW,+CAA+C;IACvE,QAAQ,EAAE,IAAI,EAAU,oDAAoD;IAE5E,OAAO,EAAE,IAAI,EAAW,oDAAoD;IAC5E,OAAO,EAAE,IAAI,EAAW,8CAA8C;IACtE,QAAQ,EAAE,IAAI,EAAU,uCAAuC;IAE/D,IAAI,EAAE,IAAI,EAAc,0CAA0C;IAClE,KAAK,EAAE,IAAI,EAAa,GAAG;IAE3B,MAAM,EAAE,IAAI,EAAY,2BAA2B;IACnD,OAAO,EAAE,IAAI;IAEb,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI,EAAW,UAAU;IAElC,SAAS,EAAE,IAAI,EAAS,mDAAmD;IAE3E,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IAEf,KAAK,EAAE,IAAI,EAAa,sGAAsG;IAE9H,QAAQ,EAAE,IAAI,EAAU,uEAAuE;IAC/F,QAAQ,EAAE,IAAI;IAEd,MAAM,EAAE,IAAI,EAAY,mEAAmE;IAE3F,MAAM,EAAE,IAAI,EAAY,eAAe;IACvC,MAAM,EAAE,IAAI,EAAY,wBAAwB;IAChD,SAAS,EAAE,IAAI;IAEf,GAAG,EAAE,IAAI,EAAe,0BAA0B;IAClD,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IAEf,MAAM,EAAE,IAAI;IAEZ,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IAEX,SAAS,EAAE,IAAI,EAAS,qCAAqC;IAC7D,OAAO,EAAE,IAAI;IACW,0BAA0B;IAClD,OAAO,EAAE,IAAI,EAAW,kCAAkC;IAE1D,SAAS,EAAE,IAAI,EAAS,qCAAqC;IAE7D,MAAM,EAAE,IAAI;CACf,CAAA;AAED,MAAM,QAAQ,GAAG,MAAM,CAAC;AACxB,MAAM,QAAQ,GAAG,IAAI,CAAC;AAEtB,MAAM,CAAC,MAAM,IAAI,GAAG;IAChB,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE;QACH,GAAG,EAAE,KAAK;QACV,SAAS,EAAE;YACP,OAAO,EAAE,SAAS;SACrB;QACD,MAAM,EAAE;YACJ,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,QAAQ;SAChB;KACJ;IACD,GAAG,EAAE,UAAU,QAAQ,IAAI,YAAY,IAAI,QAAQ,EAAE;CACxD,CAAA;AAED,iEAAiE;AACjE,2CAA2C;AAC3C,+DAA+D;AAC/D,uEAAuE;AACvE,4DAA4D;AAC5D,4CAA4C;AAC5C,2DAA2D;AAC3D,uCAAuC;AACvC,qDAAqD;AACrD,oDAAoD;AACpD,2DAA2D;AAC3D,6CAA6C;AAC7C,sCAAsC;AACtC,wDAAwD;AACxD,oDAAoD;AACpD,6DAA6D;AAC7D,uCAAuC;AACvC,yCAAyC;AACzC,uCAAuC;AACvC,8CAA8C;AAC9C,gDAAgD;AAChD,EAAE"}

package/.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-    {
-        "type": "node",
-        "request": "launch",
-        "name": "Launch Program",
-        "program": "${workspaceFolder}/index.js",
-        "skipFiles": [ "<node_internals>/**" ],
-        "outFiles": [
-                     "${workspaceFolder}/**/*.js"
-                    ]
-    }
-    ]
-}

package/.vscode/settings.json

@@ -1,23 +0,0 @@
-{
-    "workbench.colorTheme": "Visual Studio 2019 Dark",
-    "workbench.colorCustomizations": {
-        "activityBar.activeBackground": "#77a8ff",
-        "activityBar.background": "#77a8ff",
-        "activityBar.foreground": "#15202b",
-        "activityBar.inactiveForeground": "#15202b99",
-        "activityBarBadge.background": "#df0050",
-        "activityBarBadge.foreground": "#e7e7e7",
-        "commandCenter.border": "#15202b99",
-        "sash.hoverBorder": "#77a8ff",
-        "statusBar.background": "#4488ff",
-        "statusBar.foreground": "#15202b",
-        "statusBarItem.hoverBackground": "#1168ff",
-        "statusBarItem.remoteBackground": "#4488ff",
-        "statusBarItem.remoteForeground": "#15202b",
-        "titleBar.activeBackground": "#4488ff",
-        "titleBar.activeForeground": "#15202b",
-        "titleBar.inactiveBackground": "#4488ff99",
-        "titleBar.inactiveForeground": "#15202b99"
-    },
-    "peacock.color": "4488ff"
-}

package/.vscode/tasks.json

@@ -1,23 +0,0 @@
-{
-    // Template 1.0 y:\x\bin\MakeCodeTemplates\vscode\
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "typescript",
-            "tsconfig": "tsconfig.json",
-            "option": "watch",
-            "runOptions": {
-                "runOn": "folderOpen"
-            },
-            "problemMatcher": [
-                "$tsc-watch"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        }
-    ]
-}

package/checkaddress.ts

@@ -1,158 +0,0 @@
-// From y:\dev\homecontrol\Others\LifX\Apps\lzlan\lants-address.ts
-
-// import { isIPv6 } from 'net';
-import os, { networkInterfaces } from 'os';
-
-// Quck hack - using namespace to hid this until we debug and integrate it for v6 support
-// namespace hidden {
-//     type netinfo = os.NetworkInterfaceInfo & { ints: { address: number, mask: number } }
-
-//     const NetworkInterfaces: netinfo[] = [];	// Need to fix this signature
-
-//     export function assureNetworkInterfaces() {
-//         // Note we don't detect changes to the interfaces
-//         if (networkInterfaces.length > 0) return;
-
-//         const netifs = os.networkInterfaces();
-//         for (const dev in netifs) {
-//             netifs[dev].forEach((info) => {
-
-//                 let family = info.family;
-
-//                 if (typeof family == "number")
-//                     family = `IPv${family}`;	// Strange change work-around
-
-//                 if (family !== 'IPv4' || info.internal === true) {
-//                     return;
-//                 }
-//                 // let info4 = info as os.NetworkInterfaceInfoIPv4;
-//                 // (<any>info)['broadcast'] = _getBroadcastAddress(info4);
-
-//                 const mask = ipToUnsignedInt(info.netmask);
-//                 const address = ipToUnsignedInt(info.address) & mask;
-//                 const ni = { ...info, ints: { mask, address } };
-//                 NetworkInterfaces.push(ni);
-//             })
-//         }
-//         return NetworkInterfaces;
-//     };
-
-//     export function isLocalIp4Address(ip4Address: string) {
-//         if (ip4Address == '127.0.0.1')
-//             return true;
-//         const ipa = ipToUnsignedInt(ip4Address);
-//         assureNetworkInterfaces();
-//         return NetworkInterfaces.some((ni) => (ni.ints.address & ni.ints.mask) === (ipa & ni.ints.mask));
-//     }
-
-//     function ipToUnsignedInt(ipAddress: string): number {
-//         const parts = ipAddress.split('.');
-//         if (parts.length !== 4) {
-//             throw new Error('Invalid IP address format');
-//         }
-
-//         const num = parts.map((part) => parseInt(part, 10));
-//         if (num.some((part) => isNaN(part) || part < 0 || part > 255)) {
-//             throw new Error(`Invalid IP address ${ipAddress}`);
-//         }
-
-//         const signed = (num[0] << 24) + (num[1] << 16) + (num[2] << 8) + num[3];
-//         const unsigned = signed >>> 0;
-//         return unsigned;
-//     }
-
-//     let pretendRemote = false;
-
-//     export function isLocalIpAddress(ipAddress: string) {
-//         // '::ffff:172.20.3.39'
-//         if (pretendRemote) return false;
-//         ipAddress = ipAddress.toLowerCase();    // Safety
-//         if (ipAddress.startsWith('fe80:'))
-//             return true;    // Link local
-//         if (ipAddress == "::1")
-//             return true;
-//         ipAddress = ipAddress.replace(/^::ffff:/, '');  // If it's like V5
-
-//         if (/^[0-9.]+$/.test(ipAddress))
-//             return isLocalIp4Address(ipAddress)
-//         return isIPv6LocalAddress(ipAddress);
-
-
-//         // const localIps = getLocalAddresses();
-
-//         // for (const localIp of localIps) {
-//         //     const range = new AddressInfo(localIp);
-
-//         //     if (range.family === 'IPv4' && net.isIPv4(ipAddress)) {
-//         //         if (range.address === ipAddress) {
-//         //             return true;
-//         //         }
-//         //     } else if (range.family === 'IPv6' && net.isIPv6(ipAddress)) {
-//         //         if (range.address === ipAddress) {
-//         //             return true;
-//         //         }
-//         //     }
-//         // }
-
-//         return false;
-//     }
-
-//     // function isIPv6LocalAddress(ipv6Address: string): boolean {
-//     //     const interfaces = networkInterfaces();
-//     //     for (const interfaceName of Object.keys(interfaces)) {
-//     //         const addresses = interfaces[interfaceName].filter(
-//     //             (iface) => iface.family === 'IPv6'
-//     //         );
-//     //         for (const iface of addresses) {
-//     //             if (iface.address === ipv6Address) {
-//     //                 return true;
-//     //             }
-//     //         }
-//     //     }
-//     //     return false;
-//     // }
-
-//     function isIPv6LocalAddress(ipv6Address: string): boolean {
-//         const interfaces = networkInterfaces();
-//         for (const interfaceName of Object.keys(interfaces)) {
-//             const addresses = interfaces[interfaceName].filter((iface) => iface.family === 'IPv6');
-//             for (const iface of addresses) {
-//                 if (iface.cidr) {
-//                     const [ifaceAddress, networkMask] = iface.cidr.split('/');
-//                     if (isSameNetwork(ipv6Address, networkMask, ifaceAddress)) {
-//                         return true;
-//                     }
-//                 }
-//             }
-//         }
-//         return false;
-//     }
-
-//     function isSameNetwork(ipv6Address: string, networkMaskLength: string, ifaceAddress: string): boolean {
-//         const maskLength = parseInt(networkMaskLength, 10);
-//         const bufferLength = Math.ceil(maskLength / 8);
-//         const addressBuffer = Buffer.from(ipv6Address.split(':').map((part) => parseInt(part, 16)));
-//         const ifaceBuffer = Buffer.from(ifaceAddress.split(':').map((part) => parseInt(part, 16)));
-
-//         for (let i = 0; i < bufferLength; i++) {
-//             const maskBits = Math.min(maskLength - i * 8, 8);
-//             const mask = (0xff00 >> maskBits) & 0xff;
-//             if ((addressBuffer[i] & mask) !== ifaceBuffer[i]) {
-//                 return false;
-//             }
-//         }
-//         return true;
-//     }
-
-//     // Example usage
-//     // const ipv6AddressToCheck = 'fdb7:3df3:9615:193e:3743:1a24:69e8:127a';
-//     // const isLocalAddress = isIPv6LocalAddress(ipv6AddressToCheck);
-//     // console.log(`Is IPv6 Address ${ipv6AddressToCheck} on the same local network? ${isLocalAddress}`);
-
-
-//     // // Example usage
-//     // const ipv6AddressToCheck = 'fdb7:3df3:9615:193e:3743:1a24:69e8:127a';
-//     // const networkMask = 'ffff:ffff:ffff:ffff::'; // Replace with the actual subnet mask
-//     // const isLocalAddress = isIPv6LocalAddress(ipv6AddressToCheck, networkMask);
-//     // console.log(`Is IPv6 Address ${ipv6AddressToCheck} on the same local network? ${isLocalAddress}`);
-// }

package/dnsassist.ts

@@ -1,113 +0,0 @@
-import dns from 'dns';
-import os from 'os'
-
-/***
- * return IPv4 address giving local addresses priority
- */
-
-export const default_fqdn = 'aaz.lt';  // For now
-
-export async function resolve4(name: string, local?: boolean): Promise<string> {
-    if (!name?.includes('.')) name += '.' + default_fqdn;   // FQDN Hack
-
-    return new Promise((resolve, reject) => dns.resolve4(name,
-        (err: any, ips) => {
-            if (err)
-                return resolve(null);
-
-            const locals = ips.filter(ip => isLocalIP(ip));
-            if (locals.length > 0)
-                return resolve(locals[0]);
-            if (local)
-                return resolve(null);
-
-            resolve(ips[0]);
-        }
-    ));
-}
-
-export async function resolveLocal4(name: string): Promise<string> {
-    return await resolve4(name, true);
-}
-
-// #region Local IP address
-
-interface localIPAndMask { ipn: number, mask: number, s: { ip: string, mask: string } };
-export let localIPAndMasks: localIPAndMask[] = null;
-
-function ipv4ToInt(ip: string): number {
-    ip = ip.replace('::ffff:', ''); // Convert IPv4-mapped IPv6 addresses to their IPv4 representation
-    const octets = ip.split(".").map(o => parseInt(o));
-    // let z8 = octets.reduce((acc, octet) => (acc << 8) + octet);
-    let x8 = arrayToUint32(octets.reverse());
-    return x8;
-}
-
-function arrayToUint32(arr: number[]): number {
-    const uint8Arr = Uint8Array.from(arr);
-    const uint32Arr = new Uint32Array(uint8Arr.buffer);
-    return uint32Arr[0];
-}
-
-function assureLocalV4Address() {
-    // 2023-12-18 removed caching so we can change it on the fly
-    // if (localIPAndMasks)
-    //     return localIPAndMasks;
-    localIPAndMasks = [];
-    const interfaces = os.networkInterfaces();
-
-    for (const name of Object.keys(interfaces)) {
-        for (const netinterface of interfaces[name]) {
-            if (netinterface.family !== 'IPv4') continue;
-            if (netinterface.internal) continue;
-            const mask = ipv4ToInt(netinterface.netmask);
-            const ipn = ipv4ToInt(netinterface.address) & mask;
-            localIPAndMasks.push({ ipn, mask, s: { ip: netinterface.address, mask: netinterface.netmask } });
-        }
-    }
-    return localIPAndMasks;
-}
-
-export function isLocalIP(ip: string) {
-    if (isThisMachine(ip))
-        return true; // It handles special cases better
-    const ipn = ipv4ToInt(ip);
-    for (var ipm of assureLocalV4Address()) {
-        if ((ipn & ipm.mask) === ipm.ipn) return true;
-    }
-    return false;
-}
-
-// // Function to get all IP addresses of the local machine, both IPv4 and IPv6
-// const getLocalIPs = (): string[] => {
-//     const interfaces = os.networkInterfaces();
-//     const ips: string[] = [];
-
-//     for (const interfaceName in interfaces) {
-//         const iface = interfaces[interfaceName];
-//         if (iface) {P
-//             for (const alias of iface) {
-//                 if ((alias.family === 'IPv4' || alias.family === 'IPv6') && !alias.internal) {
-//                     // Store IPv4 addresses directly and IPv6 addresses in their full representation
-//                     ips.push(alias.family === 'IPv4' ? alias.address : `::ffff:${alias.address}`);
-//                 }
-//             }
-//         }
-//     }
-
-//     return ips;
-// };
-
-// Function to check if the IP address is from this machine
-export function isThisMachine(ip: string) {
-    // Convert IPv4-mapped IPv6 addresses to their IPv4 representation
-    ip = ip.replace('::ffff:', '');
-
-    // Handling the case where IP is ::1 (localhost in IPv6)
-    if (ip === '::1' || ip == '127.0.0.1') {
-        return true;
-    }
-
-    const localIPs = assureLocalV4Address().map(ipm => ipm.s.ip);
-    return localIPs.includes(ip);
-};

package/index.ts

@@ -1,21 +0,0 @@
-import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js'
-import { ports, mqtt } from './ports.js'
-import { makerPayload } from './maker.js';
-import { jSubSiteInfo, jpriv, jprivs } from './jserve.js';
-
-export {
-    resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn,
-    ports, mqtt, jprivs
-};
-    export type { makerPayload, jSubSiteInfo, jpriv };
-
-export default {
-    resolve4,
-    resolveLocal4,
-    isLocalIP,
-    isThisMachine,
-    default_fqdn,
-    ports,
-    mqtt,
-    jprivs
-}

package/jserve.ts

@@ -1,25 +0,0 @@
-// Support for connecting with jserve
-
-// This can be passed via the default value or, better, via the JExport
-
-// Note that a client entry is
-//   name or pfx:name so you can say "ui:useful"
-//   * means deafult so you can /subpapp rather than /subapp/name
-
-export const jprivs = [
-    "admin",            // Uber privilege
-    "user",             // Normal user
-    "guest",            // Low privilege guest
-    "home",             // Home control
-    "bbs"];             // bbs (bbt) app
-export type jpriv = typeof jprivs[number];
-
-// export type jpriv = "admin" | "user" | "guest";
-
-export interface jSubSiteInfo {
-    app: object;  // Express -- so we don't nee the Express definition in miscassists
-    AppInit?: () => Promise<void>
-    subClients?: string[];  // Dirname or path to html file
-    privs?: jpriv[];
-    localLogin?: boolean;   // If true, use local login. Allow remember?
-}

package/maker.ts

@@ -1,14 +0,0 @@
-// Support for Hubitat and Devqtt
-
-
-export interface makerPayload {
-    content: {
-        name: string,
-        value: string,
-        displayName: string,
-        deviceId: string,
-        descriptionText: string,
-        unit: object,
-        data: object
-    }
-}

package/ports.ts

@@ -1,102 +0,0 @@
-import { default_fqdn } from "./dnsassist.js";
-
-export const ports = {
-    jserve2:  10080, 
-    jserve2s: 10443,        // For now, we use the same port for http and https
-    
-    devlisten: 9070,        // Hubitat MakerAPI http server
-    halisten: 9071,         // Home Assistant MakerAPI http server
-
-    rmfsite: 9081,          // These will be phased out for the new version
-    rmfsites: 9082,         // used to be for SSL but now any port is ssl or not
-    
-    rmfprod: 9081,          // Secondary port for production version (debugging)
-    rmfbeta: 9082,          // Secondary port for beta version (debugging)
-    rmfalpha: 9083,         // Secondary port for the alpha version
-    
-    shim: 9084,             // Warming -- these are current forwarded!
-    shims: 9085,            // 
-
-    jvport: 9180,           // These are copied in hlib
-    jvports: 9143,
-
-    sqltcp: 9098,
-    sqldbg: 9096,
-    sqlhttp: 9099,          // For now
-
-    sqlproxy2: 9097,        // Replace sqlproxy and share a port for http/https
-
-    sqlproxy: 9080,
-    sqlproxys: 9043,
-
-    pinst: 9299,            // Used for my pings server [currently it has a local value because --install-links isn't cooperating]
-
-    mlplanel: 9300,         // Note: This must jibe with mlpanel since we copy it to another system
-    mlpanels: 9301,
-
-    wizzer: 9310,           // Work in progress Wiz control. Internal only so not https for now
- 
-    pserve: 9311,           // Photo server
-    vserve: 9312,           // Video server from IIS
-    checkmake: 9313,
-
-    bbt: 9314,              // Bulletin board test    
-    backts: 9315,
-    backserve: 9316,
-
-    syncer: 9317,
-
-    lifxer: 9318,
-    itemw: 9319,
-        
-    stephanie: 9320,        // For testing stephanie site locally
-    asyncer: 9321,
-                            // 9322 is used by Windows
-    psyncer: 9324,          // Used for the powershell version
-
-    rmfAlpha2: 9325,        // So we can try alternative clients.
-
-    carder: 9326
-}
-
-const mqttHost = "pi4c";
-const mqttPort = 1883;
-
-export const mqtt = {
-    host: mqttHost,
-    port: mqttPort,
-    topic: {        // Default for our own use
-        rmf: "rmf",
-        subtopics: {
-            restart: "restart",
-        },
-        devqtt: {
-            top: "rmf",
-            sub: "devqtt"
-        }
-    },
-    URL: `mstt://${mqttHost}.${default_fqdn}:${mqttPort}`
-}
-
-//		<port port="9070" name="Listen for Hubitat (experimental)" />
-//		<port port="9080" name="birdbox1:80" />
-//		<port port="9081" name="Home port for home.rmf.vc et al" />
-//		<port port="9082" name="Home port for home.rmf.vc et al for SSL" />
-//		<port port="9083" name="Web Sockets for home control" />
-//		<port port="9084" name="Insteon Shim" />
-//		<port port="9085" name="Insteon Shim SSL (reserved)" />
-//		<port port="9086" name="shimmer" />
-//		<port port="9087" name="shimmer SSL (not yet)" />
-//		<port port="9088" name="TCP For NodeSQLAssit" />
-//		<port port="9089" name="TCP Shelly Listener (HTLog)" />
-//		<port port="9389" name="Birdbox1:3389" />
-//		<port port="9920" name="HC XML" />
-//		<!-- <port port="9994" name="HC TCP Listener" /> -->
-//		<port port="9800-9899" name="HC TCP Listener" />
-//		<!-- <port port="9960-9969" name="HC TCP Listener" /> -->
-//		<port port="9995" name="HC xcmd" />
-//		<port port="9996" name="HC Manual" />
-//		<port port="9997" name="HC HTTP" />
-//		<port port="9970-9979" name="HC Telnet" />
-//		<port port="9901" name="Lightify Client1" />
-//

package/tsconfig.json

@@ -1,109 +0,0 @@
-{
-  "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig to read more about this file */
-
-    /* Projects */
-    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
-    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
-    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-    /* Language and Environment */
-    "target": "esnext",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
-    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
-    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
-    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-
-    /* Modules */
-    "module": "esnext",                                  /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "node",                        /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
-    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
-    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
-    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
-    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
-    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-
-    /* JavaScript Support */
-    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
-    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-
-    /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-    "sourceMap": true,                                   /* Create source map files for emitted JavaScript files. */
-    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
-    // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
-    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
-    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
-    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
-    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
-    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-    /* Interop Constraints */
-    "isolatedModules": true,                             /* Ensure that each file can be safely transpiled without relying on other imports. */
-    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
-    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
-    /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-    "strictNullChecks": false,                           /* When type checking, take into account 'null' and 'undefined'. */
-    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
-    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
-    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
-  }
-}