koa-micro-ts 3.2.8 → 3.3.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.
Files changed (9) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +1 -1
  3. package/dist/autoRoute.js +3 -3
  4. package/dist/autoRoute.js.map +1 -1
  5. package/dist/index.js +2 -2
  6. package/dist/log.d.ts +17 -1
  7. package/dist/log.js +164 -23
  8. package/dist/log.js.map +1 -1
  9. package/package.json +5 -5
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (c) 2021 Sebastian Hildebrandt
3
+ Copyright (c) 2022 Sebastian Hildebrandt
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
package/README.md CHANGED
@@ -176,7 +176,7 @@ As `koa-micro-ts` uses some external packages, you can also refer to the documen
176
176
 
177
177
  >The [`MIT`][license-url] License (MIT)
178
178
  >
179
- >Copyright © 2021 Sebastian Hildebrandt, [+innovations](http://www.plus-innovations.com).
179
+ >Copyright © 2022 Sebastian Hildebrandt, [+innovations](http://www.plus-innovations.com).
180
180
  >
181
181
  >Permission is hereby granted, free of charge, to any person obtaining a copy
182
182
  >of this software and associated documentation files (the "Software"), to deal
package/dist/autoRoute.js CHANGED
@@ -37,7 +37,7 @@ const autoRoute = (app, routepath, mountpoint, auth) => {
37
37
  const files = [];
38
38
  let docObj = app.apiDocObj;
39
39
  if (app && app.log && app.log.level && app.log.level === log_1.LogLevels.all) {
40
- app.log.trace('\n Auto-Install Routes: (' + (auth ? 'private/auth' : 'public') + ')\n Path: ' + routepath + '\n', false, false);
40
+ app.log.note('\n Auto-Install Routes: (' + (auth ? 'private/auth' : 'public') + ')\n Path: ' + routepath + '\n', false, false);
41
41
  }
42
42
  readdirSyncRecursive(routepath, files);
43
43
  for (const file of files) {
@@ -155,7 +155,7 @@ const autoRoute = (app, routepath, mountpoint, auth) => {
155
155
  routes[method](url, obj[key]);
156
156
  }
157
157
  if (app && app.log && app.log.level && app.log.level === log_1.LogLevels.all) {
158
- app.log.trace(' ' + mountpoint + url + ' --- ' + method + ' - Function: ' + key, false, false);
158
+ app.log.note(' ' + mountpoint + url + ' --- ' + method + ' - Function: ' + key, false, false);
159
159
  }
160
160
  }
161
161
  }
@@ -164,7 +164,7 @@ const autoRoute = (app, routepath, mountpoint, auth) => {
164
164
  }
165
165
  app.use(routes.routes()).use(routes.allowedMethods());
166
166
  if (app && app.log && app.log.level && app.log.level === log_1.LogLevels.all) {
167
- app.log.trace('', false, false);
167
+ app.log.note('', false, false);
168
168
  }
169
169
  if (app.apiDoc) {
170
170
  app.apiDocObj = docObj;
package/dist/autoRoute.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"autoRoute.js","sourceRoot":"","sources":["../src/autoRoute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"autoRoute.js","sourceRoot":"","sources":["../src/autoRoute.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -214,10 +214,10 @@ class KoaMicro extends koa_1.default {
214
214
  ? ctx[Symbol.for('request-received.startTime')].getTime()
215
215
  : Date.now();
216
216
  try {
217
- this.log.info(` <-- ${ctx.method} ${ctx.originalUrl}`);
217
+ this.log.http(` <-- ${ctx.method} ${ctx.originalUrl}`);
218
218
  yield next();
219
219
  if (ctx.status < 400) {
220
- this.log.info(` --> ${ctx.method} ${ctx.originalUrl} ${ctx.status || 500} ${time(start)} ${len(ctx)}`);
220
+ this.log.http(` --> ${ctx.method} ${ctx.originalUrl} ${ctx.status || 500} ${time(start)} ${len(ctx)}`);
221
221
  }
222
222
  else {
223
223
  this.log.error(` --> ${ctx.method} ${ctx.originalUrl} ${ctx.status || 500} ${time(start)} ${len(ctx)}`);
package/dist/log.d.ts CHANGED
@@ -4,6 +4,7 @@ declare const LogLevels: {
4
4
  warn: number;
5
5
  trace: number;
6
6
  info: number;
7
+ http: number;
7
8
  note: number;
8
9
  all: number;
9
10
  };
@@ -11,19 +12,34 @@ interface iLogOptions {
11
12
  level?: number;
12
13
  logTimestamp?: boolean;
13
14
  logType?: boolean;
14
- destination?: string;
15
+ logFileName?: string;
16
+ logPath?: string;
17
+ logFileMaxSize?: number | string;
18
+ logFileMaxHistory?: number;
19
+ logFileZipHistory?: boolean;
15
20
  }
16
21
  declare class Logger {
17
22
  private logToFile;
18
23
  private fileStream;
19
24
  private logTimestamp;
20
25
  private logType;
26
+ private logSize;
27
+ private logFileName;
28
+ private logFileNameFull;
29
+ private logPath;
30
+ private logFileMaxSize;
31
+ private logFileMaxHistory;
32
+ private logFileZipHistory;
33
+ private logFileExtHistory;
21
34
  private levels;
22
35
  private level;
23
36
  constructor(options?: iLogOptions);
37
+ checkLogRotate(): void;
38
+ rotateFilesSync(): void;
24
39
  log: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
25
40
  light: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
26
41
  note: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
42
+ http: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
27
43
  info: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
28
44
  trace: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
29
45
  warn: (msg?: string | undefined, forceTimestamp?: boolean | undefined, forceLogtype?: boolean | undefined) => void;
package/dist/log.js CHANGED
@@ -1,4 +1,23 @@
1
1
  'use strict';
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
2
21
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
22
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
23
  };
@@ -8,6 +27,7 @@ const util_1 = __importDefault(require("util"));
8
27
  const readline_1 = __importDefault(require("readline"));
9
28
  const fs_1 = require("fs");
10
29
  const path_1 = require("path");
30
+ const zlib = __importStar(require("zlib"));
11
31
  const Reset = '\x1b[0m';
12
32
  const Bright = '\x1b[1m';
13
33
  const Dim = '\x1b[2m';
@@ -63,28 +83,66 @@ const LogLevels = {
63
83
  warn: 2,
64
84
  trace: 3,
65
85
  info: 4,
66
- note: 5,
67
- all: 6
86
+ http: 5,
87
+ note: 6,
88
+ all: 7
68
89
  };
69
90
  exports.LogLevels = LogLevels;
70
- function str(obj) {
91
+ const str = (obj) => {
71
92
  if (typeof (obj) === 'object') {
72
93
  return util_1.default.inspect(obj, false, null);
73
94
  }
74
95
  else {
75
96
  return obj;
76
97
  }
77
- }
98
+ };
99
+ const calcMacSize = (val) => {
100
+ let result = 0;
101
+ if (typeof val === 'string') {
102
+ result = parseInt(val);
103
+ if (val.endsWith('k')) {
104
+ result = result * 1024;
105
+ }
106
+ if (val.endsWith('m')) {
107
+ result = result * 1024 * 1024;
108
+ }
109
+ if (val.endsWith('g')) {
110
+ result = result * 1024 * 1024 * 1024;
111
+ }
112
+ }
113
+ if (typeof val === 'number') {
114
+ result = val;
115
+ }
116
+ return result;
117
+ };
118
+ const zipFile = (source, destination) => {
119
+ const gzip = zlib.createGzip();
120
+ const inFile = (0, fs_1.createReadStream)(source);
121
+ const outFile = (0, fs_1.createWriteStream)(destination);
122
+ inFile.on('end', function () {
123
+ (0, fs_1.rmSync)(source);
124
+ });
125
+ inFile.pipe(gzip).pipe(outFile);
126
+ };
78
127
  class Logger {
79
128
  constructor(options) {
80
129
  this.logToFile = false;
81
130
  this.logTimestamp = true;
82
131
  this.logType = true;
132
+ this.logSize = 0;
133
+ this.logFileName = '';
134
+ this.logFileNameFull = '';
135
+ this.logPath = '';
136
+ this.logFileMaxSize = 1024 * 1024;
137
+ this.logFileMaxHistory = 12;
138
+ this.logFileZipHistory = false;
139
+ this.logFileExtHistory = '';
83
140
  this.levels = {
84
141
  error: false,
85
142
  warn: false,
86
143
  trace: false,
87
144
  info: false,
145
+ http: false,
88
146
  note: false,
89
147
  all: false,
90
148
  };
@@ -93,9 +151,11 @@ class Logger {
93
151
  if (this.levels.all) {
94
152
  forceLogtype = forceLogtype === undefined ? this.logType : forceLogtype;
95
153
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
96
- const logMsg = this.formatMessage(7, forceTimestamp, forceLogtype, msg || '');
154
+ const logMsg = this.formatMessage(8, forceTimestamp, forceLogtype, msg || '');
97
155
  if (this.logToFile) {
98
- this.fileStream.write(logMsg);
156
+ this.logSize += logMsg.length + 2;
157
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
158
+ this.checkLogRotate();
99
159
  }
100
160
  else {
101
161
  console.log(logMsg);
@@ -106,9 +166,11 @@ class Logger {
106
166
  if (this.levels.all) {
107
167
  forceLogtype = forceLogtype === undefined ? this.logType : forceLogtype;
108
168
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
109
- const logMsg = this.formatMessage(6, forceTimestamp, forceLogtype, msg || '');
169
+ const logMsg = this.formatMessage(7, forceTimestamp, forceLogtype, msg || '');
110
170
  if (this.logToFile) {
111
- this.fileStream.write(logMsg);
171
+ this.logSize += logMsg.length + 2;
172
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
173
+ this.checkLogRotate();
112
174
  }
113
175
  else {
114
176
  console.log(logMsg);
@@ -117,11 +179,28 @@ class Logger {
117
179
  };
118
180
  this.note = (msg, forceTimestamp, forceLogtype) => {
119
181
  if (this.levels.note) {
182
+ forceLogtype = forceLogtype === undefined ? this.logType : forceLogtype;
183
+ forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
184
+ const logMsg = this.formatMessage(6, forceTimestamp, forceLogtype, msg || '');
185
+ if (this.logToFile) {
186
+ this.logSize += logMsg.length + 2;
187
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
188
+ this.checkLogRotate();
189
+ }
190
+ else {
191
+ console.log(logMsg);
192
+ }
193
+ }
194
+ };
195
+ this.http = (msg, forceTimestamp, forceLogtype) => {
196
+ if (this.levels.info) {
120
197
  forceLogtype = forceLogtype === undefined ? this.logType : forceLogtype;
121
198
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
122
199
  const logMsg = this.formatMessage(5, forceTimestamp, forceLogtype, msg || '');
123
200
  if (this.logToFile) {
124
- this.fileStream.write(logMsg);
201
+ this.logSize += logMsg.length + 2;
202
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
203
+ this.checkLogRotate();
125
204
  }
126
205
  else {
127
206
  console.log(logMsg);
@@ -134,7 +213,9 @@ class Logger {
134
213
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
135
214
  const logMsg = this.formatMessage(4, forceTimestamp, forceLogtype, msg || '');
136
215
  if (this.logToFile) {
137
- this.fileStream.write(logMsg);
216
+ this.logSize += logMsg.length + 2;
217
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
218
+ this.checkLogRotate();
138
219
  }
139
220
  else {
140
221
  console.log(logMsg);
@@ -147,7 +228,9 @@ class Logger {
147
228
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
148
229
  const logMsg = this.formatMessage(3, forceTimestamp, forceLogtype, msg || '');
149
230
  if (this.logToFile) {
150
- this.fileStream.write(logMsg);
231
+ this.logSize += logMsg.length + 2;
232
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
233
+ this.checkLogRotate();
151
234
  }
152
235
  else {
153
236
  console.log(logMsg);
@@ -160,7 +243,9 @@ class Logger {
160
243
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
161
244
  const logMsg = this.formatMessage(2, forceTimestamp, forceLogtype, msg || '');
162
245
  if (this.logToFile) {
163
- this.fileStream.write(logMsg);
246
+ this.logSize += logMsg.length + 2;
247
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
248
+ this.checkLogRotate();
164
249
  }
165
250
  else {
166
251
  console.log(logMsg);
@@ -173,7 +258,9 @@ class Logger {
173
258
  forceTimestamp = forceTimestamp === undefined ? this.logTimestamp : forceTimestamp;
174
259
  const logMsg = this.formatMessage(1, forceTimestamp, forceLogtype, msg || '');
175
260
  if (this.logToFile) {
176
- this.fileStream.write(logMsg);
261
+ this.logSize += logMsg.length + 2;
262
+ (0, fs_1.appendFileSync)(this.logFileNameFull, logMsg);
263
+ this.checkLogRotate();
177
264
  }
178
265
  else {
179
266
  console.log(logMsg);
@@ -208,7 +295,7 @@ class Logger {
208
295
  l = 4;
209
296
  }
210
297
  if (loglevel === 3) {
211
- level = this.logToFile ? 'TRACE' : chalk.cyan('TRACE');
298
+ level = this.logToFile ? 'TRACE' : chalk.blue('TRACE');
212
299
  l = 5;
213
300
  }
214
301
  if (loglevel === 4) {
@@ -216,14 +303,18 @@ class Logger {
216
303
  l = 4;
217
304
  }
218
305
  if (loglevel === 5) {
219
- level = this.logToFile ? 'NOTE' : chalk.blue('NOTE');
306
+ level = this.logToFile ? 'HTTP' : chalk.green('HTTP');
220
307
  l = 4;
221
308
  }
222
309
  if (loglevel === 6) {
310
+ level = this.logToFile ? 'NOTE' : chalk.cyan('NOTE');
311
+ l = 4;
312
+ }
313
+ if (loglevel === 7) {
223
314
  level = this.logToFile ? 'LOG' : chalk.grey('LOG');
224
315
  l = 3;
225
316
  }
226
- if (loglevel === 7) {
317
+ if (loglevel === 8) {
227
318
  level = this.logToFile ? 'LOG' : chalk.white('LOG');
228
319
  l = 3;
229
320
  }
@@ -244,18 +335,21 @@ class Logger {
244
335
  msg = chalk.yellow(msg);
245
336
  }
246
337
  if (loglevel === 3) {
247
- msg = chalk.cyan(msg);
338
+ msg = chalk.blue(msg);
248
339
  }
249
340
  if (loglevel === 4) {
250
341
  msg = chalk.green(msg);
251
342
  }
252
343
  if (loglevel === 5) {
253
- msg = chalk.blue(msg);
344
+ msg = chalk.green(msg);
254
345
  }
255
346
  if (loglevel === 6) {
256
- msg = chalk.grey(msg);
347
+ msg = chalk.cyan(msg);
257
348
  }
258
349
  if (loglevel === 7) {
350
+ msg = chalk.grey(msg);
351
+ }
352
+ if (loglevel === 8) {
259
353
  msg = chalk.white(msg);
260
354
  }
261
355
  }
@@ -264,6 +358,12 @@ class Logger {
264
358
  this.level = options && (options.level || options.level === 0) ? options.level : LogLevels.all;
265
359
  this.logTimestamp = options ? (options.logTimestamp !== undefined ? options.logTimestamp : true) : true;
266
360
  this.logType = options ? (options.logType !== undefined ? options.logType : true) : true;
361
+ this.logFileName = options && options.logFileName ? options.logFileName : this.logFileName;
362
+ this.logPath = options && options.logPath ? options.logPath : this.logPath;
363
+ this.logFileMaxSize = options && options.logFileMaxSize !== undefined ? calcMacSize(options.logFileMaxSize) : this.logFileMaxSize;
364
+ this.logFileMaxHistory = options && options.logFileMaxHistory ? options.logFileMaxHistory : this.logFileMaxHistory;
365
+ this.logFileZipHistory = options && options.logFileZipHistory !== undefined ? options.logFileZipHistory : this.logFileZipHistory;
366
+ this.logFileExtHistory = this.logFileZipHistory ? '.gz' : '';
267
367
  let index = 0;
268
368
  if (this.level >= LogLevels.error) {
269
369
  this.levels.error = true;
@@ -277,17 +377,58 @@ class Logger {
277
377
  if (this.level >= LogLevels.info) {
278
378
  this.levels.info = true;
279
379
  }
380
+ if (this.level >= LogLevels.http) {
381
+ this.levels.http = true;
382
+ }
280
383
  if (this.level >= LogLevels.note) {
281
384
  this.levels.note = true;
282
385
  }
283
386
  if (this.level >= LogLevels.all) {
284
387
  this.levels.all = true;
285
388
  }
286
- if (options && options.destination) {
287
- const file = (0, path_1.parse)(options.destination);
389
+ if (this.logFileName) {
288
390
  this.logToFile = true;
289
- (0, fs_1.mkdirSync)(file.dir, { recursive: true });
290
- this.fileStream = (0, fs_1.createWriteStream)(options.destination, { flags: 'a' });
391
+ if (this.logPath) {
392
+ (0, fs_1.mkdirSync)(this.logPath, { recursive: true });
393
+ }
394
+ this.logFileNameFull = (0, path_1.join)(this.logPath, this.logFileName + '.log');
395
+ try {
396
+ const stats = (0, fs_1.statSync)(this.logFileNameFull);
397
+ this.logSize = stats.size;
398
+ }
399
+ catch (_a) {
400
+ this.logSize = 0;
401
+ }
402
+ }
403
+ }
404
+ checkLogRotate() {
405
+ if (this.logFileMaxSize && this.logSize >= this.logFileMaxSize) {
406
+ this.rotateFilesSync();
407
+ if (this.logFileZipHistory) {
408
+ const zipFileName = (0, path_1.join)(this.logPath, this.logFileName + '.1.log.gz');
409
+ const zipFileSource = (0, path_1.join)(this.logPath, this.logFileName + '.0.log');
410
+ (0, fs_1.renameSync)(this.logFileNameFull, zipFileSource);
411
+ zipFile(zipFileSource, zipFileName);
412
+ }
413
+ else {
414
+ const newFileName = (0, path_1.join)(this.logPath, this.logFileName + '.1.log');
415
+ (0, fs_1.renameSync)(this.logFileNameFull, newFileName);
416
+ }
417
+ this.logSize = 0;
418
+ }
419
+ }
420
+ rotateFilesSync() {
421
+ for (let i = this.logFileMaxHistory; i >= 1; i--) {
422
+ const oldFilename = (0, path_1.join)(this.logPath, `${this.logFileName}.${i}.log${this.logFileExtHistory}`);
423
+ const newFilename = (0, path_1.join)(this.logPath, `${this.logFileName}.${i + 1}.log${this.logFileExtHistory}`);
424
+ if ((0, fs_1.existsSync)(oldFilename)) {
425
+ if (i === this.logFileMaxHistory) {
426
+ (0, fs_1.rmSync)(oldFilename);
427
+ }
428
+ else {
429
+ (0, fs_1.renameSync)(oldFilename, newFilename);
430
+ }
431
+ }
291
432
  }
292
433
  }
293
434
  }
package/dist/log.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "koa-micro-ts",
3
- "version": "3.2.8",
3
+ "version": "3.3.0",
4
4
  "description": "Microservice Typescript Framework - based on koa",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -41,8 +41,8 @@
41
41
  ],
42
42
  "dependencies": {
43
43
  "@koa/router": "^10.1.1",
44
- "@types/jsonwebtoken": "^8.5.6",
45
- "http-graceful-shutdown": "^3.1.5",
44
+ "@types/jsonwebtoken": "^8.5.8",
45
+ "http-graceful-shutdown": "^3.1.7",
46
46
  "jsonwebtoken": "^8.5.1",
47
47
  "koa": "^2.13.4",
48
48
  "koa-body": "^4.2.0",
@@ -52,7 +52,7 @@
52
52
  "devDependencies": {
53
53
  "@types/koa": "^2.13.4",
54
54
  "@types/koa-send": "^4.1.3",
55
- "@types/node": "^16.11.10",
56
- "@types/koa__router": "^8.0.10"
55
+ "@types/node": "^17.0.22",
56
+ "@types/koa__router": "^8.0.11"
57
57
  }
58
58
  }