@livequery/nestjs 1.0.23 → 1.0.27

package/build/index.d.ts

@@ -1,6 +1,4 @@
 export * from './src/LivequeryRequest';
-export * from './src/LivequeryResponse';
 export * from './src/LivequeryInterceptor';
 export * from './src/LivequeryWebsocketSync';
-export * from './src/ControllerMetadata';
-export * from './src/UseDataSource';
+export * from './src/pathResolver';

package/build/index.js

@@ -11,8 +11,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./src/LivequeryRequest"), exports);
-__exportStar(require("./src/LivequeryResponse"), exports);
 __exportStar(require("./src/LivequeryInterceptor"), exports);
 __exportStar(require("./src/LivequeryWebsocketSync"), exports);
-__exportStar(require("./src/ControllerMetadata"), exports);
-__exportStar(require("./src/UseDataSource"), exports);
+__exportStar(require("./src/pathResolver"), exports);

package/build/src/LivequeryInterceptor.js

@@ -29,37 +29,37 @@ const LivequeryWebsocketSync_1 = require("./LivequeryWebsocketSync");
 const const_1 = require("./const");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const index_1 = require("index");
 let LivequeryInterceptor = class LivequeryInterceptor {
     constructor(LivequeryWebsocketSync = null) {
         this.LivequeryWebsocketSync = LivequeryWebsocketSync;
     }
     intercept(context, next) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const req = context.switchToHttp().getRequest();
-        const _b = req.query, { _limit = 20, _cursor, _order_by, _sort, _select } = _b, rest = __rest(_b, ["_limit", "_cursor", "_order_by", "_sort", "_select"]);
+        const _l = req.query, { _limit = 20, _cursor, _order_by, _sort, _select } = _l, rest = __rest(_l, ["_limit", "_cursor", "_order_by", "_sort", "_select"]);
         const filters = Object
             .keys(rest)
             .map(key => {
             const [name, expression] = key.split(':');
             try {
-                return [name, expression || '==', JSON.parse(rest[key])];
+                return [name, expression || 'eq', JSON.parse(rest[key])];
             }
             catch (e) {
-                return [name, expression || '==', rest[key]];
+                return [name, expression || 'eq', rest[key]];
             }
         });
-        const refs = req._parsedUrl.pathname.split('/').slice(const_1.COLLECTION_REF_SLICE_INDEX + 1);
+        const refs = (_c = (_b = (_a = req._parsedUrl.pathname) === null || _a === void 0 ? void 0 : _a.split(const_1.LIVEQUERY_MAGIC_KEY)) === null || _b === void 0 ? void 0 : _b[1]) === null || _c === void 0 ? void 0 : _c.split('/');
+        if (!refs)
+            throw new common_1.HttpException('CAN_NOT_DETECT_LIVEQUERY_KEY', 400);
         const ref = refs.join('/');
         const is_collection = refs.length % 2 == 1;
         const collection_ref = refs.slice(0, refs.length - (is_collection ? 0 : 1)).join('/');
         const doc_id = !is_collection && refs[refs.length - 1];
-        const schema_collection_ref = req.route.path
-            .split('/')
-            .slice(const_1.COLLECTION_REF_SLICE_INDEX + 1)
-            .filter((_, i) => i % 2 == 0)
-            .join('/')
-            .replaceAll(':', '');
-        req.__livequery_request = {
+        const schema_collection_ref = (_j = (_h = (_g = (_f = (_e = (_d = req.route.path) === null || _d === void 0 ? void 0 : _d.split(const_1.LIVEQUERY_MAGIC_KEY)) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.split('/')) === null || _g === void 0 ? void 0 : _g.filter((_, i) => i % 2 == 0)) === null || _h === void 0 ? void 0 : _h.join('/')) === null || _j === void 0 ? void 0 : _j.replaceAll(':', '');
+        if (!schema_collection_ref)
+            throw new common_1.HttpException('CAN_NOT_DETECT_LIVEQUERY_KEY', 400);
+        req[index_1.LivequeryRequestKey] = {
             ref,
             collection_ref,
             schema_collection_ref,
@@ -72,15 +72,15 @@ let LivequeryInterceptor = class LivequeryInterceptor {
             keys: req.params
         };
         const socket_id = req.headers.socket_id;
-        socket_id && ((_a = this.LivequeryWebsocketSync) === null || _a === void 0 ? void 0 : _a.listen(socket_id, collection_ref));
-        return next.handle().pipe(operators_1.map(data => ({ data })), operators_1.catchError(error => rxjs_1.of({ error })));
+        socket_id && ((_k = this.LivequeryWebsocketSync) === null || _k === void 0 ? void 0 : _k.listen(socket_id, collection_ref, doc_id));
+        return next.handle().pipe((0, operators_1.map)(data => ({ data })), (0, operators_1.catchError)(error => (0, rxjs_1.of)({ error })));
     }
 };
 LivequeryInterceptor = __decorate([
-    common_1.Injectable(),
-    __param(0, common_1.Optional()),
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Optional)()),
     __metadata("design:paramtypes", [LivequeryWebsocketSync_1.LivequeryWebsocketSync])
 ], LivequeryInterceptor);
 exports.LivequeryInterceptor = LivequeryInterceptor;
