@machhub-dev/sdk-ts 0.0.7 → 0.0.9

package/dist/cjs/classes/collection.js

@@ -55,10 +55,20 @@ class Collection {
     }
     async create(data) {
         try {
-            return await this.httpService.request.withJSON(data).post(this.collectionName);
+            const formData = new FormData();
+            for (const [key, value] of Object.entries(data)) {
+                if (value instanceof File) {
+                    formData.append(key, value, value.name);
+                    data[key] = value.name;
+                }
+            }
+            formData.append("record", JSON.stringify(data));
+            return await this.httpService.request
+                .withBody(formData)
+                .post(this.collectionName);
         }
         catch (error) {
-            throw new CollectionError('create', this.collectionName, error);
+            throw new CollectionError("create", this.collectionName, error);
         }
     }
     async update(id, data) {

package/dist/cjs/sdk-ts.js

@@ -18,8 +18,8 @@ class HTTPClient {
      * @param applicationID The ID for your application (required)
      * @param httpUrl The base URL for HTTP connection (default = http://localhost:6188)
      */
-    constructor(applicationID, httpUrl, developerKey) {
-        this.httpService = new http_service_js_1.HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey);
+    constructor(applicationID, httpUrl, developerKey, runtimeID) {
+        this.httpService = new http_service_js_1.HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey, runtimeID);
     }
     /**
      * Gets server info
@@ -147,20 +147,20 @@ class SDK {
             if (!config.application_id)
                 config = { application_id: "" };
             // console.log("Using application_id:", config.application_id);
-            const PORT = await getEnvPort();
-            console.log("Port:", PORT);
+            const { port, runtimeID } = await getEnvConfig();
+            console.log("Port:", port);
             if (!config.httpUrl) {
-                config.httpUrl = "http://localhost:" + PORT;
+                config.httpUrl = "http://localhost:" + port;
             }
             if (!config.mqttUrl) {
-                config.mqttUrl = "ws://localhost:" + PORT + "/mqtt";
+                config.mqttUrl = "ws://localhost:" + port + "/mqtt";
             }
             if (!config.natsUrl) {
-                config.natsUrl = "ws://localhost:" + PORT + "/nats";
+                config.natsUrl = "ws://localhost:" + port + "/nats";
             }
             const { application_id, httpUrl, mqttUrl, natsUrl } = config;
             console.log("SDK Config:", { application_id, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
-            this.http = new HTTPClient(application_id, httpUrl, config.developer_key);
+            this.http = new HTTPClient(application_id, httpUrl, config.developer_key, runtimeID);
             this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
             this.nats = await NATSClient.getInstance(application_id, natsUrl);
             this._historian = new historian_js_1.Historian(this.http["httpService"], this.mqtt["mqttService"]);
@@ -234,7 +234,7 @@ class SDK {
     }
 }
 exports.SDK = SDK;
-async function getEnvPort() {
+async function getEnvConfig() {
     try {
         // Try to find the configuration endpoint by testing different base paths
         const configUrl = await findConfigEndpoint();
@@ -242,12 +242,12 @@ async function getEnvPort() {
         // console.log('Response:', response);
         // console.log('runtimeID: ', response.runtimeID);
         // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
-        return response.port;
+        return { port: response.port, runtimeID: response.runtimeID };
     }
     catch (error) {
         // console.log('No configured runtime ID:', error);
         // TODO: Use DevPort from SDK Config or default to 61888
-        return "61888";
+        return { port: "61888", runtimeID: "" };
     }
 }
 /**

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

@@ -9,19 +9,19 @@ export declare class HTTPService {
     private url;
     private applicationID;
     private developerKey?;
-    constructor(url: string, prefix: string, applicationID: string, developerKey?: string);
+    private runtimeID?;
+    constructor(url: string, prefix: string, applicationID: string, developerKey?: string, runtimeID?: string);
     get request(): RequestParameters;
-    private addRuntimeHeaders;
-    private getCookie;
 }
 declare class RequestParameters {
     private base;
     private applicationID;
     private developerKey?;
+    private runtimeID?;
     query?: Record<string, string>;
     init?: RequestInit;
     headers?: Record<string, string>;
-    constructor(base: URL, applicationID: string, developerKey?: string, query?: Record<string, string>);
+    constructor(base: URL, applicationID: string, developerKey?: string, runtimeID?: string, query?: Record<string, string>);
     private withQuery;
     private parseInit;
     withBody(body: BodyInit): RequestParameters;
@@ -33,6 +33,7 @@ declare class RequestParameters {
     setHeader(key: string, value: string): RequestParameters;
     setBearerToken(token: string): RequestParameters;
     withAccessToken(): RequestParameters;
+    withRuntimeID(): RequestParameters;
     withDomain(): RequestParameters;
     withDeveloperKey(): RequestParameters;
     withContentType(mime: string): RequestParameters;

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

@@ -14,47 +14,30 @@ class HTTPException extends Error {
 }
 exports.HTTPException = HTTPException;
 class HTTPService {
-    constructor(url, prefix, applicationID, developerKey) {
+    constructor(url, prefix, applicationID, developerKey, runtimeID) {
         if (prefix == null)
             prefix = "";
         this.url = new URL(prefix, url);
         this.applicationID = "domains:" + applicationID;
         this.developerKey = developerKey;
+        this.runtimeID = runtimeID;
     }
     get request() {
-        return new RequestParameters(this.url, this.applicationID, this.developerKey);
-    }
-    addRuntimeHeaders(headers = {}) {
-        // Add runtime ID from cookie if available (for hosted applications)
-        if (typeof document !== 'undefined') {
-            const runtimeID = this.getCookie('machhub_runtime_id');
-            if (runtimeID) {
-                headers['X-MachHub-Runtime-ID'] = runtimeID;
-            }
-        }
-        return headers;
-    }
-    getCookie(name) {
-        if (typeof document === 'undefined')
-            return null;
-        const value = `; ${document.cookie}`;
-        const parts = value.split(`; ${name}=`);
-        if (parts.length === 2) {
-            return parts.pop()?.split(';').shift() || null;
-        }
-        return null;
+        return new RequestParameters(this.url, this.applicationID, this.developerKey, this.runtimeID);
     }
 }
 exports.HTTPService = HTTPService;
 class RequestParameters {
-    constructor(base, applicationID, developerKey, query) {
+    constructor(base, applicationID, developerKey, runtimeID, query) {
         this.base = base;
         this.applicationID = applicationID;
         this.developerKey = developerKey;
+        this.runtimeID = runtimeID;
         this.query = query;
         this.withDomain(); // Ensure withDomain() is called by default
         this.withAccessToken(); // Ensure withAccessToken() is called by default
         this.withDeveloperKey(); // Ensure withDeveloperKey() is called by default
+        this.withRuntimeID(); // Ensure withRuntimeID() is called by default
     }
     withQuery(path, query) {
         const newPath = [this.base.pathname, path].map(pathPart => pathPart.replace(/(^\/|\/$)/g, "")).join("/");
@@ -138,6 +121,10 @@ class RequestParameters {
         this.setHeader("Authorization", `Bearer ${tkn}`);
         return this;
     }
+    withRuntimeID() {
+        this.setHeader("X-Machhub-Runtime-Id", this.runtimeID ?? "");
+        return this;
+    }
     withDomain() {
         this.setHeader("Domain", this.applicationID);
         return this;
@@ -168,6 +155,12 @@ class RequestParameters {
         if (body) {
             if (body instanceof FormData) {
                 init.body = body;
+                // Remove Content-Type header if it exists, let browser set it for FormData
+                if (init.headers && typeof init.headers === 'object') {
+                    const headers = init.headers;
+                    delete headers['Content-Type'];
+                    delete headers['content-type'];
+                }
             }
             else {
                 init.body = JSON.stringify(body);

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

@@ -90,20 +90,20 @@ class MQTTService {
         this.client.on('message', (topic, message) => {
             for (const subscribedTopic of this.subscribedTopics) {
                 if (topic === subscribedTopic.topic) {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = this.parseMessage(message, topic);
                     subscribedTopic.handler(parsedMessage);
                     break;
                 }
             }
         });
     }
-    parseMessage(message) {
+    parseMessage(message, topic) {
         try {
             return JSON.parse(message.toString());
         }
         catch (error) {
-            console.error("Error parsing message:", error);
-            return null;
+            console.warn("Failed to parse message as JSON '" + topic + "' : ", message.toString());
+            return message.toString();
         }
     }
 }

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

@@ -66,9 +66,9 @@ export declare class NATSService {
      */
     printFunctions(): void;
     /**
-     * Parses a message buffer into a JSON object.
+     * Parses a message buffer into a JSON object or returns raw data.
      * @param message {Uint8Array} The message buffer.
-     * @returns {unknown} The parsed message.
+     * @returns {unknown} The parsed message (JSON object) or the raw string if parsing fails.
      */
     private parseMessage;
     /**

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

@@ -107,20 +107,31 @@ class NATSService {
                     console.error("Error handling message:", err);
                     return;
                 }
-                const data = JSON.parse(msg.data.toString());
-                const subjectParts = msg.subject.split(".");
-                if (subjectParts.length !== 4) {
-                    msg.respond(JSON.stringify({ error: "Invalid subject format" }));
-                    return;
+                try {
+                    const dataStr = Buffer.from(msg.data).toString('utf-8');
+                    const data = JSON.parse(dataStr);
+                    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) => {
+                        console.log("Error executing function '" + functionName + "': ", e);
+                        msg.respond(JSON.stringify({ status: "failed", error: e.message }));
+                    });
+                }
+                catch (parseError) {
+                    console.error("Error parsing function execution message:", parseError);
+                    msg.respond(JSON.stringify({
+                        status: "failed",
+                        error: `Failed to parse message: ${parseError.message}`
+                    }));
                 }
-                const functionName = subjectParts[3];
-                this.executeFunction(functionName, data)
-                    .then((result) => {
-                    msg.respond(JSON.stringify(result));
-                })
-                    .catch((e) => {
-                    msg.respond(JSON.stringify({ status: "failed", error: e.message }));
-                });
             },
         });
         if (sub)
@@ -195,17 +206,34 @@ class NATSService {
         NATSService.log("Available functions: ", Object.keys(this.functions).join(", "));
     }
     /**
-     * Parses a message buffer into a JSON object.
+     * Parses a message buffer into a JSON object or returns raw data.
      * @param message {Uint8Array} The message buffer.
-     * @returns {unknown} The parsed message.
+     * @returns {unknown} The parsed message (JSON object) or the raw string if parsing fails.
      */
     parseMessage(message) {
         try {
-            return JSON.parse(Buffer.from(message).toString());
+            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 null;
+            return messageStr;
         }
     }
     /**

package/dist/classes/collection.js

@@ -51,10 +51,20 @@ export class Collection {
     }
     async create(data) {
         try {
-            return await this.httpService.request.withJSON(data).post(this.collectionName);
+            const formData = new FormData();
+            for (const [key, value] of Object.entries(data)) {
+                if (value instanceof File) {
+                    formData.append(key, value, value.name);
+                    data[key] = value.name;
+                }
+            }
+            formData.append("record", JSON.stringify(data));
+            return await this.httpService.request
+                .withBody(formData)
+                .post(this.collectionName);
         }
         catch (error) {
-            throw new CollectionError('create', this.collectionName, error);
+            throw new CollectionError("create", this.collectionName, error);
         }
     }
     async update(id, data) {

package/dist/sdk-ts.js

@@ -15,8 +15,8 @@ class HTTPClient {
      * @param applicationID The ID for your application (required)
      * @param httpUrl The base URL for HTTP connection (default = http://localhost:6188)
      */
-    constructor(applicationID, httpUrl, developerKey) {
-        this.httpService = new HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey);
+    constructor(applicationID, httpUrl, developerKey, runtimeID) {
+        this.httpService = new HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey, runtimeID);
     }
     /**
      * Gets server info
@@ -144,20 +144,20 @@ export class SDK {
             if (!config.application_id)
                 config = { application_id: "" };
             // console.log("Using application_id:", config.application_id);
-            const PORT = await getEnvPort();
-            console.log("Port:", PORT);
+            const { port, runtimeID } = await getEnvConfig();
+            console.log("Port:", port);
             if (!config.httpUrl) {
-                config.httpUrl = "http://localhost:" + PORT;
+                config.httpUrl = "http://localhost:" + port;
             }
             if (!config.mqttUrl) {
-                config.mqttUrl = "ws://localhost:" + PORT + "/mqtt";
+                config.mqttUrl = "ws://localhost:" + port + "/mqtt";
             }
             if (!config.natsUrl) {
-                config.natsUrl = "ws://localhost:" + PORT + "/nats";
+                config.natsUrl = "ws://localhost:" + port + "/nats";
             }
             const { application_id, httpUrl, mqttUrl, natsUrl } = config;
             console.log("SDK Config:", { application_id, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
-            this.http = new HTTPClient(application_id, httpUrl, config.developer_key);
+            this.http = new HTTPClient(application_id, httpUrl, config.developer_key, runtimeID);
             this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
             this.nats = await NATSClient.getInstance(application_id, natsUrl);
             this._historian = new Historian(this.http["httpService"], this.mqtt["mqttService"]);
@@ -230,7 +230,7 @@ export class SDK {
         return new Collection(this.http["httpService"], this.mqtt ? this.mqtt["mqttService"] : null, collectionName);
     }
 }
-async function getEnvPort() {
+async function getEnvConfig() {
     try {
         // Try to find the configuration endpoint by testing different base paths
         const configUrl = await findConfigEndpoint();
@@ -238,12 +238,12 @@ async function getEnvPort() {
         // console.log('Response:', response);
         // console.log('runtimeID: ', response.runtimeID);
         // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
-        return response.port;
+        return { port: response.port, runtimeID: response.runtimeID };
     }
     catch (error) {
         // console.log('No configured runtime ID:', error);
         // TODO: Use DevPort from SDK Config or default to 61888
-        return "61888";
+        return { port: "61888", runtimeID: "" };
     }
 }
 /**

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

@@ -9,19 +9,19 @@ export declare class HTTPService {
     private url;
     private applicationID;
     private developerKey?;
-    constructor(url: string, prefix: string, applicationID: string, developerKey?: string);
+    private runtimeID?;
+    constructor(url: string, prefix: string, applicationID: string, developerKey?: string, runtimeID?: string);
     get request(): RequestParameters;
-    private addRuntimeHeaders;
-    private getCookie;
 }
 declare class RequestParameters {
     private base;
     private applicationID;
     private developerKey?;
+    private runtimeID?;
     query?: Record<string, string>;
     init?: RequestInit;
     headers?: Record<string, string>;
-    constructor(base: URL, applicationID: string, developerKey?: string, query?: Record<string, string>);
+    constructor(base: URL, applicationID: string, developerKey?: string, runtimeID?: string, query?: Record<string, string>);
     private withQuery;
     private parseInit;
     withBody(body: BodyInit): RequestParameters;
@@ -33,6 +33,7 @@ declare class RequestParameters {
     setHeader(key: string, value: string): RequestParameters;
     setBearerToken(token: string): RequestParameters;
     withAccessToken(): RequestParameters;
+    withRuntimeID(): RequestParameters;
     withDomain(): RequestParameters;
     withDeveloperKey(): RequestParameters;
     withContentType(mime: string): RequestParameters;

package/dist/services/http.service.js

@@ -10,46 +10,29 @@ export class HTTPException extends Error {
     }
 }
 export class HTTPService {
-    constructor(url, prefix, applicationID, developerKey) {
+    constructor(url, prefix, applicationID, developerKey, runtimeID) {
         if (prefix == null)
             prefix = "";
         this.url = new URL(prefix, url);
         this.applicationID = "domains:" + applicationID;
         this.developerKey = developerKey;
+        this.runtimeID = runtimeID;
     }
     get request() {
-        return new RequestParameters(this.url, this.applicationID, this.developerKey);
-    }
-    addRuntimeHeaders(headers = {}) {
-        // Add runtime ID from cookie if available (for hosted applications)
-        if (typeof document !== 'undefined') {
-            const runtimeID = this.getCookie('machhub_runtime_id');
-            if (runtimeID) {
-                headers['X-MachHub-Runtime-ID'] = runtimeID;
-            }
-        }
-        return headers;
-    }
-    getCookie(name) {
-        if (typeof document === 'undefined')
-            return null;
-        const value = `; ${document.cookie}`;
-        const parts = value.split(`; ${name}=`);
-        if (parts.length === 2) {
-            return parts.pop()?.split(';').shift() || null;
-        }
-        return null;
+        return new RequestParameters(this.url, this.applicationID, this.developerKey, this.runtimeID);
     }
 }
 class RequestParameters {
-    constructor(base, applicationID, developerKey, query) {
+    constructor(base, applicationID, developerKey, runtimeID, query) {
         this.base = base;
         this.applicationID = applicationID;
         this.developerKey = developerKey;
+        this.runtimeID = runtimeID;
         this.query = query;
         this.withDomain(); // Ensure withDomain() is called by default
         this.withAccessToken(); // Ensure withAccessToken() is called by default
         this.withDeveloperKey(); // Ensure withDeveloperKey() is called by default
+        this.withRuntimeID(); // Ensure withRuntimeID() is called by default
     }
     withQuery(path, query) {
         const newPath = [this.base.pathname, path].map(pathPart => pathPart.replace(/(^\/|\/$)/g, "")).join("/");
@@ -133,6 +116,10 @@ class RequestParameters {
         this.setHeader("Authorization", `Bearer ${tkn}`);
         return this;
     }
+    withRuntimeID() {
+        this.setHeader("X-Machhub-Runtime-Id", this.runtimeID ?? "");
+        return this;
+    }
     withDomain() {
         this.setHeader("Domain", this.applicationID);
         return this;
@@ -163,6 +150,12 @@ class RequestParameters {
         if (body) {
             if (body instanceof FormData) {
                 init.body = body;
+                // Remove Content-Type header if it exists, let browser set it for FormData
+                if (init.headers && typeof init.headers === 'object') {
+                    const headers = init.headers;
+                    delete headers['Content-Type'];
+                    delete headers['content-type'];
+                }
             }
             else {
                 init.body = JSON.stringify(body);

package/dist/services/mqtt.service.js

@@ -84,20 +84,20 @@ export class MQTTService {
         this.client.on('message', (topic, message) => {
             for (const subscribedTopic of this.subscribedTopics) {
                 if (topic === subscribedTopic.topic) {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = this.parseMessage(message, topic);
                     subscribedTopic.handler(parsedMessage);
                     break;
                 }
             }
         });
     }
-    parseMessage(message) {
+    parseMessage(message, topic) {
         try {
             return JSON.parse(message.toString());
         }
         catch (error) {
-            console.error("Error parsing message:", error);
-            return null;
+            console.warn("Failed to parse message as JSON '" + topic + "' : ", message.toString());
+            return message.toString();
         }
     }
 }

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

@@ -66,9 +66,9 @@ export declare class NATSService {
      */
     printFunctions(): void;
     /**
-     * Parses a message buffer into a JSON object.
+     * Parses a message buffer into a JSON object or returns raw data.
      * @param message {Uint8Array} The message buffer.
-     * @returns {unknown} The parsed message.
+     * @returns {unknown} The parsed message (JSON object) or the raw string if parsing fails.
      */
     private parseMessage;
     /**

package/dist/services/nats.service.js

@@ -104,20 +104,31 @@ export class NATSService {
                     console.error("Error handling message:", err);
                     return;
                 }
-                const data = JSON.parse(msg.data.toString());
-                const subjectParts = msg.subject.split(".");
-                if (subjectParts.length !== 4) {
-                    msg.respond(JSON.stringify({ error: "Invalid subject format" }));
-                    return;
+                try {
+                    const dataStr = Buffer.from(msg.data).toString('utf-8');
+                    const data = JSON.parse(dataStr);
+                    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) => {
+                        console.log("Error executing function '" + functionName + "': ", e);
+                        msg.respond(JSON.stringify({ status: "failed", error: e.message }));
+                    });
+                }
+                catch (parseError) {
+                    console.error("Error parsing function execution message:", parseError);
+                    msg.respond(JSON.stringify({
+                        status: "failed",
+                        error: `Failed to parse message: ${parseError.message}`
+                    }));
                 }
-                const functionName = subjectParts[3];
-                this.executeFunction(functionName, data)
-                    .then((result) => {
-                    msg.respond(JSON.stringify(result));
-                })
-                    .catch((e) => {
-                    msg.respond(JSON.stringify({ status: "failed", error: e.message }));
-                });
             },
         });
         if (sub)
@@ -192,17 +203,34 @@ export class NATSService {
         NATSService.log("Available functions: ", Object.keys(this.functions).join(", "));
     }
     /**
-     * Parses a message buffer into a JSON object.
+     * Parses a message buffer into a JSON object or returns raw data.
      * @param message {Uint8Array} The message buffer.
-     * @returns {unknown} The parsed message.
+     * @returns {unknown} The parsed message (JSON object) or the raw string if parsing fails.
      */
     parseMessage(message) {
         try {
-            return JSON.parse(Buffer.from(message).toString());
+            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 null;
+            return messageStr;
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machhub-dev/sdk-ts",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "MACHHUB TYPESCRIPT SDK",
   "keywords": [
     "machhub",
@@ -20,14 +20,14 @@
     "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",
     "mqtt": "^5.10.4",
     "safe-buffer": "^5.2.1",
     "typescript": "^5.8.3",
-    "undici-types": "^7.4.0",
-    "@nats-io/nats-core": "^3.0.2",
-    "@nats-io/transport-node": "^3.0.2"
+    "undici-types": "^7.4.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.5"
   }
-}
+}

package/src/classes/collection.ts

@@ -27,6 +27,7 @@ export class Collection {
     this.collectionName = collectionName;
   }
 
+
   filter(fieldName: string, operator: "=" | ">" | "<" | "<=" | ">=" | "!=", value: any): Collection {
     this.queryParams[`filter[${fieldName}][${operator}][${typeof value}]`] = value;
     return this;
@@ -68,9 +69,20 @@ export class Collection {
 
   async create(data: Record<string, any>): Promise<any> {
     try {
-      return await this.httpService.request.withJSON(data).post(this.collectionName);
+      const formData = new FormData();
+
+      for (const [key, value] of Object.entries(data)) {
+        if (value instanceof File) {
+          formData.append(key, value, value.name);
+          data[key] = value.name
+        } 
+      }
+      formData.append("record", JSON.stringify(data))
+      return await this.httpService.request
+        .withBody(formData)
+        .post(this.collectionName);
     } catch (error) {
-      throw new CollectionError('create', this.collectionName, error as Error);
+      throw new CollectionError("create", this.collectionName, error as Error);
     }
   }
 

package/src/sdk-ts.ts

@@ -19,8 +19,8 @@ class HTTPClient {
    * @param applicationID The ID for your application (required)
    * @param httpUrl The base URL for HTTP connection (default = http://localhost:6188)
    */
-  constructor(applicationID: string, httpUrl:string, developerKey?: string) {
-    this.httpService = new HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey);
+  constructor(applicationID: string, httpUrl:string, developerKey?: string, runtimeID?: string) {
+    this.httpService = new HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey, runtimeID);
   }
 
   /**
@@ -173,26 +173,26 @@ export class SDK {
       // console.log("Using application_id:", config.application_id);
 
 
-      const PORT = await getEnvPort();
-      console.log("Port:", PORT);
+      const {port, runtimeID} = await getEnvConfig();
+      console.log("Port:", port);
 
       if (!config.httpUrl) {
-        config.httpUrl = "http://localhost:" + PORT;
+        config.httpUrl = "http://localhost:" + port;
       }
 
       if (!config.mqttUrl) {
-        config.mqttUrl = "ws://localhost:" + PORT + "/mqtt";
+        config.mqttUrl = "ws://localhost:" + port + "/mqtt";
       }
 
       if (!config.natsUrl) {
-        config.natsUrl = "ws://localhost:" + PORT + "/nats";
+        config.natsUrl = "ws://localhost:" + port + "/nats";
       }
 
       const { application_id, httpUrl, mqttUrl, natsUrl } = config;
 
       console.log("SDK Config:", { application_id, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config!.developer_key!.length - 4 ? '*' : config!.developer_key![i]).join('') });
 
-      this.http = new HTTPClient(application_id, httpUrl, config.developer_key);
+      this.http = new HTTPClient(application_id, httpUrl, config.developer_key, runtimeID);
       this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
       this.nats = await NATSClient.getInstance(application_id, natsUrl);
       
@@ -273,19 +273,19 @@ export class SDK {
   }
 }
 
-async function getEnvPort(): Promise<string> {
+async function getEnvConfig(): Promise<{port:string, runtimeID:string}> {
   try {
     // Try to find the configuration endpoint by testing different base paths
     const configUrl = await findConfigEndpoint();
-    const response = await fetchData<{runtimeID:string, port:string}>(configUrl);
+    const response = await fetchData<{port:string, runtimeID:string}>(configUrl);
     // console.log('Response:', response);
     // console.log('runtimeID: ', response.runtimeID);
     // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
-    return response.port;
+    return {  port: response.port, runtimeID: response.runtimeID};
   } catch (error) {
     // console.log('No configured runtime ID:', error);
     // TODO: Use DevPort from SDK Config or default to 61888
-    return "61888";
+    return { port: "61888", runtimeID: ""};
   }
 }
 

package/src/services/http.service.ts

@@ -19,39 +19,18 @@ export class HTTPService {
     private url: URL;
     private applicationID: string;
     private developerKey?: string;
+    private runtimeID?: string;
 
-    constructor(url: string, prefix: string, applicationID: string, developerKey?: string) {
+    constructor(url: string, prefix: string, applicationID: string, developerKey?: string, runtimeID?: string) {
         if (prefix == null) prefix = "";
         this.url = new URL(prefix, url);
         this.applicationID = "domains:" + applicationID
         this.developerKey = developerKey
+        this.runtimeID = runtimeID
     }
 
     public get request(): RequestParameters {
-        return new RequestParameters(this.url, this.applicationID, this.developerKey);
-    }
-
-    private addRuntimeHeaders(headers: Record<string, string> = {}): Record<string, string> {
-        // Add runtime ID from cookie if available (for hosted applications)
-        if (typeof document !== 'undefined') {
-            const runtimeID = this.getCookie('machhub_runtime_id');
-            if (runtimeID) {
-                headers['X-MachHub-Runtime-ID'] = runtimeID;
-            }
-        }
-
-        return headers;
-    }
-
-    private getCookie(name: string): string | null {
-        if (typeof document === 'undefined') return null;
-
-        const value = `; ${document.cookie}`;
-        const parts = value.split(`; ${name}=`);
-        if (parts.length === 2) {
-            return parts.pop()?.split(';').shift() || null;
-        }
-        return null;
+        return new RequestParameters(this.url, this.applicationID, this.developerKey, this.runtimeID);
     }
 }
 
@@ -59,18 +38,21 @@ class RequestParameters {
     private base: URL;
     private applicationID: string;
     private developerKey?: string;
+    private runtimeID?: string;
     public query?: Record<string, string>;
     public init?: RequestInit;
     public headers?: Record<string, string>;
 
-    constructor(base: URL, applicationID: string, developerKey?:string, query?: Record<string, string>) {
+    constructor(base: URL, applicationID: string, developerKey?: string, runtimeID?: string, query?: Record<string, string>) {
         this.base = base;
         this.applicationID = applicationID;
         this.developerKey = developerKey;
+        this.runtimeID = runtimeID;
         this.query = query;
         this.withDomain(); // Ensure withDomain() is called by default
         this.withAccessToken(); // Ensure withAccessToken() is called by default
         this.withDeveloperKey(); // Ensure withDeveloperKey() is called by default
+        this.withRuntimeID(); // Ensure withRuntimeID() is called by default
     }
 
     private withQuery(path: string, query?: Record<string, string>): URL {
@@ -170,6 +152,11 @@ class RequestParameters {
         return this;
     }
 
+    public withRuntimeID(): RequestParameters {
+        this.setHeader("X-Machhub-Runtime-Id", this.runtimeID ?? "");
+        return this;
+    }
+
     public withDomain(): RequestParameters {
         this.setHeader("Domain", this.applicationID);
         return this;
@@ -211,6 +198,12 @@ class RequestParameters {
         if (body) {
             if (body instanceof FormData) {
                 init.body = body;
+                // Remove Content-Type header if it exists, let browser set it for FormData
+                if (init.headers && typeof init.headers === 'object') {
+                    const headers = init.headers as Record<string, string>;
+                    delete headers['Content-Type'];
+                    delete headers['content-type'];
+                }
             } else {
                 init.body = JSON.stringify(body);
                 init.headers = {

package/src/services/mqtt.service.ts

@@ -102,7 +102,7 @@ export class MQTTService {
         this.client.on('message', (topic: string, message: Buffer) => {
             for (const subscribedTopic of this.subscribedTopics) {
                 if (topic === subscribedTopic.topic) {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = this.parseMessage(message, topic);
                     subscribedTopic.handler(parsedMessage);
                     break;
                 }
@@ -110,12 +110,12 @@ export class MQTTService {
         });
     }
 
-    private parseMessage(message: Buffer): unknown {
+    private parseMessage(message: Buffer, topic: string): unknown {
         try {
             return JSON.parse(message.toString());
         } catch (error) {
-            console.error("Error parsing message:", error);
-            return null;
+            console.warn("Failed to parse message as JSON '" + topic + "' : ", message.toString());
+            return message.toString();
         }
     }
 }

package/src/services/nats.service.ts

@@ -119,21 +119,31 @@ export class NATSService {
                     return;
                 }
 
-                const data = JSON.parse(msg.data.toString()) as Record<string, any>;
-                const subjectParts = msg.subject.split(".");
-                if (subjectParts.length !== 4) {
-                    msg.respond(JSON.stringify({ error: "Invalid subject format" }));
-                    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) => {
-                        msg.respond(JSON.stringify({ status: "failed", error: e.message }));
-                    });
+                    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);
@@ -223,16 +233,37 @@ export class NATSService {
     }
 
     /**
-     * Parses a message buffer into a JSON object.
+     * Parses a message buffer into a JSON object or returns raw data.
      * @param message {Uint8Array} The message buffer.
-     * @returns {unknown} The parsed message.
+     * @returns {unknown} The parsed message (JSON object) or the raw string if parsing fails.
      */
     private parseMessage(message: Uint8Array): unknown {
         try {
-            return JSON.parse(Buffer.from(message).toString());
+            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 null;
+            return messageStr;
         }
     }