proto.io 0.0.150 → 0.0.152

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-013pxZ3P.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CyX8Lu9K.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-m4WmZoWj.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.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-013pxZ3P.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CyX8Lu9K.js';
+import { P as ProtoService } from '../../internals/index-m4WmZoWj.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.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-013pxZ3P.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CyX8Lu9K.js';
+import { P as ProtoService } from '../../internals/index-m4WmZoWj.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.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, n as EventData, T as TSchema, o as DecodedQuery, F as FindOptions, Q as QuerySelector, p as DecodedSortOption, I as InsertOptions, q as TValue, r as FindOneOptions, t as TUpdateOp, u as FieldSelectorExpression, v as QueryExpression, w as TStorage, x as TransactionOptions, h as TObject, y as TQueryRandomOptions, z as TPubSub } from '../../internals/index-013pxZ3P.js';
+import { _ as _TValue, n as EventData, T as TSchema, o as DecodedQuery, F as FindOptions, Q as QuerySelector, p as DecodedSortOption, I as InsertOptions, q as TValue, r as FindOneOptions, t as TUpdateOp, u as FieldSelectorExpression, v as QueryExpression, w as TStorage, x as TransactionOptions, h as TObject, y as TQueryRandomOptions, z as TPubSub } from '../../internals/index-m4WmZoWj.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-CsRN32Jf.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-CsRN32Jf.js';
+import { P as ProtoClient } from './internals/index-DQm5Xz3Q.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DQm5Xz3Q.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-013pxZ3P.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-m4WmZoWj.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-013pxZ3P.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-013pxZ3P.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-m4WmZoWj.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-m4WmZoWj.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-CsRN32Jf.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-DQm5Xz3Q.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -1115,7 +1115,10 @@ const _session = (proto, request) => {
     const cached = sessionMap.get(request);
     if (cached)
         return cached;
-    sessionMap.set(request, { sessionId: cryptoJs.randomUUID() });
+    sessionMap.set(request, {
+        sessionId: cryptoJs.randomUUID(),
+        createdAt: new Date,
+    });
     const jwtToken = proto[_private.PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
         throw Error('Invalid jwt token');
@@ -1134,8 +1137,9 @@ const _session = (proto, request) => {
     if (!_.isObject(payload))
         return;
     const session = {
-        sessionId: payload.sessionId ?? cryptoJs.randomUUID(),
         ...payload,
+        sessionId: payload.sessionId ?? cryptoJs.randomUUID(),
+        createdAt: new Date(payload.createdAt),
     };
     sessionMap.set(request, session);
     return session;
@@ -1147,9 +1151,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,
     };
 };
@@ -1179,9 +1183,13 @@ const signUser = async (proto, res, user, options) => {
     if (_.isNil(proto[_private.PVK].options.jwtToken))
         return;
     const session = _session(proto, res.req);
-    const sessionId = sessionMap.get(res.req)?.sessionId ?? session?.sessionId ?? cryptoJs.randomUUID();
     const cookieOptions = options?.cookieOptions ?? session?.cookieOptions ?? proto[_private.PVK].options.cookieOptions;
-    const token = proto[_private.PVK].jwtSign({ sessionId, user: user?.objectId, cookieOptions }, options?.jwtSignOptions ?? 'login');
+    const token = proto[_private.PVK].jwtSign({
+        sessionId: session?.sessionId ?? cryptoJs.randomUUID(),
+        createdAt: session?.createdAt?.getTime() ?? Date.now(),
+        user: user?.objectId,
+        cookieOptions,
+    }, options?.jwtSignOptions ?? 'login');
     res.cookie(index.AUTH_COOKIE_KEY, token, cookieOptions);
     sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.objectId) : {});
 };
@@ -1346,9 +1354,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;