proto.io 0.0.139 → 0.0.141

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-rcLPSrw6.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-D1h-5NmA.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-BabXTvEZ.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DCjn9EDu.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/filesystem.d.ts

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-rcLPSrw6.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-D1h-5NmA.js';
+import { P as ProtoService } from '../../internals/index-BabXTvEZ.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DCjn9EDu.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-rcLPSrw6.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-D1h-5NmA.js';
+import { P as ProtoService } from '../../internals/index-BabXTvEZ.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DCjn9EDu.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { _ as _TValue, o as EventData, T as TSchema, q as DecodedQuery, F as FindOptions, Q as QuerySelector, r as DecodedSortOption, I as InsertOptions, t as TValue, u as FindOneOptions, v as TUpdateOp, w as FieldSelectorExpression, x as QueryExpression, y as TStorage, z as TransactionOptions, h as TObject, A as TQueryRandomOptions, B as TPubSub } from '../../internals/index-rcLPSrw6.js';
+import { _ as _TValue, o as EventData, T as TSchema, q as DecodedQuery, F as FindOptions, Q as QuerySelector, r as DecodedSortOption, I as InsertOptions, t as TValue, u as FindOneOptions, v as TUpdateOp, w as FieldSelectorExpression, x as QueryExpression, y as TStorage, z as TransactionOptions, h as TObject, A as TQueryRandomOptions, B as TPubSub } from '../../internals/index-BabXTvEZ.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/client.d.ts

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

package/dist/client.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-CTyYPai3.js');
+var index = require('./internals/index-D5nf79vF.js');
 var Decimal = require('decimal.js');
 require('./internals/index-C6zdNpc_.js');
 require('lodash');

package/dist/client.mjs

@@ -1,5 +1,5 @@
-import { c as ProtoClient } from './internals/index-C8hhBfuh.mjs';
-export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-C8hhBfuh.mjs';
+import { c as ProtoClient } from './internals/index-ZIegYNKT.mjs';
+export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-ZIegYNKT.mjs';
 export { Decimal } from 'decimal.js';
 import './internals/index-EOtjV6U_.mjs';
 import 'lodash';

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

package/dist/index.js

@@ -7,7 +7,7 @@ var serverJs = require('@o2ter/server-js');
 var random = require('./internals/random-CiJ8I0Cd.js');
 var _private = require('./internals/private-CSB1Ep4g.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-CTyYPai3.js');
+var index = require('./internals/index-D5nf79vF.js');
 var index$1 = require('./internals/index-C6zdNpc_.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -695,15 +695,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(index$1.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(random.QueryValidator.patterns.name))
             throw Error(`Invalid class name: ${className}`);
         for (const [key, dataType] of _.toPairs(_schema.fields)) {
-            if (_.includes(index$1.TObject.defaultKeys, key))
-                throw Error(`Reserved field name: ${key}`);
             if (!key.match(random.QueryValidator.patterns.name))
                 throw Error(`Invalid field name: ${key}`);
             if (index$1.isShape(dataType)) {
@@ -719,15 +734,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) => ({
@@ -759,10 +765,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() {
@@ -1083,7 +1091,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: cryptoJs.randomUUID() });
     const jwtToken = proto[_private.PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
@@ -1102,11 +1110,12 @@ const _session = (proto, request) => {
     const payload = proto[_private.PVK].jwtVarify(authorization, 'login');
     if (!_.isObject(payload))
         return;
-    sessionMap.set(request, {
+    const session = {
         sessionId: payload.sessionId ?? cryptoJs.randomUUID(),
-        payload,
-    });
-    return payload;
+        ...payload,
+    };
+    sessionMap.set(request, session);
+    return session;
 };
 const sessionId = (proto, request) => {
     const session = _session(proto, request);
@@ -1129,13 +1138,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(index.MASTER_USER_HEADER_NAME);
@@ -1305,17 +1313,18 @@ class ProtoService extends index.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;
@@ -2098,6 +2107,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);