@jiangnian520/midway-operation-log 1.0.4 → 1.0.5
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/dist/configuration.d.ts +2 -2
- package/dist/configuration.js +14 -2
- package/dist/index.d.ts +0 -1
- package/dist/index.js +2 -4
- package/dist/queue/queue.service.d.ts +0 -1
- package/dist/queue/queue.service.js +8 -7
- package/dist/queue/redis.queue.d.ts +1 -2
- package/dist/queue/redis.queue.js +3 -38
- package/package.json +1 -1
package/dist/configuration.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MidwayDecoratorService } from '@midwayjs/core';
|
|
2
|
-
import type { ILifeCycle } from '@midwayjs/core';
|
|
2
|
+
import type { ILifeCycle, IMidwayContainer } from '@midwayjs/core';
|
|
3
3
|
export declare class OperationLogConfiguration implements ILifeCycle {
|
|
4
4
|
decoratorService: MidwayDecoratorService;
|
|
5
|
-
onReady(): Promise<void>;
|
|
5
|
+
onReady(container: IMidwayContainer): Promise<void>;
|
|
6
6
|
}
|
package/dist/configuration.js
CHANGED
|
@@ -47,7 +47,19 @@ const core_1 = require("@midwayjs/core");
|
|
|
47
47
|
const DefaultConfig = __importStar(require("./config/config.default"));
|
|
48
48
|
const interface_1 = require("./interface");
|
|
49
49
|
let OperationLogConfiguration = class OperationLogConfiguration {
|
|
50
|
-
async onReady() {
|
|
50
|
+
async onReady(container) {
|
|
51
|
+
const configService = container.get(core_1.MidwayConfigService);
|
|
52
|
+
const config = configService.getConfiguration('operationLog');
|
|
53
|
+
if (config && config.useRedis === true) {
|
|
54
|
+
try {
|
|
55
|
+
const { RedisLogQueue } = require('./queue/redis.queue');
|
|
56
|
+
container.registerObject('RedisLogQueue', RedisLogQueue);
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
console.error('[OperationLog] 启用 Redis 队列失败,请确保已安装 @midwayjs/bullmq', error.message);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
// 注册装饰器拦截
|
|
51
63
|
this.decoratorService.registerMethodHandler(interface_1.LOGGING_KEY, (options) => {
|
|
52
64
|
return {
|
|
53
65
|
around: async (joinPoint) => {
|
|
@@ -76,4 +88,4 @@ exports.OperationLogConfiguration = OperationLogConfiguration = __decorate([
|
|
|
76
88
|
importConfigs: [{ default: DefaultConfig }],
|
|
77
89
|
})
|
|
78
90
|
], OperationLogConfiguration);
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25maWd1cmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHlDQUF5SDtBQUV6SCx1RUFBeUQ7QUFDekQsMkNBQTBDO0FBTW5DLElBQU0seUJBQXlCLEdBQS9CLE1BQU0seUJBQXlCO0lBSXBDLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBMkI7UUFDdkMsTUFBTSxhQUFhLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQywwQkFBbUIsQ0FBQyxDQUFDO1FBQ3pELE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUU5RCxJQUFJLE1BQU0sSUFBSSxNQUFNLENBQUMsUUFBUSxLQUFLLElBQUksRUFBRSxDQUFDO1lBQ3ZDLElBQUksQ0FBQztnQkFDSCxNQUFNLEVBQUUsYUFBYSxFQUFFLEdBQUcsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQUM7Z0JBQ3pELFNBQVMsQ0FBQyxjQUFjLENBQUMsZUFBZSxFQUFFLGFBQWEsQ0FBQyxDQUFDO1lBQzNELENBQUM7WUFBQyxPQUFPLEtBQVUsRUFBRSxDQUFDO2dCQUNwQixPQUFPLENBQUMsS0FBSyxDQUFDLHNEQUFzRCxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN2RixDQUFDO1FBQ0gsQ0FBQztRQUVELFVBQVU7UUFDVixJQUFJLENBQUMsZ0JBQWdCLENBQUMscUJBQXFCLENBQUMsdUJBQVcsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ25FLE9BQU87Z0JBQ0wsTUFBTSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsRUFBRTtvQkFDMUIsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQywwQkFBbUIsQ0FBQyxDQUFDO29CQUNsRCxJQUFJLEdBQUcsRUFBRSxDQUFDO3dCQUNSLEdBQUcsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUM7d0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsWUFBWSxHQUFHOzRCQUN2QixVQUFVLEVBQUUsU0FBUyxDQUFDLFVBQVU7NEJBQ2hDLE9BQU87eUJBQ1IsQ0FBQztvQkFDSixDQUFDO29CQUNELE9BQU8sU0FBUyxDQUFDLE9BQVEsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDL0MsQ0FBQzthQUNGLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFBO0FBbENZLDhEQUF5QjtBQUVwQztJQURDLElBQUEsYUFBTSxHQUFFOzhCQUNTLDZCQUFzQjttRUFBQztvQ0FGOUIseUJBQXlCO0lBSnJDLElBQUEsb0JBQWEsRUFBQztRQUNiLFNBQVMsRUFBRSxjQUFjO1FBQ3pCLGFBQWEsRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxDQUFDO0tBQzVDLENBQUM7R0FDVyx5QkFBeUIsQ0FrQ3JDIn0=
|
package/dist/index.d.ts
CHANGED
|
@@ -3,5 +3,4 @@ export { Log } from './decorator/log.decorator';
|
|
|
3
3
|
export { ReportMiddleware } from './middleware/report.middleware';
|
|
4
4
|
export { LogQueueService } from './queue/queue.service';
|
|
5
5
|
export { MemoryLogQueue } from './queue/memory.queue';
|
|
6
|
-
export { RedisLogQueue } from './queue/redis.queue';
|
|
7
6
|
export * from './interface';
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
17
|
+
exports.MemoryLogQueue = exports.LogQueueService = exports.ReportMiddleware = exports.Log = exports.Configuration = void 0;
|
|
18
18
|
var configuration_1 = require("./configuration");
|
|
19
19
|
Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.OperationLogConfiguration; } });
|
|
20
20
|
var log_decorator_1 = require("./decorator/log.decorator");
|
|
@@ -25,7 +25,5 @@ var queue_service_1 = require("./queue/queue.service");
|
|
|
25
25
|
Object.defineProperty(exports, "LogQueueService", { enumerable: true, get: function () { return queue_service_1.LogQueueService; } });
|
|
26
26
|
var memory_queue_1 = require("./queue/memory.queue");
|
|
27
27
|
Object.defineProperty(exports, "MemoryLogQueue", { enumerable: true, get: function () { return memory_queue_1.MemoryLogQueue; } });
|
|
28
|
-
var redis_queue_1 = require("./queue/redis.queue");
|
|
29
|
-
Object.defineProperty(exports, "RedisLogQueue", { enumerable: true, get: function () { return redis_queue_1.RedisLogQueue; } });
|
|
30
28
|
__exportStar(require("./interface"), exports);
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxpREFBNkU7QUFBcEUsOEdBQUEseUJBQXlCLE9BQWlCO0FBQ25ELDJEQUFnRDtBQUF2QyxvR0FBQSxHQUFHLE9BQUE7QUFDWixvRUFBa0U7QUFBekQscUhBQUEsZ0JBQWdCLE9BQUE7QUFFekIsdURBQXdEO0FBQS9DLGdIQUFBLGVBQWUsT0FBQTtBQUN4QixxREFBc0Q7QUFBN0MsOEdBQUEsY0FBYyxPQUFBO0FBRXZCLDhDQUE0QiJ9
|
|
@@ -2,7 +2,6 @@ import type { IMidwayContainer } from '@midwayjs/core';
|
|
|
2
2
|
import type { CollectedLogData, OperationLogConfig } from '../interface';
|
|
3
3
|
import type { LogQueue } from './queue.interface';
|
|
4
4
|
import { MemoryLogQueue } from './memory.queue';
|
|
5
|
-
export declare const LOG_QUEUE_TOKEN = "LOG_QUEUE_TOKEN";
|
|
6
5
|
export declare class LogQueueService implements LogQueue {
|
|
7
6
|
logConfig: OperationLogConfig;
|
|
8
7
|
memoryQueue: MemoryLogQueue;
|
|
@@ -9,18 +9,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.LogQueueService =
|
|
12
|
+
exports.LogQueueService = void 0;
|
|
13
13
|
const core_1 = require("@midwayjs/core");
|
|
14
14
|
const memory_queue_1 = require("./memory.queue");
|
|
15
|
-
exports.LOG_QUEUE_TOKEN = 'LOG_QUEUE_TOKEN';
|
|
16
15
|
let LogQueueService = class LogQueueService {
|
|
17
16
|
async push(ctx, logData) {
|
|
18
17
|
if (this.logConfig.useRedis) {
|
|
19
18
|
const redisQueue = await this.appCtx.getAsync('RedisLogQueue');
|
|
20
|
-
if (
|
|
21
|
-
|
|
19
|
+
if (redisQueue) {
|
|
20
|
+
await redisQueue.push(ctx, logData);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
ctx.logger.error('[OperationLog] 未找到 RedisLogQueue 实例');
|
|
22
24
|
}
|
|
23
|
-
await redisQueue.push(ctx, logData);
|
|
24
25
|
}
|
|
25
26
|
else {
|
|
26
27
|
await this.memoryQueue.push(ctx, logData);
|
|
@@ -41,6 +42,6 @@ __decorate([
|
|
|
41
42
|
__metadata("design:type", Object)
|
|
42
43
|
], LogQueueService.prototype, "appCtx", void 0);
|
|
43
44
|
exports.LogQueueService = LogQueueService = __decorate([
|
|
44
|
-
(0, core_1.Provide)()
|
|
45
|
+
(0, core_1.Provide)()
|
|
45
46
|
], LogQueueService);
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVldWUuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWV1ZS9xdWV1ZS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHlDQUE2RTtBQUk3RSxpREFBZ0Q7QUFHekMsSUFBTSxlQUFlLEdBQXJCLE1BQU0sZUFBZTtJQVV4QixLQUFLLENBQUMsSUFBSSxDQUFDLEdBQVEsRUFBRSxPQUF5QjtRQUMxQyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDMUIsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBVyxlQUFlLENBQUMsQ0FBQztZQUN6RSxJQUFJLFVBQVUsRUFBRSxDQUFDO2dCQUNiLE1BQU0sVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDeEMsQ0FBQztpQkFBTSxDQUFDO2dCQUNKLEdBQUcsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7WUFDNUQsQ0FBQztRQUNMLENBQUM7YUFBTSxDQUFDO1lBQ0osTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDOUMsQ0FBQztJQUNMLENBQUM7Q0FDSixDQUFBO0FBdEJZLDBDQUFlO0FBRXhCO0lBREMsSUFBQSxhQUFNLEVBQUMsY0FBYyxDQUFDOztrREFDTztBQUc5QjtJQURDLElBQUEsYUFBTSxHQUFFOzhCQUNJLDZCQUFjO29EQUFDO0FBRzVCO0lBREMsSUFBQSx5QkFBa0IsR0FBRTs7K0NBQ0k7MEJBUmhCLGVBQWU7SUFEM0IsSUFBQSxjQUFPLEdBQUU7R0FDRyxlQUFlLENBc0IzQiJ9
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { LogQueue } from './queue.interface';
|
|
2
2
|
import type { CollectedLogData, OperationLogConfig } from '../interface';
|
|
3
|
-
import * as bullmq from '@midwayjs/bullmq';
|
|
4
3
|
export declare class RedisLogQueue implements LogQueue {
|
|
5
4
|
logConfig: OperationLogConfig;
|
|
6
|
-
bullmqFramework:
|
|
5
|
+
bullmqFramework: any;
|
|
7
6
|
push(ctx: any, logData: CollectedLogData): Promise<void>;
|
|
8
7
|
}
|
|
@@ -1,52 +1,17 @@
|
|
|
1
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
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
7
|
};
|
|
24
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
-
var ownKeys = function(o) {
|
|
26
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
-
var ar = [];
|
|
28
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
-
return ar;
|
|
30
|
-
};
|
|
31
|
-
return ownKeys(o);
|
|
32
|
-
};
|
|
33
|
-
return function (mod) {
|
|
34
|
-
if (mod && mod.__esModule) return mod;
|
|
35
|
-
var result = {};
|
|
36
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
-
__setModuleDefault(result, mod);
|
|
38
|
-
return result;
|
|
39
|
-
};
|
|
40
|
-
})();
|
|
41
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
42
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
43
10
|
};
|
|
44
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
12
|
exports.RedisLogQueue = void 0;
|
|
46
13
|
const core_1 = require("@midwayjs/core");
|
|
47
|
-
const bullmq = __importStar(require("@midwayjs/bullmq"));
|
|
48
14
|
let RedisLogQueue = class RedisLogQueue {
|
|
49
|
-
;
|
|
50
15
|
async push(ctx, logData) {
|
|
51
16
|
if (!this.bullmqFramework) {
|
|
52
17
|
throw new Error('请安装并配置 @midwayjs/bullmq 以使用 Redis 模式');
|
|
@@ -66,10 +31,10 @@ __decorate([
|
|
|
66
31
|
], RedisLogQueue.prototype, "logConfig", void 0);
|
|
67
32
|
__decorate([
|
|
68
33
|
(0, core_1.Inject)('bullmqFramework'),
|
|
69
|
-
__metadata("design:type",
|
|
34
|
+
__metadata("design:type", Object)
|
|
70
35
|
], RedisLogQueue.prototype, "bullmqFramework", void 0);
|
|
71
36
|
exports.RedisLogQueue = RedisLogQueue = __decorate([
|
|
72
|
-
(0, core_1.Provide)(
|
|
37
|
+
(0, core_1.Provide)(),
|
|
73
38
|
(0, core_1.Scope)(core_1.ScopeEnum.Singleton)
|
|
74
39
|
], RedisLogQueue);
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXMucXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcXVldWUvcmVkaXMucXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEseUNBQTJFO0FBTXBFLElBQU0sYUFBYSxHQUFuQixNQUFNLGFBQWE7SUFPdEIsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFRLEVBQUUsT0FBeUI7UUFDMUMsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksS0FBSyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUNELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxJQUFJLGVBQWUsQ0FBQztRQUNuRSxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUV2RCxNQUFNLEtBQUssQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLE9BQU8sRUFBRTtZQUNsQyxRQUFRLEVBQUUsQ0FBQztZQUNYLE9BQU8sRUFBRSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRTtTQUNoRCxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQ0osQ0FBQTtBQW5CWSxzQ0FBYTtBQUV0QjtJQURDLElBQUEsYUFBTSxFQUFDLGNBQWMsQ0FBQzs7Z0RBQ087QUFHOUI7SUFEQyxJQUFBLGFBQU0sRUFBQyxpQkFBaUIsQ0FBQzs7c0RBQ0w7d0JBTFosYUFBYTtJQUZ6QixJQUFBLGNBQU8sR0FBRTtJQUNULElBQUEsWUFBSyxFQUFDLGdCQUFTLENBQUMsU0FBUyxDQUFDO0dBQ2QsYUFBYSxDQW1CekIifQ==
|