@bobfrankston/miscassists 1.0.12 → 1.0.15

package/index.js

@@ -1,7 +1,6 @@
 import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js';
-export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js';
 import { ports, mqtt } from './ports.js';
-export { ports, mqtt } from './ports.js';
+export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn, ports, mqtt };
 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,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAEhG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAKxC,eAAe;IACX,QAAQ;IACR,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,KAAK;IACL,IAAI;CACP,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;AAIxC,OAAO,EACH,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAC/D,KAAK,EAAE,IAAI,EACd,CAAC;AAEF,eAAe;IACX,QAAQ;IACR,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,KAAK;IACL,IAAI;CACP,CAAA"}

package/index.ts

@@ -1,11 +1,12 @@
 import { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js'
-export { resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn } from './dnsassist.js'
-
 import { ports, mqtt } from './ports.js'
-export { ports, mqtt } from './ports.js'
-
 import { makerPayload } from './maker.js';
-export { makerPayload } from './maker.js';
+import { jSubSiteInfo } from './jserve.js';
+
+export {
+    resolve4, resolveLocal4, isLocalIP, isThisMachine, default_fqdn,
+    ports, mqtt, makerPayload, jSubSiteInfo
+};
 
 export default {
     resolve4,

package/jserve.js

@@ -0,0 +1,3 @@
+// Support for connecting with jserve
+export {};
+//# sourceMappingURL=jserve.js.map

package/jserve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jserve.js","sourceRoot":"","sources":["jserve.ts"],"names":[],"mappings":"AAAA,qCAAqC"}

package/jserve.ts

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

package/maker.js

@@ -1,2 +1,3 @@
+// Support for Hubitat and Devqtt
 export {};
 //# sourceMappingURL=maker.js.map

package/maker.js.map

@@ -1 +1 @@
-{"version":3,"file":"maker.js","sourceRoot":"","sources":["maker.ts"],"names":[],"mappings":""}
+{"version":3,"file":"maker.js","sourceRoot":"","sources":["maker.ts"],"names":[],"mappings":"AAAA,iCAAiC"}

package/maker.ts

@@ -1,3 +1,6 @@
+// Support for Hubitat and Devqtt
+
+
 export interface makerPayload {
     content: {
         name: string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/miscassists",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "",
   "main": "index.js",
   "module": "main.js",

package/ports.js

@@ -1,3 +1,4 @@
+import { default_fqdn } from "./dnsassist";
 export const ports = {
     jserve2: 10080,
     jserve2s: 10443,
@@ -32,9 +33,11 @@ export const ports = {
     pinst: 9299,
     stephanie: 9320, // For testing stephanie site locally
 };
+const mqttHost = "pi4c";
+const mqttPort = 1883;
 export const mqtt = {
-    host: "pi4c",
-    port: 1883,
+    host: mqttHost,
+    port: mqttPort,
     topic: {
         rmf: "rmf",
         subtopics: {
@@ -44,7 +47,8 @@ export const mqtt = {
             top: "rmf",
             sub: "devqtt"
         }
-    }
+    },
+    URL: `mstt://${mqttHost}.${default_fqdn}:${mqttPort}`
 };
 //		<port port="9070" name="Listen for Hubitat (experimental)" />
 //		<port port="9080" name="birdbox1:80" />

package/ports.js.map

@@ -1 +1 @@
-{"version":3,"file":"ports.js","sourceRoot":"","sources":["ports.ts"],"names":[],"mappings":"AAAA,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,CAAC,MAAM,IAAI,GAAG;IAChB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,IAAI;IACV,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;CAEJ,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,aAAa,CAAC;AAE3C,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"}

package/ports.ts

@@ -1,3 +1,5 @@
+import { default_fqdn } from "./dnsassist";
+
 export const ports = {
     jserve2:  10080, 
     jserve2s: 10443,        // For now, we use the same port for http and https
@@ -50,9 +52,12 @@ export const ports = {
 
 }
 
+const mqttHost = "pi4c";
+const mqttPort = 1883;
+
 export const mqtt = {
-    host: "pi4c",
-    port: 1883,
+    host: mqttHost,
+    port: mqttPort,
     topic: {        // Default for our own use
         rmf: "rmf",
         subtopics: {
@@ -62,8 +67,8 @@ export const mqtt = {
             top: "rmf",
             sub: "devqtt"
         }
-    }
-
+    },
+    URL: `mstt://${mqttHost}.${default_fqdn}:${mqttPort}`
 }
 
 //		<port port="9070" name="Listen for Hubitat (experimental)" />