proto.io 0.0.223 → 0.0.225

package/dist/client.d.ts

@@ -1,6 +1,6 @@
-import { P as ProtoClient } from './internals/index-DRgs8WkW.js';
-export { c as classExtends } from './internals/index-DRgs8WkW.js';
-export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-B9kyejqo.js';
+import { P as ProtoClient } from './internals/index-y_bUWp3C.js';
+export { c as classExtends } from './internals/index-y_bUWp3C.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-Bi9H_aYC.js';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sources":[],"sourcesContent":[],"names":[],"mappings":""}
+{"version":3,"file":"client.d.ts","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;"}

package/dist/client.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-C01HL8O6.js');
+var index = require('./internals/index-vOFh8pVc.js');
 var Decimal = require('decimal.js');
 require('@o2ter/utils-js');
 require('./internals/private-Ciddhure.js');

package/dist/client.mjs

@@ -1,12 +1,12 @@
-import { b as ProtoClient } from './internals/index-BozJOOCD.mjs';
-export { c as classExtends, d as deserialize, s as serialize } from './internals/index-BozJOOCD.mjs';
+import { b as ProtoClient } from './internals/index-BWZIV3_T.mjs';
+export { c as classExtends, d as deserialize, s as serialize } from './internals/index-BWZIV3_T.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';
 import 'lodash';
-import './internals/index-gWcE22mf.mjs';
+import './internals/index-CSOoWRr1.mjs';
 import 'axios';
-import './internals/const-DqPhhmor.mjs';
+import './internals/const-68KwNmag.mjs';
 import '@o2ter/server-js/dist/const';
 import 'socket.io-client';
 import '@o2ter/crypto-js';

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import * as socket_io from 'socket.io';
 import { Router } from 'express';
 import { Server } from '@o2ter/server-js';
