@machhub-dev/sdk-ts 1.0.4 → 1.0.6

package/dist/cjs/sdk-ts.d.ts

@@ -1,7 +1,6 @@
 import { Collection } from "./classes/collection.js";
 import { Historian } from "./classes/historian.js";
 import { Tag } from "./classes/tag.js";
-import { Function } from "./classes/function.js";
 import { Flow } from "./classes/flow.js";
 import { Auth } from "./classes/auth.js";
 export interface SDKConfig {
@@ -9,12 +8,10 @@ export interface SDKConfig {
     developer_key?: string;
     httpUrl?: string;
     mqttUrl?: string;
-    natsUrl?: string;
 }
 export declare class SDK {
     private http;
     private mqtt;
-    private nats;
     private _historian;
     private _tag;
     private _function;
@@ -39,7 +36,6 @@ export declare class SDK {
      *   application_id: 'your-app-id',
      *   httpUrl: 'http://localhost:6188', // optional (default = http://localhost:6188)
      *   mqttUrl: 'ws://localhost:180',  // optional (default = ws://localhost:180)
-     *   natsUrl: 'ws://localhost:7500', // optional (default = ws://localhost:7500)
      * };
      *
      * const sdk = new SDK();

package/dist/cjs/sdk-ts.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK = void 0;
 const http_service_js_1 = require("./services/http.service.js");
 const mqtt_service_js_1 = require("./services/mqtt.service.js");
-const nats_service_js_1 = require("./services/nats.service.js");
 const collection_js_1 = require("./classes/collection.js");
 const historian_js_1 = require("./classes/historian.js");
 const tag_js_1 = require("./classes/tag.js");
-const function_js_1 = require("./classes/function.js");
 const flow_js_1 = require("./classes/flow.js");
 const auth_js_1 = require("./classes/auth.js");
 const MACHHUB_SDK_PATH = "machhub";
@@ -68,46 +66,11 @@ class MQTTClient {
         return this.mqttService.publish(topic, data);
     }
 }
-// Core NATS client class
-class NATSClient {
-    constructor(natsService) {
-        this.natsService = natsService;
-    }
-    /**
-     * Creates a new NATSClient instance
-     * @param applicationID The ID for your application
-     * @param natsUrl The base URL for NATS connection (default = ws://localhost:7500)
-     */
-    static async getInstance(applicationID, natsUrl = "ws://localhost:7500") {
-        if (!this.instance) {
-            const natsService = await nats_service_js_1.NATSService.getInstance(natsUrl);
-            this.instance = new NATSClient(natsService);
-        }
-        return this.instance;
-    }
-    /**
-     * Subscribes to subject updates
-     * @param subject The subject to subscribe to
-     * @param callback The callback function for data updates
-     */
-    async subscribe(subject, callback) {
-        return this.natsService.addSubjectHandler(subject, callback);
-    }
-    /**
-     * Publishes a message to a specific subject
-     * @param subject The subject to publish to
-     * @param data The data to publish
-     */
-    async publish(subject, data) {
-        return this.natsService.publish(subject, data);
-    }
-}
 // SDK Class
 class SDK {
     constructor() {
         this.http = null;
         this.mqtt = null;
-        this.nats = null;
         this._historian = null;
         this._tag = null;
         this._function = null;
@@ -138,7 +101,6 @@ class SDK {
      *   application_id: 'your-app-id',
      *   httpUrl: 'http://localhost:6188', // optional (default = http://localhost:6188)
      *   mqttUrl: 'ws://localhost:180',  // optional (default = ws://localhost:180)
-     *   natsUrl: 'ws://localhost:7500', // optional (default = ws://localhost:7500)
      * };
      *
      * const sdk = new SDK();
@@ -164,12 +126,15 @@ class SDK {
             const application_id = config.application_id ||
                 this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
             this.applicationID = application_id;
-            // Determine the hostname - use window.location.hostname in browser, otherwise fallback to localhost
+            // Determine the hostname - use window.location in browser, otherwise fallback to localhost
             const hostname = typeof window !== 'undefined' ? window.location.hostname : 'localhost';
             const secured = typeof window !== 'undefined' ? window.location.protocol === 'https:' : false;
             let host = hostname;
             if (envCfg.hostingMode === 'port' || !envCfg.hostingMode) {
-                host += `:${envCfg.port}`;
+                // In browser, use window.location.host which includes the port only when non-standard
+                // (e.g. "localhost:6190" for local dev, "machhub.dev" when behind a reverse proxy on 443)
+                // In non-browser environments, fall back to hostname:envCfg.port
+                host = typeof window !== 'undefined' ? window.location.host : `${hostname}:${envCfg.port}`;
             }
             else if (envCfg.hostingMode === 'path') {
                 host += envCfg.pathHosted;
@@ -180,17 +145,12 @@ class SDK {
             if (!config.mqttUrl) {
                 config.mqttUrl = `${secured ? 'wss' : 'ws'}://${host}/mqtt`;
             }
-            if (!config.natsUrl) {
-                config.natsUrl = `${secured ? 'wss' : 'ws'}://${host}/nats`;
-            }
-            const { httpUrl, mqttUrl, natsUrl } = config;
-            console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
+            const { httpUrl, mqttUrl } = config;
+            console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
             this.http = new HTTPClient(this.applicationID, httpUrl, config.developer_key, envCfg.runtimeID);
             this.mqtt = await MQTTClient.getInstance(this.applicationID, mqttUrl, config.developer_key);
-            this.nats = await NATSClient.getInstance(this.applicationID, natsUrl);
             this._historian = new historian_js_1.Historian(this.http["httpService"], this.mqtt["mqttService"]);
             this._tag = new tag_js_1.Tag(this.http["httpService"], this.mqtt["mqttService"]);
-            this._function = new function_js_1.Function(this.http["httpService"], this.nats["natsService"]);
             this._flow = new flow_js_1.Flow(this.http["httpService"]);
             this._auth = new auth_js_1.Auth(this.http["httpService"], this.applicationID);
         }

package/dist/sdk-ts.d.ts

@@ -1,7 +1,6 @@
 import { Collection } from "./classes/collection.js";
 import { Historian } from "./classes/historian.js";
 import { Tag } from "./classes/tag.js";
-import { Function } from "./classes/function.js";
 import { Flow } from "./classes/flow.js";
 import { Auth } from "./classes/auth.js";
 export interface SDKConfig {
@@ -9,12 +8,10 @@ export interface SDKConfig {
     developer_key?: string;
     httpUrl?: string;
     mqttUrl?: string;
-    natsUrl?: string;
 }
 export declare class SDK {
     private http;
     private mqtt;
-    private nats;
     private _historian;
     private _tag;
     private _function;
@@ -39,7 +36,6 @@ export declare class SDK {
      *   application_id: 'your-app-id',
      *   httpUrl: 'http://localhost:6188', // optional (default = http://localhost:6188)
      *   mqttUrl: 'ws://localhost:180',  // optional (default = ws://localhost:180)
-     *   natsUrl: 'ws://localhost:7500', // optional (default = ws://localhost:7500)
      * };
      *
      * const sdk = new SDK();

package/dist/sdk-ts.js

@@ -1,10 +1,8 @@
 import { HTTPService } from "./services/http.service.js";
 import { MQTTService } from "./services/mqtt.service.js";
-import { NATSService } from "./services/nats.service.js";
 import { Collection } from "./classes/collection.js";
 import { Historian } from "./classes/historian.js";
 import { Tag } from "./classes/tag.js";
-import { Function } from "./classes/function.js";
 import { Flow } from "./classes/flow.js";
 import { Auth } from "./classes/auth.js";
 const MACHHUB_SDK_PATH = "machhub";
@@ -65,46 +63,11 @@ class MQTTClient {
         return this.mqttService.publish(topic, data);
     }
 }
-// Core NATS client class
-class NATSClient {
-    constructor(natsService) {
-        this.natsService = natsService;
-    }
-    /**
-     * Creates a new NATSClient instance
-     * @param applicationID The ID for your application
-     * @param natsUrl The base URL for NATS connection (default = ws://localhost:7500)
-     */
-    static async getInstance(applicationID, natsUrl = "ws://localhost:7500") {
-        if (!this.instance) {
-            const natsService = await NATSService.getInstance(natsUrl);
-            this.instance = new NATSClient(natsService);
-        }
-        return this.instance;
-    }
-    /**
-     * Subscribes to subject updates
-     * @param subject The subject to subscribe to
-     * @param callback The callback function for data updates
-     */
-    async subscribe(subject, callback) {
-        return this.natsService.addSubjectHandler(subject, callback);
-    }
-    /**
-     * Publishes a message to a specific subject
-     * @param subject The subject to publish to
-     * @param data The data to publish
-     */
-    async publish(subject, data) {
-        return this.natsService.publish(subject, data);
-    }
-}
 // SDK Class
 export class SDK {
     constructor() {
         this.http = null;
         this.mqtt = null;
-        this.nats = null;
         this._historian = null;
         this._tag = null;
         this._function = null;
@@ -135,7 +98,6 @@ export class SDK {
      *   application_id: 'your-app-id',
      *   httpUrl: 'http://localhost:6188', // optional (default = http://localhost:6188)
      *   mqttUrl: 'ws://localhost:180',  // optional (default = ws://localhost:180)
-     *   natsUrl: 'ws://localhost:7500', // optional (default = ws://localhost:7500)
      * };
      *
      * const sdk = new SDK();
@@ -161,12 +123,15 @@ export class SDK {
             const application_id = config.application_id ||
                 this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
             this.applicationID = application_id;
-            // Determine the hostname - use window.location.hostname in browser, otherwise fallback to localhost
+            // Determine the hostname - use window.location in browser, otherwise fallback to localhost
             const hostname = typeof window !== 'undefined' ? window.location.hostname : 'localhost';
             const secured = typeof window !== 'undefined' ? window.location.protocol === 'https:' : false;
             let host = hostname;
             if (envCfg.hostingMode === 'port' || !envCfg.hostingMode) {
-                host += `:${envCfg.port}`;
+                // In browser, use window.location.host which includes the port only when non-standard
+                // (e.g. "localhost:6190" for local dev, "machhub.dev" when behind a reverse proxy on 443)
+                // In non-browser environments, fall back to hostname:envCfg.port
+                host = typeof window !== 'undefined' ? window.location.host : `${hostname}:${envCfg.port}`;
             }
             else if (envCfg.hostingMode === 'path') {
                 host += envCfg.pathHosted;
@@ -177,17 +142,12 @@ export class SDK {
             if (!config.mqttUrl) {
                 config.mqttUrl = `${secured ? 'wss' : 'ws'}://${host}/mqtt`;
             }
-            if (!config.natsUrl) {
-                config.natsUrl = `${secured ? 'wss' : 'ws'}://${host}/nats`;
-            }
-            const { httpUrl, mqttUrl, natsUrl } = config;
-            console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
+            const { httpUrl, mqttUrl } = config;
+            console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
             this.http = new HTTPClient(this.applicationID, httpUrl, config.developer_key, envCfg.runtimeID);
             this.mqtt = await MQTTClient.getInstance(this.applicationID, mqttUrl, config.developer_key);
-            this.nats = await NATSClient.getInstance(this.applicationID, natsUrl);
             this._historian = new Historian(this.http["httpService"], this.mqtt["mqttService"]);
             this._tag = new Tag(this.http["httpService"], this.mqtt["mqttService"]);
-            this._function = new Function(this.http["httpService"], this.nats["natsService"]);
             this._flow = new Flow(this.http["httpService"]);
             this._auth = new Auth(this.http["httpService"], this.applicationID);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machhub-dev/sdk-ts",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "MACHHUB TYPESCRIPT SDK",
   "keywords": [
     "machhub",
@@ -20,8 +20,6 @@
     "build": "npx tsc && npx tsc --module CommonJS --outDir dist/cjs"
   },
   "dependencies": {
-    "@nats-io/nats-core": "^3.0.2",
-    "@nats-io/transport-node": "^3.0.2",
     "jwt-decode": "^4.0.0",
     "mqtt": "^5.10.4",
     "safe-buffer": "^5.2.1",

package/src/sdk-ts.ts

@@ -1,10 +1,8 @@
 import { HTTPService } from "./services/http.service.js";
 import { MQTTService } from "./services/mqtt.service.js";
-import { NATSService } from "./services/nats.service.js";
 import { Collection } from "./classes/collection.js";
 import { Historian } from "./classes/historian.js";
 import { Tag } from "./classes/tag.js";
-import { Function } from "./classes/function.js";
 import { Flow } from "./classes/flow.js";
 import { Auth } from "./classes/auth.js";
 
@@ -78,60 +76,17 @@ class MQTTClient {
   }
 }
 
-// Core NATS client class
-class NATSClient {
-  private natsService: NATSService;
-  private static instance: NATSClient | undefined;
-
-  private constructor(natsService: NATSService) {
-    this.natsService = natsService;
-  }
-
-  /**
-   * Creates a new NATSClient instance
-   * @param applicationID The ID for your application
-   * @param natsUrl The base URL for NATS connection (default = ws://localhost:7500)
-   */
-  static async getInstance(applicationID?: string, natsUrl: string = "ws://localhost:7500"): Promise<NATSClient> {
-    if (!this.instance) {
-      const natsService = await NATSService.getInstance(natsUrl);
-      this.instance = new NATSClient(natsService);
-    }
-    return this.instance;
-  }
-
-  /**
-   * Subscribes to subject updates
-   * @param subject The subject to subscribe to
-   * @param callback The callback function for data updates
-   */
-  async subscribe(subject: string, callback: (data: any) => void): Promise<any> {
-    return this.natsService.addSubjectHandler(subject, callback);
-  }
-
-  /**
-   * Publishes a message to a specific subject
-   * @param subject The subject to publish to
-   * @param data The data to publish
-   */
-  async publish(subject: string, data: any): Promise<any> {
-    return this.natsService.publish(subject, data);
-  }
-}
-
 export interface SDKConfig {
   application_id: string;
   developer_key?: string;
   httpUrl?: string;
   mqttUrl?: string;
-  natsUrl?: string;
 }
 
 // SDK Class
 export class SDK {
   private http: HTTPClient | null = null;
   private mqtt: MQTTClient | null = null;
-  private nats: NATSClient | null = null;
   private _historian: Historian | null = null;
   private _tag: Tag | null = null;
   private _function: Function | null = null;
@@ -162,7 +117,6 @@ export class SDK {
    *   application_id: 'your-app-id',
    *   httpUrl: 'http://localhost:6188', // optional (default = http://localhost:6188)
    *   mqttUrl: 'ws://localhost:180',  // optional (default = ws://localhost:180)
-   *   natsUrl: 'ws://localhost:7500', // optional (default = ws://localhost:7500)
    * };
    *
    * const sdk = new SDK();
@@ -186,20 +140,23 @@ export class SDK {
       const envCfg = await getEnvConfig();
 
       // Extract application_id from runtimeID if not provided in config
-      const application_id = config.application_id || 
-                            this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
-      
+      const application_id = config.application_id ||
+        this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
+
       this.applicationID = application_id;
 
-      // Determine the hostname - use window.location.hostname in browser, otherwise fallback to localhost
+      // Determine the hostname - use window.location in browser, otherwise fallback to localhost
       const hostname = typeof window !== 'undefined' ? window.location.hostname : 'localhost';
       const secured = typeof window !== 'undefined' ? window.location.protocol === 'https:' : false;
 
-      let host = hostname
+      let host = hostname;
       if (envCfg.hostingMode === 'port' || !envCfg.hostingMode) {
-        host += `:${envCfg.port}`;
+        // In browser, use window.location.host which includes the port only when non-standard
+        // (e.g. "localhost:6190" for local dev, "machhub.dev" when behind a reverse proxy on 443)
+        // In non-browser environments, fall back to hostname:envCfg.port
+        host = typeof window !== 'undefined' ? window.location.host : `${hostname}:${envCfg.port}`;
       } else if (envCfg.hostingMode === 'path') {
-        host += envCfg.pathHosted
+        host += envCfg.pathHosted;
       }
 
       if (!config.httpUrl) {
@@ -210,21 +167,15 @@ export class SDK {
         config.mqttUrl = `${secured ? 'wss' : 'ws'}://${host}/mqtt`;
       }
 
-      if (!config.natsUrl) {
-        config.natsUrl = `${secured ? 'wss' : 'ws'}://${host}/nats`;
-      }
-      
-      const { httpUrl, mqttUrl, natsUrl } = config;
+      const { httpUrl, mqttUrl } = config;
 
-      console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config!.developer_key!.length - 4 ? '*' : config!.developer_key![i]).join('') });
+      console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config!.developer_key!.length - 4 ? '*' : config!.developer_key![i]).join('') });
 
       this.http = new HTTPClient(this.applicationID, httpUrl, config.developer_key, envCfg.runtimeID);
       this.mqtt = await MQTTClient.getInstance(this.applicationID, mqttUrl, config.developer_key);
-      this.nats = await NATSClient.getInstance(this.applicationID, natsUrl);
 
       this._historian = new Historian(this.http["httpService"], this.mqtt["mqttService"]);
       this._tag = new Tag(this.http["httpService"], this.mqtt["mqttService"]);
-      this._function = new Function(this.http["httpService"], this.nats["natsService"]);
       this._flow = new Flow(this.http["httpService"]);
       this._auth = new Auth(this.http["httpService"], this.applicationID);
     } catch (error: any) {
@@ -355,7 +306,7 @@ async function findConfigEndpoint(): Promise<string> {
           'Accept': 'application/json',
         },
         signal: AbortSignal.timeout(2000)
-      }).catch(() => {console.log("ERR"); return null}); // Catch fetch errors silently
+      }).catch(() => { console.log("ERR"); return null }); // Catch fetch errors silently
 
       if (!testResponse || !testResponse.ok) {
         continue; // Skip to next candidate

package/src/classes/function.ts

@@ -1,34 +0,0 @@
-import { HTTPService } from "../services/http.service.js";
-import { NATSService } from "../services/nats.service.js";
-
-export class Function {
-  private httpService: HTTPService;
-  private natsService: NATSService | null;
-
-  constructor(httpService: HTTPService, natsService: NATSService) {
-    this.httpService = httpService;
-    this.natsService = natsService;
-  }
-
-  public async executeFunction(function_type: string, function_name: string, payload: any): Promise<any> {
-    return await this.httpService.request.withJSON({
-      function_type: function_type,
-      function_name: function_name,
-      payload: payload,
-    }).post("function/execute");
-  }
-
-  public async addFunction(name: string, func: (data: Record<string,any>) => Record<string,any>): Promise<any> {
-    if (!this.natsService) {
-      throw new Error("NATS service not connected");
-    }
-    return this.natsService.addFunction(name, func);
-  }
-
-  public async initializeFunctions(): Promise<any> {
-    if (!this.natsService) {
-      throw new Error("NATS service not connected");
-    }
-    return this.natsService.initializeFunctions();
-  }
-}

package/src/example/functions.ts

@@ -1,21 +0,0 @@
-import { SDK, SDKConfig } from "../index.js";
-
-let sdk = new SDK();
-let config: SDKConfig = {
-  application_id: "machhub_admin",
-  natsUrl: "nats://localhost:4222",
-};
-
-(async () => {
-  await sdk.Initialize(config);
-
-  function add10(data: Record<string,any>): Record<string,any>{
-      data.result = data.a + 10;
-      console.log("Function add executed with data:", data);
-      return data
-  }
-
-  sdk.function.addFunction("add", add10);
-
-  await sdk.function.initializeFunctions();
-})();

package/src/services/nats.service.ts

@@ -1,293 +0,0 @@
-import { NatsConnection, Subscription, wsconnect } from "@nats-io/nats-core";
-import { connect } from "@nats-io/transport-node";
-
-const HEALTH_SUBJECT = "runtime.typescript.health";
-
-interface SubscribedSubject {
-    subject: string;
-    handler: (message: unknown) => void;
-}
-
-export class NATSService {
-    private url!: string;
-    private functions: Record<string, (data: Record<string, any>) => Promise<Record<string, any>> | Record<string, any>> = {};
-    private connection: NatsConnection | null = null;
-    private static instance: NATSService | undefined;
-    private subscribedSubjects: SubscribedSubject[] = [];
-    private subscriptions: Subscription[] = [];
-    private readonly EXEC_FUNCTION_SUBJECT = "runtime.exec.typescript.*";
-
-    constructor(url: string) {
-        this.url = url;
-    }
-
-    /**
-     * Returns a singleton instance of NATSService.
-     */
-    static async getInstance(url: string = "ws://localhost:7500"): Promise<NATSService> {
-        if (!this.instance || !this.instance.connection) {
-            this.instance = new NATSService(url);
-            await this.instance.connect();
-        }
-        return this.instance;
-    }
-
-    /**
-     * Resets the singleton instance.
-     */
-    public static resetInstance(): void {
-        if (this.instance) {
-            this.instance.connection?.close();
-            this.instance = undefined;
-        }
-    }
-
-    /**
-     * Connects to the NATS broker.
-     */
-    private async connect(): Promise<void> {
-        let retries = 0;
-        const maxRetries = 10;
-
-        while (!this.connection && retries < maxRetries) {
-            try {
-                // NATSService.log(`Connecting to NATS server (${this.url})...`);
-                if (this.url.startsWith("nats")) {
-                    this.connection = await connect({ servers: this.url });
-                } else if (this.url.startsWith("ws")) {
-                    this.connection = await wsconnect({ servers: this.url });
-                } else {
-                    NATSService.log("ERROR - Unsupported protocol : ", this.url.split("://")[0]);
-                }
-                this.connection?.publish(HEALTH_SUBJECT, JSON.stringify(true));
-                // NATSService.log(`Published message: true to ${HEALTH_SUBJECT}`);
-                // NATSService.log("Connected to NATS server");
-            } catch (err: any) {
-                NATSService.log("Caught an error during connection attempt:", err); // Debugging log
-                retries++;
-                console.error(`Failed to connect to NATS server. Retrying (${retries}/${maxRetries})...`, err);
-                if (retries >= maxRetries) {
-                    throw new Error("Max retries reached. Unable to connect to NATS server.");
-                }
-                await new Promise((resolve) => setTimeout(resolve, 5000));
-            }
-        }
-
-        if (!this.connection) {
-            throw new Error("Failed to establish a connection to the NATS server.");
-        }
-    }
-
-    /**
-     * Adds a subject and handler to the subscribed list.
-     * @param subject {string} The subject to subscribe to.
-     * @param handler {(message: unknown) => void} The handler function for incoming messages.
-     */
-    public addSubjectHandler(subject: string, handler: (message: unknown) => void): void {
-        try {
-            this.subscribedSubjects.push({ subject, handler });
-            NATSService.log("New Subscription Handler:", subject);
-
-            const sub = this.connection?.subscribe(subject, {
-                callback: (err, msg) => {
-                    if (err) {
-                        console.error(`Error handling message for subject ${subject}:`, err);
-                        return;
-                    }
-                    const parsedMessage = this.parseMessage(msg.data);
-                    handler(parsedMessage);
-                },
-            });
-            if (sub) this.subscriptions.push(sub);
-        } catch (e) {
-            console.error(`Failed to subscribe to subject ${subject}:`, e);
-        }
-    }
-
-    /**
-     * Subscribes to the EXEC_FUNCTION_SUBJECT and executes registered functions.
-    */
-    public initializeFunctions(): boolean {
-        if (!this.connection) {
-            throw new Error("No active connection. Please connect to the NATS server first.");
-        }
-
-        const sub = this.connection.subscribe(this.EXEC_FUNCTION_SUBJECT, {
-            callback: (err, msg) => {
-                if (err) {
-                    console.error("Error handling message:", err);
-                    return;
-                }
-
-                try {
-                    const dataStr = Buffer.from(msg.data).toString('utf-8');
-                    const data = JSON.parse(dataStr) as Record<string, any>;
-                    const subjectParts = msg.subject.split(".");
-                    if (subjectParts.length !== 4) {
-                        msg.respond(JSON.stringify({ error: "Invalid subject format" }));
-                        return;
-                    }
-
-                    const functionName = subjectParts[3];
-                    this.executeFunction(functionName, data)
-                        .then((result) => {
-                            msg.respond(JSON.stringify(result));
-                        })
-                        .catch((e: any) => {
-                            console.log("Error executing function '" + functionName + "': ", e);
-                            msg.respond(JSON.stringify({ status: "failed", error: e.message }));
-                        });
-                } catch (parseError: any) {
-                    console.error("Error parsing function execution message:", parseError);
-                    msg.respond(JSON.stringify({ 
-                        status: "failed", 
-                        error: `Failed to parse message: ${parseError.message}` 
-                    }));
-                }
-            },
-        });
-        if (sub) this.subscriptions.push(sub);
-
-        NATSService.log(`Subscribed to '${this.EXEC_FUNCTION_SUBJECT}'`);
-        return true;
-    }
-
-    /**
-     * Adds a new function to the registry.
-     * @param functionName {string} The name of the function to add.
-     * @param func {(data: Record<string, any>) => Promise<Record<string, any>> | Record<string, any>} The function implementation.
-     * @throws TypeError if the provided argument is not a function.
-     */
-    public addFunction(
-        functionName: string,
-        func: (data: Record<string, any>) => Promise<Record<string, any>> | Record<string, any>
-    ): void {
-        if (typeof func !== "function") {
-            throw new TypeError(`The provided argument '${functionName}' is not a function.`);
-        }
-        this.functions[functionName] = func;
-    }
-
-    /**
-     * Executes a registered function by name with the provided arguments.
-     * @param functionName {string} The name of the function to execute.
-     * @param arg {Record<string, any>} The arguments to pass to the function. (JSON)
-     * @returns {Promise<Record<string, any>>} The result of the function execution. (JSON)
-     * @throws Error if the function is not found.
-     */
-    public async executeFunction(
-        functionName: string,
-        arg: Record<string, any>
-    ): Promise<Record<string, any>> {
-        const func = this.functions[functionName];
-        if (!func) {
-            throw new Error(`Function '${functionName}' not found`);
-        }
-
-        return await func(arg);
-    }
-
-    /**
-     * Clears all subscribed subjects.
-     */
-    public clearSubjects(): void {
-        this.subscribedSubjects = [];
-    }
-
-    /**
-     * Publishes a message to a specific subject.
-     * @param subject {string} The subject to publish to.
-     * @param message {unknown} The message to publish.
-     * @returns {boolean} True if the message was published successfully.
-     */
-    public publish(subject: string, message: unknown): boolean {
-        try {
-            const payload = JSON.stringify(message);
-            NATSService.log("Publishing to", subject, "with payload:", payload);
-
-            this.connection?.publish(subject, payload);
-        } catch (e) {
-            console.error(`Failed to publish to subject ${subject}:`, e);
-            throw e;
-        }
-        return true;
-    }
-
-    /**
-     * Retrieves all registered functions.
-     * @returns {Record<string, (data: Record<string, any>) => Record<string, any>} An object containing all registered functions.
-     */
-    public getAllFunctions(): Record<string, (data: Record<string, any>) => Record<string, any>> {
-        return this.functions;
-    }
-
-    public static log(message?: any, ...optionalParams: any[]) {
-        console.log("[TYPESCRIPT] >", message, ...optionalParams);
-    }
-
-    /**
-     * Prints the names of all available functions to the console.
-     */
-    public printFunctions(): void {
-        NATSService.log("Available functions: ", Object.keys(this.functions).join(", "));
-    }
-
-    /**
-     * Parses a message buffer into a JSON object or returns raw data.
-     * @param message {Uint8Array} The message buffer.
-     * @returns {unknown} The parsed message (JSON object) or the raw string if parsing fails.
-     */
-    private parseMessage(message: Uint8Array): unknown {
-        try {
-            const messageStr = Buffer.from(message).toString('utf-8');
-            // Check if the message is empty
-            if (!messageStr || messageStr.trim().length === 0) {
-                NATSService.log("Received empty message");
-                return null;
-            }
-            
-            // Try to parse as JSON
-            return JSON.parse(messageStr);
-        } catch (error) {
-            // If JSON parsing fails, check if it's binary data or non-JSON content
-            const messageStr = Buffer.from(message).toString('utf-8');
-            
-            // Check if it looks like binary data (contains non-printable characters)
-            const isBinary = message.some(byte => byte < 32 && byte !== 9 && byte !== 10 && byte !== 13);
-            
-            if (isBinary) {
-                NATSService.log("Received binary data, returning as Uint8Array");
-                return message; // Return raw binary data
-            }
-            
-            // If it's a plain string (not JSON), return as is
-            NATSService.log("Failed to parse message as JSON, returning as string:", messageStr.substring(0, 100));
-            console.error("Error parsing message:", error);
-            return messageStr;
-        }
-    }
-
-    /**
-     * Gracefully unsubscribes from all NATS subscriptions and closes the connection.
-     */
-    public async shutdown(): Promise<void> {
-        NATSService.log("Shutting down NATSService...");
-        for (const sub of this.subscriptions) {
-            try {
-                sub.unsubscribe();
-            } catch (e) {
-                NATSService.log("Error unsubscribing:", e);
-            }
-        }
-        this.subscriptions = [];
-        if (this.connection) {
-            try {
-                await this.connection.drain();
-                await this.connection.close();
-            } catch (e) {
-                NATSService.log("Error closing NATS connection:", e);
-            }
-        }
-        NATSService.log("NATSService shutdown complete.");
-    }
-}