proto.io 0.0.153 → 0.0.154

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

@@ -1,5 +1,5 @@
-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 { T as TSchema, P as ProtoService } from '../../internals/index-BeRyWUVp.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rx1BTcvL.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-m4WmZoWj.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.js';
+import { P as ProtoService } from '../../internals/index-BeRyWUVp.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rx1BTcvL.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-m4WmZoWj.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.js';
+import { P as ProtoService } from '../../internals/index-BeRyWUVp.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rx1BTcvL.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-m4WmZoWj.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-BeRyWUVp.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-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';
+import { P as ProtoClient } from './internals/index-DI0coKnM.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DI0coKnM.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-m4WmZoWj.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BeRyWUVp.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-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 { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-BeRyWUVp.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BeRyWUVp.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-DQm5Xz3Q.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-DI0coKnM.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -1109,7 +1109,12 @@ const _sessionWithToken = (proto, token) => {
     const payload = proto[_private.PVK].jwtVarify(token, 'login');
     if (!_.isObject(payload))
         return;
-    return payload;
+    return {
+        ...payload,
+        sessionId: payload.sessionId ?? cryptoJs.randomUUID(),
+        createdAt: payload.createdAt && _.isSafeInteger(payload.createdAt) ? new Date(payload.createdAt) : new Date,
+        loginedAt: payload.loginedAt && _.isSafeInteger(payload.loginedAt) ? new Date(payload.loginedAt) : new Date,
+    };
 };
 const _session = (proto, request) => {
     const cached = sessionMap.get(request);
@@ -1118,6 +1123,7 @@ const _session = (proto, request) => {
     sessionMap.set(request, {
         sessionId: cryptoJs.randomUUID(),
         createdAt: new Date,
+        loginedAt: new Date,
     });
     const jwtToken = proto[_private.PVK].options.jwtToken;
     if (_.isEmpty(jwtToken))
@@ -1133,14 +1139,9 @@ const _session = (proto, request) => {
     }
     if (_.isEmpty(authorization))
         return;
-    const payload = proto[_private.PVK].jwtVarify(authorization, 'login');
-    if (!_.isObject(payload))
+    const session = _sessionWithToken(proto, authorization);
+    if (!_.isObject(session))
         return;
-    const session = {
-        ...payload,
-        sessionId: payload.sessionId ?? cryptoJs.randomUUID(),
-        createdAt: payload.createdAt && _.isSafeInteger(payload.createdAt) ? new Date(payload.createdAt) : new Date,
-    };
     sessionMap.set(request, session);
     return session;
 };
@@ -1159,18 +1160,29 @@ const fetchSessionInfo = async (proto, userId) => {
 };
 const sessionWithToken = async (proto, token) => {
     const session = _sessionWithToken(proto, token);
-    const sessionId = session?.sessionId;
     const info = await fetchSessionInfo(proto, session?.user);
-    return { sessionId, ...info };
+    return {
+        ...session ?? {},
+        ...info,
+        loginedAt: info?.user ? session?.loginedAt : undefined,
+    };
 };
 const session = async (proto, request) => {
     const session = _session(proto, request);
     const cached = sessionInfoMap.get(request);
     if (cached)
-        return { ...session ?? {}, ...cached };
+        return {
+            ...session ?? {},
+            ...cached,
+            loginedAt: cached?.user ? session?.loginedAt : undefined,
+        };
     const info = await fetchSessionInfo(proto, session?.user);
     sessionInfoMap.set(request, info);
-    return { ...session ?? {}, ...info };
+    return {
+        ...session ?? {},
+        ...info,
+        loginedAt: info?.user ? session?.loginedAt : undefined,
+    };
 };
 const sessionIsMaster = (proto, request) => {
     const user = request.header(index.MASTER_USER_HEADER_NAME);
@@ -1187,6 +1199,7 @@ const signUser = async (proto, res, user, options) => {
     const token = proto[_private.PVK].jwtSign({
         sessionId: session?.sessionId ?? cryptoJs.randomUUID(),
         createdAt: session?.createdAt?.getTime() ?? Date.now(),
+        loginedAt: user ? session?.loginedAt?.getTime() ?? Date.now() : undefined,
         user: user?.objectId,
         cookieOptions,
     }, options?.jwtSignOptions ?? 'login');