pubface 1.0.0 → 1.0.3

package/README.md

@@ -27,6 +27,12 @@ Install the command
 $ npm install -g pubface
 ```
 
+Or alternatively download the latest executable if you do not have Node.js or NPM installed
+
+-   [MacOS](https://github.com/postalsys/pubface/releases/latest/download/pubface.pkg)
+-   [Linux](https://github.com/postalsys/pubface/releases/latest/download/pubface.tar.gz)
+-   [Window](https://github.com/postalsys/pubface/releases/latest/download/pubface.exe)
+
 Use it to get an array of interfaces
 
 ```

package/entitlements.mac.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+  </dict>
+</plist>

package/index.js

@@ -1,10 +1,11 @@
 'use strict';
 
-const fetch = require('nodemailer/lib/fetch');
+const fetchUrl = require('nodemailer/lib/fetch');
 const packageData = require('./package.json');
 const dns = require('dns').promises;
 const os = require('os');
 const net = require('net');
+const ipaddr = require('ipaddr.js');
 
 const RESOLV_URL = process.env.RESOLV_URL || 'https://api.nodemailer.com/';
 const RESOLV_TIMEOUT = Number(process.env.RESOLV_TIMEOUT) || 5;
@@ -12,6 +13,29 @@ const RESOLV_TIMEOUT = Number(process.env.RESOLV_TIMEOUT) || 5;
 const RESOLV_TIMEOUT_SEC = RESOLV_TIMEOUT * 1000;
 const DNS_CACHE = {};
 
+function getPtrAddr(address) {
+    let parsed = ipaddr.parse(address);
+    if (net.isIPv4(address)) {
+        return parsed.toByteArray().reverse().join('.') + '.in-addr.arpa.';
+    }
+    if (net.isIPv6(address)) {
+        return (
+            parsed
+                .toByteArray()
+                .map(nr => (nr < 0x0a ? '0' : '') + nr.toString(16))
+                .join('')
+                .split('')
+                .reverse()
+                .join('.') + '.ip6.arpa.'
+        );
+    }
+}
+
+async function resolvePtr(address) {
+    let ptrAddress = getPtrAddr(address);
+    return await dns.resolvePtr(ptrAddress);
+}
+
 async function updateDns() {
     let now = new Date();
 
@@ -77,9 +101,15 @@ function getPublicInterfaces() {
     let publicInterfaces = { IPv4: [], IPv6: [] };
     Object.keys(interfaces)
         .flatMap(iface => interfaces[iface].filter(entry => !entry.internal).map(entry => Object.assign({ iface }, entry)))
-        .forEach(entry => {
-            if (Array.isArray(publicInterfaces[entry.family])) {
-                publicInterfaces[entry.family].push(entry);
+        .forEach(originalEntry => {
+            let entry = Object.assign({}, originalEntry);
+
+            let family = typeof entry.family === 'number' ? `IPv${entry.family}` : entry.family;
+            if (entry.family !== family) {
+                entry.family = family;
+            }
+            if (Array.isArray(publicInterfaces[family])) {
+                publicInterfaces[family].push(entry);
             }
         });
     return publicInterfaces;
@@ -100,7 +130,7 @@ async function timedFunction(prom, timeout, localAddress) {
 
 async function resolveIP(localAddress, family) {
     let data = await new Promise((resolve, reject) => {
-        let req = fetch(RESOLV_URL, {
+        let req = fetchUrl(RESOLV_URL, {
             userAgent: `${packageData.name}/${packageData.version}`,
             tls: {
                 host: DNS_CACHE[family] && DNS_CACHE[family].host,
@@ -136,7 +166,7 @@ async function resolveIP(localAddress, family) {
     }
 
     try {
-        let name = await dns.reverse(data.ip);
+        let name = await resolvePtr(data.ip);
         if (name && name.length) {
             data.name = name[0];
         }

package/package.json

@@ -1,18 +1,36 @@
 {
     "name": "pubface",
-    "version": "1.0.0",
+    "version": "1.0.3",
     "description": "Resolve public network interfaces for current machine",
     "main": "index.js",
     "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "build-dist": "pkg package.json"
     },
     "keywords": [],
     "author": "Postal Systems OÜ",
     "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/postalsys/pubface/issues"
+    },
+    "homepage": "https://github.com/postalsys/pubface",
     "bin": {
         "pubface": "bin/pubface.js"
     },
     "dependencies": {
-        "nodemailer": "6.7.1"
+        "ipaddr.js": "2.0.1",
+        "nodemailer": "6.7.5"
+    },
+    "devDependencies": {
+        "pkg": "5.7.0"
+    },
+    "pkg": {
+        "assets": [
+            "LICENSE.txt"
+        ],
+        "_targets": [
+            "node16-macos-x64"
+        ],
+        "outputPath": "dist"
     }
 }