-import { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-B9kyejqo.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TFileStorage, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-B9kyejqo.js';
+import { P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions, T as TSchema, c as TValueWithoutObject } from './internals/index-Bi9H_aYC.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TFileStorage, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-Bi9H_aYC.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends } from './internals/index-DRgs8WkW.js';
+export { P as ProtoClient, c as classExtends } from './internals/index-y_bUWp3C.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sources":[],"sourcesContent":[],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sources":["../src/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { Router } from 'express';\nimport { Server } from '@o2ter/server-js';\nimport { ProtoService } from './server/proto';\nimport { ProtoServiceKeyOptions, ProtoServiceOptions } from './server/proto/types';\nimport authHandler from './server/auth';\nimport classesRoute from './server/routes/classes';\nimport functionRoute from './server/routes/function';\nimport jobRoute from './server/routes/job';\nimport filesRoute from './server/routes/files';\nimport userRoute from './server/routes/user';\nimport notifyRoute from './server/routes/notify';\nimport schemaRoute from './server/routes/schema';\nimport configRoute from './server/routes/config';\nimport { TSchema } from './internals/schema';\nimport { PVK } from './internals/private';\nimport { TValueWithoutObject } from './internals/types';\nimport Decimal from 'decimal.js';\nimport { response } from './server/routes/common';\nimport { QuerySelector } from './server/query/dispatcher/parser';\nimport { serialize } from './internals/codec';\n\nexport * from './internals/codec';\nexport { classExtends } from './internals/utils';\nexport { TFileStorage } from './server/file';\nexport { ProtoService } from './server/proto';\nexport { ProtoClient } from './client';\n\n/**\n * Schema definition utility functions.\n */\nexport const schema = _.assign((x: Record<string, TSchema>) => x, {\n  /**\n   * Defines a boolean schema.\n   * @param defaultValue - The default value for the boolean.\n   * @returns The boolean schema.\n   */\n  boolean: (defaultValue?: boolean) => ({ type: 'boolean', default: defaultValue }) as const,\n\n  /**\n   * Defines a number schema.\n   * @param defaultValue - The default value for the number.\n   * @returns The number schema.\n   */\n  number: (defaultValue?: number) => ({ type: 'number', default: defaultValue }) as const,\n\n  /**\n   * Defines a decimal schema.\n   * @param defaultValue - The default value for the decimal.\n   * @returns The decimal schema.\n   */\n  decimal: (defaultValue?: Decimal) => ({ type: 'decimal', default: defaultValue }) as const,\n\n  /**\n   * Defines a string schema.\n   * @param defaultValue - The default value for the string.\n   * @returns The string schema.\n   */\n  string: (defaultValue?: string) => ({ type: 'string', default: defaultValue }) as const,\n\n  /**\n   * Defines a string array schema.\n   * @param defaultValue - The default value for the string array.\n   * @returns The string array schema.\n   */\n  stringArray: (defaultValue?: string[]) => ({ type: 'string[]', default: defaultValue }) as const,\n\n  /**\n   * Defines a date schema.\n   * @param defaultValue - The default value for the date.\n   * @returns The date schema.\n   */\n  date: (defaultValue?: Date) => ({ type: 'date', default: defaultValue }) as const,\n\n  /**\n   * Defines an object schema.\n   * @param defaultValue - The default value for the object.\n   * @returns The object schema.\n   */\n  object: <T extends Record<string, TValueWithoutObject>>(defaultValue?: T) => ({ type: 'object', default: defaultValue }) as const,\n\n  /**\n   * Defines an array schema.\n   * @param defaultValue - The default value for the array.\n   * @returns The array schema.\n   */\n  array: <T extends TValueWithoutObject[]>(defaultValue?: T) => ({ type: 'array', default: defaultValue }) as const,\n\n  /**\n   * Defines a vector schema.\n   * @param dimension - The dimension of the vector.\n   * @param defaultValue - The default value for the vector.\n   * @returns The vector schema.\n   */\n  vector: (dimension: number, defaultValue?: number[]) => ({ type: 'vector', dimension, default: defaultValue }) as const,\n\n  /**\n   * Defines a shape schema.\n   * @param shape - The shape definition.\n   * @returns The shape schema.\n   */\n  shape: (shape: Record<string, TSchema.DataType>) => ({ type: 'shape', shape }) as const,\n\n  /**\n   * Defines a pointer schema.\n   * @param target - The target of the pointer.\n   * @returns The pointer schema.\n   */\n  pointer: (target: string) => ({ type: 'pointer', target }) as const,\n\n  /**\n   * Defines a relation schema.\n   * @param target - The target of the relation.\n   * @param foreignField - The foreign field of the relation.\n   * @returns The relation schema.\n   */\n  relation: (target: string, foreignField?: string) => ({ type: 'relation', target, foreignField }) as const,\n});\n\n/**\n * Creates a ProtoRoute.\n * @param options - The options for the ProtoRoute.\n * @returns A promise that resolves to a Router.\n */\nexport const ProtoRoute = async <E>(options: {\n  proto: ProtoService<E> | (ProtoServiceOptions<E> & ProtoServiceKeyOptions);\n}): Promise<Router> => {\n\n  const proto = options.proto instanceof ProtoService ? options.proto : new ProtoService(options.proto);\n  await proto[PVK].prepare();\n\n  const router = Server.Router().use(\n    authHandler(proto),\n    (req, res, next) => {\n      const payload = proto.connect(req);\n      if (!payload.isInvalidMasterToken) return next();\n      res.status(400).json({ message: 'Invalid token' });\n    },\n  );\n\n  router.get('/health', (req, res) => { res.sendStatus(200); });\n  router.get('/sessionInfo', async (req, res) => {\n    await response(res, () => proto.connect(req).sessionInfo());\n  });\n\n  classesRoute(router, proto);\n  functionRoute(router, proto);\n  jobRoute(router, proto);\n  filesRoute(router, proto);\n  userRoute(router, proto);\n  notifyRoute(router, proto);\n  schemaRoute(router, proto);\n  configRoute(router, proto);\n\n  return router;\n}\n\n/**\n * Registers a ProtoSocket.\n * @param proto - The ProtoService instance.\n * @param server - The server instance.\n * @param endpoint - The optional endpoint.\n * @returns The socket.io instance.\n */\nexport const registerProtoSocket = <E>(\n  proto: ProtoService<E>,\n  server: Server,\n  endpoint?: string,\n) => {\n  const io = endpoint ? server.socket().of(endpoint) : server.socket();\n\n  io.on('connection', async (socket) => {\n\n    let { token } = socket.handshake.auth;\n    const service = await proto.connectWithSessionToken(token);\n\n    socket.on('auth', (t) => {\n      token = t;\n      service.connectWithSessionToken(t);\n    });\n\n    type QueryOpts = {\n      event: string;\n      className: string;\n      filter: QuerySelector | boolean;\n    };\n\n    let events: Record<string, QuerySelector | boolean> = {};\n    let queries: Record<string, QueryOpts> = {};\n\n    const { remove: remove_basic } = service.listen(data => {\n      const ids = _.keys(_.pickBy(events, v => v instanceof QuerySelector ? v.eval(data) : v));\n      const payload = JSON.parse(serialize(data));\n      if (!_.isEmpty(ids)) socket.emit('ON_EV_NOTIFY', { ids, data: payload });\n    });\n\n    const { remove: remove_livequery } = service[PVK]._liveQuery(service, (ev, objs) => {\n      const ids: Record<string, string[]> = {};\n      for (const obj of objs) {\n        ids[obj.id!] = _.keys(_.pickBy(queries, v => {\n          if (v.event !== ev || v.className !== obj.className) return false;\n          return v.filter instanceof QuerySelector ? v.filter.eval(obj) : v.filter;\n        }));\n      }\n      if (_.isEmpty(ids)) return;\n      const payload = JSON.parse(serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.id!]))));\n      socket.emit('ON_EV_LIVEQUERY', { ids, data: payload });\n    });\n\n    socket.on('disconnect', () => {\n      remove_basic();\n      remove_livequery();\n    });\n\n    socket.on('EV_NOTIFY', (payload) => {\n      events = _.mapValues(payload, v => {\n        if (_.isBoolean(v)) return true;\n        try {\n          return QuerySelector.decode(v);\n        } catch (error) {\n          proto.logger.error(error);\n          return false;\n        }\n      });\n    });\n\n    socket.on('EV_LIVEQUERY', (payload) => {\n      queries = _.mapValues(payload, v => {\n        const { event = '', className = '', filter } = v ?? {};\n        if (_.isBoolean(v)) return { event, className, filter: true };\n        try {\n          return { event, className, filter: QuerySelector.decode(filter) };\n        } catch (error) {\n          proto.logger.error(error);\n          return { event, className, filter: false };\n        }\n      });\n    });\n  });\n\n  return io;\n}\n\nexport default ProtoRoute;"],"names":[],"mappings":";;;;;;;;;;;;;;;AAYA;AACA;AACA;AACO,cAAA,MAAA,OAAA,MAAA,SAAA,OAAA,MAAA,MAAA,SAAA,OAAA;AACP;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,6BAAA,OAAA;AACA;AACA,0BAAA,OAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAAA,IAAA;AACA;AACA,0BAAA,IAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uBAAA,MAAA,SAAA,mBAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,sBAAA,mBAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAA,MAAA,SAAA,OAAA,CAAA,QAAA;AACA;AACA,wBAAA,MAAA,SAAA,OAAA,CAAA,QAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,cAAA,UAAA;AACP,WAAA,YAAA,OAAA,mBAAA,MAAA,sBAAA;AACA,MAAA,OAAA,CAAA,MAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,cAAA,mBAAA,aAAA,YAAA,aAAA,MAAA,wBAAqG,SAAmB,CAAA,MAAA,CAAQ,SAAmB,CAAA,gBAAA,EAAmB,SAAmB,CAAA,gBAAA,EAAmB,SAAmB,CAAA,gBAAA,SAA0B,SAAmB,CAAA,SAAA,CAAW,SAAmB,CAAA,gBAAA,EAAmB,SAAmB,mBAAmB,SAAmB,CAAA,gBAAA;;;;"}

package/dist/index.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var validator = require('./internals/validator-B5yHpyvb.js');
+var validator = require('./internals/validator-Bc1jRJfA.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-C01HL8O6.js');
+var index = require('./internals/index-vOFh8pVc.js');
 var index$1 = require('./internals/index-CLKTEIj0.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -327,7 +327,7 @@ class _ProtoQuery extends index.TQuery {
                 yield self._objectMethods(object);
         });
     }
