@bobfrankston/miscassists 1.0.53 → 1.0.55

package/dnsassist.d.ts

@@ -16,3 +16,4 @@ interface localIPAndMask {
 export declare let localIPAndMasks: localIPAndMask[];
 export declare function isLocalIP(ip: string): boolean;
 export declare function isThisMachine(ip: string): boolean;
+export declare function getLocalSuffix(): Promise<string | null>;

package/dnsassist.js

@@ -1,5 +1,5 @@
-import dns from 'dns';
-import os from 'os';
+import dnsp from 'node:dns/promises';
+import os from 'node:os';
 import { default_fqdn } from '@bobfrankston/miscinfo';
 /***
  * return IPv4 address giving local addresses priority
@@ -8,16 +8,19 @@ export { default_fqdn };
 export async function resolve4(name, local) {
     if (!name?.includes('.'))
         name += '.' + default_fqdn; // FQDN Hack
-    return new Promise((resolve, reject) => dns.resolve4(name, (err, 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]);
-    }));
+    let ips;
+    try {
+        ips = await dnsp.resolve4(name);
+    }
+    catch {
+        return null;
+    }
+    const locals = ips.filter(ip => isLocalIP(ip));
+    if (locals.length > 0)
+        return locals[0];
+    if (local)
+        return null;
+    return ips[0];
 }
 export async function resolveLocal4(name) {
     return await resolve4(name, true);
@@ -94,4 +97,17 @@ export function isThisMachine(ip) {
     return localIPs.includes(ip);
 }
 ;
+export async function getLocalSuffix() {
+    try {
+        const [server] = dnsp.getServers();
+        if (!server)
+            return null;
+        const [name] = await dnsp.reverse(server);
+        const parts = name?.split(".") ?? [];
+        return parts.length > 1 ? parts.slice(1).join(".") : null;
+    }
+    catch {
+        return null;
+    }
+}
 //# sourceMappingURL=dnsassist.js.map

package/index.d.ts

@@ -1,7 +1,7 @@
-import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js';
+import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, getLocalSuffix } from './dnsassist.js';
 import { ports, mqtt, endsWithFQDN } from '@bobfrankston/miscinfo';
 import { makerPayload } from './maker.js';
-export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, makerPayload, endsWithFQDN };
+export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, makerPayload, endsWithFQDN, getLocalSuffix };
 export declare const values: {
     exitRunit: number;
 };
@@ -73,5 +73,6 @@ declare const _default: {
         exitRunit: number;
     };
     endsWithFQDN: typeof endsWithFQDN;
+    getLocalSuffix: typeof getLocalSuffix;
 };
 export default _default;

package/index.js

@@ -1,7 +1,7 @@
-import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js';
+import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, getLocalSuffix } from './dnsassist.js';
 import { ports, mqtt, endsWithFQDN } from '@bobfrankston/miscinfo';
 // import { jSubSiteInfo, jpriv, jprivs } from './jserve.js';
-export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, endsWithFQDN
+export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, endsWithFQDN, getLocalSuffix
 // , jSubSiteInfo, jpriv, jprivs
  };
 export const values = {
@@ -17,6 +17,7 @@ export default {
     mqtt,
     // jprivs,
     values,
-    endsWithFQDN
+    endsWithFQDN,
+    getLocalSuffix
 };
 //# sourceMappingURL=index.js.map

package/jserve.d.ts

@@ -0,0 +1 @@
+export {};

package/jserve.js

@@ -1,4 +1,4 @@
-"use strict";
+export {};
 // 
 // 
 // // This can be passed via the default value or, better, via the JExport

package/miscassists.code-workspace

@@ -10,7 +10,25 @@
 	"settings": {
 		"workbench.colorCustomizations": {
 			"statusBar.noFolderBackground": "#551913",
-			"statusBar.noFolderForeground": "#FEFCFC"
-		}
+			"statusBar.noFolderForeground": "#FEFCFC",
+			"activityBar.background": "#ba8be6",
+			"titleBar.activeBackground": "#a161dd",
+			"titleBar.activeForeground": "#15202b",
+			"titleBar.inactiveBackground": "#a161dd99",
+			"titleBar.inactiveForeground": "#15202b99",
+			"statusBar.background": "#a161dd",
+			"statusBar.foreground": "#15202b",
+			"activityBar.activeBackground": "#ba8be6",
+			"activityBar.foreground": "#15202b",
+			"activityBar.inactiveForeground": "#15202b99",
+			"activityBarBadge.background": "#f4e0cb",
+			"activityBarBadge.foreground": "#15202b",
+			"commandCenter.border": "#15202b99",
+			"sash.hoverBorder": "#ba8be6",
+			"statusBarItem.hoverBackground": "#8837d4",
+			"statusBarItem.remoteBackground": "#a161dd",
+			"statusBarItem.remoteForeground": "#15202b"
+		},
+		"peacock.color": "#a161dd"
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/miscassists",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "Miscelleanous assists for various tasks including defining port numbers",
   "main": "index.js",
   "module": "main.js",