-const UseLivequeryInterceptor = () => common_1.UseInterceptors(LivequeryInterceptor);
+const UseLivequeryInterceptor = () => (0, common_1.UseInterceptors)(LivequeryInterceptor);
 exports.UseLivequeryInterceptor = UseLivequeryInterceptor;

package/build/src/LivequeryRequest.d.ts

@@ -1 +1,2 @@
+export declare const LivequeryRequestKey: unique symbol;
 export declare const LivequeryRequest: (...dataOrPipes: unknown[]) => ParameterDecorator;

package/build/src/LivequeryRequest.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LivequeryRequest = void 0;
+exports.LivequeryRequest = exports.LivequeryRequestKey = void 0;
 const common_1 = require("@nestjs/common");
-exports.LivequeryRequest = common_1.createParamDecorator((data, ctx) => {
+exports.LivequeryRequestKey = Symbol();
+exports.LivequeryRequest = (0, common_1.createParamDecorator)((data, ctx) => {
     const request = ctx.switchToHttp().getRequest();
-    return request.__livequery_request;
+    return request[exports.LivequeryRequestKey];
 });

package/build/src/LivequeryWebsocketSync.d.ts

@@ -16,5 +16,5 @@ export declare class LivequeryWebsocketSync {
     }, socket: WebSocket & {
         id: string;
     }): void;
-    listen(connection_id: string, ref: string): void;
+    listen(connection_id: string, collection_ref: string, doc_id?: string): void;
 }

package/build/src/LivequeryWebsocketSync.js

@@ -21,7 +21,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         this.connections = new Map();
         this.refs = new Map();
         this.changes = new rxjs_1.Subject();