-    _on_upsert(objects) {
+    _on_upsert_traggers(objects) {
         const createTraggers = this._proto[_private.PVK].triggers[this.className]?.create ?? [];
         const updateTraggers = this._proto[_private.PVK].triggers[this.className]?.update ?? [];
         for (const obj of objects) {
@@ -342,6 +342,8 @@ class _ProtoQuery extends index.TQuery {
                 })();
             }
         }
+    }
+    _on_upsert(objects) {
         if (this._proto.schema[this.className]?.liveQuery) {
             (async () => {
                 try {
@@ -354,7 +356,7 @@ class _ProtoQuery extends index.TQuery {
             })();
         }
     }
-    _on_delete(objects) {
+    _on_delete_traggers(objects) {
         const traggers = this._proto[_private.PVK].triggers[this.className]?.delete ?? [];
         for (const obj of objects) {
             for (const tragger of traggers) {
@@ -368,6 +370,8 @@ class _ProtoQuery extends index.TQuery {
                 })();
             }
         }
+    }
+    _on_delete(objects) {
         if (this._proto.schema[this.className]?.liveQuery) {
             (async () => {
                 try {
@@ -386,26 +390,30 @@ class _ProtoQuery extends index.TQuery {
             matches: this[_private.PVK].options.matches,
             groupMatches: this[_private.PVK].options.groupMatches,
         }, values));
-        if (!options?.silent)
-            this._on_upsert(objs);
+        this._on_upsert(objs);
+        if (!options?.silent || !options.master)
+            this._on_upsert_traggers(objs);
         return objs;
     }
     async updateMany(update, options) {
         const objs = this._objectMethods(await this._dispatcher(options).update(this._queryOptions, update));
-        if (!options?.silent)
-            this._on_upsert(objs);
+        this._on_upsert(objs);
+        if (!options?.silent || !options.master)
+            this._on_upsert_traggers(objs);
         return objs;
     }
     async upsertMany(update, setOnInsert, options) {
         const objs = this._objectMethods(await this._dispatcher(options).upsert(this._queryOptions, update, setOnInsert));
-        if (!options?.silent)
-            this._on_upsert(objs);
+        this._on_upsert(objs);
+        if (!options?.silent || !options.master)
+            this._on_upsert_traggers(objs);
         return objs;
     }
     async deleteMany(options) {
         const objs = this._objectMethods(await this._dispatcher(options).delete(this._queryOptions));
-        if (!options?.silent)
-            this._on_delete(objs);
+        this._on_delete(objs);
+        if (!options?.silent || !options.master)
+            this._on_delete_traggers(objs);
         return objs;
     }
 }
@@ -1075,14 +1083,14 @@ class ProtoInternal {
         });
     }
     listen(proto, callback) {
-        const isMaster = proto.isMaster;
-        const roles = isMaster ? [] : this._perms(proto);
         return {
             remove: this.options.pubsub.subscribe(_const.PROTO_NOTY_MSG, payload => {
                 const { _rperm } = payload;
                 (async () => {
                     try {
-                        if (!isMaster && !_.some(await roles, x => _.includes(_rperm, x)))
+                        const isMaster = proto.isMaster;
+                        const roles = isMaster ? [] : await this._perms(proto);
+                        if (!isMaster && !_.some(roles, x => _.includes(_rperm, x)))
                             return;
                         await callback(payload);
                     }
@@ -1099,18 +1107,17 @@ class ProtoInternal {
         return this.options.pubsub.publish(_const.PROTO_LIVEQUERY_MSG, JSON.parse(index.serialize({ event, objects }, { objAttrs: index$1.TObject.defaultKeys })));
     }
     _liveQuery(proto, callback) {
-        const isMaster = proto.isMaster;
-        const roles = isMaster ? [] : this._perms(proto);
         return {
             remove: this.options.pubsub.subscribe(_const.PROTO_LIVEQUERY_MSG, payload => {
                 const { event, objects } = index.deserialize(JSON.stringify(payload));
                 (async () => {
                     try {
-                        const _roles = await roles;
+                        const isMaster = proto.isMaster;
+                        const roles = isMaster ? [] : await this._perms(proto);
                         const payload = proto.rebind(isMaster ? objects : _.filter(objects, object => {
                             const acl = object.acl();
                             const clp = proto.schema[object.className].classLevelPermissions?.get ?? ['*'];
-                            return _.some(_roles, x => _.includes(clp, x) && _.includes(acl.read, x));
+                            return _.some(roles, x => _.includes(clp, x) && _.includes(acl.read, x));
                         }));
                         if (!_.isEmpty(payload))
                             await callback(event, payload);
@@ -2281,6 +2288,7 @@ var filesRoute = (router, proto) => {
         }
         res.setHeader('Content-Type', file.type);
         res.setHeader('Cache-Control', 'public, max-age=0');
+        res.setHeader('Content-Disposition', 'attachment');
         res.setHeader('ETag', `"${id}"`);
         let stream;
         if (_.isArray(ranges) && ranges.type === 'bytes') {
@@ -2633,42 +2641,37 @@ const ProtoRoute = async (options) => {
 const registerProtoSocket = (proto, server, endpoint) => {
     const io = endpoint ? server.socket().of(endpoint) : server.socket();
     io.on('connection', async (socket) => {
+        let { token } = socket.handshake.auth;
+        const service = await proto.connectWithSessionToken(token);
+        socket.on('auth', (t) => {
+            token = t;
+            service.connectWithSessionToken(t);
+        });
         let events = {};
         let queries = {};
-        const connect = (proto) => {
-            const { remove: remove_basic } = proto.listen(data => {
-                const ids = _.keys(_.pickBy(events, v => v instanceof validator.QuerySelector ? v.eval(data) : v));
-                const payload = JSON.parse(index.serialize(data));
-                if (!_.isEmpty(ids))
-                    socket.emit('ON_EV_NOTIFY', { ids, data: payload });
-            });
-            const { remove: remove_livequery } = proto[_private.PVK]._liveQuery(proto, (ev, objs) => {
-                const ids = {};
-                for (const obj of objs) {
-                    ids[obj.id] = _.keys(_.pickBy(queries, v => {
-                        if (v.event !== ev || v.className !== obj.className)
-                            return false;
-                        return v.filter instanceof validator.QuerySelector ? v.filter.eval(obj) : v.filter;
-                    }));
-                }
-                if (_.isEmpty(ids))
-                    return;
-                const payload = JSON.parse(index.serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.id]))));
-                socket.emit('ON_EV_LIVEQUERY', { ids, data: payload });
-            });
-            return () => {
-                remove_basic();
-                remove_livequery();
-            };
-        };
-        const { token } = socket.handshake.auth;
-        const service = await proto.connectWithSessionToken(token);
-        const remove = connect(service);
-        socket.on('auth', (token) => {
-            service.connectWithSessionToken(token);
+        const { remove: remove_basic } = service.listen(data => {
+            const ids = _.keys(_.pickBy(events, v => v instanceof validator.QuerySelector ? v.eval(data) : v));
+            const payload = JSON.parse(index.serialize(data));
+            if (!_.isEmpty(ids))
+                socket.emit('ON_EV_NOTIFY', { ids, data: payload });
+        });
+        const { remove: remove_livequery } = service[_private.PVK]._liveQuery(service, (ev, objs) => {
+            const ids = {};
+            for (const obj of objs) {
+                ids[obj.id] = _.keys(_.pickBy(queries, v => {
+                    if (v.event !== ev || v.className !== obj.className)
+                        return false;
+                    return v.filter instanceof validator.QuerySelector ? v.filter.eval(obj) : v.filter;
+                }));
+            }
+            if (_.isEmpty(ids))
+                return;
+            const payload = JSON.parse(index.serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.id]))));
+            socket.emit('ON_EV_LIVEQUERY', { ids, data: payload });
         });
         socket.on('disconnect', () => {
-            remove();
+            remove_basic();
+            remove_livequery();
         });
         socket.on('EV_NOTIFY', (payload) => {
             events = _.mapValues(payload, v => {