proto.io 0.0.182 → 0.0.184

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-BSyWEK8G.mjs';
+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-CQdNVgOu.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-CQdNVgOu.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';
@@ -79,9 +79,12 @@ const normalize = (x) => {
 //  THE SOFTWARE.
 //
 const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.objectId]));
-const dispatcher = (proto, options, disableSecurity) => {
+const dispatcher = (proto, options) => {
     const acls = async () => options.master ? [] : await fetchUserPerms(proto);
-    const validator = async () => new QueryValidator(proto, await acls(), options.master ?? false, disableSecurity);
+    const validator = async () => new QueryValidator(proto, await acls(), {
+        master: options.master ?? false,
+        disableSecurity: options.disableSecurity,
+    });
     return {
         async explain(query) {
             QueryValidator.recursiveCheck(query);
@@ -315,11 +318,17 @@ class _ProtoQuery extends TQuery {
         };
     }
     _dispatcher(options) {
+        const schema = this._proto.schema[this.className];
+        if (_.isNil(schema))
+            throw Error('Invalid className');
         if (this._opts.insecure) {
             if (options?.master !== true)
                 throw Error('No permission');
         }
-        return dispatcher(_serviceOf(options) ?? this._proto, options ?? {}, !!this._opts.insecure);
+        return dispatcher(_serviceOf(options) ?? this._proto, {
+            ...options ?? {},
+            disableSecurity: !!this._opts.insecure,
+        });
     }
     explain(options) {
         return this._dispatcher(options).explain(this._queryOptions);
@@ -725,6 +734,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}`);
@@ -1299,7 +1310,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 };
@@ -1451,6 +1463,7 @@ class ProtoService extends ProtoType {
     constructor(options) {
         super();
         this[PVK] = new ProtoInternal({
+            userResolver: (_req, user) => user,
             roleResolver: {},
             objectIdSize: 10,
             maxFetchLimit: 1000,