proto.io 0.0.206 → 0.0.207

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-CURcwPBG.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-CURcwPBG.js';
+import { P as ProtoClient } from './internals/index-CKcESGqE.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-CKcESGqE.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-DnbbpIaO.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-PLz89AWF.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/client.js

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

package/dist/client.mjs

@@ -1,10 +1,10 @@
-import { e as ProtoClient } from './internals/index-CSnRU_KQ.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-CSnRU_KQ.mjs';
+import { e as ProtoClient } from './internals/index-DAkcqabS.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-DAkcqabS.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';
 import 'lodash';
-import './internals/index-DpN9tcbY.mjs';
+import './internals/index-al1N-qi7.mjs';
 import 'axios';
 import '@o2ter/server-js/dist/const';
 import 'socket.io-client';

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-DnbbpIaO.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-DnbbpIaO.js';
+import { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-PLz89AWF.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-PLz89AWF.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-CURcwPBG.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-CKcESGqE.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-D7S1XD7F.js');
+var random = require('./internals/random-B0V0EnjP.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-BFZlY3IO.js');
-var index$1 = require('./internals/index-CsmAYB_t.js');
+var index = require('./internals/index-BRzKDwPs.js');
+var index$1 = require('./internals/index-B8TESzd9.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
 var node_stream = require('node:stream');
@@ -16,7 +16,7 @@ var node_crypto = require('node:crypto');
 var util = require('util');
 var cryptoJs = require('@o2ter/crypto-js');
 var Decimal = require('decimal.js');
-var index$2 = require('./internals/index-CyPxh5dl.js');
+var index$2 = require('./internals/index-CkAvNaAe.js');
 var queryType = require('query-types');
 var busboy = require('busboy');
 require('axios');
@@ -88,6 +88,7 @@ const dispatcher = (proto, options) => {
         master: options.master ?? false,
         disableSecurity: options.disableSecurity,
     });
+    const createFile = options.createFile;
     return {
         async explain(query) {
             random.QueryValidator.recursiveCheck(query);
@@ -134,35 +135,9 @@ const dispatcher = (proto, options) => {
                 throw Error('No permission');
             return proto.storage.random(decoded, opts);
         },
-        async insert(options, attrs) {
-            random.QueryValidator.recursiveCheck(attrs);
-            const _validator = await validator();
-            _validator.validateCountMatches(options.className, options.countMatches ?? []);
-            const _includes = _validator.decodeIncludes(options.className, options.includes ?? ['*']);
-            const _matches = _validator.decodeMatches(options.className, options.matches ?? {}, _includes);
-            if (!_validator.validateCLPs(options.className, 'create'))
-                throw Error('No permission');
-            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,
-                        countMatches: options.countMatches ?? [],
-                        objectIdSize: proto[_private.PVK].options.objectIdSize
-                    }, _attrs), { lockTable: options.className, retry: true });
-                }
-                catch (e) {
-                    if (proto.storage.isDuplicateIdError(e))
-                        continue;
-                    throw e;
-                }
-            }
-        },
-        async insertMany(options, values) {
-            if (options.className === 'File')
-                throw Error('File is not support insertMany');
+        async insert(options, values) {
+            if (!createFile && options.className === 'File')
+                throw Error('File is not support insert');
             random.QueryValidator.recursiveCheck(values);
             const _validator = await validator();
             _validator.validateCountMatches(options.className, options.countMatches ?? []);
@@ -173,7 +148,7 @@ const dispatcher = (proto, options) => {
             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({
+                    return await proto.storage.atomic((storage) => storage.insert({
                         className: options.className,
                         includes: _includes,
                         matches: _matches,
@@ -188,44 +163,16 @@ const dispatcher = (proto, options) => {
                 }
             }
         },
-        async updateOne(query, update) {
+        async update(query, update) {
             random.QueryValidator.recursiveCheck(query, update);
             const _validator = await validator();
             if (!_validator.validateCLPs(query.className, 'update'))
                 throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.updateOne(_validator.decodeQuery(normalize(query), 'update'), normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path))));
-        },
-        async updateMany(query, update) {
-            random.QueryValidator.recursiveCheck(query, update);
-            const _validator = await validator();
-            if (!_validator.validateCLPs(query.className, 'update'))
-                throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.updateMany(_validator.decodeQuery(normalize(query), 'update'), normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path))));
-        },
-        async upsertOne(query, update, setOnInsert) {
-            if (query.className === 'File')
-                throw Error('File is not support upsertOne');
-            random.QueryValidator.recursiveCheck(query, update, setOnInsert);
-            const _validator = await validator();
-            if (!_validator.validateCLPs(query.className, 'create', 'update'))
-                throw Error('No permission');
-            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.path));
-            while (true) {
-                try {
-                    return await proto.storage.atomic((storage) => storage.upsertOne(_query, _update, _setOnInsert), { lockTable: query.className, retry: true });
-                }
-                catch (e) {
-                    if (proto.storage.isDuplicateIdError(e))
-                        continue;
-                    throw e;
-                }
-            }
+            return proto.storage.atomic((storage) => storage.update(_validator.decodeQuery(normalize(query), 'update'), normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path))));
         },
