proto.io 0.0.139 → 0.0.141

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { Server } from '@o2ter/server-js';
 import { Q as QueryValidator, g as generateId } from './internals/random-Dn9rhwfh.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-C8hhBfuh.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-C8hhBfuh.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-ZIegYNKT.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-ZIegYNKT.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 jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -692,15 +692,30 @@ const validateShapedObject = (schema, dataType) => {
         }
     }
 };
-const validateSchema = (schema) => {
+const validateSchemaPermission = (schema) => {
     if (!_.isNil(schema['_Schema']) || !_.isNil(schema['_Config']))
         throw Error('Reserved name of class');
+    for (const [, _schema] of _.toPairs(schema)) {
+        for (const [key] of _.toPairs(_schema.fields)) {
+            if (_.includes(TObject.defaultKeys, key))
+                throw Error(`Reserved field name: ${key}`);
+        }
+        const fields = _.keys(_schema.fields);
+        for (const key of _.keys(_schema.fieldLevelPermissions)) {
+            if (!fields.includes(key))
+                throw Error(`Invalid field permission: ${key}`);
+        }
+        for (const key of _schema.secureFields ?? []) {
+            if (!fields.includes(key))
+                throw Error(`Invalid field permission: ${key}`);
+        }
+    }
+};
+const validateSchema = (schema) => {
     for (const [className, _schema] of _.toPairs(schema)) {
         if (!className.match(QueryValidator.patterns.name))
             throw Error(`Invalid class name: ${className}`);
         for (const [key, dataType] of _.toPairs(_schema.fields)) {
-            if (_.includes(TObject.defaultKeys, key))
-                throw Error(`Reserved field name: ${key}`);
             if (!key.match(QueryValidator.patterns.name))
                 throw Error(`Invalid field name: ${key}`);
             if (isShape(dataType)) {
@@ -716,15 +731,6 @@ const validateSchema = (schema) => {
                 validateForeignField(schema, key, dataType);
             }
         }
-        const fields = _.keys(_schema.fields);
-        for (const key of _.keys(_schema.fieldLevelPermissions)) {
-            if (!fields.includes(key))
-                throw Error(`Invalid field permission: ${key}`);
-        }
-        for (const key of _schema.secureFields ?? []) {
-            if (!fields.includes(key))
-                throw Error(`Invalid field permission: ${key}`);
-        }
     }
 };
 const mergeSchema = (...schemas) => _.reduce(schemas, (acc, schema) => ({
@@ -756,10 +762,12 @@ class ProtoInternal {
     functions = {};
     triggers = {};
     constructor(options) {
-        validateSchema(options.schema);
+        validateSchemaPermission(options.schema);
+        const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
+        validateSchema(schema);
         this.options = {
             ...options,
-            schema: mergeSchema(defaultSchema, options.fileStorage.schema, options.schema),
+            schema,
         };
     }
     async prepare() {
@@ -1080,7 +1088,7 @@ const _sessionWithToken = (proto, token) => {
 const _session = (proto, request) => {
     const cached = sessionMap.get(request);
     if (cached)
-        return cached?.payload;
+        return cached;
     sessionMap.set(request, { sessionId: randomUUID() });
     const jwtToken = proto[PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
@@ -1099,11 +1107,12 @@ const _session = (proto, request) => {
     const payload = proto[PVK].jwtVarify(authorization, 'login');
     if (!_.isObject(payload))
         return;
-    sessionMap.set(request, {
+    const session = {
         sessionId: payload.sessionId ?? randomUUID(),
-        payload,
-    });
-    return payload;
+        ...payload,
+    };
+    sessionMap.set(request, session);
+    return session;
 };
 const sessionId = (proto, request) => {
     const session = _session(proto, request);
@@ -1126,13 +1135,12 @@ const sessionWithToken = async (proto, token) => {
 };
 const session = async (proto, request) => {
     const session = _session(proto, request);
-    const sessionId = sessionMap.get(request)?.sessionId ?? session?.sessionId;
     const cached = sessionInfoMap.get(request);
     if (cached)
-        return { sessionId, ...cached };
+        return { ...session ?? {}, ...cached };
     const info = await fetchSessionInfo(proto, session?.user);
     sessionInfoMap.set(request, info);
-    return { sessionId, ...info };
+    return { ...session ?? {}, ...info };
 };
 const sessionIsMaster = (proto, request) => {
     const user = request.header(MASTER_USER_HEADER_NAME);
@@ -1302,17 +1310,18 @@ class ProtoService extends ProtoType {
             return this.session.sessionId;
         return this.req ? sessionId(this, this.req) : undefined;
     }
-    async currentUser() {
+    async sessionInfo() {
         if (this.session)
-            return this.session.user;
-        const _session = this.req ? await session(this, this.req) : undefined;
-        return _session?.user;
+            return this.session;
+        return this.req ? session(this, this.req) : undefined;
+    }
+    async currentUser() {
+        const session = await this.sessionInfo();
+        return session?.user;
     }
     async currentRoles() {
-        if (this.session)
-            return this.session.roles ?? [];
-        const _session = this.req ? await session(this, this.req) : undefined;
-        return _session?.roles ?? [];
+        const session = await this.sessionInfo();
+        return session?.roles ?? [];
     }
     get isMaster() {
         return this.req ? sessionIsMaster(this, this.req) === 'valid' : false;
@@ -2095,6 +2104,9 @@ const ProtoRoute = async (options) => {
         res.status(400).json({ message: 'Invalid token' });
     });
     router.get('/health', (req, res) => { res.sendStatus(200); });
+    router.get('/sessionInfo', async (req, res) => {
+        await response(res, () => proto.connect(req).sessionInfo());
+    });
     classesRoute(router, proto);
     functionRoute(router, proto);
     filesRoute(router, proto);