@livequery/nestjs 1.0.48 → 1.0.50

package/build/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/src/LivequeryDatasourceInterceptors.d.ts

@@ -1,10 +1,10 @@
 import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import { LivequeryRequest } from '@livequery/types';
 import { ModuleRef } from '@nestjs/core';
-export declare type DatasourceOptions<T> = Array<T & {
+export type DatasourceOptions<T> = Array<T & {
     refs: string[];
 }>;
-export declare type Datasource<T = any> = {
+export type Datasource<T = any> = {
     query(query: LivequeryRequest): any;
 };
 export declare const DatasourceList: Map<new (...args: any[]) => Datasource, Datasource<any>>;

package/build/src/LivequeryDatasourceInterceptors.js

@@ -15,7 +15,7 @@ const rxjs_1 = require("rxjs");
 const core_1 = require("@nestjs/core");
 exports.DatasourceList = new Map();
 exports.$__datasource_factory_token = Symbol();
-let LivequeryDatasourceInterceptors = class LivequeryDatasourceInterceptors {
+let LivequeryDatasourceInterceptors = exports.LivequeryDatasourceInterceptors = class LivequeryDatasourceInterceptors {
     moduleRef;
     constructor(moduleRef) {
         this.moduleRef = moduleRef;
@@ -25,11 +25,10 @@ let LivequeryDatasourceInterceptors = class LivequeryDatasourceInterceptors {
         const datasource = exports.DatasourceList.has(token) ? exports.DatasourceList.get(token) : this.moduleRef.get(token);
         const req = ctx.switchToHttp().getRequest();
         req.livequery_response = await datasource.query(req.livequery);
-        return next.handle().pipe(rxjs_1.map(rs => rs ?? req.livequery_response));
+        return next.handle().pipe((0, rxjs_1.map)(rs => rs ?? req.livequery_response));
     }
 };
-LivequeryDatasourceInterceptors = __decorate([
-    common_1.Injectable(),
+exports.LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors = __decorate([
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.ModuleRef])
 ], LivequeryDatasourceInterceptors);
-exports.LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors;

package/build/src/LivequeryInterceptor.d.ts

@@ -1,6 +1,6 @@
 import { CallHandler, ExecutionContext, NestInterceptor } from "@nestjs/common";
 import { LivequeryWebsocketSync } from "./LivequeryWebsocketSync";
-export declare type RealtimeSubscription = {
+export type RealtimeSubscription = {
     collection_ref: string;
     doc_id: string;
 };

package/build/src/LivequeryInterceptor.js

@@ -19,7 +19,7 @@ const PathHelper_1 = require("./helpers/PathHelper");
 const LivequeryWebsocketSync_1 = require("./LivequeryWebsocketSync");
 const UseWebsocketShareKeyPair_1 = require("./UseWebsocketShareKeyPair");
 const JWT = require('jsonwebtoken');
-let LivequeryInterceptor = class LivequeryInterceptor {
+let LivequeryInterceptor = exports.LivequeryInterceptor = class LivequeryInterceptor {
     LivequeryWebsocketSync;
     secret_or_private_key;
     constructor(LivequeryWebsocketSync, secret_or_private_key) {
@@ -67,15 +67,16 @@ let LivequeryInterceptor = class LivequeryInterceptor {
                 return s(null);
             JWT.sign({ collection_ref, doc_id }, this.secret_or_private_key, {}, (error, data) => s(error ? null : data));
         });
-        return next.handle().pipe(operators_1.map(data => ({ data: { ...data, realtime_token } })));
+        return next.handle().pipe((0, operators_1.map)(data => ({ data: { ...data, realtime_token } })));
     }
 };
-LivequeryInterceptor = __decorate([
-    common_1.Injectable(),
-    __param(0, common_1.Optional()), __param(0, common_1.Inject(common_1.forwardRef(() => LivequeryWebsocketSync_1.LivequeryWebsocketSync))),
-    __param(1, common_1.Optional()), __param(1, UseWebsocketShareKeyPair_1.InjectWebsocketPrivateKey()),
+exports.LivequeryInterceptor = LivequeryInterceptor = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Optional)()),
+    __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => LivequeryWebsocketSync_1.LivequeryWebsocketSync))),
+    __param(1, (0, common_1.Optional)()),
+    __param(1, (0, UseWebsocketShareKeyPair_1.InjectWebsocketPrivateKey)()),
     __metadata("design:paramtypes", [LivequeryWebsocketSync_1.LivequeryWebsocketSync, String])
 ], LivequeryInterceptor);
-exports.LivequeryInterceptor = LivequeryInterceptor;
-const UseLivequeryInterceptor = () => common_1.UseInterceptors(LivequeryInterceptor);
+const UseLivequeryInterceptor = () => (0, common_1.UseInterceptors)(LivequeryInterceptor);
 exports.UseLivequeryInterceptor = UseLivequeryInterceptor;

