proto.io 0.0.209 → 0.0.211

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-Dx36qTUa.js';
-export { c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-Dx36qTUa.js';
+import { P as ProtoClient } from './internals/index-8AdKlZUU.js';
+export { c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-8AdKlZUU.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-Dn1IkLDx.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-lTzbCO8S.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/client.js

@@ -2,13 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-CK1snZyh.js');
+var index = require('./internals/index-Btxxs0KS.js');
 var Decimal = require('decimal.js');
 require('@o2ter/utils-js');
 require('./internals/private-Ciddhure.js');
 require('lodash');
 require('./internals/index-B8TESzd9.js');
 require('axios');
+require('./internals/const-C3I6cfav.js');
 require('@o2ter/server-js/dist/const');
 require('socket.io-client');
 require('@o2ter/crypto-js');

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sources":["../../src/client/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 { ProtoClient } from './proto';\n\nexport * from '../common';\n\nexport { ProtoClient };\n\nexport default ProtoClient;"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"client.js","sources":["../../src/client/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 { ProtoClient } from './proto';\n\nexport * from '../common';\n\nexport { ProtoClient };\n\nexport default ProtoClient;"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;"}

package/dist/client.mjs

@@ -1,11 +1,12 @@
-import { e as ProtoClient } from './internals/index-Eo70ZAdZ.mjs';
-export { f as classExtends, d as deserialize, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-Eo70ZAdZ.mjs';
+import { b as ProtoClient } from './internals/index-CoeDMG5V.mjs';
+export { c as classExtends, d as deserialize, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser, s as serialize } from './internals/index-CoeDMG5V.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';
 import 'lodash';
 import './internals/index-al1N-qi7.mjs';
 import 'axios';
+import './internals/const-Dkp7Nsv5.mjs';
 import '@o2ter/server-js/dist/const';
 import 'socket.io-client';
 import '@o2ter/crypto-js';

package/dist/client.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"client.mjs","sources":["../../src/client/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 { ProtoClient } from './proto';\n\nexport * from '../common';\n\nexport { ProtoClient };\n\nexport default ProtoClient;"],"names":[],"mappings":";;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;"}
+{"version":3,"file":"client.mjs","sources":["../../src/client/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 { ProtoClient } from './proto';\n\nexport * from '../common';\n\nexport { ProtoClient };\n\nexport default ProtoClient;"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;"}

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-Dn1IkLDx.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-Dn1IkLDx.js';
+import { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-lTzbCO8S.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-lTzbCO8S.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-Dx36qTUa.js';
+export { P as ProtoClient, c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-8AdKlZUU.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-B0V0EnjP.js');
+var random = require('./internals/random-CyU_Y2Ay.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-CK1snZyh.js');
+var index = require('./internals/index-Btxxs0KS.js');
 var index$1 = require('./internals/index-B8TESzd9.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -15,8 +15,9 @@ var node_stream = require('node:stream');
 var node_crypto = require('node:crypto');
 var util = require('util');
 var cryptoJs = require('@o2ter/crypto-js');
+var _const = require('./internals/const-C3I6cfav.js');
+var index$2 = require('./internals/index-D8O7SinR.js');
 var Decimal = require('decimal.js');
-var index$2 = require('./internals/index-CkAvNaAe.js');
 var queryType = require('query-types');
 var busboy = require('busboy');
 require('axios');
@@ -338,6 +339,17 @@ class _ProtoQuery extends index.TQuery {
                 })();
             }
         }
+        if (this._proto.schema[this.className]?.liveQuery) {
+            (async () => {
+                try {
+                    await this._proto[_private.PVK].publishLiveQuery(this._proto, 'create', _.filter(objects, x => x.__v === 0));
+                    await this._proto[_private.PVK].publishLiveQuery(this._proto, 'update', _.filter(objects, x => x.__v !== 0));
+                }
+                catch (e) {
+                    this._proto.logger.error(e);
+                }
+            })();
+        }
     }
     _on_delete(objects) {
         const traggers = this._proto[_private.PVK].triggers[this.className]?.delete ?? [];
@@ -353,6 +365,16 @@ class _ProtoQuery extends index.TQuery {
                 })();
             }
         }
