@machhub-dev/sdk-ts 1.0.0 → 1.0.2

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

@@ -1,5 +1,6 @@
 import { HTTPService } from "../services/http.service.js";
 import { MQTTService } from "../services/mqtt.service.js";
+import { Operator } from "../types/operator.models.js";
 export declare class CollectionError extends Error {
     operation: string;
     collectionName: string;
@@ -12,7 +13,7 @@ export declare class Collection {
     protected collectionName: string;
     protected queryParams: Record<string, any>;
     constructor(httpService: HTTPService, mqttService: MQTTService | null, collectionName: string);
-    filter(fieldName: string, operator: "=" | ">" | "<" | "<=" | ">=" | "!=" | "CONTAINS" | "IN", value: any): Collection;
+    filter(fieldName: string, operator: Operator, value: any): Collection;
     sort(field: string, direction?: "asc" | "desc"): Collection;
     limit(limit: number): Collection;
     offset(offset: number): Collection;
@@ -21,6 +22,7 @@ export declare class Collection {
     first(): Promise<any>;
     getAll(options?: {
         expand?: string | string[];
+        fields?: string | string[];
     }): Promise<any[]>;
     count(options?: {
         filter?: any;

package/dist/cjs/classes/collection.js

@@ -55,7 +55,10 @@ class Collection {
         try {
             this.applyOptions(options);
             if (options?.expand) {
-                this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join() : options.expand;
+                this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join(",") : options.expand;
+            }
+            if (options?.fields) {
+                this.queryParams.fields = Array.isArray(options.fields) ? options.fields.join(",") : options.fields;
             }
             return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
         }

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

@@ -6,5 +6,5 @@ export declare class Tag {
     constructor(httpService: HTTPService, mqttService: MQTTService | null);
     getAllTags(): Promise<string[]>;
     publish(topic: string, data: any): Promise<void>;
-    subscribe(topic: string, callback: (data: any) => void): Promise<void>;
+    subscribe(topic: string, callback: (data: any, topic?: string) => void): Promise<void>;
 }

package/dist/cjs/index.d.ts

@@ -1,5 +1,6 @@
 export { SDK, type SDKConfig } from './sdk-ts.js';
 export type { LoginResponse, PermissionResponse, User, Group, Feature, Permission, ActionResponse, Action, Scope } from './types/auth.models.js';
+export type { Operator } from './types/operator.models.js';
 export type { BaseResponse } from './types/response.models.js';
 export type { RecordID } from './types/recordID.models.js';
 export type { HistorizedData } from './types/tag.models.js';

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

@@ -7,9 +7,10 @@ export declare class MQTTService {
     constructor(url: string);
     static getInstance(url?: string, developerKey?: string): Promise<MQTTService>;
     static resetInstance(): void;
-    addTopicHandler(topic: string, handler: (message: unknown) => void): void;
+    addTopicHandler(topic: string, handler: (message: unknown, topic?: string) => void): void;
     clearTopics(): void;
     publish(topic: string, message: unknown): boolean;
     private attachMessageListener;
+    private matchesTopic;
     private parseMessage;
 }

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

@@ -89,14 +89,48 @@ class MQTTService {
         });
         this.client.on('message', (topic, message) => {
             for (const subscribedTopic of this.subscribedTopics) {
-                if (topic === subscribedTopic.topic) {
+                if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
-                    subscribedTopic.handler(parsedMessage);
+                    subscribedTopic.handler(parsedMessage, topic);
                     break;
                 }
             }
         });
     }
+    // Matches MQTT topic patterns with wildcards (+ for single level, # for multi-level)
+    matchesTopic(pattern, topic) {
+        // Handle exact match first for performance
+        if (pattern === topic) {
+            return true;
+        }
+        const patternParts = pattern.split('/');
+        const topicParts = topic.split('/');
+        let i = 0;
+        let j = 0;
+        while (i < patternParts.length && j < topicParts.length) {
+            const patternPart = patternParts[i];
+            if (patternPart === '#') {
+                // Multi-level wildcard matches everything from this point
+                return true;
+            }
+            else if (patternPart === '+') {
+                // Single-level wildcard matches any single level
+                i++;
+                j++;
+            }
+            else if (patternPart === topicParts[j]) {
+                // Exact match
+                i++;
+                j++;
+            }
+            else {
+                // No match
+                return false;
+            }
+        }
+        // Check if we've consumed both pattern and topic completely
+        return i === patternParts.length && j === topicParts.length;
+    }
     parseMessage(message, topic) {
         try {
             return JSON.parse(message.toString());

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

@@ -0,0 +1,28 @@
+/**
+ * SurrealDB Operators
+ * Reference: https://surrealdb.com/docs/surrealql/operators
+ */
+/**
+ * Comparison operators
+ */
+export type ComparisonOperator = "=" | "!=" | "==" | "?=" | "*=" | "~" | "!~" | "?~" | "*~" | "<" | "<=" | ">" | ">=";
+/**
+ * Containment operators
+ */
+export type ContainmentOperator = "CONTAINS" | "CONTAINSNOT" | "CONTAINSALL" | "CONTAINSANY" | "CONTAINSNONE" | "INSIDE" | "NOTINSIDE" | "ALLINSIDE" | "ANYINSIDE" | "NONEINSIDE";
+/**
+ * String operators
+ */
+export type StringOperator = "@@" | "@0@" | "@1@" | "@2@" | "@3@";
+/**
+ * Array operators
+ */
+export type ArrayOperator = "IN" | "NOT IN";
+/**
+ * All available operators in SurrealDB
+ */
+export type Operator = ComparisonOperator | ContainmentOperator | StringOperator | ArrayOperator;
+/**
+ * Common operators for basic queries
+ */
+export type BasicOperator = "=" | "!=" | "<" | "<=" | ">" | ">=" | "CONTAINS" | "IN";

package/dist/cjs/types/operator.models.js

@@ -0,0 +1,6 @@
+"use strict";
+/**
+ * SurrealDB Operators
+ * Reference: https://surrealdb.com/docs/surrealql/operators
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/classes/collection.d.ts

@@ -1,5 +1,6 @@
 import { HTTPService } from "../services/http.service.js";
 import { MQTTService } from "../services/mqtt.service.js";
+import { Operator } from "../types/operator.models.js";
 export declare class CollectionError extends Error {
     operation: string;
     collectionName: string;
@@ -12,7 +13,7 @@ export declare class Collection {
     protected collectionName: string;
     protected queryParams: Record<string, any>;
     constructor(httpService: HTTPService, mqttService: MQTTService | null, collectionName: string);
-    filter(fieldName: string, operator: "=" | ">" | "<" | "<=" | ">=" | "!=" | "CONTAINS" | "IN", value: any): Collection;
+    filter(fieldName: string, operator: Operator, value: any): Collection;
     sort(field: string, direction?: "asc" | "desc"): Collection;
     limit(limit: number): Collection;
     offset(offset: number): Collection;
@@ -21,6 +22,7 @@ export declare class Collection {
     first(): Promise<any>;
     getAll(options?: {
         expand?: string | string[];
+        fields?: string | string[];
     }): Promise<any[]>;
     count(options?: {
         filter?: any;

package/dist/classes/collection.js

@@ -51,7 +51,10 @@ export class Collection {
         try {
             this.applyOptions(options);
             if (options?.expand) {
-                this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join() : options.expand;
+                this.queryParams.expand = Array.isArray(options.expand) ? options.expand.join(",") : options.expand;
+            }
+            if (options?.fields) {
+                this.queryParams.fields = Array.isArray(options.fields) ? options.fields.join(",") : options.fields;
             }
             return await this.httpService.request.get(this.collectionName + "/all", this.queryParams);
         }

package/dist/classes/tag.d.ts

@@ -6,5 +6,5 @@ export declare class Tag {
     constructor(httpService: HTTPService, mqttService: MQTTService | null);
     getAllTags(): Promise<string[]>;
     publish(topic: string, data: any): Promise<void>;
-    subscribe(topic: string, callback: (data: any) => void): Promise<void>;
+    subscribe(topic: string, callback: (data: any, topic?: string) => void): Promise<void>;
 }

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { SDK, type SDKConfig } from './sdk-ts.js';
 export type { LoginResponse, PermissionResponse, User, Group, Feature, Permission, ActionResponse, Action, Scope } from './types/auth.models.js';
+export type { Operator } from './types/operator.models.js';
 export type { BaseResponse } from './types/response.models.js';
 export type { RecordID } from './types/recordID.models.js';
 export type { HistorizedData } from './types/tag.models.js';

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

@@ -7,9 +7,10 @@ export declare class MQTTService {
     constructor(url: string);
     static getInstance(url?: string, developerKey?: string): Promise<MQTTService>;
     static resetInstance(): void;
-    addTopicHandler(topic: string, handler: (message: unknown) => void): void;
+    addTopicHandler(topic: string, handler: (message: unknown, topic?: string) => void): void;
     clearTopics(): void;
     publish(topic: string, message: unknown): boolean;
     private attachMessageListener;
+    private matchesTopic;
     private parseMessage;
 }

package/dist/services/mqtt.service.js

@@ -83,14 +83,48 @@ export class MQTTService {
         });
         this.client.on('message', (topic, message) => {
             for (const subscribedTopic of this.subscribedTopics) {
-                if (topic === subscribedTopic.topic) {
+                if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
-                    subscribedTopic.handler(parsedMessage);
+                    subscribedTopic.handler(parsedMessage, topic);
                     break;
                 }
             }
         });
     }
+    // Matches MQTT topic patterns with wildcards (+ for single level, # for multi-level)
+    matchesTopic(pattern, topic) {
+        // Handle exact match first for performance
+        if (pattern === topic) {
+            return true;
+        }
+        const patternParts = pattern.split('/');
+        const topicParts = topic.split('/');
+        let i = 0;
+        let j = 0;
+        while (i < patternParts.length && j < topicParts.length) {
+            const patternPart = patternParts[i];
+            if (patternPart === '#') {
+                // Multi-level wildcard matches everything from this point
+                return true;
+            }
+            else if (patternPart === '+') {
+                // Single-level wildcard matches any single level
+                i++;
+                j++;
+            }
+            else if (patternPart === topicParts[j]) {
+                // Exact match
+                i++;
+                j++;
+            }
+            else {
+                // No match
+                return false;
+            }
+        }
+        // Check if we've consumed both pattern and topic completely
+        return i === patternParts.length && j === topicParts.length;
+    }
     parseMessage(message, topic) {
         try {
             return JSON.parse(message.toString());

package/dist/types/operator.models.d.ts

@@ -0,0 +1,28 @@
+/**
+ * SurrealDB Operators
+ * Reference: https://surrealdb.com/docs/surrealql/operators
+ */
+/**
+ * Comparison operators
+ */
+export type ComparisonOperator = "=" | "!=" | "==" | "?=" | "*=" | "~" | "!~" | "?~" | "*~" | "<" | "<=" | ">" | ">=";
+/**
+ * Containment operators
+ */
+export type ContainmentOperator = "CONTAINS" | "CONTAINSNOT" | "CONTAINSALL" | "CONTAINSANY" | "CONTAINSNONE" | "INSIDE" | "NOTINSIDE" | "ALLINSIDE" | "ANYINSIDE" | "NONEINSIDE";
+/**
+ * String operators
+ */
+export type StringOperator = "@@" | "@0@" | "@1@" | "@2@" | "@3@";
+/**
+ * Array operators
+ */
+export type ArrayOperator = "IN" | "NOT IN";
+/**
+ * All available operators in SurrealDB
+ */
+export type Operator = ComparisonOperator | ContainmentOperator | StringOperator | ArrayOperator;
+/**
+ * Common operators for basic queries
+ */
+export type BasicOperator = "=" | "!=" | "<" | "<=" | ">" | ">=" | "CONTAINS" | "IN";

package/dist/types/operator.models.js

@@ -0,0 +1,5 @@
+/**
+ * SurrealDB Operators
+ * Reference: https://surrealdb.com/docs/surrealql/operators
+ */
+export {};

package/package.json

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

package/src/classes/tag.ts

@@ -21,7 +21,7 @@ export class Tag {
     this.mqttService.publish(topic, data);
   }
 
-  async subscribe(topic: string, callback: (data: any) => void): Promise<void> {
+  async subscribe(topic: string, callback: (data: any, topic?: string) => void): Promise<void> {
     if (!this.mqttService) {
       throw new Error("MQTT service not connected");
     }

package/src/services/mqtt.service.ts

@@ -2,7 +2,7 @@ import mqtt from 'mqtt';
 
 interface SubscribedTopic {
     topic: string;
-    handler: (message: unknown) => void;
+    handler: (message: unknown, topic?: string) => void;
 }
 
 export class MQTTService {
@@ -46,7 +46,7 @@ export class MQTTService {
     }
 
     // addTopicHandler Adds a topic and handler to the subscribed list
-    public addTopicHandler(topic: string, handler: (message: unknown) => void): void {
+    public addTopicHandler(topic: string, handler: (message: unknown, topic?: string) => void): void {
         try {
             this.subscribedTopics.push({ topic, handler });
             if (topic == "") return;
@@ -101,15 +101,52 @@ export class MQTTService {
 
         this.client.on('message', (topic: string, message: Buffer) => {
             for (const subscribedTopic of this.subscribedTopics) {
-                if (topic === subscribedTopic.topic) {
+                if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
-                    subscribedTopic.handler(parsedMessage);
+                    subscribedTopic.handler(parsedMessage, topic);
                     break;
                 }
             }
         });
     }
 
+    // Matches MQTT topic patterns with wildcards (+ for single level, # for multi-level)
+    private matchesTopic(pattern: string, topic: string): boolean {
+        // Handle exact match first for performance
+        if (pattern === topic) {
+            return true;
+        }
+
+        const patternParts = pattern.split('/');
+        const topicParts = topic.split('/');
+
+        let i = 0;
+        let j = 0;
+
+        while (i < patternParts.length && j < topicParts.length) {
+            const patternPart = patternParts[i];
+
+            if (patternPart === '#') {
+                // Multi-level wildcard matches everything from this point
+                return true;
+            } else if (patternPart === '+') {
+                // Single-level wildcard matches any single level
+                i++;
+                j++;
+            } else if (patternPart === topicParts[j]) {
+                // Exact match
+                i++;
+                j++;
+            } else {
+                // No match
+                return false;
+            }
+        }
+
+        // Check if we've consumed both pattern and topic completely
+        return i === patternParts.length && j === topicParts.length;
+    }
+
     private parseMessage(message: Buffer, topic: string): unknown {
         try {
             return JSON.parse(message.toString());