package/build/src/LivequeryRequest.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LivequeryRequest = void 0;
 const common_1 = require("@nestjs/common");
-exports.LivequeryRequest = common_1.createParamDecorator((data, ctx) => {
+exports.LivequeryRequest = (0, common_1.createParamDecorator)((data, ctx) => {
     const request = ctx.switchToHttp().getRequest();
     return request.livequery;
 });

package/build/src/LivequeryResponse.d.ts

@@ -1,4 +1,4 @@
-export declare type LivequeryResponse<T = any> = {
+export type LivequeryResponse<T = any> = {
     items: T[];
     page_info?: {
         has_more: boolean;

package/build/src/LivequeryResponse.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LivequeryResponse = void 0;
 const common_1 = require("@nestjs/common");
-exports.LivequeryResponse = common_1.createParamDecorator((data, ctx) => ctx.switchToHttp().getRequest().livequery_response);
+exports.LivequeryResponse = (0, common_1.createParamDecorator)((data, ctx) => ctx.switchToHttp().getRequest().livequery_response);

package/build/src/LivequeryWebsocketSync.d.ts

@@ -1,13 +1,22 @@
 import { Subject } from "rxjs";
 import { LivequeryInterceptor, RealtimeSubscription } from "./LivequeryInterceptor";
-import { UpdatedData } from "@livequery/types";
+import { UpdatedData, UpdatedDataType } from "@livequery/types";
 export declare class LivequeryWebsocketSync {
     private secret_or_public_key;
     private connections;
     private refs;
-    readonly changes: Subject<UpdatedData<any>>;
+    readonly changes: Subject<UpdatedData>;
     constructor(secret_or_public_key: string, LivequeryInterceptor: LivequeryInterceptor);
     private handleDisconnect;
+    sync_db_change<T extends {
+        id: string;
+    }>(event: {
+        type: UpdatedDataType;
+        old_data?: T;
+        old_ref: string;
+        new_data?: T;
+        new_ref: string;
+    }): Promise<void>;
     start({ id }: {
         id: string;
     }, socket: WebSocket & {

package/build/src/LivequeryWebsocketSync.js

@@ -20,7 +20,7 @@ const crypto_1 = require("crypto");
 const common_1 = require("@nestjs/common");
 const UseWebsocketShareKeyPair_1 = require("./UseWebsocketShareKeyPair");
 const JWT = require('jsonwebtoken');
-let LivequeryWebsocketSync = class LivequeryWebsocketSync {
+let LivequeryWebsocketSync = exports.LivequeryWebsocketSync = class LivequeryWebsocketSync {
     secret_or_public_key;
     connections = new Map();
     refs = new Map();
@@ -46,7 +46,47 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         });
         this.connections.delete(socket.id);
     }
-    start({ id = crypto_1.randomUUID() }, socket) {
+    async sync_db_change(event) {
+        if (event.type == 'added') {
+            this.changes.next({
+                data: event.new_data,
+                ref: event.new_ref,
+                type: event.type
+            });
+            return;
+        }
+        if (event.type == 'modified') {
+            if (event.old_ref == event.new_ref) {
+                this.changes.next({
+                    type: 'modified',
+                    ref: event.new_ref,
+                    data: event.new_data
+                });
+            }
+            else {
+                this.changes.next({
+                    type: 'removed',
+                    ref: event.old_ref,
+                    data: { id: event.old_data.id }
+                });
+                this.changes.next({
+                    type: 'added',
+                    ref: event.new_ref,
+                    data: { ...event.old_data || {}, ...event.new_data || {}, id: event.old_data.id }
+                });
+            }
+            return;
+        }
+        if (event.type == 'removed') {
+            this.changes.next({
+                data: { id: event.old_data.id },
+                ref: event.old_ref,
+                type: event.type
+            });
+            return;
+        }
+    }
+    start({ id = (0, crypto_1.randomUUID)() }, socket) {
         if (typeof id == 'string' && id.length < 40) {
             socket.id = id;
             this.connections.set(id, { socket, refs: new Set() });
@@ -75,33 +115,34 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
     }
 };
 __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, "start", null);
 __decorate([
-    websockets_1.SubscribeMessage('subscribe'),
-    __param(0, websockets_1.MessageBody()),
-    __param(1, websockets_1.ConnectedSocket()),
+    (0, websockets_1.SubscribeMessage)('subscribe'),
+    __param(0, (0, websockets_1.MessageBody)()),
+    __param(1, (0, websockets_1.ConnectedSocket)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], 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' }),
-    __param(0, common_1.Optional()), __param(0, UseWebsocketShareKeyPair_1.InjectWebsocketPublicKey()),
-    __param(1, common_1.Optional()), __param(1, common_1.Inject(common_1.forwardRef(() => LivequeryInterceptor_1.LivequeryInterceptor))),
+exports.LivequeryWebsocketSync = LivequeryWebsocketSync = __decorate([
+    (0, websockets_1.WebSocketGateway)({ path: process.env.REALTIME_UPDATE_SOCKET_PATH || '/livequery/realtime-updates' }),
+    __param(0, (0, common_1.Optional)()),
+    __param(0, (0, UseWebsocketShareKeyPair_1.InjectWebsocketPublicKey)()),
+    __param(1, (0, common_1.Optional)()),
+    __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => LivequeryInterceptor_1.LivequeryInterceptor))),
     __metadata("design:paramtypes", [String, LivequeryInterceptor_1.LivequeryInterceptor])
 ], LivequeryWebsocketSync);
-exports.LivequeryWebsocketSync = LivequeryWebsocketSync;

package/build/src/UseWebsocketShareKeyPair.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from "@nestjs/common";
-export declare const InjectWebsocketPublicKey: () => (target: object, key: string | symbol, index?: number) => void;
-export declare const InjectWebsocketPrivateKey: () => (target: object, key: string | symbol, index?: number) => void;
-export declare const UseWebsocketPublicKey: (secret_or_public_key: string) => Provider<any>;
-export declare const UseWebsocketPrivateKey: (secret_or_private_key: string) => Provider<any>;
+export declare const InjectWebsocketPublicKey: () => PropertyDecorator & ParameterDecorator;
+export declare const InjectWebsocketPrivateKey: () => PropertyDecorator & ParameterDecorator;
+export declare const UseWebsocketPublicKey: (secret_or_public_key: string) => Provider;
+export declare const UseWebsocketPrivateKey: (secret_or_private_key: string) => Provider;

package/build/src/UseWebsocketShareKeyPair.js

@@ -4,9 +4,9 @@ exports.UseWebsocketPrivateKey = exports.UseWebsocketPublicKey = exports.InjectW
 const common_1 = require("@nestjs/common");
 const WebsocketPublicKey = 'WebsocketPublicKey';
 const WebsocketPrivateKey = 'WebsocketPrivateKey';
-const InjectWebsocketPublicKey = () => common_1.Inject(WebsocketPublicKey);
+const InjectWebsocketPublicKey = () => (0, common_1.Inject)(WebsocketPublicKey);
 exports.InjectWebsocketPublicKey = InjectWebsocketPublicKey;
-const InjectWebsocketPrivateKey = () => common_1.Inject(WebsocketPrivateKey);
+const InjectWebsocketPrivateKey = () => (0, common_1.Inject)(WebsocketPrivateKey);
 exports.InjectWebsocketPrivateKey = InjectWebsocketPrivateKey;
 const UseWebsocketPublicKey = (secret_or_public_key) => ({
     provide: WebsocketPublicKey,

package/build/src/helpers/PathHelper.js

@@ -5,6 +5,7 @@ const const_1 = require("../const");
 class PathHelper {
     static trimLivequeryHotkey(path) {
         const ref = path
+            ?.split('~')[0]
             ?.replaceAll(':', '')
             ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
             ?.split('/')
@@ -16,19 +17,18 @@ 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 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];
+        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];
         return { ref, schema_ref, is_collection, doc_id, collection_ref };
     }
     static join(a, b) {

package/build/src/helpers/createDatasourceMapper.js

@@ -7,7 +7,7 @@ const LivequeryInterceptor_1 = require("../LivequeryInterceptor");
 const PathHelper_1 = require("./PathHelper");
 const createDatasourceMapper = (datasource_factory) => {
     const RouteConfigList = [];
-    const decorator = (options) => common_1.applyDecorators((target, method) => RouteConfigList.push({ target, method, options }), LivequeryInterceptor_1.UseLivequeryInterceptor(), common_1.UseInterceptors(LivequeryDatasourceInterceptors_1.LivequeryDatasourceInterceptors), (target, method, descriptor) => {
+    const decorator = (options) => (0, common_1.applyDecorators)((target, method) => RouteConfigList.push({ target, method, options }), (0, LivequeryInterceptor_1.UseLivequeryInterceptor)(), (0, common_1.UseInterceptors)(LivequeryDatasourceInterceptors_1.LivequeryDatasourceInterceptors), (target, method, descriptor) => {
         Reflect.defineMetadata(LivequeryDatasourceInterceptors_1.$__datasource_factory_token, datasource_factory, descriptor.value);
     });
     const getDatasourceMetadatas = () => RouteConfigList.map(config => {

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "1.0.48",
+    "version": "1.0.50",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -36,6 +36,7 @@
     "license": "ISC",
     "dependencies": {
         "@types/jsonwebtoken": "x",
-        "jsonwebtoken": "x"
+        "jsonwebtoken": "x",
+        "typescript": "^5.1.6"
     }
 }