@bobfrankston/miscassists 1.0.48 → 1.0.50

package/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git init:*)",
+      "Bash(npx tsc:*)",
+      "Bash(del \"y:\\\\dev\\\\projects\\\\NodeJS\\\\miscassists\\\\ports.ts\" \"y:\\\\dev\\\\projects\\\\NodeJS\\\\miscassists\\\\ports.js\" \"y:\\\\dev\\\\projects\\\\NodeJS\\\\miscassists\\\\ports.d.ts\" \"y:\\\\dev\\\\projects\\\\NodeJS\\\\miscassists\\\\ports.js.map\")",
+      "Bash(npm install)"
+    ]
+  }
+}

package/dnsassist.d.ts

@@ -1,7 +1,8 @@
+import { default_fqdn } from '@bobfrankston/miscinfo';
 /***
  * return IPv4 address giving local addresses priority
  */
-export declare const default_fqdn = "aaz.lt";
+export { default_fqdn };
 export declare function resolve4(name: string, local?: boolean): Promise<string>;
 export declare function resolveLocal4(name: string): Promise<string>;
 interface localIPAndMask {
@@ -15,4 +16,3 @@ interface localIPAndMask {
 export declare let localIPAndMasks: localIPAndMask[];
 export declare function isLocalIP(ip: string): boolean;
 export declare function isThisMachine(ip: string): boolean;
-export {};

package/dnsassist.js

@@ -1,9 +1,10 @@
 import dns from 'dns';
 import os from 'os';
+import { default_fqdn } from '@bobfrankston/miscinfo';
 /***
  * return IPv4 address giving local addresses priority
  */
-export const default_fqdn = 'aaz.lt'; // For now
+export { default_fqdn };
 export async function resolve4(name, local) {
     if (!name?.includes('.'))
         name += '.' + default_fqdn; // FQDN Hack

package/index.d.ts

@@ -1,8 +1,7 @@
 import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js';
-import { ports, mqtt } from './ports.js';
+import { ports, mqtt } from '@bobfrankston/miscinfo';
 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 { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt, makerPayload };
 export declare const values: {
     exitRunit: number;
 };
@@ -67,7 +66,6 @@ declare const _default: {
         };
         URL: string;
     };
-    jprivs: string[];
     values: {
         exitRunit: number;
     };

package/index.js

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

package/jserve.d.ts

@@ -1,9 +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;
-}

package/jserve.js

@@ -1,13 +1,27 @@
-// 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
+"use strict";
+// 
+// 
+// // 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?
+// }
 //# sourceMappingURL=jserve.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/miscassists",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "description": "Miscelleanous assists for various tasks including defining port numbers",
   "main": "index.js",
   "module": "main.js",
@@ -17,13 +17,21 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
+    "@bobfrankston/miscinfo": "^1.0.2",
     "esm": "^3.2.25"
   },
   "devDependencies": {
-    "@types/node": "^20.12.7"
+    "@types/node": "^25.2.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/BobFrankston/miscassists.git"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  ".dependencies": {
+    "@bobfrankston/miscinfo": "file:../../npm/miscinfo",
+    "esm": "^3.2.25"
   }
 }

package/ports.d.ts

@@ -1,55 +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;
-    sqlhttp: number;
-    sqlproxy2: number;
-    sqlproxy: number;
-    sqlproxys: 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;
-    pinst: number;
-    stephanie: number;
-    httpudp: number;
-    logit: number;
-    psyncer: number;
-    rmfAlpha2: number;
-    carder: number;
-    cardaid: number;
-};
-export declare const mqtt: {
-    host: string;
-    port: number;
-    topic: {
-        rmf: string;
-        subtopics: {
-            restart: string;
-        };
-        devqtt: {
-            top: string;
-            sub: string;
-        };
-    };
-    URL: string;
-};

package/ports.js

@@ -1,81 +0,0 @@
-import { default_fqdn } from "./dnsassist.js";
-export const ports = {
-    jserve2: 10080,
-    jserve2s: 10443, // For now, we use the same port for http and https
-    devlisten: 9070, // Hubitat MakerAPI http server
-    halisten: 9071, // Home Assistant MakerAPI http server
-    rmfsite: 9081, // These will be phased out for the new version
-    rmfsites: 9082, // used to be for SSL but now any port is ssl or not
-    rmfprod: 9081, // Secondary port for production version (debugging)
-    rmfbeta: 9082, // Secondary port for beta version (debugging)
-    rmfalpha: 9083, // Secondary port for the alpha version
-    shim: 9084, // Warming -- these are current forwarded!
-    shims: 9085, // 
-    jvport: 9180, // These are copied in hlib
-    jvports: 9143,
-    sqltcp: 9098,
-    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,
-    logit: 9322, // logit logger
-    psyncer: 9324, // Used for the powershell version ??
-    rmfAlpha2: 9325, // So we can try alternative clients.
-    carder: 9329,
-    cardaid: 9330
-};
-const mqttHost = "pi4c";
-const mqttPort = 1883;
-export const mqtt = {
-    host: mqttHost,
-    port: mqttPort,
-    topic: {
-        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" />
-//
-//# sourceMappingURL=ports.js.map