@machhub-dev/sdk-ts 0.0.2 → 0.0.4

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

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { Action, ActionResponse, Feature, Group, LoginResponse, User, ValidateJWTResponse } from "../types/auth.models";
+import { HTTPService } from "../services/http.service.js";
+import { Action, ActionResponse, Feature, Group, LoginResponse, User, ValidateJWTResponse } from "../types/auth.models.js";
 export declare class Auth {
     private httpService;
     constructor(httpService: HTTPService);

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

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { MQTTService } from "../services/mqtt.service";
+import { HTTPService } from "../services/http.service.js";
+import { MQTTService } from "../services/mqtt.service.js";
 export declare class Collection {
     protected httpService: HTTPService;
     protected mqttService: MQTTService | null;

package/dist/cjs/classes/collection.js

@@ -28,15 +28,24 @@ class Collection {
         return this.httpService.request.get(this.collectionName + "/all", this.queryParams);
     }
     async getOne(id) {
+        if (!id) {
+            throw new Error("ID must be provided");
+        }
         return this.httpService.request.get(id);
     }
     async create(data) {
         return this.httpService.request.withJSON(data).post(this.collectionName);
     }
     async update(id, data) {
+        if (!id) {
+            throw new Error("ID must be provided");
+        }
         return this.httpService.request.withJSON(data).put(id);
     }
     async delete(id) {
+        if (!id) {
+            throw new Error("ID must be provided");
+        }
         return this.httpService.request.delete(id);
     }
 }

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

@@ -1,4 +1,4 @@
-import { HTTPService } from "../services/http.service";
+import { HTTPService } from "../services/http.service.js";
 export declare class Flow {
     private httpService;
     constructor(httpService: HTTPService);

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

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { NATSService } from "../services/nats.service";
+import { HTTPService } from "../services/http.service.js";
+import { NATSService } from "../services/nats.service.js";
 export declare class Function {
     private httpService;
     private natsService;

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

@@ -1,6 +1,6 @@
-import { HTTPService } from "../services/http.service";
-import { MQTTService } from "../services/mqtt.service";
-import { HistorizedData } from "../types/tag.models";
+import { HTTPService } from "../services/http.service.js";
+import { MQTTService } from "../services/mqtt.service.js";
+import { HistorizedData } from "../types/tag.models.js";
 export declare class Historian {
     private httpService;
     private mqttService;

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

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { MQTTService } from "../services/mqtt.service";
+import { HTTPService } from "../services/http.service.js";
+import { MQTTService } from "../services/mqtt.service.js";
 export declare class Tag {
     private httpService;
     private mqttService;

package/dist/cjs/example/functions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-let sdk = new index_1.SDK();
+const index_js_1 = require("../index.js");
+let sdk = new index_js_1.SDK();
 let config = {
     application_id: "machhub_admin",
     natsUrl: "nats://localhost:4222",

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

@@ -1,11 +1,12 @@
-import { Collection } from "./classes/collection";
-import { Historian } from "./classes/historian";
-import { Tag } from "./classes/tag";
-import { Function } from "./classes/function";
-import { Flow } from "./classes/flow";
-import { Auth } from "./classes/auth";
+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 {
     application_id: string;
+    developer_key?: string;
     httpUrl?: string;
     mqttUrl?: string;
     natsUrl?: string;
@@ -28,7 +29,7 @@ export declare class SDK {
      *
      * const config: SDKConfig = {
      *   application_id: 'your-app-id',
-     *   httpUrl: 'http://localhost:80', // optional (default = http://localhost:80)
+     *   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)
      * };
@@ -40,7 +41,7 @@ export declare class SDK {
      * @param config {SDKConfig} The configuration object containing initialization parameters. See SDKConfig for details.
      * @returns {Promise<boolean>} Resolves to true if initialization is successful.
      */
-    Initialize(config: SDKConfig): Promise<boolean>;
+    Initialize(config?: SDKConfig): Promise<boolean>;
     /**
      * Getter for `auth`. Ensures `auth` is accessed only after initialization.
      */

package/dist/cjs/sdk-ts.js

@@ -1,38 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK = void 0;
-const http_service_1 = require("./services/http.service");
-const mqtt_service_1 = require("./services/mqtt.service");
-const nats_service_1 = require("./services/nats.service");
-const appConfig_1 = require("./utils/appConfig");
-const collection_1 = require("./classes/collection");
-const historian_1 = require("./classes/historian");
-const tag_1 = require("./classes/tag");
-const function_1 = require("./classes/function");
-const flow_1 = require("./classes/flow");
-const auth_1 = require("./classes/auth");
+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";
 // Core HTTP client class
 class HTTPClient {
     /**
      * Creates a new HTTPClient instance
      * @param applicationID The ID for your application (required)
-     * @param httpUrl The base URL for HTTP connection (default = http://localhost:80)
+     * @param httpUrl The base URL for HTTP connection (default = http://localhost:6188)
      */
-    constructor(applicationID, httpUrl = "http://localhost:80") {
-        if (!applicationID) {
-            const config = (0, appConfig_1.getAppConfig)();
-            if (config != undefined) {
-                applicationID = config.application_id;
-            }
-            else {
-                throw new Error("Failed to get Configuration.");
-            }
-            if (!applicationID) {
-                throw new Error("Application ID is required. Set it via the APP_ID environment variable or pass it as a parameter.");
-            }
-        }
-        this.httpService = new http_service_1.HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID);
+    constructor(applicationID, httpUrl, developerKey) {
+        this.httpService = new http_service_js_1.HTTPService(httpUrl, MACHHUB_SDK_PATH, applicationID, developerKey);
     }
     /**
      * Gets server info
@@ -51,7 +38,7 @@ class MQTTClient {
      * @param applicationID The ID for your application
      * @param mqttUrl The base URL for MQTT connection (default = ws://localhost:180)
      */
-    static async getInstance(applicationID, mqttUrl = "ws://localhost:180") {
+    static async getInstance(applicationID, mqttUrl = "ws://localhost:180", developerKey) {
         // if (!applicationID) {
         //   applicationID = process.env.APP_ID;
         //   if (!applicationID) {
@@ -59,7 +46,7 @@ class MQTTClient {
         //   }
         // }
         if (!this.instance) {
-            const mqttService = await mqtt_service_1.MQTTService.getInstance(mqttUrl);
+            const mqttService = await mqtt_service_js_1.MQTTService.getInstance(mqttUrl, developerKey);
             this.instance = new MQTTClient(mqttService); // Use the constructor to initialize the instance
         }
         return this.instance;
@@ -93,7 +80,7 @@ class NATSClient {
      */
     static async getInstance(applicationID, natsUrl = "ws://localhost:7500") {
         if (!this.instance) {
-            const natsService = await nats_service_1.NATSService.getInstance(natsUrl);
+            const natsService = await nats_service_js_1.NATSService.getInstance(natsUrl);
             this.instance = new NATSClient(natsService);
         }
         return this.instance;
@@ -136,7 +123,7 @@ class SDK {
      *
      * const config: SDKConfig = {
      *   application_id: 'your-app-id',
-     *   httpUrl: 'http://localhost:80', // optional (default = http://localhost:80)
+     *   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)
      * };
@@ -150,15 +137,37 @@ class SDK {
      */
     async Initialize(config) {
         try {
+            console.log("Initializing SDK with config:", config);
+            // Methods to initialize config 
+            // 1. Via application_id + URLs + developer key passed in config parameter
+            // 2. Via development server - Set via Extension/ 
+            //          API to get Config (All SDK URLs default to localhost with port from querying current window or 61888)
+            if (config === undefined)
+                config = { application_id: "" };
+            if (!config.application_id)
+                config = { application_id: "" };
+            console.log("Using application_id:", config.application_id);
+            const PORT = await getEnvPort();
+            console.log("Using port:", PORT);
+            if (!config.httpUrl) {
+                config.httpUrl = "http://localhost:" + PORT;
+            }
+            if (!config.mqttUrl) {
+                config.mqttUrl = "ws://localhost:" + PORT + "/mqtt";
+            }
+            if (!config.natsUrl) {
+                config.natsUrl = "ws://localhost:" + PORT + "/nats";
+            }
             const { application_id, httpUrl, mqttUrl, natsUrl } = config;
-            this.http = new HTTPClient(application_id, httpUrl);
-            this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl);
+            console.log("Final config:", { application_id, httpUrl, mqttUrl, natsUrl });
+            this.http = new HTTPClient(application_id, httpUrl, config.developer_key);
+            this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
             this.nats = await NATSClient.getInstance(application_id, natsUrl);
-            this._historian = new historian_1.Historian(this.http["httpService"], this.mqtt["mqttService"]);
-            this._tag = new tag_1.Tag(this.http["httpService"], this.mqtt["mqttService"]);
-            this._function = new function_1.Function(this.http["httpService"], this.nats["natsService"]);
-            this._flow = new flow_1.Flow(this.http["httpService"]);
-            this._auth = new auth_1.Auth(this.http["httpService"]);
+            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"]);
         }
         catch (error) {
             console.error("Failed to initialize:", error);
@@ -221,7 +230,40 @@ class SDK {
         if (!this.http) {
             throw new Error("SDK is not initialized. Call `Initialize` before accessing collection.");
         }
-        return new collection_1.Collection(this.http["httpService"], this.mqtt ? this.mqtt["mqttService"] : null, collectionName);
+        return new collection_js_1.Collection(this.http["httpService"], this.mqtt ? this.mqtt["mqttService"] : null, collectionName);
     }
 }
 exports.SDK = SDK;
+async function getEnvPort() {
+    console.log(window.location.origin);
+    try {
+        const response = await fetchData(window.location.origin + "/_cfg");
+        // console.log('Response:', response);
+        // console.log('runtimeID: ', response.runtimeID);
+        // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
+        return response.port;
+    }
+    catch (error) {
+        // console.log('No configured runtime ID:', error);
+        // TODO: Use DevPort from SDK Config or default to 61888
+        return "61888";
+    }
+}
+async function fetchData(url) {
+    try {
+        const response = await fetch(url, {
+            method: 'GET',
+            headers: {
+                'Accept': 'application/json',
+            },
+        });
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const data = await response.json();
+        return data;
+    }
+    catch (error) {
+        throw error;
+    }
+}

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

@@ -8,16 +8,20 @@ export declare class HTTPException extends Error {
 export declare class HTTPService {
     private url;
     private applicationID;
-    constructor(url: string, prefix?: string, applicationID?: string);
+    private developerKey?;
+    constructor(url: string, prefix: string, applicationID: string, developerKey?: string);
     get request(): RequestParameters;
+    private addRuntimeHeaders;
+    private getCookie;
 }
 declare class RequestParameters {
     private base;
     private applicationID;
+    private developerKey?;
     query?: Record<string, string>;
     init?: RequestInit;
     headers?: Record<string, string>;
-    constructor(base: URL, applicationID: string, query?: Record<string, string>);
+    constructor(base: URL, applicationID: string, developerKey?: string, query?: Record<string, string>);
     private withQuery;
     private parseInit;
     withBody(body: BodyInit): RequestParameters;
@@ -30,6 +34,7 @@ declare class RequestParameters {
     setBearerToken(token: string): RequestParameters;
     withAccessToken(): RequestParameters;
     withDomain(): RequestParameters;
+    withDeveloperKey(): RequestParameters;
     withContentType(mime: string): RequestParameters;
     withJSON(body: Record<string, unknown>): RequestParameters;
     get<ReturnType>(path: string, query?: Record<string, string>): Promise<ReturnType>;

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

@@ -14,24 +14,47 @@ class HTTPException extends Error {
 }
 exports.HTTPException = HTTPException;
 class HTTPService {
-    constructor(url, prefix, applicationID) {
+    constructor(url, prefix, applicationID, developerKey) {
         if (prefix == null)
             prefix = "";
         this.url = new URL(prefix, url);
         this.applicationID = "domains:" + applicationID;
+        this.developerKey = developerKey;
     }
     get request() {
-        return new RequestParameters(this.url, this.applicationID);
+        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;
     }
 }
 exports.HTTPService = HTTPService;
 class RequestParameters {
-    constructor(base, applicationID, query) {
+    constructor(base, applicationID, developerKey, query) {
         this.base = base;
         this.applicationID = applicationID;
+        this.developerKey = developerKey;
         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
     }
     withQuery(path, query) {
         const newPath = [this.base.pathname, path].map(pathPart => pathPart.replace(/(^\/|\/$)/g, "")).join("/");
@@ -119,6 +142,12 @@ class RequestParameters {
         this.setHeader("Domain", this.applicationID);
         return this;
     }
+    withDeveloperKey() {
+        if (!this.developerKey)
+            return this;
+        this.setHeader("X-Machhub-Api-Key", this.developerKey);
+        return this;
+    }
     withContentType(mime) {
         this.setHeader("Content-Type", mime);
         return this;

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

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

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

@@ -10,13 +10,20 @@ class MQTTService {
         this.subscribedTopics = [];
         this.url = url;
     }
-    static async getInstance(url = "ws://localhost:180") {
+    static async getInstance(url = "ws://localhost:180", developerKey) {
         if (!this.instance || !this.instance.client) {
             this.instance = new MQTTService(url);
             // Ensure the URL is set correctly
             this.instance.url = url;
             // Initialize the MQTT client
-            this.instance.client = mqtt_1.default.connect(this.instance.url, { protocolVersion: 5 });
+            const connectOptions = {
+                protocolVersion: 5,
+                ...(developerKey && {
+                    username: "mch_developer_key",
+                    password: developerKey,
+                })
+            };
+            this.instance.client = mqtt_1.default.connect(this.instance.url, connectOptions);
             this.instance.attachMessageListener();
             // console.log("MQTT Client initialized with URL:", this.instance.url);
         }

package/dist/cjs/types/auth.models.d.ts

@@ -1,5 +1,5 @@
-import { RecordID } from "./recordID.models";
-import { BaseResponse } from "./response.models";
+import { RecordID } from "./recordID.models.js";
+import { BaseResponse } from "./response.models.js";
 export interface LoginResponse extends BaseResponse {
     tkn: string;
 }

package/dist/classes/auth.d.ts

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { Action, ActionResponse, Feature, Group, LoginResponse, User, ValidateJWTResponse } from "../types/auth.models";
+import { HTTPService } from "../services/http.service.js";
+import { Action, ActionResponse, Feature, Group, LoginResponse, User, ValidateJWTResponse } from "../types/auth.models.js";
 export declare class Auth {
     private httpService;
     constructor(httpService: HTTPService);

package/dist/classes/collection.d.ts

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { MQTTService } from "../services/mqtt.service";
+import { HTTPService } from "../services/http.service.js";
+import { MQTTService } from "../services/mqtt.service.js";
 export declare class Collection {
     protected httpService: HTTPService;
     protected mqttService: MQTTService | null;

package/dist/classes/collection.js

@@ -25,15 +25,24 @@ export class Collection {
         return this.httpService.request.get(this.collectionName + "/all", this.queryParams);
     }
     async getOne(id) {
+        if (!id) {
+            throw new Error("ID must be provided");
+        }
         return this.httpService.request.get(id);
     }
     async create(data) {
         return this.httpService.request.withJSON(data).post(this.collectionName);
     }
     async update(id, data) {
+        if (!id) {
+            throw new Error("ID must be provided");
+        }
         return this.httpService.request.withJSON(data).put(id);
     }
     async delete(id) {
+        if (!id) {
+            throw new Error("ID must be provided");
+        }
         return this.httpService.request.delete(id);
     }
 }

package/dist/classes/flow.d.ts

@@ -1,4 +1,4 @@
-import { HTTPService } from "../services/http.service";
+import { HTTPService } from "../services/http.service.js";
 export declare class Flow {
     private httpService;
     constructor(httpService: HTTPService);

package/dist/classes/function.d.ts

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { NATSService } from "../services/nats.service";
+import { HTTPService } from "../services/http.service.js";
+import { NATSService } from "../services/nats.service.js";
 export declare class Function {
     private httpService;
     private natsService;

package/dist/classes/historian.d.ts

@@ -1,6 +1,6 @@
-import { HTTPService } from "../services/http.service";
-import { MQTTService } from "../services/mqtt.service";
-import { HistorizedData } from "../types/tag.models";
+import { HTTPService } from "../services/http.service.js";
+import { MQTTService } from "../services/mqtt.service.js";
+import { HistorizedData } from "../types/tag.models.js";
 export declare class Historian {
     private httpService;
     private mqttService;

package/dist/classes/tag.d.ts

@@ -1,5 +1,5 @@
-import { HTTPService } from "../services/http.service";
-import { MQTTService } from "../services/mqtt.service";
+import { HTTPService } from "../services/http.service.js";
+import { MQTTService } from "../services/mqtt.service.js";
 export declare class Tag {
     private httpService;
     private mqttService;

package/dist/example/functions.js

@@ -1,4 +1,4 @@
-import { SDK } from "../index";
+import { SDK } from "../index.js";
 let sdk = new SDK();
 let config = {
     application_id: "machhub_admin",

package/dist/sdk-ts.d.ts

@@ -1,11 +1,12 @@
-import { Collection } from "./classes/collection";
-import { Historian } from "./classes/historian";
-import { Tag } from "./classes/tag";
-import { Function } from "./classes/function";
-import { Flow } from "./classes/flow";
-import { Auth } from "./classes/auth";
+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 {
     application_id: string;
+    developer_key?: string;
     httpUrl?: string;
     mqttUrl?: string;
     natsUrl?: string;
@@ -28,7 +29,7 @@ export declare class SDK {
      *
      * const config: SDKConfig = {
      *   application_id: 'your-app-id',
-     *   httpUrl: 'http://localhost:80', // optional (default = http://localhost:80)
+     *   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)
      * };
@@ -40,7 +41,7 @@ export declare class SDK {
      * @param config {SDKConfig} The configuration object containing initialization parameters. See SDKConfig for details.
      * @returns {Promise<boolean>} Resolves to true if initialization is successful.
      */
-    Initialize(config: SDKConfig): Promise<boolean>;
+    Initialize(config?: SDKConfig): Promise<boolean>;
     /**
      * Getter for `auth`. Ensures `auth` is accessed only after initialization.
      */