proto.io 0.0.148 → 0.0.150

package/dist/index.mjs

@@ -1,18 +1,18 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, g as generateId } from './internals/random-BjV_01xP.mjs';
+import { Q as QueryValidator, g as generateId } from './internals/random-KZTFMK9-.mjs';
 import { P as PVK } from './internals/private-BUpLAMZi.mjs';
 import { asyncStream, asyncIterableToArray, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-DGau0Wqf.mjs';
-export { c as ProtoClient, e as classExtends, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser } from './internals/index-DGau0Wqf.mjs';
-import { d as decodeUpdateOp, T as TObject, i as isShape, a as isPointer, b as isRelation, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index-EOtjV6U_.mjs';
+import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-c-CaNuVY.mjs';
+export { c as ProtoClient, e as classExtends, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser } from './internals/index-c-CaNuVY.mjs';
+import { d as decodeUpdateOp, T as TObject, i as isShape, a as isPointer, b as isRelation, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index-BmRuvHVZ.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
 import { Readable } from 'node:stream';
 import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
-import { Q as QuerySelector } from './internals/index-DTZ5uRgF.mjs';
+import { Q as QuerySelector } from './internals/index-tU-lsQqj.mjs';
 import queryType from 'query-types';
 import busboy from 'busboy';
 export { Decimal } from 'decimal.js';
@@ -135,12 +135,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[PVK].options.objectIdSize
-            }, normalize(_validator.validateFields(options.className, attrs, 'create', QueryValidator.patterns.name))), { lockTable: options.className });
+            const _attrs = normalize(_validator.validateFields(options.className, attrs, 'create', QueryValidator.patterns.path));
+            while (true) {
+                try {
+                    return await proto.storage.atomic((storage) => storage.insert({
+                        className: options.className,
+                        includes: _includes,
+                        matches: _matches,
+                        objectIdSize: proto[PVK].options.objectIdSize
+                    }, _attrs), { lockTable: options.className, retry: true });
+                }
+                catch (e) {
+                    if (proto.storage.isDuplicateIdError(e))
+                        continue;
+                    throw e;
+                }
+            }
         },
         async insertMany(options, values) {
             QueryValidator.recursiveCheck(values);
@@ -149,12 +159,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[PVK].options.objectIdSize
-            }, normalize(_.map(values, attr => _validator.validateFields(options.className, attr, 'create', QueryValidator.patterns.name)))), { lockTable: options.className });
+            const _attrs = normalize(_.map(values, attr => _validator.validateFields(options.className, attr, 'create', QueryValidator.patterns.path)));
+            while (true) {
+                try {
+                    return await proto.storage.atomic((storage) => storage.insertMany({
+                        className: options.className,
+                        includes: _includes,
+                        matches: _matches,
+                        objectIdSize: proto[PVK].options.objectIdSize
+                    }, _attrs), { lockTable: options.className, retry: true });
+                }
+                catch (e) {
+                    if (proto.storage.isDuplicateIdError(e))
+                        continue;
+                    throw e;
+                }
+            }
         },
         async updateOne(query, update) {
             QueryValidator.recursiveCheck(query, update);
@@ -168,7 +188,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', QueryValidator.patterns.path)), normalize(_validator.validateFields(query.className, setOnInsert, 'create', QueryValidator.patterns.name))));
+            const _query = _validator.decodeQuery(normalize(query), 'update');
+            const _update = normalize(_validator.validateFields(query.className, update, 'update', QueryValidator.patterns.path));
+            const _setOnInsert = normalize(_validator.validateFields(query.className, setOnInsert, 'create', QueryValidator.patterns.name));
+            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;
+                }
+            }
         },
         async deleteOne(query) {
             QueryValidator.recursiveCheck(query);
@@ -330,7 +362,7 @@ class ProtoQuery extends TQuery {
             className: this.className,
             includes: this[PVK].options.includes,
             matches: this[PVK].options.matches,
-        }, _.fromPairs([...object.entries()])));
+        }, _.fromPairs([...object._set_entries()])));
         if (!result)
             throw Error('Unable to insert document');
         if (_.isFunction(afterSave)) {
@@ -360,7 +392,7 @@ class ProtoQuery extends TQuery {
                 className: this.className,
                 includes: this[PVK].options.includes,
                 matches: this[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)))));
             }
@@ -917,7 +949,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[PVK].attributes = created.attributes;
                 object[PVK].mutated = {};
@@ -1252,6 +1284,7 @@ const schedule = (proto) => {
 //  THE SOFTWARE.
 //
 class ProtoService extends ProtoType {
+    /** @internal */
     [PVK];
     _storage;
     _schedule = schedule(this);