@bobfrankston/miscassists 1.0.20 → 1.0.22

package/checkaddress.js

@@ -1,137 +1,130 @@
 // From y:\dev\homecontrol\Others\LifX\Apps\lzlan\lants-address.ts
-// import { isIPv6 } from 'net';
-import os, { networkInterfaces } from 'os';
+export {};
 // Quck hack - using namespace to hid this until we debug and integrate it for v6 support
-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 = {}));
+// 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}`);
+// }
 //# sourceMappingURL=checkaddress.js.map

package/checkaddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkaddress.js","sourceRoot":"","sources":["checkaddress.ts"],"names":[],"mappings":"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"}
+{"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"}

package/checkaddress.ts

@@ -4,155 +4,155 @@
 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}`);
-}
+// 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/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,EAAqC,MAAM,EACzD,CAAC;AAEF,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,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"}

package/index.ts

@@ -5,8 +5,9 @@ import { jSubSiteInfo, jpriv, jprivs } from './jserve.js';
 
 export {
     resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn,
-    ports, mqtt, makerPayload, jSubSiteInfo, jpriv, jprivs
+    ports, mqtt, jprivs
 };
+    export type { makerPayload, jSubSiteInfo, jpriv };
 
 export default {
     resolve4,

package/jserve.js

@@ -3,5 +3,11 @@
 // 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", "user", "guest", "bbs"];
+export const jprivs = [
+    "admin",
+    "user",
+    "guest",
+    "home",
+    "bbs"
+]; // bbs (bbt) app
 //# sourceMappingURL=jserve.js.map

package/jserve.js.map

@@ -1 +1 @@
-{"version":3,"file":"jserve.js","sourceRoot":"","sources":["jserve.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,uEAAuE;AAEvE,8BAA8B;AAC9B,gDAAgD;AAChD,iEAAiE;AAEjE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"jserve.js","sourceRoot":"","sources":["jserve.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,uEAAuE;AAEvE,8BAA8B;AAC9B,gDAAgD;AAChD,iEAAiE;AAEjE,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,KAAK;CAAC,CAAC,CAAa,gBAAgB"}

package/jserve.ts

@@ -6,7 +6,12 @@
 //   name or pfx:name so you can say "ui:useful"
 //   * means deafult so you can /subpapp rather than /subapp/name
 
-export const jprivs = ["admin", "user", "guest", "bbs"];
+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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/miscassists",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "",
   "main": "index.js",
   "module": "main.js",
@@ -15,6 +15,6 @@
     "esm": "^3.2.25"
   },
   "devDependencies": {
-    "@types/node": "^20.12.7"
+    "@types/node": "^22.10.2"
   }
 }

package/ports.js

@@ -14,10 +14,12 @@ export const ports = {
     jvport: 9180,
     jvports: 9143,
     sqltcp: 9098,
+    sqldbg: 9096,
     sqlhttp: 9099,
     sqlproxy2: 9097,
     sqlproxy: 9080,
     sqlproxys: 9043,
+    pinst: 9299,
     mlplanel: 9300,
     mlpanels: 9301,
     wizzer: 9310,
@@ -30,8 +32,11 @@ export const ports = {
     syncer: 9317,
     lifxer: 9318,
     itemw: 9319,
-    pinst: 9299,
-    stephanie: 9320, // For testing stephanie site locally
+    stephanie: 9320,
+    asyncer: 9321,
+    // 9322 is used by Windows
+    psyncer: 9324,
+    rmfAlpha2: 9325, // So we can try alternative clients.
 };
 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;IAEf,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,IAAI;IAEd,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IAEd,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IAEd,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IAEX,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IAEb,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IAEb,SAAS,EAAE,IAAI;IAEf,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IAEf,QAAQ,EAAE,IAAI;IACd,QAAQ,EAAE,IAAI;IAEd,MAAM,EAAE,IAAI;IAEZ,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IAEf,GAAG,EAAE,IAAI;IACT,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IAEf,MAAM,EAAE,IAAI;IAEZ,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IAEX,KAAK,EAAE,IAAI;IAEX,SAAS,EAAE,IAAI,EAAS,qCAAqC;CAEhE,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;IAEf,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,IAAI;IAEd,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IAEd,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IAEd,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IAEX,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IAEb,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IAEb,SAAS,EAAE,IAAI;IAEf,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IAEf,KAAK,EAAE,IAAI;IAEX,QAAQ,EAAE,IAAI;IACd,QAAQ,EAAE,IAAI;IAEd,MAAM,EAAE,IAAI;IAEZ,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IAEf,GAAG,EAAE,IAAI;IACT,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IAEf,MAAM,EAAE,IAAI;IAEZ,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IAEX,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,IAAI;IACW,0BAA0B;IAClD,OAAO,EAAE,IAAI;IAEb,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"}

package/ports.ts

@@ -21,6 +21,7 @@ export const ports = {
     jvports: 9143,
 
     sqltcp: 9098,
+    sqldbg: 9096,
     sqlhttp: 9099,          // For now
 
     sqlproxy2: 9097,        // Replace sqlproxy and share a port for http/https
@@ -28,11 +29,13 @@ export const ports = {
     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,
@@ -46,10 +49,12 @@ export const ports = {
     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.
 }
 
 const mqttHost = "pi4c";

package/tsconfig.json

@@ -74,7 +74,7 @@
     // "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. */
+    "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. */