-        this.changes.pipe(operators_1.mergeMap(change => {
+        this.changes.pipe((0, operators_1.mergeMap)(change => {
             const map = new Map();
             if (!map.has(change.ref))
                 map.set(change.ref, []);
@@ -39,9 +39,9 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         });
     }
     async handleDisconnect(socket) {
-        var _a;
+        var _a, _b;
         for (const ref of ((_a = this.connections.get(socket.id)) === null || _a === void 0 ? void 0 : _a.refs) || []) {
-            this.refs.get(ref).delete(socket.id);
+            (_b = this.refs.get(ref)) === null || _b === void 0 ? void 0 : _b.delete(socket.id);
         }
         this.connections.delete(socket.id);
     }
@@ -50,41 +50,41 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         socket.id = id;
     }
     unsubscribe({ ref }, socket) {
-        var _a;
+        var _a, _b, _c, _d;
         if (!this.connections.has(socket.id))
             return;
-        const refs = [...this.connections.get(socket.id).refs];
-        for (const ref of refs)
-            (_a = this.refs.get(ref)) === null || _a === void 0 ? void 0 : _a.delete(socket.id);
+        (_b = (_a = this.connections.get(socket.id)) === null || _a === void 0 ? void 0 : _a.refs) === null || _b === void 0 ? void 0 : _b.delete(ref);
+        (_c = this.refs.get(ref)) === null || _c === void 0 ? void 0 : _c.delete(socket.id);
+        ((_d = this.refs.get(ref)) === null || _d === void 0 ? void 0 : _d.size) == 0 && this.refs.delete(ref);
     }
-    listen(connection_id, ref) {
+    listen(connection_id, collection_ref, doc_id) {
         const cnn = this.connections.get(connection_id);
         if (cnn) {
-            cnn.refs.add(ref);
-            if (!this.refs.has(ref))
-                this.refs.set(ref, new Set());
+            const ref = `${collection_ref}${doc_id ? `/${doc_id}` : ''}`;
+            !cnn.refs.has(collection_ref) && cnn.refs.add(ref);
+            !this.refs.has(ref) && this.refs.set(ref, new Set());
             this.refs.get(ref).add(connection_id);
         }
     }
 };
 __decorate([
-    websockets_1.SubscribeMessage('start'),
-    __param(0, websockets_1.MessageBody()),
-    __param(1, websockets_1.ConnectedSocket()),
+    (0, websockets_1.SubscribeMessage)('start'),
+    __param(0, (0, websockets_1.MessageBody)()),
+    __param(1, (0, websockets_1.ConnectedSocket)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
 ], LivequeryWebsocketSync.prototype, "subscribe", null);
 __decorate([
-    websockets_1.SubscribeMessage('unsubscribe'),
-    __param(0, websockets_1.MessageBody()),
-    __param(1, websockets_1.ConnectedSocket()),
+    (0, websockets_1.SubscribeMessage)('unsubscribe'),
+    __param(0, (0, websockets_1.MessageBody)()),
+    __param(1, (0, websockets_1.ConnectedSocket)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
 ], LivequeryWebsocketSync.prototype, "unsubscribe", null);
 LivequeryWebsocketSync = __decorate([
-    websockets_1.WebSocketGateway({ path: process.env.REALTIME_UPDATE_SOCKET_PATH || '/livequery/realtime-updates' }),
+    (0, websockets_1.WebSocketGateway)({ path: process.env.REALTIME_UPDATE_SOCKET_PATH || '/livequery/realtime-updates' }),
     __metadata("design:paramtypes", [])
 ], LivequeryWebsocketSync);
 exports.LivequeryWebsocketSync = LivequeryWebsocketSync;

package/build/src/UseDataSource.js

@@ -13,7 +13,7 @@ exports.UseDatasource = exports.UseDataSourceInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const operators_1 = require("rxjs/operators");
-const DataSourceMetadataKey = 'jjj';
+const DataSourceMetadataKey = Symbol();
 let UseDataSourceInterceptor = class UseDataSourceInterceptor {
     constructor(moduleRef) {
         this.moduleRef = moduleRef;

package/build/src/const.d.ts

@@ -1 +1 @@
-export declare const COLLECTION_REF_SLICE_INDEX: number;
+export declare const LIVEQUERY_MAGIC_KEY: string;

package/build/src/const.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COLLECTION_REF_SLICE_INDEX = void 0;
-exports.COLLECTION_REF_SLICE_INDEX = Number(process.env.COLLECTION_REF_SLICE_INDEX || 1);
+exports.LIVEQUERY_MAGIC_KEY = void 0;
+exports.LIVEQUERY_MAGIC_KEY = process.env.LIVEQUERY_MAGIC_KEY || 'livequery';

package/build/src/pathResolver.d.ts

@@ -0,0 +1,4 @@
+export declare const pathResolver: (target: Function, method: string) => {
+    ref: string;
+    schema_ref: string;
+};

package/build/src/pathResolver.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pathResolver = void 0;
+const const_1 = require("./const");
+const pathResolver = (target, method) => {
+    var _a;
+    const collection_path = Reflect.getMetadata('path', target) || '';
+    const method_path = Reflect.getMetadata('path', target.prototype[method]) || '';
+    const refs = (_a = `${collection_path}/${method_path}`
+        .replaceAll(':', '')
+        .split(const_1.LIVEQUERY_MAGIC_KEY)) === null || _a === void 0 ? void 0 : _a[1].split('/').filter(s => s.length > 0);
+    const ref = refs.join('/');
+    const schema_ref = refs.filter((_, i) => i % 2 == 0).join('/');
+    return { ref, schema_ref };
+};
+exports.pathResolver = pathResolver;

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "1.0.23",
+    "version": "1.0.27",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -11,7 +11,7 @@
         "build/**/*"
     ],
     "devDependencies": {
-        "@livequery/types": "^1.0.25",
+        "@livequery/types": "^1.0.29",
         "@types/express": "^4.17.11",
         "@types/node": "^14.14.20"
     },