proto.io 0.0.147 → 0.0.149

package/dist/client.d.ts

@@ -1,12 +1,10 @@
-import { P as ProtoClient } from './internals/index-bbPCIbir.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-bbPCIbir.js';
+import { P as ProtoClient } from './internals/index-CKgKjs8z.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-CKgKjs8z.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BWztjrw_.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-DnREUbmG.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';
-import 'stream';
-import 'axios';
 import 'jsonwebtoken';
 import '@o2ter/server-js';
 import 'lodash';

package/dist/client.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-CT01T3qs.js');
+var index = require('./internals/index-D1YGwuNK.js');
 var Decimal = require('decimal.js');
-require('./internals/index-C6zdNpc_.js');
+require('./internals/index-CVutVPmd.js');
 require('lodash');
 require('./internals/private-CSB1Ep4g.js');
 require('@o2ter/utils-js');

package/dist/client.mjs

@@ -1,7 +1,7 @@
-import { c as ProtoClient } from './internals/index-Do-zNOpD.mjs';
-export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-Do-zNOpD.mjs';
+import { c as ProtoClient } from './internals/index-c-CaNuVY.mjs';
+export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-c-CaNuVY.mjs';
 export { Decimal } from 'decimal.js';
-import './internals/index-EOtjV6U_.mjs';
+import './internals/index-BmRuvHVZ.mjs';
 import 'lodash';
 import './internals/private-BUpLAMZi.mjs';
 import '@o2ter/utils-js';

package/dist/index.d.ts

@@ -2,19 +2,17 @@ import * as socket_io from 'socket.io';
 import * as socket_io_dist_typed_events from 'socket.io/dist/typed-events';
 import * as express_serve_static_core from 'express-serve-static-core';
 import { Server, RequestHandler } from '@o2ter/server-js';
-import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-BWztjrw_.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BWztjrw_.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-DnREUbmG.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-DnREUbmG.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-bbPCIbir.js';
+export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-CKgKjs8z.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';
 import 'node:stream';
 import 'socket.io-client';
 import '@socket.io/component-emitter';
