@machhub-dev/sdk-ts 1.0.1 → 1.0.3

package/dist/cjs/classes/tag.d.ts

@@ -6,5 +6,6 @@ export declare class Tag {
     constructor(httpService: HTTPService, mqttService: MQTTService | null);
     getAllTags(): Promise<string[]>;
     publish(topic: string, data: any): Promise<void>;
-    subscribe(topic: string, callback: (data: any) => void): Promise<void>;
+    subscribe(topic: string, callback: (data: any, topic?: string) => void): Promise<void>;
+    unsubscribe(topic: string): Promise<void>;
 }

package/dist/cjs/classes/tag.js

@@ -21,5 +21,11 @@ class Tag {
         }
         this.mqttService.addTopicHandler(topic, callback);
     }
+    async unsubscribe(topic) {
+        if (!this.mqttService) {
+            throw new Error("MQTT service not connected");
+        }
+        this.mqttService.removeTopicHandler(topic);
+    }
 }
 exports.Tag = Tag;

package/dist/cjs/services/mqtt.service.d.ts

@@ -7,7 +7,8 @@ export declare class MQTTService {
     constructor(url: string);
     static getInstance(url?: string, developerKey?: string): Promise<MQTTService>;
     static resetInstance(): void;
-    addTopicHandler(topic: string, handler: (message: unknown) => void): void;
+    addTopicHandler(topic: string, handler: (message: unknown, topic?: string) => void): void;
+    removeTopicHandler(topic: string): void;
     clearTopics(): void;
     publish(topic: string, message: unknown): boolean;
     private attachMessageListener;

package/dist/cjs/services/mqtt.service.js

@@ -39,6 +39,12 @@ class MQTTService {
     // addTopicHandler Adds a topic and handler to the subscribed list
     addTopicHandler(topic, handler) {
         try {
+            // Check if already subscribed to this topic
+            const existingSubscription = this.subscribedTopics.find(sub => sub.topic === topic);
+            if (existingSubscription) {
+                // If already subscribed, unsubscribe first to get retained message again
+                this.removeTopicHandler(topic);
+            }
             this.subscribedTopics.push({ topic, handler });
             if (topic == "")
                 return;
@@ -53,6 +59,24 @@ class MQTTService {
             console.error(`Failed to subscribe to topic ${topic}:`, e);
         }
     }
+    // removeTopicHandler removes a specific topic handler and unsubscribes from the topic
+    removeTopicHandler(topic) {
+        try {
+            // Remove all handlers for this topic
+            this.subscribedTopics = this.subscribedTopics.filter(sub => sub.topic !== topic);
+            // Unsubscribe from the MQTT topic
+            if (topic && topic !== "") {
+                this.client.unsubscribe(topic, (err) => {
+                    if (err) {
+                        console.error(`Failed to unsubscribe from topic ${topic}:`, err);
+                    }
+                });
+            }
+        }
+        catch (e) {
+            console.error(`Failed to unsubscribe from topic ${topic}:`, e);
+        }
+    }
     // clearTopics clears all the topics subscribed to
     clearTopics() {
         this.subscribedTopics = [];
@@ -91,7 +115,7 @@ class MQTTService {
             for (const subscribedTopic of this.subscribedTopics) {
                 if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
-                    subscribedTopic.handler(parsedMessage);
+                    subscribedTopic.handler(parsedMessage, topic);
                     break;
                 }
             }

package/dist/classes/tag.d.ts

@@ -6,5 +6,6 @@ export declare class Tag {
     constructor(httpService: HTTPService, mqttService: MQTTService | null);
     getAllTags(): Promise<string[]>;
     publish(topic: string, data: any): Promise<void>;
-    subscribe(topic: string, callback: (data: any) => void): Promise<void>;
+    subscribe(topic: string, callback: (data: any, topic?: string) => void): Promise<void>;
+    unsubscribe(topic: string): Promise<void>;
 }

package/dist/classes/tag.js

@@ -18,4 +18,10 @@ export class Tag {
         }
         this.mqttService.addTopicHandler(topic, callback);
     }
+    async unsubscribe(topic) {
+        if (!this.mqttService) {
+            throw new Error("MQTT service not connected");
+        }
+        this.mqttService.removeTopicHandler(topic);
+    }
 }

package/dist/services/mqtt.service.d.ts

@@ -7,7 +7,8 @@ export declare class MQTTService {
     constructor(url: string);
     static getInstance(url?: string, developerKey?: string): Promise<MQTTService>;
     static resetInstance(): void;
-    addTopicHandler(topic: string, handler: (message: unknown) => void): void;
+    addTopicHandler(topic: string, handler: (message: unknown, topic?: string) => void): void;
+    removeTopicHandler(topic: string): void;
     clearTopics(): void;
     publish(topic: string, message: unknown): boolean;
     private attachMessageListener;

package/dist/services/mqtt.service.js

@@ -33,6 +33,12 @@ export class MQTTService {
     // addTopicHandler Adds a topic and handler to the subscribed list
     addTopicHandler(topic, handler) {
         try {
+            // Check if already subscribed to this topic
+            const existingSubscription = this.subscribedTopics.find(sub => sub.topic === topic);
+            if (existingSubscription) {
+                // If already subscribed, unsubscribe first to get retained message again
+                this.removeTopicHandler(topic);
+            }
             this.subscribedTopics.push({ topic, handler });
             if (topic == "")
                 return;
@@ -47,6 +53,24 @@ export class MQTTService {
             console.error(`Failed to subscribe to topic ${topic}:`, e);
         }
     }
+    // removeTopicHandler removes a specific topic handler and unsubscribes from the topic
+    removeTopicHandler(topic) {
+        try {
+            // Remove all handlers for this topic
+            this.subscribedTopics = this.subscribedTopics.filter(sub => sub.topic !== topic);
+            // Unsubscribe from the MQTT topic
+            if (topic && topic !== "") {
+                this.client.unsubscribe(topic, (err) => {
+                    if (err) {
+                        console.error(`Failed to unsubscribe from topic ${topic}:`, err);
+                    }
+                });
+            }
+        }
+        catch (e) {
+            console.error(`Failed to unsubscribe from topic ${topic}:`, e);
+        }
+    }
     // clearTopics clears all the topics subscribed to
     clearTopics() {
         this.subscribedTopics = [];
@@ -85,7 +109,7 @@ export class MQTTService {
             for (const subscribedTopic of this.subscribedTopics) {
                 if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
-                    subscribedTopic.handler(parsedMessage);
+                    subscribedTopic.handler(parsedMessage, topic);
                     break;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machhub-dev/sdk-ts",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "MACHHUB TYPESCRIPT SDK",
   "keywords": [
     "machhub",

package/src/classes/tag.ts

@@ -21,10 +21,17 @@ export class Tag {
     this.mqttService.publish(topic, data);
   }
 
-  async subscribe(topic: string, callback: (data: any) => void): Promise<void> {
+  async subscribe(topic: string, callback: (data: any, topic?: string) => void): Promise<void> {
     if (!this.mqttService) {
       throw new Error("MQTT service not connected");
     }
     this.mqttService.addTopicHandler(topic, callback);
   }
+
+  async unsubscribe(topic: string): Promise<void> {
+    if (!this.mqttService) {
+      throw new Error("MQTT service not connected");
+    }
+    this.mqttService.removeTopicHandler(topic);
+  }
 }

package/src/services/mqtt.service.ts

@@ -2,7 +2,7 @@ import mqtt from 'mqtt';
 
 interface SubscribedTopic {
     topic: string;
-    handler: (message: unknown) => void;
+    handler: (message: unknown, topic?: string) => void;
 }
 
 export class MQTTService {
@@ -46,8 +46,16 @@ export class MQTTService {
     }
 
     // addTopicHandler Adds a topic and handler to the subscribed list
-    public addTopicHandler(topic: string, handler: (message: unknown) => void): void {
+    public addTopicHandler(topic: string, handler: (message: unknown, topic?: string) => void): void {
         try {
+            // Check if already subscribed to this topic
+            const existingSubscription = this.subscribedTopics.find(sub => sub.topic === topic);
+            
+            if (existingSubscription) {
+                // If already subscribed, unsubscribe first to get retained message again
+                this.removeTopicHandler(topic);
+            }
+            
             this.subscribedTopics.push({ topic, handler });
             if (topic == "") return;
             // console.log("New Subscription Handler:", topic);
@@ -61,6 +69,25 @@ export class MQTTService {
         }
     }
 
+    // removeTopicHandler removes a specific topic handler and unsubscribes from the topic
+    public removeTopicHandler(topic: string): void {
+        try {
+            // Remove all handlers for this topic
+            this.subscribedTopics = this.subscribedTopics.filter(sub => sub.topic !== topic);
+            
+            // Unsubscribe from the MQTT topic
+            if (topic && topic !== "") {
+                this.client.unsubscribe(topic, (err?: unknown) => {
+                    if (err) {
+                        console.error(`Failed to unsubscribe from topic ${topic}:`, err);
+                    }
+                });
+            }
+        } catch (e) {
+            console.error(`Failed to unsubscribe from topic ${topic}:`, e);
+        }
+    }
+
     // clearTopics clears all the topics subscribed to
     public clearTopics(): void {
         this.subscribedTopics = [];
@@ -103,7 +130,7 @@ export class MQTTService {
             for (const subscribedTopic of this.subscribedTopics) {
                 if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
-                    subscribedTopic.handler(parsedMessage);
+                    subscribedTopic.handler(parsedMessage, topic);
                     break;
                 }
             }