@livequery/nestjs 1.0.46 → 1.0.48

package/build/src/LivequeryInterceptor.js

@@ -61,7 +61,7 @@ let LivequeryInterceptor = class LivequeryInterceptor {
             body: req.body,
             method: req.method.toLowerCase()
         };
-        req.headers.socket_id && this.LivequeryWebsocketSync?.listen(req.headers.socket_id, { collection_ref, doc_id });
+        req.method == 'GET' && req.headers.socket_id && this.LivequeryWebsocketSync?.listen(req.headers.socket_id, { collection_ref, doc_id });
         const realtime_token = await new Promise(s => {
             if (this.LivequeryWebsocketSync || !this.secret_or_private_key || req.method.toLowerCase() != 'get' || req.query._cursor)
                 return s(null);

package/build/src/LivequeryWebsocketSync.js

@@ -16,7 +16,7 @@ exports.LivequeryWebsocketSync = void 0;
 const websockets_1 = require("@nestjs/websockets");
 const rxjs_1 = require("rxjs");
 const LivequeryInterceptor_1 = require("./LivequeryInterceptor");
-const uuid_1 = require("uuid");
+const crypto_1 = require("crypto");
 const common_1 = require("@nestjs/common");
 const UseWebsocketShareKeyPair_1 = require("./UseWebsocketShareKeyPair");
 const JWT = require('jsonwebtoken');
@@ -46,7 +46,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         });
         this.connections.delete(socket.id);
     }
-    start({ id = uuid_1.v4() }, socket) {
+    start({ id = crypto_1.randomUUID() }, socket) {
         if (typeof id == 'string' && id.length < 40) {
             socket.id = id;
             this.connections.set(id, { socket, refs: new Set() });

package/build/src/helpers/PathHelper.js

@@ -5,7 +5,6 @@ const const_1 = require("../const");
 class PathHelper {
     static trimLivequeryHotkey(path) {
         const ref = path
-            ?.split('~')[0]
             ?.replaceAll(':', '')
             ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
             ?.split('/')
@@ -17,18 +16,19 @@ class PathHelper {
     }
     static parseHttpRequestPath(path) {
         const refs = path
-            ?.split('~')[0]
             ?.replaceAll(':', '')
             ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
             ?.split('/')
             ?.filter(s => s.length > 0);
         if (!refs)
             throw 'LIVEQUERY_MAGIC_KEY_NOT_FOUND';
-        const is_collection = refs.length % 2 == 1;
         const ref = refs.join('/');
-        const collection_ref = is_collection ? ref : refs.slice(0, refs.length - 1).join('/');
-        const schema_ref = refs.filter((_, i) => i % 2 == 0).join('/');
-        const doc_id = is_collection ? null : refs[refs.length - 1];
+        const ref_without_action = ref.split('/~')[0];
+        const refs_without_action = ref_without_action.split('/');
+        const is_collection = refs_without_action.length % 2 == 1;
+        const collection_ref = is_collection ? ref_without_action : refs_without_action.slice(0, refs_without_action.length - 1).join('/');
+        const schema_ref = refs_without_action.filter((_, i) => i % 2 == 0).join('/');
+        const doc_id = is_collection ? null : refs_without_action[refs_without_action.length - 1];
         return { ref, schema_ref, is_collection, doc_id, collection_ref };
     }
     static join(a, b) {

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "1.0.46",
+    "version": "1.0.48",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",