proto.io 0.0.183 → 0.0.185

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { Server } from '@o2ter/server-js';
 import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-BtYyzHJD.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { asyncStream, prototypes, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { T as TQuery, P as PROTO_NOTY_MSG, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, c as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-CmJh3t_k.mjs';
-export { e as ProtoClient, f as classExtends, k as isFile, g as isObject, i as isQuery, j as isRole, h as isUser } from './internals/index-CmJh3t_k.mjs';
+import { T as TQuery, P as PROTO_NOTY_MSG, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, c as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-DdXXYN4Z.mjs';
+export { e as ProtoClient, f as classExtends, k as isFile, l as isJob, g as isObject, i as isQuery, j as isRole, h as isUser } from './internals/index-DdXXYN4Z.mjs';
 import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-DyjcBbS1.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -252,32 +252,6 @@ const dispatcher = (proto, options) => {
     };
 };
 
-//
-//  options.ts
-//
-//  The MIT License
-//  Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-const _serviceOf = (options) => options?.session instanceof ProtoService ? options?.session : undefined;
-
 //
 //  methods.ts
 //
@@ -734,6 +708,8 @@ const validateForeignField = (schema, key, dataType) => {
         throw Error(`Invalid foreign field: ${key}`);
 };
 const validateShapedObject = (schema, dataType) => {
+    if (_.isEmpty(dataType.shape))
+        throw Error('Invalid empty shape');
     for (const [key, type] of _.entries(dataType.shape)) {
         if (!key.match(QueryValidator.patterns.name))
             throw Error(`Invalid field name: ${key}`);
@@ -1308,7 +1284,8 @@ const fetchSessionInfo = async (proto, userId) => {
     const cache = userCacheMap.get(proto[PVK]);
     if (_.isNil(cache[userId]))
         cache[userId] = (async () => {
-            const user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
+            const _user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
+            const user = proto.req ? await proto[PVK].options.userResolver(proto, _user) : _user;
             const _roles = user instanceof TUser ? _.filter(await proto.userRoles(user), x => !_.isEmpty(x.name)) : [];
             cache[userId] = undefined;
             return { user, _roles };
@@ -1450,6 +1427,7 @@ const schedule = (proto) => {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
+const _serviceOf = (options) => options?.session instanceof ProtoService ? options?.session : undefined;
 class ProtoService extends ProtoType {
     /** @internal */
     [PVK];
@@ -1460,6 +1438,7 @@ class ProtoService extends ProtoType {
     constructor(options) {
         super();
         this[PVK] = new ProtoInternal({
+            userResolver: (_req, user) => user,
             roleResolver: {},
             objectIdSize: 10,
             maxFetchLimit: 1000,