p-sw/nestlogged
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: make ScopedLogger init by REQUEST_LOG_ID

Browse Source
This commit is contained in:
Shinwoo PARK 2025-03-20 17:21:22 +09:00
parent 9758dfcb9d
commit b1bbb09bae
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/logged.ts
View File

@ -14,7 +14,8 @@ import {
returns, returns,
nestLoggedMetadata, nestLoggedMetadata,
loggedParam, loggedParam,
scopedLogger scopedLogger,
createRouteParamDecorator
} from "./reflected"; } from "./reflected";
import { imObjectContainedLogSync, getItemByPathSync } from "./functions"; import { imObjectContainedLogSync, getItemByPathSync } from "./functions";
import { RequestMethod } from "@nestjs/common"; import { RequestMethod } from "@nestjs/common";
@ -240,21 +241,22 @@ function overrideBuild<F extends Array<any>, R>(
let req = ctx.switchToHttp().getRequest(); let req = ctx.switchToHttp().getRequest();
if (req[REQUEST_LOG_ID] === undefined) { if (req[REQUEST_LOG_ID] === undefined) {
req[REQUEST_LOG_ID] = ScopedLogger.createScopeId(); req[REQUEST_LOG_ID] = ScopedLogger.createScopeId();
} else {
args[metadatas.scopedLoggerInjectableParam] = ScopedLogger.fromRoot(baseLogger, key, req[REQUEST_LOG_ID]);
} }
args[metadatas.scopedLoggerInjectableParam] = ScopedLogger.fromRoot(baseLogger, key, req[REQUEST_LOG_ID]);
} }
} else if (type === 'middleware') { } else if (type === 'middleware') {
let req = args[0]; let req = args[0];
if (req[REQUEST_LOG_ID] === undefined) { if (req[REQUEST_LOG_ID] === undefined) {
req[REQUEST_LOG_ID] = ScopedLogger.createScopeId(); req[REQUEST_LOG_ID] = ScopedLogger.createScopeId();
} else {
args[metadatas.scopedLoggerInjectableParam] = ScopedLogger.fromRoot(baseLogger, key, req[REQUEST_LOG_ID]);
} }
args[metadatas.scopedLoggerInjectableParam] = ScopedLogger.fromRoot(baseLogger, key, req[REQUEST_LOG_ID]);
} else if (type === 'route') { } else if (type === 'route') {
// should use @Req // args[metadatas.scopedLoggerInjectableParam] is now Request object, thanks to code in @LoggedRoute!!!!
// WTF how should I get the request id from request object??????????????????????????????????????????????????????????????? let req = args[metadatas.scopedLoggerInjectableParam];
// FUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCK if (req[REQUEST_LOG_ID] === undefined) {
req[REQUEST_LOG_ID] = ScopedLogger.createScopeId();
}
args[metadatas.scopedLoggerInjectableParam] = ScopedLogger.fromRoot(baseLogger, key, req[REQUEST_LOG_ID]);
} }
} }
@ -272,7 +274,12 @@ function overrideBuild<F extends Array<any>, R>(
// Start Log // Start Log
if (logged.options.callLogLevel !== 'skip') { if (logged.options.callLogLevel !== 'skip') {
const callLogIdentifyMessage = type === 'route' || type === 'guard' || type === 'interceptor' ? createCallLogIdentifyMessage(type, key, route) : createCallLogIdentifyMessage(type, key) const callLogIdentifyMessage =
type === 'middleware' || type === 'guard' || type === 'interceptor'
? createCallLogIdentifyMessage(type, route)
: type === 'route'
? createCallLogIdentifyMessage(type, key, route)
: createCallLogIdentifyMessage(type, key);
injectedLogger[logged.options.callLogLevel]( injectedLogger[logged.options.callLogLevel](
`${callLogIdentifyMessage} ${metadatas.loggedParams && metadatas.loggedParams.length > 0 `${callLogIdentifyMessage} ${metadatas.loggedParams && metadatas.loggedParams.length > 0
? "WITH " + ? "WITH " +
@ -365,7 +372,7 @@ function overrideBuild<F extends Array<any>, R>(
} }
throw e; throw e;
} }
}; }
} }
export function LoggedFunction<F extends Array<any>, R>( export function LoggedFunction<F extends Array<any>, R>(
@ -499,6 +506,10 @@ export function LoggedRoute<F extends Array<any>, R>(route?: string, options?: P
_target, _target,
key key
); );
// if @InjectLogger exists, fake nestjs as it is @Req()
if (scopedLoggerInjectableParam !== undefined) {
createRouteParamDecorator(0)()(_target, key, scopedLoggerInjectableParam);
}
const loggedParams: LoggedParamReflectData[] = Reflect.getOwnMetadata( const loggedParams: LoggedParamReflectData[] = Reflect.getOwnMetadata(
loggedParam, loggedParam,

2
src/reflected.ts
View File

@ -4,7 +4,7 @@ import {isNil, isString} from "@nestjs/common/utils/shared.utils";
const ROUTE_ARGS_METADATA = '__routeArguments__'; const ROUTE_ARGS_METADATA = '__routeArguments__';
function createRouteParamDecorator(paramtype: RouteParamtypes) { export function createRouteParamDecorator(paramtype: RouteParamtypes) {
return (data?: ParamData): ParameterDecorator => return (data?: ParamData): ParameterDecorator =>
(target, key, index) => { (target, key, index) => {
const args = const args =