@transitive-sdk/utils-web 0.16.0 → 0.16.2

package/dist/utils-web.js

@@ -406,8 +406,10 @@ var require_common = __commonJS({
         callback && callback(count);
       }, delay);
     };
-    var storageRequestToSelector = (topic) => pathToTopic2(topicToPath2(topic).map((value) => value == "$store" ? "+" : value).map((value) => value == "$storeTail" ? "#" : value));
-    var selectorToStorageRequest = (topic) => pathToTopic2(topicToPath2(topic).map((value) => value[0] == "+" ? "$store" : value).map((value) => value[0] == "#" ? "$storeTail" : value));
+    var metaPathToSelectorPath = (path) => path.map((value) => value[0] == "$" ? decodeURIComponent(value.slice(1)) : value);
+    var metaTopicToSelector = (topic) => pathToTopic2(metaPathToSelectorPath(topicToPath2(topic)));
+    var selectorPathToMetaPath = (path) => path.map((value) => ["+", "#"].includes(value[0]) ? `$${encodeURIComponent(value)}` : value);
+    var selectorToMetaTopic = (topic) => pathToTopic2(selectorPathToMetaPath(topicToPath2(topic)));
     var getRandomId = (bytes = 6) => {
       const buffer = new Uint8Array(bytes);
       crypto.getRandomValues(buffer);
@@ -497,8 +499,11 @@ var require_common = __commonJS({
       tryJSONParse,
       decodeJWT: decodeJWT3,
       visitAncestor,
-      storageRequestToSelector,
-      selectorToStorageRequest
+      // storageRequestToSelector, selectorToStorageRequest
+      metaPathToSelectorPath,
+      selectorPathToMetaPath,
+      metaTopicToSelector,
+      selectorToMetaTopic
     };
   }
 });
@@ -718,7 +723,8 @@ var require_MqttSync = __commonJS({
       encodeTopicElement,
       visitAncestor,
       getRandomId,
-      selectorToStorageRequest
+      selectorPathToMetaPath,
+      selectorToMetaTopic
     } = require_common();
     var { DataCache } = require_DataCache();
     var log2 = getLogger2("MqttSync");
@@ -802,9 +808,6 @@ var require_MqttSync = __commonJS({
               path = path.slice(sliceTopic);
               topic = pathToTopic2(path);
             }
-            if (!inclMeta && path.some((field) => field[0] == "$")) {
-              return;
-            }
             const rpcHandler = this.getRPCHandler(topic);
             if (rpcHandler) {
               const json = mqttParsePayload(payload);
@@ -813,6 +816,9 @@ var require_MqttSync = __commonJS({
               const json = mqttParsePayload(payload);
               this.handleRPCResponse(topic, json);
             } else if (packet.retain || ignoreRetain) {
+              if (!inclMeta && path.slice(0, 5).some((field) => field[0] == "$")) {
+                return;
+              }
               if (this.isPublished(topic)) {
                 const json = mqttParsePayload(payload);
                 this.publishedMessages.updateFromArray([...path, specialKey], json);
@@ -1307,9 +1313,28 @@ var require_MqttSync = __commonJS({
       * service is running -- as it usually is inside the
       * transitiverobotics/clickhouse docker image). */
       requestHistoryStorage(topic, ttl = 1) {
-        const storageRequest = selectorToStorageRequest(topic);
+        const path = selectorPathToMetaPath(topicToPath2(topic));
+        path.splice(5, 0, "$store");
+        const storageRequest = pathToTopic2(path);
         this.mqtt.publish(storageRequest, String(ttl), { retain: true });
       }
+      /** Query a topics history (if stored). Convenience function to make RPC call
+       * to the mqtt2clickhouse service.
+      * @param params = {topic, since, until, orderBy, limit} */
+      async queryHistory(params) {
+        const path = topicToPath2(params.topic);
+        const rpc = selectorToMetaTopic(`${pathToTopic2(path.slice(0, 5))}/$queryMQTTHistory`);
+        const query = {
+          subtopic: pathToTopic2(path.slice(5)),
+          ...params
+        };
+        delete query.topic;
+        query.since && (query.since = query.since.getTime());
+        query.until && (query.until = query.until.getTime());
+        log2.info("queryHistory", { rpc, query });
+        const result = await this.call(rpc, query);
+        return result;
+      }
     };
     module2.exports = MqttSync3;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transitive-sdk/utils-web",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "description": "Web utils for the Transitive framework",
   "homepage": "https://transitiverobotics.com",
   "repository": {