@machhub-dev/sdk-ts 0.0.6 → 0.0.7

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

@@ -1,5 +1,11 @@
 import { HTTPService } from "../services/http.service.js";
 import { MQTTService } from "../services/mqtt.service.js";
+export declare class CollectionError extends Error {
+    operation: string;
+    collectionName: string;
+    originalError: Error;
+    constructor(operation: string, collectionName: string, originalError: Error);
+}
 export declare class Collection {
     protected httpService: HTTPService;
     protected mqttService: MQTTService | null;

package/dist/cjs/classes/collection.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Collection = void 0;
+exports.Collection = exports.CollectionError = void 0;
+class CollectionError extends Error {
+    constructor(operation, collectionName, originalError) {
+        super(`Collection operation '${operation}' failed on '${collectionName}': ${originalError.message}`);
+        this.name = 'CollectionError';
+        this.operation = operation;
+        this.collectionName = collectionName;
+        this.originalError = originalError;
+    }
+}
+exports.CollectionError = CollectionError;
 class Collection {
     constructor(httpService, mqttService, collectionName) {
         this.queryParams = {};
@@ -25,28 +35,53 @@ class Collection {
         return this;
     }
     async getAll() {
-        return this.httpService.request.get(this.collectionName + "/all", this.queryParams);
+        try {
+            return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
+        }
+        catch (error) {
+            throw new CollectionError('getAll', this.collectionName, error);
+        }
     }
     async getOne(id) {
         if (!id) {
             throw new Error("ID must be provided");
         }
-        return this.httpService.request.get(id);
+        try {
+            return await this.httpService.request.get(id);
+        }
+        catch (error) {
+            throw new CollectionError('getOne', this.collectionName, error);
+        }
     }
     async create(data) {
-        return this.httpService.request.withJSON(data).post(this.collectionName);
+        try {
+            return await this.httpService.request.withJSON(data).post(this.collectionName);
+        }
+        catch (error) {
+            throw new CollectionError('create', this.collectionName, error);
+        }
     }
     async update(id, data) {
         if (!id) {
             throw new Error("ID must be provided");
         }
-        return this.httpService.request.withJSON(data).put(id);
+        try {
+            return await this.httpService.request.withJSON(data).put(id);
+        }
+        catch (error) {
+            throw new CollectionError('update', this.collectionName, error);
+        }
     }
     async delete(id) {
         if (!id) {
             throw new Error("ID must be provided");
         }
-        return this.httpService.request.delete(id);
+        try {
+            return await this.httpService.request.delete(id);
+        }
+        catch (error) {
+            throw new CollectionError('delete', this.collectionName, error);
+        }
     }
 }
 exports.Collection = Collection;

package/dist/cjs/sdk-ts.js

@@ -148,7 +148,7 @@ class SDK {
                 config = { application_id: "" };
             // console.log("Using application_id:", config.application_id);
             const PORT = await getEnvPort();
-            // console.log("Using port:", PORT);
+            console.log("Port:", PORT);
             if (!config.httpUrl) {
                 config.httpUrl = "http://localhost:" + PORT;
             }
@@ -159,7 +159,7 @@ class SDK {
                 config.natsUrl = "ws://localhost:" + PORT + "/nats";
             }
             const { application_id, httpUrl, mqttUrl, natsUrl } = config;
-            // console.log("Final config:", { application_id, httpUrl, mqttUrl, natsUrl });
+            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.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
             this.nats = await NATSClient.getInstance(application_id, natsUrl);
@@ -236,7 +236,9 @@ class SDK {
 exports.SDK = SDK;
 async function getEnvPort() {
     try {
-        const response = await fetchData(window.location.origin + "/_cfg");
+        // Try to find the configuration endpoint by testing different base paths
+        const configUrl = await findConfigEndpoint();
+        const response = await fetchData(configUrl);
         // console.log('Response:', response);
         // console.log('runtimeID: ', response.runtimeID);
         // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
@@ -248,13 +250,90 @@ async function getEnvPort() {
         return "61888";
     }
 }
-async function fetchData(url) {
+/**
+ * Attempts to find the correct configuration endpoint by trying different base paths
+ * Handles both port-based hosting (direct) and path-based hosting (reverse proxy)
+ */
+async function findConfigEndpoint() {
+    const origin = window.location.origin;
+    const pathname = window.location.pathname;
+    // List of potential base paths to try, ordered by likelihood
+    const basePaths = [
+        // 1. Try origin directly (for port-based hosting like localhost:6190)
+        origin,
+        // 2. Try current path segments for path-based hosting
+        ...generatePathCandidates(pathname),
+        // 3. Try common root paths as fallback
+        origin,
+    ];
+    // Remove duplicates while preserving order
+    const uniqueBasePaths = [...new Set(basePaths)];
+    for (const basePath of uniqueBasePaths) {
+        try {
+            const configUrl = `${basePath}/_cfg`;
+            // Test if this endpoint returns valid JSON config by making a GET request
+            const testResponse = await fetch(configUrl, {
+                method: 'GET',
+                headers: {
+                    'Accept': 'application/json',
+                },
+                signal: AbortSignal.timeout(2000) // 2 second timeout
+            });
+            if (testResponse.ok) {
+                // Validate that the response is JSON and contains the expected 'port' field
+                const contentType = testResponse.headers.get('content-type');
+                if (contentType && contentType.includes('application/json')) {
+                    try {
+                        const testData = await testResponse.json();
+                        // Check if the response has the expected structure with a 'port' field
+                        if (testData && typeof testData === 'object' && 'port' in testData) {
+                            // console.log(`Found config endpoint at: ${configUrl}`);
+                            return configUrl;
+                        }
+                    }
+                    catch (jsonError) {
+                        // Not valid JSON, continue to next candidate
+                        continue;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            // Continue to next candidate
+            continue;
+        }
+    }
+    // If all attempts fail, default to origin + /_cfg
+    console.warn('Could not find config endpoint, using default origin');
+    return `${origin}/_cfg`;
+}
+/**
+ * Generates potential base path candidates from the current pathname
+ * For example, /demo2/homepage/settings would generate:
+ * - http://localhost/demo2/homepage
+ * - http://localhost/demo2
+ * - http://localhost
+ */
+function generatePathCandidates(pathname) {
+    const origin = window.location.origin;
+    const pathSegments = pathname.split('/').filter(segment => segment.length > 0);
+    const candidates = [];
+    // Generate paths by progressively removing segments from the end
+    for (let i = pathSegments.length; i > 0; i--) {
+        const path = '/' + pathSegments.slice(0, i).join('/');
+        candidates.push(origin + path);
+    }
+    return candidates;
+}
+async function fetchData(url, options) {
     try {
         const response = await fetch(url, {
             method: 'GET',
             headers: {
                 'Accept': 'application/json',
             },
+            signal: AbortSignal.timeout(5000), // 5 second timeout
+            ...options
         });
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);

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

@@ -42,7 +42,7 @@ class MQTTService {
             this.subscribedTopics.push({ topic, handler });
             if (topic == "")
                 return;
-            console.log("New Subscription Handler:", topic);
+            // console.log("New Subscription Handler:", topic);
             this.client.subscribe(topic, { qos: 2 }, (err) => {
                 if (err) {
                     console.error(`Failed to subscribe to topic ${topic}:`, err);
@@ -61,7 +61,7 @@ class MQTTService {
     publish(topic, message) {
         try {
             const payload = JSON.stringify(message);
-            console.log("Publishing to", topic, "with payload:", payload);
+            // console.log("Publishing to", topic, "with payload:", payload);
             this.client.publish(topic, payload, {
                 qos: 2,
                 retain: true,

package/dist/classes/collection.d.ts

@@ -1,5 +1,11 @@
 import { HTTPService } from "../services/http.service.js";
 import { MQTTService } from "../services/mqtt.service.js";
+export declare class CollectionError extends Error {
+    operation: string;
+    collectionName: string;
+    originalError: Error;
+    constructor(operation: string, collectionName: string, originalError: Error);
+}
 export declare class Collection {
     protected httpService: HTTPService;
     protected mqttService: MQTTService | null;

package/dist/classes/collection.js

@@ -1,3 +1,12 @@
+export class CollectionError extends Error {
+    constructor(operation, collectionName, originalError) {
+        super(`Collection operation '${operation}' failed on '${collectionName}': ${originalError.message}`);
+        this.name = 'CollectionError';
+        this.operation = operation;
+        this.collectionName = collectionName;
+        this.originalError = originalError;
+    }
+}
 export class Collection {
     constructor(httpService, mqttService, collectionName) {
         this.queryParams = {};
@@ -22,27 +31,52 @@ export class Collection {
         return this;
     }
     async getAll() {
-        return this.httpService.request.get(this.collectionName + "/all", this.queryParams);
+        try {
+            return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
+        }
+        catch (error) {
+            throw new CollectionError('getAll', this.collectionName, error);
+        }
     }
     async getOne(id) {
         if (!id) {
             throw new Error("ID must be provided");
         }
-        return this.httpService.request.get(id);
+        try {
+            return await this.httpService.request.get(id);
+        }
+        catch (error) {
+            throw new CollectionError('getOne', this.collectionName, error);
+        }
     }
     async create(data) {
-        return this.httpService.request.withJSON(data).post(this.collectionName);
+        try {
+            return await this.httpService.request.withJSON(data).post(this.collectionName);
+        }
+        catch (error) {
+            throw new CollectionError('create', this.collectionName, error);
+        }
     }
     async update(id, data) {
         if (!id) {
             throw new Error("ID must be provided");
         }
-        return this.httpService.request.withJSON(data).put(id);
+        try {
+            return await this.httpService.request.withJSON(data).put(id);
+        }
+        catch (error) {
+            throw new CollectionError('update', this.collectionName, error);
+        }
     }
     async delete(id) {
         if (!id) {
             throw new Error("ID must be provided");
         }
-        return this.httpService.request.delete(id);
+        try {
+            return await this.httpService.request.delete(id);
+        }
+        catch (error) {
+            throw new CollectionError('delete', this.collectionName, error);
+        }
     }
 }

package/dist/sdk-ts.js

@@ -145,7 +145,7 @@ export class SDK {
                 config = { application_id: "" };
             // console.log("Using application_id:", config.application_id);
             const PORT = await getEnvPort();
-            // console.log("Using port:", PORT);
+            console.log("Port:", PORT);
             if (!config.httpUrl) {
                 config.httpUrl = "http://localhost:" + PORT;
             }
@@ -156,7 +156,7 @@ export class SDK {
                 config.natsUrl = "ws://localhost:" + PORT + "/nats";
             }
             const { application_id, httpUrl, mqttUrl, natsUrl } = config;
-            // console.log("Final config:", { application_id, httpUrl, mqttUrl, natsUrl });
+            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.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
             this.nats = await NATSClient.getInstance(application_id, natsUrl);
@@ -232,7 +232,9 @@ export class SDK {
 }
 async function getEnvPort() {
     try {
-        const response = await fetchData(window.location.origin + "/_cfg");
+        // Try to find the configuration endpoint by testing different base paths
+        const configUrl = await findConfigEndpoint();
+        const response = await fetchData(configUrl);
         // console.log('Response:', response);
         // console.log('runtimeID: ', response.runtimeID);
         // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
@@ -244,13 +246,90 @@ async function getEnvPort() {
         return "61888";
     }
 }
-async function fetchData(url) {
+/**
+ * Attempts to find the correct configuration endpoint by trying different base paths
+ * Handles both port-based hosting (direct) and path-based hosting (reverse proxy)
+ */
+async function findConfigEndpoint() {
+    const origin = window.location.origin;
+    const pathname = window.location.pathname;
+    // List of potential base paths to try, ordered by likelihood
+    const basePaths = [
+        // 1. Try origin directly (for port-based hosting like localhost:6190)
+        origin,
+        // 2. Try current path segments for path-based hosting
+        ...generatePathCandidates(pathname),
+        // 3. Try common root paths as fallback
+        origin,
+    ];
+    // Remove duplicates while preserving order
+    const uniqueBasePaths = [...new Set(basePaths)];
+    for (const basePath of uniqueBasePaths) {
+        try {
+            const configUrl = `${basePath}/_cfg`;
+            // Test if this endpoint returns valid JSON config by making a GET request
+            const testResponse = await fetch(configUrl, {
+                method: 'GET',
+                headers: {
+                    'Accept': 'application/json',
+                },
+                signal: AbortSignal.timeout(2000) // 2 second timeout
+            });
+            if (testResponse.ok) {
+                // Validate that the response is JSON and contains the expected 'port' field
+                const contentType = testResponse.headers.get('content-type');
+                if (contentType && contentType.includes('application/json')) {
+                    try {
+                        const testData = await testResponse.json();
+                        // Check if the response has the expected structure with a 'port' field
+                        if (testData && typeof testData === 'object' && 'port' in testData) {
+                            // console.log(`Found config endpoint at: ${configUrl}`);
+                            return configUrl;
+                        }
+                    }
+                    catch (jsonError) {
+                        // Not valid JSON, continue to next candidate
+                        continue;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            // Continue to next candidate
+            continue;
+        }
+    }
+    // If all attempts fail, default to origin + /_cfg
+    console.warn('Could not find config endpoint, using default origin');
+    return `${origin}/_cfg`;
+}
+/**
+ * Generates potential base path candidates from the current pathname
+ * For example, /demo2/homepage/settings would generate:
+ * - http://localhost/demo2/homepage
+ * - http://localhost/demo2
+ * - http://localhost
+ */
+function generatePathCandidates(pathname) {
+    const origin = window.location.origin;
+    const pathSegments = pathname.split('/').filter(segment => segment.length > 0);
+    const candidates = [];
+    // Generate paths by progressively removing segments from the end
+    for (let i = pathSegments.length; i > 0; i--) {
+        const path = '/' + pathSegments.slice(0, i).join('/');
+        candidates.push(origin + path);
+    }
+    return candidates;
+}
+async function fetchData(url, options) {
     try {
         const response = await fetch(url, {
             method: 'GET',
             headers: {
                 'Accept': 'application/json',
             },
+            signal: AbortSignal.timeout(5000), // 5 second timeout
+            ...options
         });
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);

package/dist/services/mqtt.service.js

@@ -36,7 +36,7 @@ export class MQTTService {
             this.subscribedTopics.push({ topic, handler });
             if (topic == "")
                 return;
-            console.log("New Subscription Handler:", topic);
+            // console.log("New Subscription Handler:", topic);
             this.client.subscribe(topic, { qos: 2 }, (err) => {
                 if (err) {
                     console.error(`Failed to subscribe to topic ${topic}:`, err);
@@ -55,7 +55,7 @@ export class MQTTService {
     publish(topic, message) {
         try {
             const payload = JSON.stringify(message);
-            console.log("Publishing to", topic, "with payload:", payload);
+            // console.log("Publishing to", topic, "with payload:", payload);
             this.client.publish(topic, payload, {
                 qos: 2,
                 retain: true,

package/package.json

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

package/src/classes/collection.ts

@@ -1,6 +1,20 @@
 import { HTTPService } from "../services/http.service.js";
 import { MQTTService } from "../services/mqtt.service.js";
 
+export class CollectionError extends Error {
+  public operation: string;
+  public collectionName: string;
+  public originalError: Error;
+
+  constructor(operation: string, collectionName: string, originalError: Error) {
+    super(`Collection operation '${operation}' failed on '${collectionName}': ${originalError.message}`);
+    this.name = 'CollectionError';
+    this.operation = operation;
+    this.collectionName = collectionName;
+    this.originalError = originalError;
+  }
+}
+
 export class Collection {
   protected httpService: HTTPService;
   protected mqttService: MQTTService | null;
@@ -34,31 +48,51 @@ export class Collection {
   }
 
   async getAll(): Promise<any[]> {
-    return this.httpService.request.get(this.collectionName + "/all", this.queryParams);
+    try {
+      return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
+    } catch (error) {
+      throw new CollectionError('getAll', this.collectionName, error as Error);
+    }
   }
 
   async getOne(id: string): Promise<any> {
     if (!id) {
       throw new Error("ID must be provided");
     }
-    return this.httpService.request.get(id);
+    try {
+      return await this.httpService.request.get(id);
+    } catch (error) {
+      throw new CollectionError('getOne', this.collectionName, error as Error);
+    }
   }
 
   async create(data: Record<string, any>): Promise<any> {
-    return this.httpService.request.withJSON(data).post(this.collectionName);
+    try {
+      return await this.httpService.request.withJSON(data).post(this.collectionName);
+    } catch (error) {
+      throw new CollectionError('create', this.collectionName, error as Error);
+    }
   }
 
   async update(id: string, data: Record<string, any>): Promise<any> {
     if (!id) {
       throw new Error("ID must be provided");
     }
-    return this.httpService.request.withJSON(data).put(id);
+    try {
+      return await this.httpService.request.withJSON(data).put(id);
+    } catch (error) {
+      throw new CollectionError('update', this.collectionName, error as Error);
+    }
   }
 
   async delete(id: string): Promise<any> {
     if (!id) {
       throw new Error("ID must be provided");
     }
-    return this.httpService.request.delete(id);
+    try {
+      return await this.httpService.request.delete(id);
+    } catch (error) {
+      throw new CollectionError('delete', this.collectionName, error as Error);
+    }
   }
 }

package/src/sdk-ts.ts

@@ -174,7 +174,7 @@ export class SDK {
 
 
       const PORT = await getEnvPort();
-      // console.log("Using port:", PORT);
+      console.log("Port:", PORT);
 
       if (!config.httpUrl) {
         config.httpUrl = "http://localhost:" + PORT;
@@ -190,7 +190,7 @@ export class SDK {
 
       const { application_id, httpUrl, mqttUrl, natsUrl } = config;
 
-      // console.log("Final config:", { application_id, httpUrl, mqttUrl, natsUrl });
+      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.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
@@ -275,7 +275,9 @@ export class SDK {
 
 async function getEnvPort(): Promise<string> {
   try {
-    const response = await fetchData<{runtimeID:string, port:string}>(window.location.origin + "/_cfg");
+    // Try to find the configuration endpoint by testing different base paths
+    const configUrl = await findConfigEndpoint();
+    const response = await fetchData<{runtimeID:string, port:string}>(configUrl);
     // console.log('Response:', response);
     // console.log('runtimeID: ', response.runtimeID);
     // console.log('applicationID: ', response.runtimeID.split('XmchX')[0]);
@@ -287,14 +289,101 @@ async function getEnvPort(): Promise<string> {
   }
 }
 
+/**
+ * Attempts to find the correct configuration endpoint by trying different base paths
+ * Handles both port-based hosting (direct) and path-based hosting (reverse proxy)
+ */
+async function findConfigEndpoint(): Promise<string> {
+  const origin = window.location.origin;
+  const pathname = window.location.pathname;
+  
+  // List of potential base paths to try, ordered by likelihood
+  const basePaths = [
+    // 1. Try origin directly (for port-based hosting like localhost:6190)
+    origin,
+    
+    // 2. Try current path segments for path-based hosting
+    ...generatePathCandidates(pathname),
+    
+    // 3. Try common root paths as fallback
+    origin,
+  ];
+
+  // Remove duplicates while preserving order
+  const uniqueBasePaths = [...new Set(basePaths)];
+
+  for (const basePath of uniqueBasePaths) {
+    try {
+      const configUrl = `${basePath}/_cfg`;
+      
+      // Test if this endpoint returns valid JSON config by making a GET request
+      const testResponse = await fetch(configUrl, { 
+        method: 'GET',
+        headers: {
+          'Accept': 'application/json',
+        },
+        signal: AbortSignal.timeout(2000) // 2 second timeout
+      });
+      
+      if (testResponse.ok) {
+        // Validate that the response is JSON and contains the expected 'port' field
+        const contentType = testResponse.headers.get('content-type');
+        if (contentType && contentType.includes('application/json')) {
+          try {
+            const testData = await testResponse.json();
+            // Check if the response has the expected structure with a 'port' field
+            if (testData && typeof testData === 'object' && 'port' in testData) {
+              // console.log(`Found config endpoint at: ${configUrl}`);
+              return configUrl;
+            }
+          } catch (jsonError) {
+            // Not valid JSON, continue to next candidate
+            continue;
+          }
+        }
+      }
+    } catch (error) {
+      // Continue to next candidate
+      continue;
+    }
+  }
+
+  // If all attempts fail, default to origin + /_cfg
+  console.warn('Could not find config endpoint, using default origin');
+  return `${origin}/_cfg`;
+}
+
+/**
+ * Generates potential base path candidates from the current pathname
+ * For example, /demo2/homepage/settings would generate:
+ * - http://localhost/demo2/homepage
+ * - http://localhost/demo2
+ * - http://localhost
+ */
+function generatePathCandidates(pathname: string): string[] {
+  const origin = window.location.origin;
+  const pathSegments = pathname.split('/').filter(segment => segment.length > 0);
+  const candidates: string[] = [];
+
+  // Generate paths by progressively removing segments from the end
+  for (let i = pathSegments.length; i > 0; i--) {
+    const path = '/' + pathSegments.slice(0, i).join('/');
+    candidates.push(origin + path);
+  }
+
+  return candidates;
+}
+
 
-async function fetchData<T>(url: string): Promise<T> {
+async function fetchData<T>(url: string, options?: RequestInit): Promise<T> {
   try {
     const response = await fetch(url, {
       method: 'GET',
       headers: {
         'Accept': 'application/json',
       },
+      signal: AbortSignal.timeout(5000), // 5 second timeout
+      ...options
     });
 
     if (!response.ok) {

package/src/services/mqtt.service.ts

@@ -50,7 +50,7 @@ export class MQTTService {
         try {
             this.subscribedTopics.push({ topic, handler });
             if (topic == "") return;
-            console.log("New Subscription Handler:", topic);
+            // console.log("New Subscription Handler:", topic);
             this.client.subscribe(topic, { qos: 2 }, (err?: unknown) => {
                 if (err) {
                     console.error(`Failed to subscribe to topic ${topic}:`, err);
@@ -70,7 +70,7 @@ export class MQTTService {
     public publish(topic: string, message: unknown): boolean {
         try {
             const payload = JSON.stringify(message);
-            console.log("Publishing to", topic, "with payload:", payload);
+            // console.log("Publishing to", topic, "with payload:", payload);
 
             this.client.publish(topic, payload, {
                 qos: 2,