proto.io 0.0.149 → 0.0.151

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-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';
+import { P as ProtoClient } from './internals/index-DoamtgZq.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DoamtgZq.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-DnREUbmG.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-DGI4rZSw.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/index.d.ts

@@ -2,11 +2,11 @@ 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-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 { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-DGI4rZSw.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-DGI4rZSw.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-CKgKjs8z.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-DoamtgZq.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -146,7 +146,7 @@ const dispatcher = (proto, options, disableSecurity) => {
                         includes: _includes,
                         matches: _matches,
                         objectIdSize: proto[_private.PVK].options.objectIdSize
-                    }, _attrs), { lockTable: options.className });
+                    }, _attrs), { lockTable: options.className, retry: true });
                 }
                 catch (e) {
                     if (proto.storage.isDuplicateIdError(e))
@@ -170,7 +170,7 @@ const dispatcher = (proto, options, disableSecurity) => {
                         includes: _includes,
                         matches: _matches,
                         objectIdSize: proto[_private.PVK].options.objectIdSize
-                    }, _attrs), { lockTable: options.className });
+                    }, _attrs), { lockTable: options.className, retry: true });
                 }
                 catch (e) {
                     if (proto.storage.isDuplicateIdError(e))
@@ -196,7 +196,7 @@ const dispatcher = (proto, options, disableSecurity) => {
             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));
+                    return await proto.storage.atomic((storage) => storage.upsertOne(_query, _update, _setOnInsert), { lockTable: query.className, retry: true });
                 }
                 catch (e) {
                     if (proto.storage.isDuplicateIdError(e))
@@ -1147,9 +1147,9 @@ const sessionId = (proto, request) => {
 const sessionInfoMap = new WeakMap();
 const fetchSessionInfo = async (proto, userId) => {
     const user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
-    const roles = user instanceof index.TUser ? _.compact(_.map(await proto.userRoles(user), x => x.name)) : [];
+    const roles = user instanceof index.TUser ? _.filter(await proto.userRoles(user), x => !_.isEmpty(x.name)) : [];
     return {
-        roles: roles,
+        _roles: roles,
         user: user instanceof index.TUser ? user : undefined,
     };
 };
@@ -1346,9 +1346,13 @@ class ProtoService extends index.ProtoType {
         const session = await this.sessionInfo();
         return session?.user;
     }
-    async currentRoles() {
+    async _currentRoles() {
         const session = await this.sessionInfo();
-        return session?.roles ?? [];
+        return session?._roles ?? [];
+    }
+    async currentRoles() {
+        const roles = await this._currentRoles();
+        return _.compact(_.map(roles, x => x.name));
     }
     get isMaster() {
         return this.req ? sessionIsMaster(this, this.req) === 'valid' : false;