@ipsme/msgenv-mqtt 0.1.7 → 0.2.1

package/dist/ipsme_msgenv.cjs.js

@@ -31380,6 +31380,7 @@ var cfg_ = (function () {
 const kstr_TOPIC = 'IPSME';
 class MsgEnvSingleton {
     static _instance = null;
+    _disposed = false;
     client;
     constructor() {
         this.client = mqtt.connect({
@@ -31393,13 +31394,36 @@ class MsgEnvSingleton {
         this.client.on('connect', function () {
             // console.log('MQTT Connected');
         });
+        this.client.on('close', () => {
+            if (!this._disposed) {
+                logr_.log(l_.CONNECTIONS, () => ['MQTT client disconnected unexpectedly']);
+            }
+        });
     }
-    static getInstance() {
+    static get_instance() {
         if (!MsgEnvSingleton._instance) {
             MsgEnvSingleton._instance = new MsgEnvSingleton();
         }
         return MsgEnvSingleton._instance;
     }
+    dispose(callback) {
+        if (this._disposed) {
+            callback?.();
+            return;
+        }
+        this._disposed = true;
+        logr_.log(l_.CONNECTIONS, () => ['MsgEnv: disposing MQTT client']);
+        // End the client connection gracefully
+        this.client.end(true, {}, (err) => {
+            if (err) {
+                console.error('Error during MQTT client shutdown:', err);
+                callback?.(err);
+                return;
+            }
+            logr_.log(l_.CONNECTIONS, () => ['MsgEnv: MQTT client cleanly disconnected']);
+            callback?.();
+        });
+    }
 }
 // Normally you can specify an object to filter on when subscribing, but in electron that is missing
 // 
@@ -31411,7 +31435,7 @@ function subscribe_(handler) {
     //     LOGR_.log(l_.REFL, cfg_.prefix +'MsgEnv: onNotification: ', userInfo.msg);
     //     this(userInfo.msg);
     // }.bind(handler));    
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     handler.subscription_ID = function (topic, message) {
         handler(message.toString());
     };
@@ -31422,7 +31446,7 @@ function subscribe_(handler) {
 function unsubscribe_(handler) {
     logr_.log(l_.CONNECTIONS, () => [cfg_.prefix + 'MsgEnv: unsubscribe']);
     // systemPreferences.unsubscribeNotification(handler.subscription_ID);
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     instance.client.removeListener('message', handler.subscription_ID);
     instance.client.unsubscribe(kstr_TOPIC);
     delete handler.subscription_ID;
@@ -31432,11 +31456,21 @@ function unsubscribe_(handler) {
 function publish_(msg) {
     logr_.log(l_.REFLECTION, () => [cfg_.prefix + 'MsgEnv: postNotification: ', msg]);
     // systemPreferences.postNotification(cfg_.channel, { "msg" : msg }, true);
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     instance.client.publish(kstr_TOPIC, msg);
 }
+function dispose_(callback) {
+    if (!MsgEnvSingleton._instance) {
+        logr_.log(l_.CONNECTIONS, () => ['MsgEnv: dispose called but no instance exists']);
+        callback?.();
+        return;
+    }
+    MsgEnvSingleton._instance.dispose(callback);
+    MsgEnvSingleton._instance = null; // Allow re-creation if needed later
+}
 
 exports.config = cfg_;
+exports.dispose = dispose_;
 exports.logr = logr_;
 exports.publish = publish_;
 exports.subscribe = subscribe_;

package/dist/ipsme_msgenv.d.ts

@@ -11,4 +11,5 @@ declare var cfg_: {
 declare function subscribe_(handler: any): void;
 declare function unsubscribe_(handler: any): void;
 declare function publish_(msg: any): void;
-export { cfg_ as config, subscribe_ as subscribe, unsubscribe_ as unsubscribe, publish_ as publish, logr_ as logr };
+declare function dispose_(callback?: (err?: Error) => void): void;
+export { cfg_ as config, subscribe_ as subscribe, unsubscribe_ as unsubscribe, publish_ as publish, dispose_ as dispose, logr_ as logr };

package/dist/ipsme_msgenv.es.mjs

@@ -31378,6 +31378,7 @@ var cfg_ = (function () {
 const kstr_TOPIC = 'IPSME';
 class MsgEnvSingleton {
     static _instance = null;
+    _disposed = false;
     client;
     constructor() {
         this.client = mqtt.connect({
@@ -31391,13 +31392,36 @@ class MsgEnvSingleton {
         this.client.on('connect', function () {
             // console.log('MQTT Connected');
         });
+        this.client.on('close', () => {
+            if (!this._disposed) {
+                logr_.log(l_.CONNECTIONS, () => ['MQTT client disconnected unexpectedly']);
+            }
+        });
     }
-    static getInstance() {
+    static get_instance() {
         if (!MsgEnvSingleton._instance) {
             MsgEnvSingleton._instance = new MsgEnvSingleton();
         }
         return MsgEnvSingleton._instance;
     }
+    dispose(callback) {
+        if (this._disposed) {
+            callback?.();
+            return;
+        }
+        this._disposed = true;
+        logr_.log(l_.CONNECTIONS, () => ['MsgEnv: disposing MQTT client']);
+        // End the client connection gracefully
+        this.client.end(true, {}, (err) => {
+            if (err) {
+                console.error('Error during MQTT client shutdown:', err);
+                callback?.(err);
+                return;
+            }
+            logr_.log(l_.CONNECTIONS, () => ['MsgEnv: MQTT client cleanly disconnected']);
+            callback?.();
+        });
+    }
 }
 // Normally you can specify an object to filter on when subscribing, but in electron that is missing
 // 
@@ -31409,7 +31433,7 @@ function subscribe_(handler) {
     //     LOGR_.log(l_.REFL, cfg_.prefix +'MsgEnv: onNotification: ', userInfo.msg);
     //     this(userInfo.msg);
     // }.bind(handler));    
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     handler.subscription_ID = function (topic, message) {
         handler(message.toString());
     };
@@ -31420,7 +31444,7 @@ function subscribe_(handler) {
 function unsubscribe_(handler) {
     logr_.log(l_.CONNECTIONS, () => [cfg_.prefix + 'MsgEnv: unsubscribe']);
     // systemPreferences.unsubscribeNotification(handler.subscription_ID);
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     instance.client.removeListener('message', handler.subscription_ID);
     instance.client.unsubscribe(kstr_TOPIC);
     delete handler.subscription_ID;
@@ -31430,8 +31454,17 @@ function unsubscribe_(handler) {
 function publish_(msg) {
     logr_.log(l_.REFLECTION, () => [cfg_.prefix + 'MsgEnv: postNotification: ', msg]);
     // systemPreferences.postNotification(cfg_.channel, { "msg" : msg }, true);
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     instance.client.publish(kstr_TOPIC, msg);
 }
+function dispose_(callback) {
+    if (!MsgEnvSingleton._instance) {
+        logr_.log(l_.CONNECTIONS, () => ['MsgEnv: dispose called but no instance exists']);
+        callback?.();
+        return;
+    }
+    MsgEnvSingleton._instance.dispose(callback);
+    MsgEnvSingleton._instance = null; // Allow re-creation if needed later
+}
 
-export { cfg_ as config, logr_ as logr, publish_ as publish, subscribe_ as subscribe, unsubscribe_ as unsubscribe };
+export { cfg_ as config, dispose_ as dispose, logr_ as logr, publish_ as publish, subscribe_ as subscribe, unsubscribe_ as unsubscribe };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ipsme/msgenv-mqtt",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "",
     "exports": {
     ".": {

package/src/ipsme_msgenv.ts

@@ -46,7 +46,8 @@ var cfg_= (function() {
 const kstr_TOPIC = 'IPSME';
 
 class MsgEnvSingleton {
-    private static _instance: MsgEnvSingleton | null = null;
+    static _instance: MsgEnvSingleton | null = null;
+    private _disposed: boolean = false;
 
     public readonly client: MqttClient;
 
@@ -64,14 +65,44 @@ class MsgEnvSingleton {
         this.client.on('connect', function () {
             // console.log('MQTT Connected');
         });
+
+        this.client.on('close', () => {
+            if (!this._disposed) {
+                logr_.log(l_.CONNECTIONS, () => ['MQTT client disconnected unexpectedly']);
+            }
+        });
     }
 
-    public static getInstance() : MsgEnvSingleton {
+    public static get_instance() : MsgEnvSingleton {
         if (! MsgEnvSingleton._instance) {
             MsgEnvSingleton._instance = new MsgEnvSingleton();
         }
         return MsgEnvSingleton._instance;
     }
+
+    public dispose(callback?: (err?: Error) => void): void {
+        if (this._disposed) {
+            callback?.();
+            return;
+        }
+
+        this._disposed = true;
+
+        logr_.log(l_.CONNECTIONS, () => ['MsgEnv: disposing MQTT client']);
+
+        // End the client connection gracefully
+        this.client.end(true, {}, (err) => {
+            if (err) {
+                console.error('Error during MQTT client shutdown:', err);
+                callback?.(err);
+                return;
+            }
+
+            logr_.log(l_.CONNECTIONS, () => ['MsgEnv: MQTT client cleanly disconnected']);
+            callback?.();
+        });
+    }
+
 }
 
 // Normally you can specify an object to filter on when subscribing, but in electron that is missing
@@ -85,7 +116,7 @@ function subscribe_(handler) {
     //     this(userInfo.msg);
     // }.bind(handler));    
 
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     handler.subscription_ID = function (topic, message) {
         handler(message.toString());
     };
@@ -98,7 +129,7 @@ function subscribe_(handler) {
 function unsubscribe_(handler) {
     logr_.log(l_.CONNECTIONS, () => [cfg_.prefix +'MsgEnv: unsubscribe'] );
     // systemPreferences.unsubscribeNotification(handler.subscription_ID);
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     instance.client.removeListener('message', handler.subscription_ID);
     instance.client.unsubscribe(kstr_TOPIC);
     delete handler.subscription_ID;
@@ -109,10 +140,21 @@ function unsubscribe_(handler) {
 function publish_(msg) {
     logr_.log(l_.REFLECTION, () => [cfg_.prefix +'MsgEnv: postNotification: ', msg] );
     // systemPreferences.postNotification(cfg_.channel, { "msg" : msg }, true);
-    let instance = MsgEnvSingleton.getInstance();
+    let instance = MsgEnvSingleton.get_instance();
     instance.client.publish(kstr_TOPIC, msg);
 }
 
+function dispose_(callback ?: (err?: Error) => void): void {
+    if (! MsgEnvSingleton._instance) {
+        logr_.log(l_.CONNECTIONS, () => ['MsgEnv: dispose called but no instance exists']);
+        callback?.();
+        return;
+    }
+
+    MsgEnvSingleton._instance.dispose(callback);
+    MsgEnvSingleton._instance = null; // Allow re-creation if needed later
+}
+
 //-------------------------------------------------------------------------------------------------
 
 export {
@@ -120,5 +162,6 @@ export {
     subscribe_ as subscribe,
     unsubscribe_ as unsubscribe,
     publish_ as publish,
+    dispose_ as dispose,
     logr_ as logr
 }

package/tests/test_ipsme_msgenv.cjs

@@ -27,6 +27,10 @@ async function demo() {
 
     IPSME_MsgEnv_OS.subscribe( handler_ );
     IPSME_MsgEnv_OS.publish('BOOYAH 3.o');
+
+    await sleep(2000);
+
+    IPSME_MsgEnv_OS.dispose();
 }
 
 demo();