proto.io 0.0.223 → 0.0.224

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, a as QueryExpression, r as resolveColumn, b as resolveDataType, c as QuerySelector } from './internals/validator-DX2nXeQo.mjs';
+import { Q as QueryValidator, a as QueryExpression, r as resolveColumn, b as resolveDataType, c as QuerySelector } from './internals/validator-0I1kvhsL.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { prototypes, asyncStream, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-BozJOOCD.mjs';
-export { b as ProtoClient, c as classExtends } from './internals/index-BozJOOCD.mjs';
+import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-BZ79Ljis.mjs';
+export { b as ProtoClient, c as classExtends } from './internals/index-BZ79Ljis.mjs';
 import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-gWcE22mf.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -324,7 +324,7 @@ class _ProtoQuery extends TQuery {
                 yield self._objectMethods(object);
         });
     }
-    _on_upsert(objects) {
+    _on_upsert_traggers(objects) {
         const createTraggers = this._proto[PVK].triggers[this.className]?.create ?? [];
         const updateTraggers = this._proto[PVK].triggers[this.className]?.update ?? [];
         for (const obj of objects) {
@@ -339,6 +339,8 @@ class _ProtoQuery extends TQuery {
                 })();
             }
         }
+    }
+    _on_upsert(objects) {
         if (this._proto.schema[this.className]?.liveQuery) {
             (async () => {
                 try {
@@ -351,7 +353,7 @@ class _ProtoQuery extends TQuery {
             })();
         }
     }
-    _on_delete(objects) {
+    _on_delete_traggers(objects) {
         const traggers = this._proto[PVK].triggers[this.className]?.delete ?? [];
         for (const obj of objects) {
             for (const tragger of traggers) {
@@ -365,6 +367,8 @@ class _ProtoQuery extends TQuery {
                 })();
             }
         }
+    }
+    _on_delete(objects) {
         if (this._proto.schema[this.className]?.liveQuery) {
             (async () => {
                 try {
@@ -383,26 +387,30 @@ class _ProtoQuery extends TQuery {
             matches: this[PVK].options.matches,
             groupMatches: this[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;
     }
 }
@@ -1072,14 +1080,14 @@ class ProtoInternal {
         });
     }
     listen(proto, callback) {
-        const isMaster = proto.isMaster;
-        const roles = isMaster ? [] : this._perms(proto);
         return {
             remove: this.options.pubsub.subscribe(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);
                     }
@@ -1096,18 +1104,17 @@ class ProtoInternal {
         return this.options.pubsub.publish(PROTO_LIVEQUERY_MSG, JSON.parse(serialize({ event, objects }, { objAttrs: TObject.defaultKeys })));
     }
     _liveQuery(proto, callback) {
-        const isMaster = proto.isMaster;
-        const roles = isMaster ? [] : this._perms(proto);
         return {
             remove: this.options.pubsub.subscribe(PROTO_LIVEQUERY_MSG, payload => {
                 const { event, objects } = 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);
@@ -2630,42 +2637,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 QuerySelector ? v.eval(data) : v));
-                const payload = JSON.parse(serialize(data));
-                if (!_.isEmpty(ids))
-                    socket.emit('ON_EV_NOTIFY', { ids, data: payload });
-            });
-            const { remove: remove_livequery } = proto[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 QuerySelector ? v.filter.eval(obj) : v.filter;
-                    }));
-                }
-                if (_.isEmpty(ids))
-                    return;
-                const payload = JSON.parse(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 QuerySelector ? v.eval(data) : v));
+            const payload = JSON.parse(serialize(data));
+            if (!_.isEmpty(ids))
+                socket.emit('ON_EV_NOTIFY', { ids, data: payload });
+        });
+        const { remove: remove_livequery } = service[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 QuerySelector ? v.filter.eval(obj) : v.filter;
+                }));
+            }
+            if (_.isEmpty(ids))
+                return;
+            const payload = JSON.parse(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 => {