@bobfrankston/miscassists 1.0.39 → 1.0.41

package/.gitattributes

@@ -1,5 +1,12 @@
-* text=auto eol=lf
-*.ts text eol=lf
-*.js text eol=lf
-*.json text eol=lf
-*.md text eol=lf
+# Ensure consistent line endings
+* text=auto eol=lf
+
+# Explicitly declare text files
+*.js text eol=lf
+*.ts text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+
+# Denote binary files
+*.png binary
+*.jpg binary

package/.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // 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

@@ -0,0 +1,23 @@
+{
+    "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

@@ -0,0 +1,20 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+    {
+        "label": "tsc: watch",
+        "type": "shell",
+        "command": "tsc",
+        "args": ["--watch"],
+        "runOptions": {
+            "runOn": "folderOpen"
+        },
+        "problemMatcher": "$tsc-watch",
+        "isBackground": true,
+        "group": {
+            "kind": "build",
+            "isDefault": true
+        }
+    }
+    ]
+}

package/checkaddress.js

@@ -1,130 +1,137 @@
 // From y:\dev\homecontrol\Others\LifX\Apps\lzlan\lants-address.ts
-export {};
+// 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}`);
-// }
+var hidden;
+(function (hidden) {
+    const NetworkInterfaces = []; // Need to fix this signature
+    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;
+    }
+    hidden.assureNetworkInterfaces = assureNetworkInterfaces;
+    ;
+    function isLocalIp4Address(ip4Address) {
+        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));
+    }
+    hidden.isLocalIp4Address = isLocalIp4Address;
+    function ipToUnsignedInt(ipAddress) {
+        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;
+    function isLocalIpAddress(ipAddress) {
+        // '::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;
+    }
+    hidden.isLocalIpAddress = isLocalIpAddress;
+    // 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) {
+        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, networkMaskLength, ifaceAddress) {
+        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}`);
+})(hidden || (hidden = {}));
 //# sourceMappingURL=checkaddress.js.map

package/checkaddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkaddress.js","sourceRoot":"","sources":["checkaddress.ts"],"names":[],"mappings":"AAAA,kEAAkE;;AAKlE,yFAAyF;AACzF,qBAAqB;AACrB,2FAA2F;AAE3F,6EAA6E;AAE7E,kDAAkD;AAClD,4DAA4D;AAC5D,oDAAoD;AAEpD,iDAAiD;AACjD,sCAAsC;AACtC,8CAA8C;AAE9C,4CAA4C;AAE5C,iDAAiD;AACjD,6EAA6E;AAE7E,qEAAqE;AACrE,8BAA8B;AAC9B,oBAAoB;AACpB,sEAAsE;AACtE,6EAA6E;AAE7E,8DAA8D;AAC9D,wEAAwE;AACxE,mEAAmE;AACnE,8CAA8C;AAC9C,iBAAiB;AACjB,YAAY;AACZ,oCAAoC;AACpC,SAAS;AAET,8DAA8D;AAC9D,yCAAyC;AACzC,2BAA2B;AAC3B,mDAAmD;AACnD,qCAAqC;AACrC,4GAA4G;AAC5G,QAAQ;AAER,4DAA4D;AAC5D,8CAA8C;AAC9C,oCAAoC;AACpC,4DAA4D;AAC5D,YAAY;AAEZ,+DAA+D;AAC/D,2EAA2E;AAC3E,kEAAkE;AAClE,YAAY;AAEZ,mFAAmF;AACnF,yCAAyC;AACzC,2BAA2B;AAC3B,QAAQ;AAER,iCAAiC;AAEjC,4DAA4D;AAC5D,kCAAkC;AAClC,2CAA2C;AAC3C,4DAA4D;AAC5D,6CAA6C;AAC7C,4CAA4C;AAC5C,kCAAkC;AAClC,2BAA2B;AAC3B,6EAA6E;AAE7E,2CAA2C;AAC3C,kDAAkD;AAClD,gDAAgD;AAGhD,mDAAmD;AAEnD,+CAA+C;AAC/C,yDAAyD;AAEzD,yEAAyE;AACzE,wDAAwD;AACxD,sCAAsC;AACtC,uBAAuB;AACvB,gFAAgF;AAChF,wDAAwD;AACxD,sCAAsC;AACtC,uBAAuB;AACvB,mBAAmB;AACnB,eAAe;AAEf,wBAAwB;AACxB,QAAQ;AAER,qEAAqE;AACrE,qDAAqD;AACrD,oEAAoE;AACpE,qEAAqE;AACrE,wDAAwD;AACxD,oBAAoB;AACpB,kDAAkD;AAClD,0DAA0D;AAC1D,sCAAsC;AACtC,uBAAuB;AACvB,mBAAmB;AACnB,eAAe;AACf,2BAA2B;AAC3B,WAAW;AAEX,kEAAkE;AAClE,kDAAkD;AAClD,iEAAiE;AACjE,sGAAsG;AACtG,+CAA+C;AAC/C,oCAAoC;AACpC,iFAAiF;AACjF,mFAAmF;AACnF,uCAAuC;AACvC,wBAAwB;AACxB,oBAAoB;AACpB,gBAAgB;AAChB,YAAY;AACZ,wBAAwB;AACxB,QAAQ;AAER,8GAA8G;AAC9G,8DAA8D;AAC9D,0DAA0D;AAC1D,uGAAuG;AACvG,sGAAsG;AAEtG,mDAAmD;AACnD,gEAAgE;AAChE,wDAAwD;AACxD,kEAAkE;AAClE,gCAAgC;AAChC,gBAAgB;AAChB,YAAY;AACZ,uBAAuB;AACvB,QAAQ;AAER,uBAAuB;AACvB,+EAA+E;AAC/E,wEAAwE;AACxE,4GAA4G;AAG5G,0BAA0B;AAC1B,+EAA+E;AAC/E,6FAA6F;AAC7F,qFAAqF;AACrF,4GAA4G;AAC5G,IAAI"}
+{"version":3,"file":"checkaddress.js","sourceRoot":"","sources":["checkaddress.ts"],"names":[],"mappings":"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"}

package/checkaddress.ts

@@ -0,0 +1,158 @@
+// 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

@@ -0,0 +1,113 @@
+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.js

@@ -1,11 +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 { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, jprivs };
 export const values = {
-    exitRunit: 99
+    exitRunit: 99,
 };
-export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, jprivs };
 export default {
     resolve4,
     resolveLocal4,

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,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;AAIF,eAAe;IACX,QAAQ;IACR,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,KAAK;IACL,IAAI;IACJ,MAAM;IACN,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,OAAO,EACH,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAC/D,KAAK,EAAE,IAAI,EAAqC,MAAM,EACzD,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,SAAS,EAAE,EAAE;CAChB,CAAA;AAED,eAAe;IACX,QAAQ;IACR,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,KAAK;IACL,IAAI;IACJ,MAAM;IACN,MAAM;CACT,CAAA"}

package/index.ts

@@ -0,0 +1,25 @@
+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, makerPayload, jSubSiteInfo, jpriv, jprivs
+};
+
+export const values = {
+    exitRunit: 99,
+}
+
+export default {
+    resolve4,
+    resolveLocal4,
+    isLocalIP,
+    isThisMachine,
+    default_fqdn,
+    ports,
+    mqtt,
+    jprivs,
+    values
+}

package/jserve.ts

@@ -0,0 +1,25 @@
+// 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

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

package/package.json

@@ -1,35 +1,25 @@
 {
   "name": "@bobfrankston/miscassists",
-  "version": "1.0.39",
-  "description": "Miscellaneous Node.js utilities",
+  "version": "1.0.41",
+  "description": "",
   "main": "index.js",
-  "types": "index.d.ts",
+  "module": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "release": "tsc && git add -A && git diff-index --quiet HEAD || git commit -m \"Pre-release changes\" && npm version patch -m \"Release %s\" && git push && git push --tags && sleep 5 && npm publish --loglevel=error"
+    "build": "tsc",
+    "prerelease:local": "git add -A && (git diff-index --quiet HEAD || git commit -m \"Pre-release commit\")",
+    "preversion": "npm run build && git add -A",
+    "postversion": "git push && git push --tags",
+    "release": "npm run prerelease:local && npm version patch && npm publish"
   },
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "misc",
-    "constants"
-  ],
-  "author": "Bob Frankston",
+  "keywords": [],
+  "author": "",
   "license": "ISC",
   "type": "module",
   "dependencies": {
     "esm": "^3.2.25"
   },
   "devDependencies": {
-    "@types/node": "^25.0.6"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/BobFrankston/miscassists.git"
-  },
-  "bugs": {
-    "url": "https://github.com/BobFrankston/miscassists/issues"
-  },
-  "homepage": "https://github.com/BobFrankston/miscassists#readme"
+    "@types/node": "^20.12.7"
+  }
 }

package/ports.js

@@ -14,12 +14,10 @@ export const ports = {
     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
@@ -32,17 +30,9 @@ export const ports = {
     syncer: 9317,
     lifxer: 9318,
     itemw: 9319,
+    pinst: 9299, // Used for my pings server [currently it has a local value because --install-links isn't cooperating]
     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.
-    gcard: 9326,
-    oauth: 9326, // Same as gcard because sahred
-    logit: 9328,
-    carder: 9329,
-    cardaid: 9330,
-    httpUDP: 9331, // HTTP UDP server
+    httpudp: 9321
 };
 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;IAE7D,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI,EAAa,+BAA+B;IACvD,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IAEb,OAAO,EAAE,IAAI,EAAW,kBAAkB;CAC7C,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,OAAO,EAAE,IAAI,EAAW,UAAU;IAElC,SAAS,EAAE,IAAI,EAAS,mDAAmD;IAE3E,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IAEf,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,KAAK,EAAE,IAAI,EAAa,sGAAsG;IAE9H,SAAS,EAAE,IAAI,EAAS,qCAAqC;IAE7D,OAAO,EAAE,IAAI;CAEhB,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/ports.ts

@@ -0,0 +1,97 @@
+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,
+    sqlhttp: 9099,          // For now
+
+    sqlproxy2: 9097,        // Replace sqlproxy and share a port for http/https
+
+    sqlproxy: 9080,
+    sqlproxys: 9043,
+
+    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,
+        
+    pinst: 9299,            // Used for my pings server [currently it has a local value because --install-links isn't cooperating]
+
+    stephanie: 9320,        // For testing stephanie site locally
+
+    httpudp: 9321
+
+}
+
+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

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "strictNullChecks": false,
+    "skipLibCheck": true,
+    "newLine": "lf"
+  }
+}

package/.claude/settings.local.json

@@ -1,12 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx tsc)",
-      "Bash(dir:*)",
-      "Bash(npx tsc:*)",
-      "Bash(git config:*)",
-      "Bash(npm config set:*)",
-      "Bash(git add:*)"
-    ]
-  }
-}

package/README.md

@@ -1,21 +0,0 @@
-# @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/checkaddress.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=checkaddress.d.ts.map

package/checkaddress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"checkaddress.d.ts","sourceRoot":"","sources":["checkaddress.ts"],"names":[],"mappings":""}

package/dnsassist.d.ts

@@ -1,19 +0,0 @@
-/***
- * return IPv4 address giving local addresses priority
- */
-export declare const default_fqdn = "aaz.lt";
-export declare function resolve4(name: string, local?: boolean): Promise<string>;
-export declare function resolveLocal4(name: string): Promise<string>;
-interface localIPAndMask {
-    ipn: number;
-    mask: number;
-    s: {
-        ip: string;
-        mask: string;
-    };
-}
-export declare let localIPAndMasks: localIPAndMask[];
-export declare function isLocalIP(ip: string): boolean;
-export declare function isThisMachine(ip: string): boolean;
-export {};
-//# sourceMappingURL=dnsassist.d.ts.map

package/dnsassist.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dnsassist.d.ts","sourceRoot":"","sources":["dnsassist.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAiB7E;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjE;AAID,UAAU,cAAc;IAAG,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE;AACvF,eAAO,IAAI,eAAe,EAAE,cAAc,EAAS,CAAC;AAmCpD,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,WAQnC;AAuBD,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,WAWvC"}

package/index.d.ts

@@ -1,81 +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 declare const values: {
-    exitRunit: number;
-};
-export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, jprivs };
-export type { makerPayload, jSubSiteInfo, jpriv };
-declare const _default: {
-    resolve4: typeof resolve4;
-    resolveLocal4: typeof resolveLocal4;
-    isLocalIP: typeof isLocalIP;
-    isThisMachine: typeof isThisMachine;
-    default_fqdn: string;
-    ports: {
-        jserve2: number;
-        jserve2s: number;
-        devlisten: number;
-        halisten: number;
-        rmfsite: number;
-        rmfsites: number;
-        rmfprod: number;
-        rmfbeta: number;
-        rmfalpha: number;
-        shim: number;
-        shims: number;
-        jvport: number;
-        jvports: number;
-        sqltcp: number;
-        sqldbg: number;
-        sqlhttp: number;
-        sqlproxy2: number;
-        sqlproxy: number;
-        sqlproxys: number;
-        pinst: number;
-        mlplanel: number;
-        mlpanels: number;
-        wizzer: number;
-        pserve: number;
-        vserve: number;
-        checkmake: number;
-        bbt: number;
-        backts: number;
-        backserve: number;
-        syncer: number;
-        lifxer: number;
-        itemw: number;
-        stephanie: number;
-        asyncer: number;
-        psyncer: number;
-        rmfAlpha2: number;
-        gcard: number;
-        oauth: number;
-        logit: number;
-        carder: number;
-        cardaid: number;
-        httpUDP: number;
-    };
-    mqtt: {
-        host: string;
-        port: number;
-        topic: {
-            rmf: string;
-            subtopics: {
-                restart: string;
-            };
-            devqtt: {
-                top: string;
-                sub: string;
-            };
-        };
-        URL: string;
-    };
-    jprivs: string[];
-    values: {
-        exitRunit: number;
-    };
-};
-export default _default;
-//# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","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;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAI1D,eAAO,MAAM,MAAM;;CAElB,CAAA;AAED,OAAO,EACH,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAC/D,KAAK,EAAE,IAAI,EAAE,MAAM,EACtB,CAAC;AAEF,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElD,wBAUC"}

package/jserve.d.ts

@@ -1,10 +0,0 @@
-export declare const jprivs: string[];
-export type jpriv = typeof jprivs[number];
-export interface jSubSiteInfo {
-    app: object;
-    AppInit?: () => Promise<void>;
-    subClients?: string[];
-    privs?: jpriv[];
-    localLogin?: boolean;
-}
-//# sourceMappingURL=jserve.d.ts.map

package/jserve.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"jserve.d.ts","sourceRoot":"","sources":["jserve.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,MAAM,UAKT,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;AAI1C,MAAM,WAAW,YAAY;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB"}

package/maker.d.ts

@@ -1,12 +0,0 @@
-export interface makerPayload {
-    content: {
-        name: string;
-        value: string;
-        displayName: string;
-        deviceId: string;
-        descriptionText: string;
-        unit: object;
-        data: object;
-    };
-}
-//# sourceMappingURL=maker.d.ts.map

package/maker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"maker.d.ts","sourceRoot":"","sources":["maker.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IACzB,OAAO,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAA;KACf,CAAA;CACJ"}

package/ports.d.ts

@@ -1,60 +0,0 @@
-export declare const ports: {
-    jserve2: number;
-    jserve2s: number;
-    devlisten: number;
-    halisten: number;
-    rmfsite: number;
-    rmfsites: number;
-    rmfprod: number;
-    rmfbeta: number;
-    rmfalpha: number;
-    shim: number;
-    shims: number;
-    jvport: number;
-    jvports: number;
-    sqltcp: number;
-    sqldbg: number;
-    sqlhttp: number;
-    sqlproxy2: number;
-    sqlproxy: number;
-    sqlproxys: number;
-    pinst: number;
-    mlplanel: number;
-    mlpanels: number;
-    wizzer: number;
-    pserve: number;
-    vserve: number;
-    checkmake: number;
-    bbt: number;
-    backts: number;
-    backserve: number;
-    syncer: number;
-    lifxer: number;
-    itemw: number;
-    stephanie: number;
-    asyncer: number;
-    psyncer: number;
-    rmfAlpha2: number;
-    gcard: number;
-    oauth: number;
-    logit: number;
-    carder: number;
-    cardaid: number;
-    httpUDP: number;
-};
-export declare const mqtt: {
-    host: string;
-    port: number;
-    topic: {
-        rmf: string;
-        subtopics: {
-            restart: string;
-        };
-        devqtt: {
-            top: string;
-            sub: string;
-        };
-    };
-    URL: string;
-};
-//# sourceMappingURL=ports.d.ts.map

package/ports.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ports.d.ts","sourceRoot":"","sources":["ports.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+DjB,CAAA;AAKD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;CAchB,CAAA"}