+        if (this._proto.schema[this.className]?.liveQuery) {
+            (async () => {
+                try {
+                    await this._proto[_private.PVK].publishLiveQuery(this._proto, 'delete', objects);
+                }
+                catch (e) {
+                    this._proto.logger.error(e);
+                }
+            })();
+        }
     }
     async insertMany(values, options) {
         const objs = this._objectMethods(await this._dispatcher(options).insert({
@@ -398,6 +420,9 @@ class ProtoQuery extends _ProtoQuery {
         clone[_private.PVK].options = options ?? { ...this[_private.PVK].options };
         return clone;
     }
+    subscribe() {
+        return new index.LiveQuerySubscription(this.className, this._proto, this[_private.PVK].options.filter ?? []);
+    }
 }
 class ProtoRelationQuery extends _ProtoQuery {
     constructor(proto, opts) {
@@ -415,6 +440,9 @@ class ProtoRelationQuery extends _ProtoQuery {
         clone[_private.PVK].options = options ?? { ...this[_private.PVK].options };
         return clone;
     }
+    subscribe() {
+        throw Error('Unable to subscribe to relationship query');
+    }
 }
 
 //
@@ -755,6 +783,7 @@ const mergeSchema = (...schemas) => _.reduce(schemas, (acc, schema) => ({
             ]),
             ...(s.indexes ?? []),
         ],
+        liveQuery: acc[className]?.liveQuery || s.liveQuery,
     })),
 }), {});
 class ProtoInternal {
@@ -1011,7 +1040,7 @@ class ProtoInternal {
         if (data._rperm && (!_.isArray(data._rperm) || !_.every(data._rperm, _.isString))) {
             throw Error('Invalid data type');
         }
-        return this.options.pubsub.publish(index.PROTO_NOTY_MSG, {
+        return this.options.pubsub.publish(_const.PROTO_NOTY_MSG, {
             ...data,
             _id: this.generateId(),
             _created_at: new Date(),
@@ -1022,13 +1051,42 @@ class ProtoInternal {
         const isMaster = proto.isMaster;
         const roles = isMaster ? [] : this._perms(proto);
         return {
-            remove: this.options.pubsub.subscribe(index.PROTO_NOTY_MSG, payload => {
+            remove: this.options.pubsub.subscribe(_const.PROTO_NOTY_MSG, payload => {
                 const { _rperm } = payload;
                 (async () => {
                     try {
-                        if (isMaster || _.some(await roles, x => _.includes(_rperm, x))) {
-                            callback(payload);
-                        }
+                        if (!isMaster && !_.some(await roles, x => _.includes(_rperm, x)))
+                            return;
+                        await callback(payload);
+                    }
+                    catch (e) {
+                        proto.logger.error(e);
+                    }
+                })();
+            }),
+        };
+    }
+    async publishLiveQuery(proto, event, objects) {
+        if (_.isEmpty(objects))
+            return;
+        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 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));
+                        }));
+                        if (!_.isEmpty(payload))
+                            await callback(event, payload);
                     }
                     catch (e) {
                         proto.logger.error(e);
@@ -1037,6 +1095,26 @@ class ProtoInternal {
             }),
         };
     }
+    liveQuery(proto, event, className, filter, callback) {
+        const _filter = _.isEmpty(filter) ? true : index$2.QuerySelector.decode(filter);
+        return this._liveQuery(proto, (ev, objs) => {
+            if (event !== ev)
+                return;
+            for (const object of objs) {
+                if (className !== object.className)
+                    continue;
+                (async () => {
+                    try {
+                        if (_filter === true || _filter.eval(object))
+                            await callback(object);
+                    }
+                    catch (e) {
+                        proto.logger.error(e);
+                    }
+                })();
+            }
+        });
+    }
     validateCLPs(className, acls, keys) {
         if (!_.has(this.options.schema, className))
             throw Error('No permission');
@@ -1232,8 +1310,8 @@ const _session = (proto, request) => {
         if (parts.length === 2 && parts[0] === 'Bearer')
             authorization = parts[1];
     }
-    else if (request.cookies[index.AUTH_COOKIE_KEY]) {
-        authorization = request.cookies[index.AUTH_COOKIE_KEY];
+    else if (request.cookies[_const.AUTH_COOKIE_KEY]) {
+        authorization = request.cookies[_const.AUTH_COOKIE_KEY];
     }
     if (_.isEmpty(authorization))
         return;
@@ -1294,8 +1372,8 @@ const session = async (proto, request) => {
     };
 };
 const sessionIsMaster = (proto, request) => {
-    const user = request.header(index.MASTER_USER_HEADER_NAME);
-    const pass = request.header(index.MASTER_PASS_HEADER_NAME);
+    const user = request.header(_const.MASTER_USER_HEADER_NAME);
+    const pass = request.header(_const.MASTER_PASS_HEADER_NAME);
     if (_.isEmpty(user) || _.isEmpty(pass))
         return false;
     return _.some(proto[_private.PVK].options.masterUsers, x => x.user === user && x.pass === pass) ? 'valid' : 'invalid';
@@ -1312,7 +1390,7 @@ const signUser = async (proto, res, user, options) => {
         user: user?.objectId,
         cookieOptions,
     }, options?.jwtSignOptions ?? 'login');
-    res.cookie(index.AUTH_COOKIE_KEY, token, cookieOptions);
+    res.cookie(_const.AUTH_COOKIE_KEY, token, cookieOptions);
     sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.objectId) : {});
 };
 
