@machhub-dev/sdk-ts 0.0.10 → 0.0.12

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

@@ -2,10 +2,16 @@ 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);
+    private applicationID;
+    private readonly AUTH_TOKEN_KEY_PREFIX;
+    constructor(httpService: HTTPService, applicationID: string);
+    private getStorageKey;
     login(username: string, password: string): Promise<LoginResponse | undefined>;
     validateJWT(token: string): Promise<ValidateJWTResponse>;
     logout(): Promise<void>;
+    getJWTData(): Promise<any>;
+    getCurrentUser(): Promise<User>;
+    validateCurrentUser(): Promise<ValidateJWTResponse>;
     checkAction(feature: string, scope: string): Promise<ActionResponse>;
     checkPermission(feature: string, scope: string, action: Action): Promise<ActionResponse>;
     getUsers(): Promise<User[]>;

package/dist/cjs/classes/auth.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Auth = void 0;
+const jwt_decode_1 = require("jwt-decode");
 class Auth {
-    constructor(httpService) {
+    constructor(httpService, applicationID) {
+        this.AUTH_TOKEN_KEY_PREFIX = "x-machhub-auth-tkn";
         this.httpService = httpService;
+        this.applicationID = applicationID;
+    }
+    getStorageKey() {
+        return this.applicationID
+            ? `${this.AUTH_TOKEN_KEY_PREFIX}-${this.applicationID}`
+            : this.AUTH_TOKEN_KEY_PREFIX;
     }
     async login(username, password) {
         let res;
@@ -13,7 +21,8 @@ class Auth {
                 password: password,
             }).post("/auth/login");
             if (localStorage) {
-                localStorage.setItem("x-machhub-auth-tkn", res.tkn); // Set User JWT
+                // console.log("storage key:", this.getStorageKey());
+                localStorage.setItem(this.getStorageKey(), res.tkn); // Set User JWT
             }
             else {
                 console.error("localStorage is not available. The program needs to be in a browser environment.");
@@ -28,11 +37,27 @@ class Auth {
         }
     }
     async validateJWT(token) {
-        let res = await this.httpService.request.withJSON({ token }).post("/auth/jwt/validate");
-        return res;
+        return await this.httpService.request.withJSON({ token }).post("/auth/jwt/validate");
     }
     async logout() {
-        localStorage.removeItem("x-machhub-auth-tkn"); // Remove User JWT
+        localStorage.removeItem(this.getStorageKey());
+    }
+    async getJWTData() {
+        const token = localStorage.getItem(this.getStorageKey());
+        if (!token) {
+            throw new Error("No JWT token found in localStorage.");
+        }
+        return (0, jwt_decode_1.jwtDecode)(token);
+    }
+    async getCurrentUser() {
+        return await this.httpService.request.get("/auth/me");
+    }
+    async validateCurrentUser() {
+        const token = localStorage.getItem(this.getStorageKey());
+        if (!token) {
+            throw new Error("No JWT token found in localStorage.");
+        }
+        return await this.validateJWT(token);
     }
     async checkAction(feature, scope) {
         try {

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

@@ -16,7 +16,12 @@ export declare class Collection {
     sort(field: string, direction?: "asc" | "desc"): Collection;
     limit(limit: number): Collection;
     offset(offset: number): Collection;
-    getAll(): Promise<any[]>;
+    expand(fields: string | string[]): Collection;
+    private applyOptions;
+    first(): Promise<any>;
+    getAll(options?: {
+        expand?: string | string[];
+    }): Promise<any[]>;
     getOne(id: string): Promise<any>;
     create(data: Record<string, any>): Promise<any>;
     update(id: string, data: Record<string, any>): Promise<any>;

package/dist/cjs/classes/collection.js

@@ -34,8 +34,29 @@ class Collection {
         this.queryParams.offset = offset;
         return this;
     }
-    async getAll() {
+    expand(fields) {
+        this.queryParams.expand = Array.isArray(fields) ? fields.join(",") : fields;
+        return this;
+    }
+    applyOptions(options) {
+        if (!options)
+            return;
+        for (const [key, value] of Object.entries(options)) {
+            if (value !== undefined && value !== null) {
+                this.queryParams[key] = value;
+            }
+        }
+    }
+    async first() {
+        const results = await this.limit(1).getAll();
+        return results[0] ?? null;
+    }
+    async getAll(options) {
         try {
+            this.applyOptions(options);
+            if (options?.expand) {
+                this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join() : options.expand;
+            }
             return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
         }
         catch (error) {

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

@@ -20,6 +20,14 @@ export declare class SDK {
     private _function;
     private _flow;
     private _auth;
+    private applicationID;
+    /**
+     * Extracts the application ID from a runtime ID.
+     * Runtime ID format: {applicationID}XmchX{randomID}
+     * @param runtimeID The runtime ID to extract from
+     * @returns The extracted application ID, or empty string if invalid format
+     */
+    private extractApplicationIDFromRuntimeID;
     /**
      * Initializes the SDK with the required clients.
      *

package/dist/cjs/sdk-ts.js

@@ -113,6 +113,19 @@ class SDK {
         this._function = null;
         this._flow = null;
         this._auth = null;
+        this.applicationID = "";
+    }
+    /**
+     * Extracts the application ID from a runtime ID.
+     * Runtime ID format: {applicationID}XmchX{randomID}
+     * @param runtimeID The runtime ID to extract from
+     * @returns The extracted application ID, or empty string if invalid format
+     */
+    extractApplicationIDFromRuntimeID(runtimeID) {
+        if (!runtimeID)
+            return "";
+        const parts = runtimeID.split('XmchX');
+        return parts.length > 0 ? parts[0] : "";
     }
     /**
      * Initializes the SDK with the required clients.
@@ -146,9 +159,11 @@ class SDK {
                 config = { application_id: "" };
             if (!config.application_id)
                 config = { application_id: "" };
-            // console.log("Using application_id:", config.application_id);
             const envCfg = await getEnvConfig();
-            // console.log("Environment Config:", envCfg);
+            // Extract application_id from runtimeID if not provided in config
+            const application_id = config.application_id ||
+                this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
+            this.applicationID = application_id;
             // Determine the hostname - use window.location.hostname in browser, otherwise fallback to localhost
             const hostname = typeof window !== 'undefined' ? window.location.hostname : 'localhost';
             const secured = typeof window !== 'undefined' ? window.location.protocol === 'https:' : false;
@@ -168,16 +183,16 @@ class SDK {
             if (!config.natsUrl) {
                 config.natsUrl = `${secured ? 'wss' : 'ws'}://${host}/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, envCfg.runtimeID);
-            this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
-            this.nats = await NATSClient.getInstance(application_id, natsUrl);
+            const { httpUrl, mqttUrl, natsUrl } = config;
+            console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
+            this.http = new HTTPClient(this.applicationID, httpUrl, config.developer_key, envCfg.runtimeID);
+            this.mqtt = await MQTTClient.getInstance(this.applicationID, mqttUrl, config.developer_key);
+            this.nats = await NATSClient.getInstance(this.applicationID, natsUrl);
             this._historian = new historian_js_1.Historian(this.http["httpService"], this.mqtt["mqttService"]);
             this._tag = new tag_js_1.Tag(this.http["httpService"], this.mqtt["mqttService"]);
             this._function = new function_js_1.Function(this.http["httpService"], this.nats["natsService"]);
             this._flow = new flow_js_1.Flow(this.http["httpService"]);
-            this._auth = new auth_js_1.Auth(this.http["httpService"]);
+            this._auth = new auth_js_1.Auth(this.http["httpService"], this.applicationID);
         }
         catch (error) {
             console.error("Failed to initialize:", error);
@@ -286,26 +301,27 @@ async function findConfigEndpoint() {
                 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
-                        // TODO: Allow checks for path based hosting as well
-                        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;
+                signal: AbortSignal.timeout(2000)
+            }).catch(() => { console.log("ERR"); return null; }); // Catch fetch errors silently
+            if (!testResponse || !testResponse.ok) {
+                continue; // Skip to next candidate
+            }
+            // 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
+                    // TODO: Allow checks for path based hosting as well
+                    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) {

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

@@ -117,8 +117,13 @@ class RequestParameters {
         return this;
     }
     withAccessToken() {
-        const tkn = localStorage.getItem("x-machhub-auth-tkn");
-        this.setHeader("Authorization", `Bearer ${tkn}`);
+        const rawAppID = this.applicationID.replace("domains:", "");
+        const storageKey = rawAppID
+            ? `x-machhub-auth-tkn-${rawAppID}`
+            : `x-machhub-auth-tkn`;
+        const tkn = localStorage.getItem(storageKey);
+        if (tkn)
+            this.setHeader("Authorization", `Bearer ${tkn}`);
         return this;
     }
     withRuntimeID() {

package/dist/classes/auth.d.ts

@@ -2,10 +2,16 @@ 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);
+    private applicationID;
+    private readonly AUTH_TOKEN_KEY_PREFIX;
+    constructor(httpService: HTTPService, applicationID: string);
+    private getStorageKey;
     login(username: string, password: string): Promise<LoginResponse | undefined>;
     validateJWT(token: string): Promise<ValidateJWTResponse>;
     logout(): Promise<void>;
+    getJWTData(): Promise<any>;
+    getCurrentUser(): Promise<User>;
+    validateCurrentUser(): Promise<ValidateJWTResponse>;
     checkAction(feature: string, scope: string): Promise<ActionResponse>;
     checkPermission(feature: string, scope: string, action: Action): Promise<ActionResponse>;
     getUsers(): Promise<User[]>;

package/dist/classes/auth.js

@@ -1,6 +1,14 @@
+import { jwtDecode } from "jwt-decode";
 export class Auth {
-    constructor(httpService) {
+    constructor(httpService, applicationID) {
+        this.AUTH_TOKEN_KEY_PREFIX = "x-machhub-auth-tkn";
         this.httpService = httpService;
+        this.applicationID = applicationID;
+    }
+    getStorageKey() {
+        return this.applicationID
+            ? `${this.AUTH_TOKEN_KEY_PREFIX}-${this.applicationID}`
+            : this.AUTH_TOKEN_KEY_PREFIX;
     }
     async login(username, password) {
         let res;
@@ -10,7 +18,8 @@ export class Auth {
                 password: password,
             }).post("/auth/login");
             if (localStorage) {
-                localStorage.setItem("x-machhub-auth-tkn", res.tkn); // Set User JWT
+                // console.log("storage key:", this.getStorageKey());
+                localStorage.setItem(this.getStorageKey(), res.tkn); // Set User JWT
             }
             else {
                 console.error("localStorage is not available. The program needs to be in a browser environment.");
@@ -25,11 +34,27 @@ export class Auth {
         }
     }
     async validateJWT(token) {
-        let res = await this.httpService.request.withJSON({ token }).post("/auth/jwt/validate");
-        return res;
+        return await this.httpService.request.withJSON({ token }).post("/auth/jwt/validate");
     }
     async logout() {
-        localStorage.removeItem("x-machhub-auth-tkn"); // Remove User JWT
+        localStorage.removeItem(this.getStorageKey());
+    }
+    async getJWTData() {
+        const token = localStorage.getItem(this.getStorageKey());
+        if (!token) {
+            throw new Error("No JWT token found in localStorage.");
+        }
+        return jwtDecode(token);
+    }
+    async getCurrentUser() {
+        return await this.httpService.request.get("/auth/me");
+    }
+    async validateCurrentUser() {
+        const token = localStorage.getItem(this.getStorageKey());
+        if (!token) {
+            throw new Error("No JWT token found in localStorage.");
+        }
+        return await this.validateJWT(token);
     }
     async checkAction(feature, scope) {
         try {

package/dist/classes/collection.d.ts

@@ -16,7 +16,12 @@ export declare class Collection {
     sort(field: string, direction?: "asc" | "desc"): Collection;
     limit(limit: number): Collection;
     offset(offset: number): Collection;
-    getAll(): Promise<any[]>;
+    expand(fields: string | string[]): Collection;
+    private applyOptions;
+    first(): Promise<any>;
+    getAll(options?: {
+        expand?: string | string[];
+    }): Promise<any[]>;
     getOne(id: string): Promise<any>;
     create(data: Record<string, any>): Promise<any>;
     update(id: string, data: Record<string, any>): Promise<any>;

package/dist/classes/collection.js

@@ -30,8 +30,29 @@ export class Collection {
         this.queryParams.offset = offset;
         return this;
     }
-    async getAll() {
+    expand(fields) {
+        this.queryParams.expand = Array.isArray(fields) ? fields.join(",") : fields;
+        return this;
+    }
+    applyOptions(options) {
+        if (!options)
+            return;
+        for (const [key, value] of Object.entries(options)) {
+            if (value !== undefined && value !== null) {
+                this.queryParams[key] = value;
+            }
+        }
+    }
+    async first() {
+        const results = await this.limit(1).getAll();
+        return results[0] ?? null;
+    }
+    async getAll(options) {
         try {
+            this.applyOptions(options);
+            if (options?.expand) {
+                this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join() : options.expand;
+            }
             return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
         }
         catch (error) {

package/dist/sdk-ts.d.ts

@@ -20,6 +20,14 @@ export declare class SDK {
     private _function;
     private _flow;
     private _auth;
+    private applicationID;
+    /**
+     * Extracts the application ID from a runtime ID.
+     * Runtime ID format: {applicationID}XmchX{randomID}
+     * @param runtimeID The runtime ID to extract from
+     * @returns The extracted application ID, or empty string if invalid format
+     */
+    private extractApplicationIDFromRuntimeID;
     /**
      * Initializes the SDK with the required clients.
      *

package/dist/sdk-ts.js

@@ -110,6 +110,19 @@ export class SDK {
         this._function = null;
         this._flow = null;
         this._auth = null;
+        this.applicationID = "";
+    }
+    /**
+     * Extracts the application ID from a runtime ID.
+     * Runtime ID format: {applicationID}XmchX{randomID}
+     * @param runtimeID The runtime ID to extract from
+     * @returns The extracted application ID, or empty string if invalid format
+     */
+    extractApplicationIDFromRuntimeID(runtimeID) {
+        if (!runtimeID)
+            return "";
+        const parts = runtimeID.split('XmchX');
+        return parts.length > 0 ? parts[0] : "";
     }
     /**
      * Initializes the SDK with the required clients.
@@ -143,9 +156,11 @@ export class SDK {
                 config = { application_id: "" };
             if (!config.application_id)
                 config = { application_id: "" };
-            // console.log("Using application_id:", config.application_id);
             const envCfg = await getEnvConfig();
-            // console.log("Environment Config:", envCfg);
+            // Extract application_id from runtimeID if not provided in config
+            const application_id = config.application_id ||
+                this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
+            this.applicationID = application_id;
             // Determine the hostname - use window.location.hostname in browser, otherwise fallback to localhost
             const hostname = typeof window !== 'undefined' ? window.location.hostname : 'localhost';
             const secured = typeof window !== 'undefined' ? window.location.protocol === 'https:' : false;
@@ -165,16 +180,16 @@ export class SDK {
             if (!config.natsUrl) {
                 config.natsUrl = `${secured ? 'wss' : 'ws'}://${host}/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, envCfg.runtimeID);
-            this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
-            this.nats = await NATSClient.getInstance(application_id, natsUrl);
+            const { httpUrl, mqttUrl, natsUrl } = config;
+            console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config.developer_key.length - 4 ? '*' : config.developer_key[i]).join('') });
+            this.http = new HTTPClient(this.applicationID, httpUrl, config.developer_key, envCfg.runtimeID);
+            this.mqtt = await MQTTClient.getInstance(this.applicationID, mqttUrl, config.developer_key);
+            this.nats = await NATSClient.getInstance(this.applicationID, natsUrl);
             this._historian = new Historian(this.http["httpService"], this.mqtt["mqttService"]);
             this._tag = new Tag(this.http["httpService"], this.mqtt["mqttService"]);
             this._function = new Function(this.http["httpService"], this.nats["natsService"]);
             this._flow = new Flow(this.http["httpService"]);
-            this._auth = new Auth(this.http["httpService"]);
+            this._auth = new Auth(this.http["httpService"], this.applicationID);
         }
         catch (error) {
             console.error("Failed to initialize:", error);
@@ -282,26 +297,27 @@ async function findConfigEndpoint() {
                 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
-                        // TODO: Allow checks for path based hosting as well
-                        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;
+                signal: AbortSignal.timeout(2000)
+            }).catch(() => { console.log("ERR"); return null; }); // Catch fetch errors silently
+            if (!testResponse || !testResponse.ok) {
+                continue; // Skip to next candidate
+            }
+            // 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
+                    // TODO: Allow checks for path based hosting as well
+                    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) {

package/dist/services/http.service.js

@@ -112,8 +112,13 @@ class RequestParameters {
         return this;
     }
     withAccessToken() {
-        const tkn = localStorage.getItem("x-machhub-auth-tkn");
-        this.setHeader("Authorization", `Bearer ${tkn}`);
+        const rawAppID = this.applicationID.replace("domains:", "");
+        const storageKey = rawAppID
+            ? `x-machhub-auth-tkn-${rawAppID}`
+            : `x-machhub-auth-tkn`;
+        const tkn = localStorage.getItem(storageKey);
+        if (tkn)
+            this.setHeader("Authorization", `Bearer ${tkn}`);
         return this;
     }
     withRuntimeID() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machhub-dev/sdk-ts",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "MACHHUB TYPESCRIPT SDK",
   "keywords": [
     "machhub",
@@ -22,6 +22,7 @@
   "dependencies": {
     "@nats-io/nats-core": "^3.0.2",
     "@nats-io/transport-node": "^3.0.2",
+    "jwt-decode": "^4.0.0",
     "mqtt": "^5.10.4",
     "safe-buffer": "^5.2.1",
     "typescript": "^5.8.3",

package/src/classes/auth.ts

@@ -1,11 +1,21 @@
 import { HTTPService } from "../services/http.service.js";
+import { jwtDecode } from "jwt-decode";
 import { Action, ActionResponse, Feature, Group, LoginResponse, User, ValidateJWTResponse } from "../types/auth.models.js";
 
 export class Auth {
   private httpService: HTTPService;
+  private applicationID: string;
+  private readonly AUTH_TOKEN_KEY_PREFIX = "x-machhub-auth-tkn";
 
-  constructor(httpService: HTTPService) {
+  constructor(httpService: HTTPService, applicationID: string) {
     this.httpService = httpService;
+    this.applicationID = applicationID;
+  }
+
+  private getStorageKey(): string {
+    return this.applicationID
+      ? `${this.AUTH_TOKEN_KEY_PREFIX}-${this.applicationID}`
+      : this.AUTH_TOKEN_KEY_PREFIX;
   }
 
   public async login(username: string, password: string): Promise<LoginResponse | undefined> {
@@ -17,7 +27,8 @@ export class Auth {
       }).post("/auth/login");
 
       if (localStorage) {
-        localStorage.setItem("x-machhub-auth-tkn", res.tkn); // Set User JWT
+        // console.log("storage key:", this.getStorageKey());
+        localStorage.setItem(this.getStorageKey(), res.tkn); // Set User JWT
       } else {
         console.error("localStorage is not available. The program needs to be in a browser environment.");
       }
@@ -31,13 +42,34 @@ export class Auth {
     }
   }
 
-  public async validateJWT(token: string): Promise<ValidateJWTResponse>{
-    let res:ValidateJWTResponse = await this.httpService.request.withJSON({ token }).post("/auth/jwt/validate");
-    return res
+  public async validateJWT(token: string): Promise<ValidateJWTResponse> {
+    return await this.httpService.request.withJSON({ token }).post("/auth/jwt/validate");
   }
 
   public async logout() {
-    localStorage.removeItem("x-machhub-auth-tkn"); // Remove User JWT
+    localStorage.removeItem(this.getStorageKey());
+  }
+
+  public async getJWTData(): Promise<any> {
+    const token = localStorage.getItem(this.getStorageKey());
+    if (!token) {
+      throw new Error("No JWT token found in localStorage.");
+    }
+
+    return jwtDecode(token);
+  }
+
+  public async getCurrentUser(): Promise<User> {
+    return await this.httpService.request.get("/auth/me");
+  }
+
+  public async validateCurrentUser(): Promise<ValidateJWTResponse> {
+    const token = localStorage.getItem(this.getStorageKey());
+    if (!token) {
+      throw new Error("No JWT token found in localStorage.");
+    }
+
+    return await this.validateJWT(token);
   }
 
   public async checkAction(feature: string, scope: string): Promise<ActionResponse> {

package/src/classes/collection.ts

@@ -48,8 +48,32 @@ export class Collection {
     return this;
   }
 
-  async getAll(): Promise<any[]> {
+  expand(fields: string | string[]): Collection {
+    this.queryParams.expand = Array.isArray(fields) ? fields.join(",") : fields;
+    return this;
+  }
+  
+  private applyOptions(options?: Record<string, any>) {
+    if (!options) return;
+
+    for (const [key, value] of Object.entries(options)) {
+      if (value !== undefined && value !== null) {
+        this.queryParams[key] = value;
+      }
+    }
+  }
+
+  async first(): Promise<any> {
+    const results = await this.limit(1).getAll();
+    return results[0] ?? null
+  }
+  
+  async getAll(options?: { expand?: string | string[] }): Promise<any[]> {
     try {
+      this.applyOptions(options)
+      if (options?.expand) {
+        this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join() : options.expand
+      }
       return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
     } catch (error) {
       throw new CollectionError('getAll', this.collectionName, error as Error);

package/src/sdk-ts.ts

@@ -137,6 +137,19 @@ export class SDK {
   private _function: Function | null = null;
   private _flow: Flow | null = null;
   private _auth: Auth | null = null;
+  private applicationID: string = "";
+
+  /**
+   * Extracts the application ID from a runtime ID.
+   * Runtime ID format: {applicationID}XmchX{randomID}
+   * @param runtimeID The runtime ID to extract from
+   * @returns The extracted application ID, or empty string if invalid format
+   */
+  private extractApplicationIDFromRuntimeID(runtimeID: string): string {
+    if (!runtimeID) return "";
+    const parts = runtimeID.split('XmchX');
+    return parts.length > 0 ? parts[0] : "";
+  }
 
   /**
    * Initializes the SDK with the required clients.
@@ -167,13 +180,16 @@ export class SDK {
       // 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 envCfg = await getEnvConfig();
-      // console.log("Environment Config:", envCfg);
+
+      // Extract application_id from runtimeID if not provided in config
+      const application_id = config.application_id || 
+                            this.extractApplicationIDFromRuntimeID(envCfg.runtimeID);
+      
+      this.applicationID = application_id;
 
       // Determine the hostname - use window.location.hostname in browser, otherwise fallback to localhost
       const hostname = typeof window !== 'undefined' ? window.location.hostname : 'localhost';
@@ -197,19 +213,20 @@ export class SDK {
       if (!config.natsUrl) {
         config.natsUrl = `${secured ? 'wss' : 'ws'}://${host}/nats`;
       }
-      const { application_id, httpUrl, mqttUrl, natsUrl } = config;
+      
+      const { 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('') });
+      console.log("SDK Config:", { application_id: this.applicationID, httpUrl, mqttUrl, natsUrl, developer_key: config.developer_key?.split('').map((_, i) => i < config!.developer_key!.length - 4 ? '*' : config!.developer_key![i]).join('') });
 
-      this.http = new HTTPClient(application_id, httpUrl, config.developer_key, envCfg.runtimeID);
-      this.mqtt = await MQTTClient.getInstance(application_id, mqttUrl, config.developer_key);
-      this.nats = await NATSClient.getInstance(application_id, natsUrl);
+      this.http = new HTTPClient(this.applicationID, httpUrl, config.developer_key, envCfg.runtimeID);
+      this.mqtt = await MQTTClient.getInstance(this.applicationID, mqttUrl, config.developer_key);
+      this.nats = await NATSClient.getInstance(this.applicationID, natsUrl);
 
       this._historian = new Historian(this.http["httpService"], this.mqtt["mqttService"]);
       this._tag = new Tag(this.http["httpService"], this.mqtt["mqttService"]);
       this._function = new Function(this.http["httpService"], this.nats["natsService"]);
       this._flow = new Flow(this.http["httpService"]);
-      this._auth = new Auth(this.http["httpService"]);
+      this._auth = new Auth(this.http["httpService"], this.applicationID);
     } catch (error: any) {
       console.error("Failed to initialize:", error);
       return false;
@@ -338,24 +355,26 @@ async function findConfigEndpoint(): Promise<string> {
           'Accept': 'application/json',
         },
         signal: AbortSignal.timeout(2000)
-      });
-
-      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
-            // TODO: Allow checks for path based hosting as well
-            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(() => {console.log("ERR"); return null}); // Catch fetch errors silently
+
+      if (!testResponse || !testResponse.ok) {
+        continue; // Skip to next candidate
+      }
+
+      // 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
+          // TODO: Allow checks for path based hosting as well
+          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) {

package/src/services/http.service.ts

@@ -147,8 +147,12 @@ class RequestParameters {
     }
 
     public withAccessToken(): RequestParameters {
-        const tkn = localStorage.getItem("x-machhub-auth-tkn");
-        this.setHeader("Authorization", `Bearer ${tkn}`);
+        const rawAppID = this.applicationID.replace("domains:", "");
+        const storageKey = rawAppID 
+          ? `x-machhub-auth-tkn-${rawAppID}`
+          : `x-machhub-auth-tkn`;
+        const tkn = localStorage.getItem(storageKey);
+        if (tkn) this.setHeader("Authorization", `Bearer ${tkn}`);
         return this;
     }