mohen 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/ci.yml +40 -0
- package/.github/workflows/publish.yml +38 -0
- package/README.md +198 -0
- package/dist/logger.d.ts +72 -0
- package/dist/logger.js +389 -0
- package/example/usage.ts +161 -0
- package/logo.png +0 -0
- package/package.json +40 -0
- package/src/logger.ts +454 -0
- package/test/logger.test.ts +499 -0
- package/test/test-server.ts +52 -0
- package/tsconfig.json +29 -0
- package/vitest.config.ts +13 -0
package/dist/logger.js
ADDED
|
@@ -0,0 +1,389 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.createLogger = createLogger;
|
|
37
|
+
exports.attachMetadata = attachMetadata;
|
|
38
|
+
exports.attachTrpcMetadata = attachTrpcMetadata;
|
|
39
|
+
const fs = __importStar(require("fs"));
|
|
40
|
+
const path = __importStar(require("path"));
|
|
41
|
+
// ============================================================================
|
|
42
|
+
// Core Logger Class
|
|
43
|
+
// ============================================================================
|
|
44
|
+
class UnifiedLogger {
|
|
45
|
+
constructor(filePath, options = {}) {
|
|
46
|
+
this.filePath = path.resolve(filePath);
|
|
47
|
+
this.maxSizeBytes = options.maxSizeBytes ?? 10 * 1024 * 1024; // 10MB default
|
|
48
|
+
this.includeHeaders = options.includeHeaders ?? false;
|
|
49
|
+
this.redactFields = new Set(options.redact ?? ['password', 'token', 'authorization', 'cookie']);
|
|
50
|
+
// Ensure directory exists
|
|
51
|
+
const dir = path.dirname(this.filePath);
|
|
52
|
+
if (!fs.existsSync(dir)) {
|
|
53
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
generateRequestId() {
|
|
57
|
+
return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 9)}`;
|
|
58
|
+
}
|
|
59
|
+
redact(obj) {
|
|
60
|
+
if (obj === null || obj === undefined)
|
|
61
|
+
return obj;
|
|
62
|
+
if (typeof obj !== 'object')
|
|
63
|
+
return obj;
|
|
64
|
+
if (Array.isArray(obj)) {
|
|
65
|
+
return obj.map((item) => this.redact(item));
|
|
66
|
+
}
|
|
67
|
+
const result = {};
|
|
68
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
69
|
+
if (this.redactFields.has(key.toLowerCase())) {
|
|
70
|
+
result[key] = '[REDACTED]';
|
|
71
|
+
}
|
|
72
|
+
else if (typeof value === 'object') {
|
|
73
|
+
result[key] = this.redact(value);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
result[key] = value;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return result;
|
|
80
|
+
}
|
|
81
|
+
checkAndRotate() {
|
|
82
|
+
try {
|
|
83
|
+
if (!fs.existsSync(this.filePath))
|
|
84
|
+
return;
|
|
85
|
+
const stats = fs.statSync(this.filePath);
|
|
86
|
+
if (stats.size > this.maxSizeBytes) {
|
|
87
|
+
// Read file, keep last 25% of lines
|
|
88
|
+
const content = fs.readFileSync(this.filePath, 'utf-8');
|
|
89
|
+
const lines = content.trim().split('\n');
|
|
90
|
+
const keepCount = Math.floor(lines.length * 0.25);
|
|
91
|
+
const newContent = lines.slice(-keepCount).join('\n') + '\n';
|
|
92
|
+
fs.writeFileSync(this.filePath, newContent);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
console.error('Logger rotation error:', err);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
write(entry) {
|
|
100
|
+
try {
|
|
101
|
+
this.checkAndRotate();
|
|
102
|
+
const redactedEntry = this.redact(entry);
|
|
103
|
+
const line = JSON.stringify(redactedEntry) + '\n';
|
|
104
|
+
fs.appendFileSync(this.filePath, line);
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
console.error('Logger write error:', err);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
// ===========================================================================
|
|
111
|
+
// Express Middleware
|
|
112
|
+
// ===========================================================================
|
|
113
|
+
expressMiddleware() {
|
|
114
|
+
return (req, res, next) => {
|
|
115
|
+
const start = Date.now();
|
|
116
|
+
const requestId = this.generateRequestId();
|
|
117
|
+
// Initialize metadata object on request
|
|
118
|
+
req.logMetadata = {};
|
|
119
|
+
// Detect SSE - check both request Accept header and response Content-Type
|
|
120
|
+
let isSSE = req.headers.accept === 'text/event-stream';
|
|
121
|
+
const chunks = [];
|
|
122
|
+
// Intercept setHeader to detect SSE by Content-Type
|
|
123
|
+
const originalSetHeader = res.setHeader.bind(res);
|
|
124
|
+
res.setHeader = ((name, value) => {
|
|
125
|
+
if (name.toLowerCase() === 'content-type' &&
|
|
126
|
+
typeof value === 'string' &&
|
|
127
|
+
value.includes('text/event-stream')) {
|
|
128
|
+
isSSE = true;
|
|
129
|
+
}
|
|
130
|
+
return originalSetHeader(name, value);
|
|
131
|
+
});
|
|
132
|
+
// Capture request info
|
|
133
|
+
const requestInfo = {
|
|
134
|
+
body: req.body,
|
|
135
|
+
query: req.query,
|
|
136
|
+
};
|
|
137
|
+
if (this.includeHeaders) {
|
|
138
|
+
requestInfo.headers = req.headers;
|
|
139
|
+
}
|
|
140
|
+
// Intercept write/end for streaming detection
|
|
141
|
+
const originalWrite = res.write.bind(res);
|
|
142
|
+
const originalEnd = res.end.bind(res);
|
|
143
|
+
const originalJson = res.json.bind(res);
|
|
144
|
+
const originalSend = res.send.bind(res);
|
|
145
|
+
let responseBody;
|
|
146
|
+
let logged = false;
|
|
147
|
+
res.write = ((chunk, encodingOrCallback, callback) => {
|
|
148
|
+
// If write is called, treat as streaming
|
|
149
|
+
if (chunk && isSSE) {
|
|
150
|
+
const chunkStr = chunk.toString();
|
|
151
|
+
const parsed = this.parseSSEChunk(chunkStr);
|
|
152
|
+
if (parsed) {
|
|
153
|
+
chunks.push(parsed);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
return originalWrite(chunk, encodingOrCallback, callback);
|
|
157
|
+
});
|
|
158
|
+
res.end = ((chunk, encodingOrCallback, callback) => {
|
|
159
|
+
if (logged)
|
|
160
|
+
return originalEnd(chunk, encodingOrCallback, callback);
|
|
161
|
+
logged = true;
|
|
162
|
+
if (isSSE) {
|
|
163
|
+
// SSE streaming path
|
|
164
|
+
if (chunk) {
|
|
165
|
+
const chunkStr = chunk.toString();
|
|
166
|
+
const parsed = this.parseSSEChunk(chunkStr);
|
|
167
|
+
if (parsed) {
|
|
168
|
+
chunks.push(parsed);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
const entry = {
|
|
172
|
+
timestamp: new Date().toISOString(),
|
|
173
|
+
requestId,
|
|
174
|
+
type: 'http',
|
|
175
|
+
method: req.method,
|
|
176
|
+
path: req.originalUrl || req.url,
|
|
177
|
+
statusCode: res.statusCode,
|
|
178
|
+
duration: Date.now() - start,
|
|
179
|
+
request: requestInfo,
|
|
180
|
+
response: {
|
|
181
|
+
streaming: true,
|
|
182
|
+
chunks,
|
|
183
|
+
},
|
|
184
|
+
};
|
|
185
|
+
if (req.logMetadata && Object.keys(req.logMetadata).length > 0) {
|
|
186
|
+
entry.metadata = req.logMetadata;
|
|
187
|
+
}
|
|
188
|
+
this.write(entry);
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
// Regular response path
|
|
192
|
+
const entry = {
|
|
193
|
+
timestamp: new Date().toISOString(),
|
|
194
|
+
requestId,
|
|
195
|
+
type: 'http',
|
|
196
|
+
method: req.method,
|
|
197
|
+
path: req.originalUrl || req.url,
|
|
198
|
+
statusCode: res.statusCode,
|
|
199
|
+
duration: Date.now() - start,
|
|
200
|
+
request: requestInfo,
|
|
201
|
+
response: {
|
|
202
|
+
body: responseBody,
|
|
203
|
+
streaming: false,
|
|
204
|
+
},
|
|
205
|
+
};
|
|
206
|
+
if (req.logMetadata && Object.keys(req.logMetadata).length > 0) {
|
|
207
|
+
entry.metadata = req.logMetadata;
|
|
208
|
+
}
|
|
209
|
+
this.write(entry);
|
|
210
|
+
}
|
|
211
|
+
return originalEnd(chunk, encodingOrCallback, callback);
|
|
212
|
+
});
|
|
213
|
+
const logResponse = () => {
|
|
214
|
+
if (logged)
|
|
215
|
+
return;
|
|
216
|
+
logged = true;
|
|
217
|
+
const entry = {
|
|
218
|
+
timestamp: new Date().toISOString(),
|
|
219
|
+
requestId,
|
|
220
|
+
type: 'http',
|
|
221
|
+
method: req.method,
|
|
222
|
+
path: req.originalUrl || req.url,
|
|
223
|
+
statusCode: res.statusCode,
|
|
224
|
+
duration: Date.now() - start,
|
|
225
|
+
request: requestInfo,
|
|
226
|
+
response: {
|
|
227
|
+
body: responseBody,
|
|
228
|
+
streaming: false,
|
|
229
|
+
},
|
|
230
|
+
};
|
|
231
|
+
if (req.logMetadata && Object.keys(req.logMetadata).length > 0) {
|
|
232
|
+
entry.metadata = req.logMetadata;
|
|
233
|
+
}
|
|
234
|
+
this.write(entry);
|
|
235
|
+
};
|
|
236
|
+
res.json = (body) => {
|
|
237
|
+
responseBody = body;
|
|
238
|
+
logResponse();
|
|
239
|
+
return originalJson(body);
|
|
240
|
+
};
|
|
241
|
+
res.send = (body) => {
|
|
242
|
+
if (!logged) {
|
|
243
|
+
try {
|
|
244
|
+
responseBody = typeof body === 'string' ? JSON.parse(body) : body;
|
|
245
|
+
}
|
|
246
|
+
catch {
|
|
247
|
+
responseBody = body;
|
|
248
|
+
}
|
|
249
|
+
logResponse();
|
|
250
|
+
}
|
|
251
|
+
return originalSend(body);
|
|
252
|
+
};
|
|
253
|
+
next();
|
|
254
|
+
};
|
|
255
|
+
}
|
|
256
|
+
parseSSEChunk(raw) {
|
|
257
|
+
const lines = raw.split('\n');
|
|
258
|
+
for (const line of lines) {
|
|
259
|
+
if (line.startsWith('data: ')) {
|
|
260
|
+
const data = line.slice(6).trim();
|
|
261
|
+
if (data === '[DONE]')
|
|
262
|
+
return { done: true };
|
|
263
|
+
try {
|
|
264
|
+
return JSON.parse(data);
|
|
265
|
+
}
|
|
266
|
+
catch {
|
|
267
|
+
return { raw: data };
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
return null;
|
|
272
|
+
}
|
|
273
|
+
// ===========================================================================
|
|
274
|
+
// tRPC Middleware
|
|
275
|
+
// ===========================================================================
|
|
276
|
+
trpcMiddleware() {
|
|
277
|
+
const logger = this;
|
|
278
|
+
return async function loggerMiddleware(opts) {
|
|
279
|
+
const start = Date.now();
|
|
280
|
+
const requestId = logger.generateRequestId();
|
|
281
|
+
// Initialize metadata on context if not present
|
|
282
|
+
if (!opts.ctx.logMetadata) {
|
|
283
|
+
opts.ctx.logMetadata = {};
|
|
284
|
+
}
|
|
285
|
+
try {
|
|
286
|
+
const result = await opts.next();
|
|
287
|
+
const entry = {
|
|
288
|
+
timestamp: new Date().toISOString(),
|
|
289
|
+
requestId,
|
|
290
|
+
type: 'trpc',
|
|
291
|
+
method: opts.type.toUpperCase(),
|
|
292
|
+
path: opts.path,
|
|
293
|
+
statusCode: result.ok ? 200 : 500,
|
|
294
|
+
duration: Date.now() - start,
|
|
295
|
+
request: {
|
|
296
|
+
body: opts.input,
|
|
297
|
+
},
|
|
298
|
+
response: {
|
|
299
|
+
body: result.data,
|
|
300
|
+
streaming: false,
|
|
301
|
+
},
|
|
302
|
+
};
|
|
303
|
+
// Attach metadata if present
|
|
304
|
+
if (opts.ctx.logMetadata && Object.keys(opts.ctx.logMetadata).length > 0) {
|
|
305
|
+
entry.metadata = opts.ctx.logMetadata;
|
|
306
|
+
}
|
|
307
|
+
if (result.error) {
|
|
308
|
+
entry.error = {
|
|
309
|
+
message: result.error.message,
|
|
310
|
+
stack: result.error.stack,
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
logger.write(entry);
|
|
314
|
+
return result;
|
|
315
|
+
}
|
|
316
|
+
catch (error) {
|
|
317
|
+
const err = error;
|
|
318
|
+
const entry = {
|
|
319
|
+
timestamp: new Date().toISOString(),
|
|
320
|
+
requestId,
|
|
321
|
+
type: 'trpc',
|
|
322
|
+
method: opts.type.toUpperCase(),
|
|
323
|
+
path: opts.path,
|
|
324
|
+
statusCode: 500,
|
|
325
|
+
duration: Date.now() - start,
|
|
326
|
+
request: {
|
|
327
|
+
body: opts.input,
|
|
328
|
+
},
|
|
329
|
+
error: {
|
|
330
|
+
message: err.message,
|
|
331
|
+
stack: err.stack,
|
|
332
|
+
},
|
|
333
|
+
};
|
|
334
|
+
// Attach metadata if present
|
|
335
|
+
if (opts.ctx.logMetadata && Object.keys(opts.ctx.logMetadata).length > 0) {
|
|
336
|
+
entry.metadata = opts.ctx.logMetadata;
|
|
337
|
+
}
|
|
338
|
+
logger.write(entry);
|
|
339
|
+
throw error;
|
|
340
|
+
}
|
|
341
|
+
};
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
// ============================================================================
|
|
345
|
+
// Factory Function (Main Export)
|
|
346
|
+
// ============================================================================
|
|
347
|
+
function createLogger(filePath, options) {
|
|
348
|
+
const logger = new UnifiedLogger(filePath, options);
|
|
349
|
+
return {
|
|
350
|
+
/** Express middleware - use with app.use() */
|
|
351
|
+
express: () => logger.expressMiddleware(),
|
|
352
|
+
/** tRPC middleware - use with t.procedure.use() */
|
|
353
|
+
trpc: () => logger.trpcMiddleware(),
|
|
354
|
+
/** Direct write access for custom logging */
|
|
355
|
+
write: (entry) => logger.write({
|
|
356
|
+
timestamp: new Date().toISOString(),
|
|
357
|
+
requestId: `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 9)}`,
|
|
358
|
+
type: 'http',
|
|
359
|
+
method: 'CUSTOM',
|
|
360
|
+
path: '/',
|
|
361
|
+
duration: 0,
|
|
362
|
+
...entry,
|
|
363
|
+
}),
|
|
364
|
+
};
|
|
365
|
+
}
|
|
366
|
+
// ============================================================================
|
|
367
|
+
// Helper to attach metadata (for cleaner API)
|
|
368
|
+
// ============================================================================
|
|
369
|
+
/**
|
|
370
|
+
* Attach metadata to the current request log entry (Express)
|
|
371
|
+
*/
|
|
372
|
+
function attachMetadata(req, metadata) {
|
|
373
|
+
if (!req.logMetadata) {
|
|
374
|
+
req.logMetadata = {};
|
|
375
|
+
}
|
|
376
|
+
Object.assign(req.logMetadata, metadata);
|
|
377
|
+
}
|
|
378
|
+
/**
|
|
379
|
+
* Attach metadata to the current request log entry (tRPC)
|
|
380
|
+
*/
|
|
381
|
+
function attachTrpcMetadata(ctx, metadata) {
|
|
382
|
+
if (!ctx.logMetadata) {
|
|
383
|
+
ctx.logMetadata = {};
|
|
384
|
+
}
|
|
385
|
+
Object.assign(ctx.logMetadata, metadata);
|
|
386
|
+
}
|
|
387
|
+
// Default export for simpler imports
|
|
388
|
+
exports.default = createLogger;
|
|
389
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport type { Request, Response, NextFunction } from 'express';\n\n// ============================================================================\n// Types\n// ============================================================================\n\ninterface LogEntry {\n  timestamp: string;\n  requestId: string;\n  type: 'http' | 'trpc';\n  method: string;\n  path: string;\n  statusCode?: number;\n  duration: number;\n  request?: {\n    body?: unknown;\n    query?: unknown;\n    headers?: Record<string, string>;\n  };\n  response?: {\n    body?: unknown;\n    streaming?: boolean;\n    chunks?: unknown[];\n  };\n  error?: {\n    message: string;\n    stack?: string;\n  };\n  metadata?: Record<string, unknown>;\n}\n\ninterface LoggerOptions {\n  maxSizeBytes?: number;      // Default: 10MB\n  includeHeaders?: boolean;   // Default: false\n  redact?: string[];          // Fields to redact from logs\n}\n\n// Extend Express Request to include metadata\ndeclare global {\n  namespace Express {\n    interface Request {\n      logMetadata?: Record<string, unknown>;\n    }\n  }\n}\n\n// ============================================================================\n// Core Logger Class\n// ============================================================================\n\nclass UnifiedLogger {\n  private filePath: string;\n  private maxSizeBytes: number;\n  private includeHeaders: boolean;\n  private redactFields: Set<string>;\n\n  constructor(filePath: string, options: LoggerOptions = {}) {\n    this.filePath = path.resolve(filePath);\n    this.maxSizeBytes = options.maxSizeBytes ?? 10 * 1024 * 1024; // 10MB default\n    this.includeHeaders = options.includeHeaders ?? false;\n    this.redactFields = new Set(options.redact ?? ['password', 'token', 'authorization', 'cookie']);\n\n    // Ensure directory exists\n    const dir = path.dirname(this.filePath);\n    if (!fs.existsSync(dir)) {\n      fs.mkdirSync(dir, { recursive: true });\n    }\n  }\n\n  private generateRequestId(): string {\n    return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 9)}`;\n  }\n\n  private redact(obj: unknown): unknown {\n    if (obj === null || obj === undefined) return obj;\n    if (typeof obj !== 'object') return obj;\n\n    if (Array.isArray(obj)) {\n      return obj.map((item) => this.redact(item));\n    }\n\n    const result: Record<string, unknown> = {};\n    for (const [key, value] of Object.entries(obj as Record<string, unknown>)) {\n      if (this.redactFields.has(key.toLowerCase())) {\n        result[key] = '[REDACTED]';\n      } else if (typeof value === 'object') {\n        result[key] = this.redact(value);\n      } else {\n        result[key] = value;\n      }\n    }\n    return result;\n  }\n\n  private checkAndRotate(): void {\n    try {\n      if (!fs.existsSync(this.filePath)) return;\n\n      const stats = fs.statSync(this.filePath);\n      if (stats.size > this.maxSizeBytes) {\n        // Read file, keep last 25% of lines\n        const content = fs.readFileSync(this.filePath, 'utf-8');\n        const lines = content.trim().split('\\n');\n        const keepCount = Math.floor(lines.length * 0.25);\n        const newContent = lines.slice(-keepCount).join('\\n') + '\\n';\n        fs.writeFileSync(this.filePath, newContent);\n      }\n    } catch (err) {\n      console.error('Logger rotation error:', err);\n    }\n  }\n\n  write(entry: LogEntry): void {\n    try {\n      this.checkAndRotate();\n      const redactedEntry = this.redact(entry) as LogEntry;\n      const line = JSON.stringify(redactedEntry) + '\\n';\n      fs.appendFileSync(this.filePath, line);\n    } catch (err) {\n      console.error('Logger write error:', err);\n    }\n  }\n\n  // ===========================================================================\n  // Express Middleware\n  // ===========================================================================\n\n  expressMiddleware() {\n    return (req: Request, res: Response, next: NextFunction) => {\n      const start = Date.now();\n      const requestId = this.generateRequestId();\n\n      // Initialize metadata object on request\n      req.logMetadata = {};\n\n      // Detect SSE - check both request Accept header and response Content-Type\n      let isSSE = req.headers.accept === 'text/event-stream';\n      const chunks: unknown[] = [];\n      \n      // Intercept setHeader to detect SSE by Content-Type\n      const originalSetHeader = res.setHeader.bind(res);\n      res.setHeader = ((name: string, value: string | number | readonly string[]): Response => {\n        if (name.toLowerCase() === 'content-type' && \n            typeof value === 'string' && \n            value.includes('text/event-stream')) {\n          isSSE = true;\n        }\n        return originalSetHeader(name, value);\n      }) as typeof res.setHeader;\n\n      // Capture request info\n      const requestInfo: LogEntry['request'] = {\n        body: req.body,\n        query: req.query,\n      };\n\n      if (this.includeHeaders) {\n        requestInfo.headers = req.headers as Record<string, string>;\n      }\n\n      // Intercept write/end for streaming detection\n      const originalWrite = res.write.bind(res);\n      const originalEnd = res.end.bind(res);\n      const originalJson = res.json.bind(res);\n      const originalSend = res.send.bind(res);\n      let responseBody: unknown;\n      let logged = false;\n\n      res.write = ((chunk: any, encodingOrCallback?: any, callback?: any): boolean => {\n        // If write is called, treat as streaming\n        if (chunk && isSSE) {\n          const chunkStr = chunk.toString();\n          const parsed = this.parseSSEChunk(chunkStr);\n          if (parsed) {\n            chunks.push(parsed);\n          }\n        }\n        return originalWrite(chunk, encodingOrCallback, callback);\n      }) as typeof res.write;\n\n      res.end = ((chunk?: any, encodingOrCallback?: any, callback?: any): Response => {\n        if (logged) return originalEnd(chunk, encodingOrCallback, callback);\n        logged = true;\n\n        if (isSSE) {\n          // SSE streaming path\n          if (chunk) {\n            const chunkStr = chunk.toString();\n            const parsed = this.parseSSEChunk(chunkStr);\n            if (parsed) {\n              chunks.push(parsed);\n            }\n          }\n\n          const entry: LogEntry = {\n            timestamp: new Date().toISOString(),\n            requestId,\n            type: 'http',\n            method: req.method,\n            path: req.originalUrl || req.url,\n            statusCode: res.statusCode,\n            duration: Date.now() - start,\n            request: requestInfo,\n            response: {\n              streaming: true,\n              chunks,\n            },\n          };\n\n          if (req.logMetadata && Object.keys(req.logMetadata).length > 0) {\n            entry.metadata = req.logMetadata;\n          }\n\n          this.write(entry);\n        } else {\n          // Regular response path\n          const entry: LogEntry = {\n            timestamp: new Date().toISOString(),\n            requestId,\n            type: 'http',\n            method: req.method,\n            path: req.originalUrl || req.url,\n            statusCode: res.statusCode,\n            duration: Date.now() - start,\n            request: requestInfo,\n            response: {\n              body: responseBody,\n              streaming: false,\n            },\n          };\n\n          if (req.logMetadata && Object.keys(req.logMetadata).length > 0) {\n            entry.metadata = req.logMetadata;\n          }\n\n          this.write(entry);\n        }\n\n        return originalEnd(chunk, encodingOrCallback, callback);\n      }) as typeof res.end;\n\n      const logResponse = () => {\n        if (logged) return;\n        logged = true;\n\n        const entry: LogEntry = {\n          timestamp: new Date().toISOString(),\n          requestId,\n          type: 'http',\n          method: req.method,\n          path: req.originalUrl || req.url,\n          statusCode: res.statusCode,\n          duration: Date.now() - start,\n          request: requestInfo,\n          response: {\n            body: responseBody,\n            streaming: false,\n          },\n        };\n\n        if (req.logMetadata && Object.keys(req.logMetadata).length > 0) {\n          entry.metadata = req.logMetadata;\n        }\n\n        this.write(entry);\n      };\n\n      res.json = (body: any) => {\n        responseBody = body;\n        logResponse();\n        return originalJson(body);\n      };\n\n      res.send = (body: any) => {\n        if (!logged) {\n          try {\n            responseBody = typeof body === 'string' ? JSON.parse(body) : body;\n          } catch {\n            responseBody = body;\n          }\n          logResponse();\n        }\n        return originalSend(body);\n      };\n\n      next();\n    };\n  }\n\n  private parseSSEChunk(raw: string): unknown {\n    const lines = raw.split('\\n');\n    for (const line of lines) {\n      if (line.startsWith('data: ')) {\n        const data = line.slice(6).trim();\n        if (data === '[DONE]') return { done: true };\n        try {\n          return JSON.parse(data);\n        } catch {\n          return { raw: data };\n        }\n      }\n    }\n    return null;\n  }\n\n  // ===========================================================================\n  // tRPC Middleware\n  // ===========================================================================\n\n  trpcMiddleware<TContext extends Record<string, unknown> = Record<string, unknown>>() {\n    const logger = this;\n\n    return async function loggerMiddleware(opts: {\n      path: string;\n      type: 'query' | 'mutation' | 'subscription';\n      input: unknown;\n      ctx: TContext & { logMetadata?: Record<string, unknown> };\n      next: () => Promise<{ ok: boolean; data?: unknown; error?: Error }>;\n    }) {\n      const start = Date.now();\n      const requestId = logger.generateRequestId();\n\n      // Initialize metadata on context if not present\n      if (!opts.ctx.logMetadata) {\n        opts.ctx.logMetadata = {};\n      }\n\n      try {\n        const result = await opts.next();\n\n        const entry: LogEntry = {\n          timestamp: new Date().toISOString(),\n          requestId,\n          type: 'trpc',\n          method: opts.type.toUpperCase(),\n          path: opts.path,\n          statusCode: result.ok ? 200 : 500,\n          duration: Date.now() - start,\n          request: {\n            body: opts.input,\n          },\n          response: {\n            body: result.data,\n            streaming: false,\n          },\n        };\n\n        // Attach metadata if present\n        if (opts.ctx.logMetadata && Object.keys(opts.ctx.logMetadata).length > 0) {\n          entry.metadata = opts.ctx.logMetadata;\n        }\n\n        if (result.error) {\n          entry.error = {\n            message: result.error.message,\n            stack: result.error.stack,\n          };\n        }\n\n        logger.write(entry);\n\n        return result;\n      } catch (error) {\n        const err = error as Error;\n\n        const entry: LogEntry = {\n          timestamp: new Date().toISOString(),\n          requestId,\n          type: 'trpc',\n          method: opts.type.toUpperCase(),\n          path: opts.path,\n          statusCode: 500,\n          duration: Date.now() - start,\n          request: {\n            body: opts.input,\n          },\n          error: {\n            message: err.message,\n            stack: err.stack,\n          },\n        };\n\n        // Attach metadata if present\n        if (opts.ctx.logMetadata && Object.keys(opts.ctx.logMetadata).length > 0) {\n          entry.metadata = opts.ctx.logMetadata;\n        }\n\n        logger.write(entry);\n\n        throw error;\n      }\n    };\n  }\n}\n\n// ============================================================================\n// Factory Function (Main Export)\n// ============================================================================\n\nexport function createLogger(filePath: string, options?: LoggerOptions) {\n  const logger = new UnifiedLogger(filePath, options);\n\n  return {\n    /** Express middleware - use with app.use() */\n    express: () => logger.expressMiddleware(),\n\n    /** tRPC middleware - use with t.procedure.use() */\n    trpc: <TContext extends Record<string, unknown> = Record<string, unknown>>() => \n      logger.trpcMiddleware<TContext>(),\n\n    /** Direct write access for custom logging */\n    write: (entry: Partial<LogEntry>) => logger.write({\n      timestamp: new Date().toISOString(),\n      requestId: `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 9)}`,\n      type: 'http',\n      method: 'CUSTOM',\n      path: '/',\n      duration: 0,\n      ...entry,\n    } as LogEntry),\n  };\n}\n\n// ============================================================================\n// Helper to attach metadata (for cleaner API)\n// ============================================================================\n\n/**\n * Attach metadata to the current request log entry (Express)\n */\nexport function attachMetadata(req: Request, metadata: Record<string, unknown>): void {\n  if (!req.logMetadata) {\n    req.logMetadata = {};\n  }\n  Object.assign(req.logMetadata, metadata);\n}\n\n/**\n * Attach metadata to the current request log entry (tRPC)\n */\nexport function attachTrpcMetadata<TContext extends { logMetadata?: Record<string, unknown> }>(\n  ctx: TContext,\n  metadata: Record<string, unknown>\n): void {\n  if (!ctx.logMetadata) {\n    ctx.logMetadata = {};\n  }\n  Object.assign(ctx.logMetadata, metadata);\n}\n\n// Default export for simpler imports\nexport default createLogger;\n"]}
|
package/example/usage.ts
ADDED
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import express from 'express';
|
|
2
|
+
import { initTRPC } from '@trpc/server';
|
|
3
|
+
import * as trpcExpress from '@trpc/server/adapters/express';
|
|
4
|
+
import { createLogger, attachMetadata, attachTrpcMetadata } from '../src/logger';
|
|
5
|
+
|
|
6
|
+
// ============================================================================
|
|
7
|
+
// Create the logger (single instance for both Express and tRPC)
|
|
8
|
+
// ============================================================================
|
|
9
|
+
|
|
10
|
+
const logger = createLogger('./logs/app.log', {
|
|
11
|
+
maxSizeBytes: 10 * 1024 * 1024, // 10MB, then truncate to 25%
|
|
12
|
+
redact: ['password', 'token', 'secret', 'authorization'],
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
// ============================================================================
|
|
16
|
+
// Express Setup
|
|
17
|
+
// ============================================================================
|
|
18
|
+
|
|
19
|
+
const app = express();
|
|
20
|
+
app.use(express.json());
|
|
21
|
+
|
|
22
|
+
// Add logging middleware - that's it!
|
|
23
|
+
app.use(logger.express());
|
|
24
|
+
|
|
25
|
+
// Regular endpoint
|
|
26
|
+
app.get('/api/health', (req, res) => {
|
|
27
|
+
res.json({ status: 'ok', timestamp: Date.now() });
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
// Endpoint with metadata
|
|
31
|
+
app.get('/api/users/:id', (req, res) => {
|
|
32
|
+
// Attach arbitrary metadata to the log entry
|
|
33
|
+
attachMetadata(req, {
|
|
34
|
+
userId: req.params.id,
|
|
35
|
+
source: 'user-service',
|
|
36
|
+
cacheHit: false,
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
res.json({ id: req.params.id, name: 'John Doe' });
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
// POST endpoint with metadata
|
|
43
|
+
app.post('/api/orders', (req, res) => {
|
|
44
|
+
const orderId = Math.random().toString(36).slice(2);
|
|
45
|
+
|
|
46
|
+
// Attach order-specific metadata
|
|
47
|
+
attachMetadata(req, {
|
|
48
|
+
orderId,
|
|
49
|
+
itemCount: req.body.items?.length ?? 0,
|
|
50
|
+
totalAmount: req.body.total,
|
|
51
|
+
region: 'us-east-1',
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
res.json({ orderId, status: 'created' });
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
// SSE streaming endpoint with metadata
|
|
58
|
+
app.get('/api/stream', (req, res) => {
|
|
59
|
+
// Attach metadata before streaming starts
|
|
60
|
+
attachMetadata(req, {
|
|
61
|
+
streamType: 'events',
|
|
62
|
+
clientId: req.query.clientId || 'anonymous',
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
res.setHeader('Content-Type', 'text/event-stream');
|
|
66
|
+
res.setHeader('Cache-Control', 'no-cache');
|
|
67
|
+
res.setHeader('Connection', 'keep-alive');
|
|
68
|
+
|
|
69
|
+
let count = 0;
|
|
70
|
+
const interval = setInterval(() => {
|
|
71
|
+
count++;
|
|
72
|
+
res.write(`data: ${JSON.stringify({ count, message: `Event ${count}` })}\n\n`);
|
|
73
|
+
|
|
74
|
+
if (count >= 5) {
|
|
75
|
+
res.write('data: [DONE]\n\n');
|
|
76
|
+
clearInterval(interval);
|
|
77
|
+
res.end();
|
|
78
|
+
}
|
|
79
|
+
}, 100);
|
|
80
|
+
|
|
81
|
+
req.on('close', () => {
|
|
82
|
+
clearInterval(interval);
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
// ============================================================================
|
|
87
|
+
// tRPC Setup
|
|
88
|
+
// ============================================================================
|
|
89
|
+
|
|
90
|
+
// Define context type with logMetadata
|
|
91
|
+
interface Context {
|
|
92
|
+
logMetadata?: Record<string, unknown>;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
const t = initTRPC.context<Context>().create();
|
|
96
|
+
|
|
97
|
+
// Create a logged procedure using the same logger
|
|
98
|
+
const loggedProcedure = t.procedure.use(logger.trpc<Context>());
|
|
99
|
+
|
|
100
|
+
const appRouter = t.router({
|
|
101
|
+
hello: loggedProcedure
|
|
102
|
+
.input((val: unknown) => val as { name: string })
|
|
103
|
+
.query(({ input, ctx }) => {
|
|
104
|
+
// Attach metadata in tRPC
|
|
105
|
+
attachTrpcMetadata(ctx, {
|
|
106
|
+
greeted: input.name,
|
|
107
|
+
locale: 'en-US',
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
return { greeting: `Hello, ${input.name}!` };
|
|
111
|
+
}),
|
|
112
|
+
|
|
113
|
+
createUser: loggedProcedure
|
|
114
|
+
.input((val: unknown) => val as { email: string; password: string })
|
|
115
|
+
.mutation(({ input, ctx }) => {
|
|
116
|
+
const userId = Math.random().toString(36).slice(2);
|
|
117
|
+
|
|
118
|
+
// Attach user creation metadata
|
|
119
|
+
attachTrpcMetadata(ctx, {
|
|
120
|
+
newUserId: userId,
|
|
121
|
+
emailDomain: input.email.split('@')[1],
|
|
122
|
+
signupSource: 'api',
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
return { id: userId, email: input.email, created: true };
|
|
126
|
+
}),
|
|
127
|
+
|
|
128
|
+
processOrder: loggedProcedure
|
|
129
|
+
.input((val: unknown) => val as { items: string[]; priority: boolean })
|
|
130
|
+
.mutation(({ input, ctx }) => {
|
|
131
|
+
// Attach processing metadata
|
|
132
|
+
attachTrpcMetadata(ctx, {
|
|
133
|
+
itemCount: input.items.length,
|
|
134
|
+
priority: input.priority,
|
|
135
|
+
processingQueue: input.priority ? 'high' : 'normal',
|
|
136
|
+
});
|
|
137
|
+
|
|
138
|
+
return { processed: true, items: input.items.length };
|
|
139
|
+
}),
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
// Mount tRPC
|
|
143
|
+
app.use(
|
|
144
|
+
'/trpc',
|
|
145
|
+
trpcExpress.createExpressMiddleware({
|
|
146
|
+
router: appRouter,
|
|
147
|
+
createContext: (): Context => ({ logMetadata: {} }),
|
|
148
|
+
})
|
|
149
|
+
);
|
|
150
|
+
|
|
151
|
+
// ============================================================================
|
|
152
|
+
// Start Server
|
|
153
|
+
// ============================================================================
|
|
154
|
+
|
|
155
|
+
const PORT = 3000;
|
|
156
|
+
app.listen(PORT, () => {
|
|
157
|
+
console.log(`Server running on http://localhost:${PORT}`);
|
|
158
|
+
console.log(`Logs written to: ./logs/app.log`);
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
export type AppRouter = typeof appRouter;
|
package/logo.png
ADDED
|
Binary file
|
package/package.json
ADDED
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "mohen",
|
|
3
|
+
"version": "1.0.0",
|
|
4
|
+
"description": "Unified request/response logger for Express and tRPC with SSE support (墨痕 - ink trace)",
|
|
5
|
+
"main": "dist/logger.js",
|
|
6
|
+
"types": "dist/logger.d.ts",
|
|
7
|
+
"scripts": {
|
|
8
|
+
"build": "tsc",
|
|
9
|
+
"test": "vitest run",
|
|
10
|
+
"test:watch": "vitest",
|
|
11
|
+
"example": "ts-node example/usage.ts"
|
|
12
|
+
},
|
|
13
|
+
"keywords": [
|
|
14
|
+
"express",
|
|
15
|
+
"trpc",
|
|
16
|
+
"logger",
|
|
17
|
+
"logging",
|
|
18
|
+
"sse",
|
|
19
|
+
"middleware"
|
|
20
|
+
],
|
|
21
|
+
"license": "MIT",
|
|
22
|
+
"engines": {
|
|
23
|
+
"node": ">=20.0.0"
|
|
24
|
+
},
|
|
25
|
+
"peerDependencies": {
|
|
26
|
+
"@trpc/server": "^10.0.0 || ^11.0.0",
|
|
27
|
+
"express": "^4.0.0 || ^5.0.0"
|
|
28
|
+
},
|
|
29
|
+
"devDependencies": {
|
|
30
|
+
"@trpc/server": "^10.45.0",
|
|
31
|
+
"@types/express": "^4.17.21",
|
|
32
|
+
"@types/node": "^20.10.0",
|
|
33
|
+
"@types/supertest": "^6.0.3",
|
|
34
|
+
"express": "^4.18.0",
|
|
35
|
+
"supertest": "^7.2.2",
|
|
36
|
+
"ts-node": "^10.9.0",
|
|
37
|
+
"typescript": "^5.3.0",
|
|
38
|
+
"vitest": "^4.0.17"
|
|
39
|
+
}
|
|
40
|
+
}
|