@@ -1640,10 +1718,10 @@ class ProtoService extends index.ProtoType {
     }
     listen(callback, selector) {
         const _selector = !_.isNil(selector) ? index$2.QuerySelector.decode(selector) : undefined;
-        return this[_private.PVK].listen(this, data => {
+        return this[_private.PVK].listen(this, async (data) => {
             if (_selector && !_selector.eval(data))
                 return;
-            callback(data);
+            await callback(data);
         });
     }
     refs(object, options) {
@@ -2129,7 +2207,7 @@ var filesRoute = (router, proto) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         await response(res, async () => {
             const payload = proto.connect(req);
-            const uploadToken = req.header(index.UPLOAD_TOKEN_HEADER_NAME);
+            const uploadToken = req.header(_const.UPLOAD_TOKEN_HEADER_NAME);
             const { maxUploadSize } = payload[_private.PVK].varifyUploadToken(payload, uploadToken, payload.isMaster);
             const { attributes, file } = await decodeFormStream(req, (file, info) => proto.fileStorage.create(proto, file, info, maxUploadSize));
             try {
@@ -2514,15 +2592,34 @@ const ProtoRoute = async (options) => {
 const registerProtoSocket = (proto, server, endpoint) => {
     const io = endpoint ? server.socket().of(endpoint) : server.socket();
     io.on('connection', async (socket) => {
-        let listeners = {};
+        let events = {};
+        let queries = {};
         const connect = async (token) => {
             const payload = await proto.connectWithSessionToken(token);
-            const { remove } = payload.listen(data => {
-                const ids = _.keys(_.pickBy(listeners, v => v instanceof index$2.QuerySelector ? v.eval(data) : v));
+            const { remove: remove_basic } = payload.listen(data => {
+                const ids = _.keys(_.pickBy(events, v => v instanceof index$2.QuerySelector ? v.eval(data) : v));
+                const payload = JSON.parse(index.serialize(data));
                 if (!_.isEmpty(ids))
-                    socket.emit('data', { ids, data });
+                    socket.emit('ON_EV_NOTIFY', { ids, data: payload });
+            });
+            const { remove: remove_livequery } = payload[_private.PVK]._liveQuery(payload, (ev, objs) => {
+                const ids = {};
+                for (const obj of objs) {
+                    ids[obj.objectId] = _.keys(_.pickBy(queries, v => {
+                        if (v.event !== ev || v.className !== obj.className)
+                            return false;
+                        return v.filter instanceof index$2.QuerySelector ? v.filter.eval(obj) : v.filter;
+                    }));
+                }
+                if (_.isEmpty(ids))
+                    return;
+                const payload = JSON.parse(index.serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.objectId]))));
+                socket.emit('ON_EV_LIVEQUERY', { ids, data: payload });
             });
-            return remove;
+            return () => {
+                remove_basic();
+                remove_livequery();
+            };
         };
         const { token } = socket.handshake.auth;
         let remove = connect(token);
@@ -2533,8 +2630,8 @@ const registerProtoSocket = (proto, server, endpoint) => {
         socket.on('disconnect', () => {
             remove.then(rm => rm());
         });
-        socket.on('register', (payload) => {
-            listeners = _.mapValues(payload, v => {
+        socket.on('EV_NOTIFY', (payload) => {
+            events = _.mapValues(payload, v => {
                 if (_.isBoolean(v))
                     return true;
                 try {
@@ -2546,6 +2643,20 @@ const registerProtoSocket = (proto, server, endpoint) => {
                 }
             });
         });
+        socket.on('EV_LIVEQUERY', (payload) => {
+            queries = _.mapValues(payload, v => {
+                const { event = '', className = '', filter } = v ?? {};
+                if (_.isBoolean(v))
+                    return { event, className, filter: true };
+                try {
+                    return { event, className, filter: index$2.QuerySelector.decode(filter) };
+                }
+                catch (error) {
+                    proto.logger.error(error);
+                    return { event, className, filter: false };
+                }
+            });
+        });
     });
     return io;
 };