-import 'stream';
-import 'axios';
 
 declare const schema: ((x: Record<string, TSchema>) => Record<string, TSchema>) & {
     boolean: (defaultValue?: boolean) => {

package/dist/index.js

@@ -4,18 +4,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-XGNkddOu.js');
+var random = require('./internals/random-DBDmz54D.js');
 var _private = require('./internals/private-CSB1Ep4g.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-CT01T3qs.js');
-var index$1 = require('./internals/index-C6zdNpc_.js');
+var index = require('./internals/index-D1YGwuNK.js');
+var index$1 = require('./internals/index-CVutVPmd.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
 var node_stream = require('node:stream');
 var node_crypto = require('node:crypto');
 var util = require('util');
 var cryptoJs = require('@o2ter/crypto-js');
-var index$2 = require('./internals/index-DZS2c96L.js');
+var index$2 = require('./internals/index-CSNRyhjB.js');
 var queryType = require('query-types');
 var busboy = require('busboy');
 var Decimal = require('decimal.js');
@@ -138,12 +138,22 @@ const dispatcher = (proto, options, disableSecurity) => {
             const _matches = _validator.decodeMatches(options.className, options.matches ?? {}, _includes);
             if (!_validator.validateCLPs(options.className, 'create'))
                 throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.insert({
-                className: options.className,
-                includes: _includes,
-                matches: _matches,
-                objectIdSize: proto[_private.PVK].options.objectIdSize
-            }, normalize(_validator.validateFields(options.className, attrs, 'create', random.QueryValidator.patterns.name))), { lockTable: options.className });
+            const _attrs = normalize(_validator.validateFields(options.className, attrs, 'create', random.QueryValidator.patterns.path));
+            while (true) {
+                try {
+                    return await proto.storage.atomic((storage) => storage.insert({
+                        className: options.className,
+                        includes: _includes,
+                        matches: _matches,
+                        objectIdSize: proto[_private.PVK].options.objectIdSize
+                    }, _attrs), { lockTable: options.className });
+                }
+                catch (e) {
+                    if (proto.storage.isDuplicateIdError(e))
+                        continue;
+                    throw e;
+                }
+            }
         },
         async insertMany(options, values) {
             random.QueryValidator.recursiveCheck(values);
@@ -152,12 +162,22 @@ const dispatcher = (proto, options, disableSecurity) => {
             const _matches = _validator.decodeMatches(options.className, options.matches ?? {}, _includes);
             if (!_validator.validateCLPs(options.className, 'create'))
                 throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.insertMany({
-                className: options.className,
-                includes: _includes,
-                matches: _matches,
-                objectIdSize: proto[_private.PVK].options.objectIdSize
-            }, normalize(_.map(values, attr => _validator.validateFields(options.className, attr, 'create', random.QueryValidator.patterns.name)))), { lockTable: options.className });
+            const _attrs = normalize(_.map(values, attr => _validator.validateFields(options.className, attr, 'create', random.QueryValidator.patterns.path)));
+            while (true) {
+                try {
+                    return await proto.storage.atomic((storage) => storage.insertMany({
+                        className: options.className,
+                        includes: _includes,
+                        matches: _matches,
+                        objectIdSize: proto[_private.PVK].options.objectIdSize
+                    }, _attrs), { lockTable: options.className });
+                }
+                catch (e) {
+                    if (proto.storage.isDuplicateIdError(e))
+                        continue;
+                    throw e;
+                }
+            }
         },
         async updateOne(query, update) {
             random.QueryValidator.recursiveCheck(query, update);
@@ -171,7 +191,19 @@ const dispatcher = (proto, options, disableSecurity) => {
             const _validator = await validator();
             if (!_validator.validateCLPs(query.className, 'create', 'update'))
                 throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.upsertOne(_validator.decodeQuery(normalize(query), 'update'), normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path)), normalize(_validator.validateFields(query.className, setOnInsert, 'create', random.QueryValidator.patterns.name))));
+            const _query = _validator.decodeQuery(normalize(query), 'update');
+            const _update = normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path));
+            const _setOnInsert = normalize(_validator.validateFields(query.className, setOnInsert, 'create', random.QueryValidator.patterns.name));
+            while (true) {
+                try {
+                    return await proto.storage.atomic((storage) => storage.upsertOne(_query, _update, _setOnInsert));
+                }
+                catch (e) {
+                    if (proto.storage.isDuplicateIdError(e))
+                        continue;
+                    throw e;
+                }
+            }
         },
         async deleteOne(query) {
             random.QueryValidator.recursiveCheck(query);
@@ -319,9 +351,10 @@ class ProtoQuery extends index.TQuery {
         });
     }
     async insert(attrs, options) {
-        const beforeSave = this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         const context = options?.context ?? {};
+        const silent = _.castArray(options?.silent ?? []);
+        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
+        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         const object = this._proto.Object(this.className);
         for (const [key, value] of _.toPairs(attrs)) {
             object[_private.PVK].mutated[key] = { $set: value };
@@ -332,7 +365,7 @@ class ProtoQuery extends index.TQuery {
             className: this.className,
             includes: this[_private.PVK].options.includes,
             matches: this[_private.PVK].options.matches,
-        }, _.fromPairs([...object.entries()])));
+        }, _.fromPairs([...object._set_entries()])));
         if (!result)
             throw Error('Unable to insert document');
         if (_.isFunction(afterSave)) {
@@ -341,9 +374,10 @@ class ProtoQuery extends index.TQuery {
         return result;
     }
     async insertMany(values, options) {
-        const beforeSave = this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         const context = options?.context ?? {};
+        const silent = _.castArray(options?.silent ?? []);
+        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
+        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         if (_.isFunction(beforeSave) || _.isFunction(afterSave)) {
             const objects = _.map(values, attr => {
                 const object = this._proto.Object(this.className);
@@ -361,7 +395,7 @@ class ProtoQuery extends index.TQuery {
                 className: this.className,
                 includes: this[_private.PVK].options.includes,
                 matches: this[_private.PVK].options.matches,
-            }, _.map(objects, x => _.fromPairs([...x.entries()])));
+            }, _.map(objects, x => _.fromPairs([...x._set_entries()])));
             if (_.isFunction(afterSave)) {
                 await Promise.all(_.map(objects, object => afterSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)))));
             }