-        async upsertMany(query, update, setOnInsert) {
+        async upsert(query, update, setOnInsert) {
             if (query.className === 'File')
-                throw Error('File is not support upsertOne');
+                throw Error('File is not support upsert');
             random.QueryValidator.recursiveCheck(query, update, setOnInsert);
             const _validator = await validator();
             if (!_validator.validateCLPs(query.className, 'create', 'update'))
@@ -235,7 +182,7 @@ const dispatcher = (proto, options) => {
             const _setOnInsert = normalize(_validator.validateFields(query.className, setOnInsert, 'create', random.QueryValidator.patterns.path));
             while (true) {
                 try {
-                    return await proto.storage.atomic((storage) => storage.upsertMany(_query, _update, _setOnInsert), { lockTable: query.className, retry: true });
+                    return await proto.storage.atomic((storage) => storage.upsert(_query, _update, _setOnInsert), { lockTable: query.className, retry: true });
                 }
                 catch (e) {
                     if (proto.storage.isDuplicateIdError(e))
@@ -244,19 +191,12 @@ const dispatcher = (proto, options) => {
                 }
             }
         },
-        async deleteOne(query) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
-            if (!_validator.validateCLPs(query.className, 'delete'))
-                throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.deleteOne(_validator.decodeQuery(normalize(query), 'update')));
-        },
-        async deleteMany(query) {
+        async delete(query) {
             random.QueryValidator.recursiveCheck(query);
             const _validator = await validator();
             if (!_validator.validateCLPs(query.className, 'delete'))
                 throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.deleteMany(_validator.decodeQuery(normalize(query), 'update')));
+            return proto.storage.atomic((storage) => storage.delete(_validator.decodeQuery(normalize(query), 'update')));
         },
     };
 };
@@ -311,6 +251,7 @@ class _ProtoQuery extends index.TQuery {
         return dispatcher(_serviceOf(options) ?? this._proto, {
             ...options ?? {},
             disableSecurity: !!this._opts.insecure,
+            createFile: !!this._opts.createFile,
         });
     }
     explain(options) {
@@ -346,45 +287,22 @@ class _ProtoQuery extends index.TQuery {
                 yield self._objectMethods(object);
         });
     }
-    async insert(attrs, options) {
-        const result = this._objectMethods(await this._dispatcher(options).insert({
-            className: this.className,
-            includes: this[_private.PVK].options.includes,
-            matches: this[_private.PVK].options.matches,
-            countMatches: this[_private.PVK].options.countMatches,
-        }, attrs));
-        if (!result)
-            throw Error('Unable to insert document');
-        return result;
-    }
     async insertMany(values, options) {
-        return this._objectMethods(await this._dispatcher(options).insertMany({
+        return this._objectMethods(await this._dispatcher(options).insert({
             className: this.className,
             includes: this[_private.PVK].options.includes,
             matches: this[_private.PVK].options.matches,
             countMatches: this[_private.PVK].options.countMatches,
         }, values));
     }
-    async updateOne(update, options) {
-        return this._objectMethods(await this._dispatcher(options).updateOne(this._queryOptions, update));
-    }
     async updateMany(update, options) {
-        return this._objectMethods(await this._dispatcher(options).updateMany(this._queryOptions, update));
-    }
-    async upsertOne(update, setOnInsert, options) {
-        const result = this._objectMethods(await this._dispatcher(options).upsertOne(this._queryOptions, update, setOnInsert));
-        if (!result)
-            throw Error('Unable to upsert document');
-        return result;
+        return this._objectMethods(await this._dispatcher(options).update(this._queryOptions, update));
     }
     async upsertMany(update, setOnInsert, options) {
-        return this._objectMethods(await this._dispatcher(options).upsertMany(this._queryOptions, update, setOnInsert));
-    }
-    async deleteOne(options) {
-        return this._objectMethods(await this._dispatcher(options).deleteOne(this._queryOptions));
+        return this._objectMethods(await this._dispatcher(options).upsert(this._queryOptions, update, setOnInsert));
     }
     async deleteMany(options) {
-        return this._objectMethods(await this._dispatcher(options).deleteMany(this._queryOptions));
+        return this._objectMethods(await this._dispatcher(options).delete(this._queryOptions));
     }
 }
 class ProtoQuery extends _ProtoQuery {
@@ -961,9 +879,8 @@ class ProtoInternal {
             object.set('size', file.size);
             if (nonce)
                 object.set('nonce', nonce);
-            const created = await proto.Query('File')
-                .includes(...object.keys())
-                .insert(_.fromPairs([...object._set_entries()]), options);
+            const query = new ProtoQuery('File', proto, { createFile: true });
+            const created = await query.includes(...object.keys()).insert(_.fromPairs([...object._set_entries()]), options);
             if (created) {
                 object[_private.PVK].attributes = created.attributes;
                 object[_private.PVK].mutated = {};
@@ -1679,7 +1596,7 @@ class ProtoService extends index.ProtoType {
                         await this.fileStorage.destroy(this, token);
                 }
             }
-            await this.storage.deleteMany({
+            await this.storage.delete({
                 className,
                 filter: index$2.QuerySelector.decode({ _expired_at: { $lt: time } }),
                 includes: ['_id', '_expired_at'],