@@ -374,9 +408,10 @@ class ProtoQuery extends index.TQuery {
         }, values);
     }
     async updateOne(update, options) {
-        const beforeSave = this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         const context = options?.context ?? {};
+        const silent = _.castArray(options?.silent ?? []);
+        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
+        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         if (_.isFunction(beforeSave)) {
             const object = this._objectMethods(_.first(await utilsJs.asyncIterableToArray(this._dispatcher(options).find({ ...this._queryOptions, limit: 1 }))));
             if (!object)
@@ -392,9 +427,10 @@ class ProtoQuery extends index.TQuery {
         return result;
     }
     async upsertOne(update, setOnInsert, options) {
-        const beforeSave = this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         const context = options?.context ?? {};
+        const silent = _.castArray(options?.silent ?? []);
+        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[_private.PVK].triggers?.beforeSave?.[this.className];
+        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[_private.PVK].triggers?.afterSave?.[this.className];
         if (_.isFunction(beforeSave)) {
             let object = this._objectMethods(_.first(await utilsJs.asyncIterableToArray(this._dispatcher(options).find({ ...this._queryOptions, limit: 1 }))));
             if (object) {
@@ -429,9 +465,10 @@ class ProtoQuery extends index.TQuery {
         return result;
     }
     async deleteOne(options) {
-        const beforeDelete = this._proto[_private.PVK].triggers?.beforeDelete?.[this.className];
-        const afterDelete = this._proto[_private.PVK].triggers?.afterDelete?.[this.className];
         const context = options?.context ?? {};
+        const silent = _.castArray(options?.silent ?? []);
+        const beforeDelete = _.includes(silent, 'beforeDelete') ? null : this._proto[_private.PVK].triggers?.beforeDelete?.[this.className];
+        const afterDelete = _.includes(silent, 'afterDelete') ? null : this._proto[_private.PVK].triggers?.afterDelete?.[this.className];
         let result;
         if (_.isFunction(beforeDelete)) {
             const object = this._objectMethods(_.first(await utilsJs.asyncIterableToArray(this._dispatcher(options).find({ ...this._queryOptions, limit: 1 }))));
@@ -452,9 +489,10 @@ class ProtoQuery extends index.TQuery {
         return result;
     }
     async deleteMany(options) {
-        const beforeDelete = this._proto[_private.PVK].triggers?.beforeDelete?.[this.className];
-        const afterDelete = this._proto[_private.PVK].triggers?.afterDelete?.[this.className];
         const context = options?.context ?? {};
+        const silent = _.castArray(options?.silent ?? []);
+        const beforeDelete = _.includes(silent, 'beforeDelete') ? null : this._proto[_private.PVK].triggers?.beforeDelete?.[this.className];
+        const afterDelete = _.includes(silent, 'afterDelete') ? null : this._proto[_private.PVK].triggers?.afterDelete?.[this.className];
         if (_.isFunction(beforeDelete) || _.isFunction(afterDelete)) {
             const objects = this._objectMethods(await utilsJs.asyncIterableToArray(this._dispatcher(options).find(this._queryOptions)));
             if (_.isEmpty(objects))
@@ -914,7 +952,7 @@ class ProtoInternal {
                 object.set('nonce', nonce);
             const created = await proto.Query('File')
                 .includes(...object.keys())
-                .insert(_.fromPairs([...object.entries()]), options);
+                .insert(_.fromPairs([...object._set_entries()]), options);
             if (created) {
                 object[_private.PVK].attributes = created.attributes;
                 object[_private.PVK].mutated = {};
@@ -928,31 +966,16 @@ class ProtoInternal {
         }
     }
     async saveFile(proto, object, options) {
-        const beforeSave = this.triggers?.beforeSaveFile;
-        const afterSave = this.triggers?.afterSaveFile;
-        const context = options?.context ?? {};
-        if (_.isFunction(beforeSave)) {
-            await beforeSave(proxy(Object.setPrototypeOf({ object, context }, proto)));
-        }
         if (object.objectId) {
             object = await this.updateFile(proto, object, options);
         }
         else {
             object = await this.createFile(proto, object, options);
         }
-        if (_.isFunction(afterSave)) {
-            await afterSave(proxy(Object.setPrototypeOf({ object, context }, proto)));
-        }
         return object;
     }
     async deleteFile(proto, object, options) {
-        const beforeDelete = this.triggers?.beforeDeleteFile;
-        const afterDelete = this.triggers?.afterDeleteFile;
         object = await object.fetchIfNeeded(['token'], options);
-        const context = options?.context ?? {};
-        if (_.isFunction(beforeDelete)) {
-            await beforeDelete(proxy(Object.setPrototypeOf({ object, context }, proto)));
-        }
         const deleted = await proto.Query('File')
             .equalTo('_id', object.objectId)
             .deleteOne(options);
@@ -962,9 +985,6 @@ class ProtoInternal {
             object[_private.PVK].extra = {};
         }
         this.destroyFileData(proto, object.token);
-        if (_.isFunction(afterDelete)) {
-            await afterDelete(proxy(Object.setPrototypeOf({ object, context }, proto)));
-        }
         return object;
     }
     fileData(proto, object, options) {
@@ -1267,6 +1287,7 @@ const schedule = (proto) => {
 //  THE SOFTWARE.
 //
 class ProtoService extends index.ProtoType {
+    /** @internal */
     [_private.PVK];
     _storage;
     _schedule = schedule(this);
@@ -1412,18 +1433,6 @@ class ProtoService extends index.ProtoType {
             this[_private.PVK].triggers.afterDelete = {};
         this[_private.PVK].triggers.afterDelete[name] = callback;
     }
-    beforeSaveFile(callback) {
-        this[_private.PVK].triggers.beforeSaveFile = callback;
-    }
-    afterSaveFile(callback) {
-        this[_private.PVK].triggers.afterSaveFile = callback;
-    }
-    beforeDeleteFile(callback) {
-        this[_private.PVK].triggers.beforeDeleteFile = callback;
-    }
-    afterDeleteFile(callback) {
-        this[_private.PVK].triggers.afterDeleteFile = callback;
-    }
     lockTable(className, update) {
         return this.storage.lockTable(className, update);
     }
@@ -1590,11 +1599,11 @@ var classesRoute = (router, proto) => {
         if (!_.includes(classes, name))
             return res.sendStatus(404);
         await response(res, async () => {
-            const { operation, context, random, attributes, update, setOnInsert, ...options } = index.deserialize(req.body);
+            const { operation, context, silent, random, attributes, update, setOnInsert, ...options } = index.deserialize(req.body);
             const payload = proto.connect(req);
             const query = payload.Query(name);
             query[_private.PVK].options = options;
-            const opts = { master: payload.isMaster, context };
+            const opts = { master: payload.isMaster, context, silent };
             switch (operation) {
                 case 'explain':
                     if (!payload.isMaster)