@builder6/core 3.1.0-alpha.0 → 3.1.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/dist/auth/auth.controller.d.ts +5 -0
- package/dist/auth/auth.controller.js +16 -2
- package/dist/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.service.js +1 -0
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/filters/all-exceptions.filter.js +1 -19
- package/dist/filters/all-exceptions.filter.js.map +1 -1
- package/dist/logger/PinoCloudWatchTransport.js +19 -6
- package/dist/logger/PinoCloudWatchTransport.js.map +1 -1
- package/dist/logger/PinoMongodbTransport.js +104 -0
- package/dist/logger/PinoMongodbTransport.js.map +1 -0
- package/dist/logger/pinoConfig.js +23 -21
- package/dist/logger/pinoConfig.js.map +1 -1
- package/package.json +5 -5
- package/dist/logger/PinoAirtableTransport.js +0 -51
- package/dist/logger/PinoAirtableTransport.js.map +0 -1
- /package/dist/logger/{PinoAirtableTransport.d.ts → PinoMongodbTransport.d.ts} +0 -0
|
@@ -3,5 +3,10 @@ import { Request, Response } from 'express';
|
|
|
3
3
|
export declare class AuthController {
|
|
4
4
|
private authService;
|
|
5
5
|
constructor(authService: AuthService);
|
|
6
|
+
healthCheck(): {
|
|
7
|
+
space_id: Promise<string>;
|
|
8
|
+
status: string;
|
|
9
|
+
timestamp: string;
|
|
10
|
+
};
|
|
6
11
|
login(req: Request, res: Response, redirect_to: string, username: string, password: string, space_id: string): Promise<void | Response<any, Record<string, any>>>;
|
|
7
12
|
}
|
|
@@ -20,6 +20,13 @@ let AuthController = class AuthController {
|
|
|
20
20
|
constructor(authService) {
|
|
21
21
|
this.authService = authService;
|
|
22
22
|
}
|
|
23
|
+
healthCheck() {
|
|
24
|
+
return {
|
|
25
|
+
space_id: this.authService.getPrimarySpaceId(),
|
|
26
|
+
status: 'ok',
|
|
27
|
+
timestamp: new Date().toISOString(),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
23
30
|
async login(req, res, redirect_to, username, password, space_id) {
|
|
24
31
|
try {
|
|
25
32
|
if (!username || !password) {
|
|
@@ -49,7 +56,14 @@ let AuthController = class AuthController {
|
|
|
49
56
|
exports.AuthController = AuthController;
|
|
50
57
|
__decorate([
|
|
51
58
|
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
52
|
-
(0, common_1.
|
|
59
|
+
(0, common_1.Get)('/health'),
|
|
60
|
+
__metadata("design:type", Function),
|
|
61
|
+
__metadata("design:paramtypes", []),
|
|
62
|
+
__metadata("design:returntype", void 0)
|
|
63
|
+
], AuthController.prototype, "healthCheck", null);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
66
|
+
(0, common_1.Post)('/auth/login'),
|
|
53
67
|
(0, swagger_1.ApiQuery)({
|
|
54
68
|
name: 'redirect_to',
|
|
55
69
|
required: false,
|
|
@@ -99,7 +113,7 @@ __decorate([
|
|
|
99
113
|
__metadata("design:returntype", Promise)
|
|
100
114
|
], AuthController.prototype, "login", null);
|
|
101
115
|
exports.AuthController = AuthController = __decorate([
|
|
102
|
-
(0, common_1.Controller)('api/v6
|
|
116
|
+
(0, common_1.Controller)('api/v6'),
|
|
103
117
|
__metadata("design:paramtypes", [auth_service_1.AuthService])
|
|
104
118
|
], AuthController);
|
|
105
119
|
//# sourceMappingURL=auth.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,iDAA6C;AAC7C,6CAAkE;AAK3D,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,6 @@ var AllExceptionsFilter_1;
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.AllExceptionsFilter = void 0;
|
|
11
11
|
const common_1 = require("@nestjs/common");
|
|
12
|
-
const ejs_1 = require("ejs");
|
|
13
|
-
const path_1 = require("path");
|
|
14
12
|
let AllExceptionsFilter = AllExceptionsFilter_1 = class AllExceptionsFilter {
|
|
15
13
|
constructor() {
|
|
16
14
|
this.logger = new common_1.Logger(AllExceptionsFilter_1.name);
|
|
@@ -43,26 +41,10 @@ let AllExceptionsFilter = AllExceptionsFilter_1 = class AllExceptionsFilter {
|
|
|
43
41
|
status: common_1.HttpStatus.INTERNAL_SERVER_ERROR,
|
|
44
42
|
};
|
|
45
43
|
}
|
|
46
|
-
|
|
47
|
-
(0, ejs_1.renderFile)(filePath, {
|
|
44
|
+
response.status(errorResponse.status).json({
|
|
48
45
|
statusCode: errorResponse.status,
|
|
49
|
-
timestamp: new Date().toISOString(),
|
|
50
|
-
path: request.url,
|
|
51
46
|
message: errorResponse.message,
|
|
52
47
|
code: code,
|
|
53
|
-
}, (err, html) => {
|
|
54
|
-
if (err) {
|
|
55
|
-
response.status(errorResponse.status).json({
|
|
56
|
-
statusCode: errorResponse.status,
|
|
57
|
-
timestamp: new Date().toISOString(),
|
|
58
|
-
path: request.url,
|
|
59
|
-
message: errorResponse.message,
|
|
60
|
-
code: code,
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
response.status(errorResponse.status).send(html);
|
|
65
|
-
}
|
|
66
48
|
});
|
|
67
49
|
}
|
|
68
50
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"all-exceptions.filter.js","sourceRoot":"","sources":["../../src/filters/all-exceptions.filter.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAOwB;
|
|
1
|
+
{"version":3,"file":"all-exceptions.filter.js","sourceRoot":"","sources":["../../src/filters/all-exceptions.filter.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAOwB;AAUjB,IAAM,mBAAmB,2BAAzB,MAAM,mBAAmB;IAAzB;QACG,WAAM,GAAW,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAyEhE,CAAC;IAxEC,KAAK,CAAC,SAAc,EAAE,IAAmB;QACvC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;YAEjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf;gBACE,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,SAAS;aACV,EACD,SAAS,CAAC,KAAK,CAChB,CAAC;YAEF,IAAI,aAA4B,CAAC;YACjC,MAAM,OAAO,GACX,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO;gBACnC,SAAS,EAAE,QAAQ,EAAE,OAAO;gBAC5B,SAAS,CAAC,OAAO,CAAC;YACpB,MAAM,IAAI,GAAG,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,IAAI,CAAC;YAEjE,IAAI,SAAS,YAAY,sBAAa,EAAE,CAAC;gBACvC,aAAa,GAAG;oBACd,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE;oBAC7B,OAAO;iBACR,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG;oBACd,OAAO;oBACP,MAAM,EAAE,mBAAU,CAAC,qBAAqB;iBACzC,CAAC;YACJ,CAAC;YAED,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;gBACzC,UAAU,EAAE,aAAa,CAAC,MAAM;gBAChC,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;QA0BL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2CAA2C,EAC3C,KAAK,CAAC,KAAK,CACZ,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA1EY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,cAAK,GAAE;GACK,mBAAmB,CA0E/B"}
|
|
@@ -13,6 +13,17 @@ async function default_1(opts) {
|
|
|
13
13
|
const ipAddress = Object.values(networkInterfaces)
|
|
14
14
|
.flat()
|
|
15
15
|
.find((details) => details.family === 'IPv4' && !details.internal)?.address;
|
|
16
|
+
const level = opts.level || 'error';
|
|
17
|
+
const levelMapping = {
|
|
18
|
+
fatal: 60,
|
|
19
|
+
error: 50,
|
|
20
|
+
warn: 40,
|
|
21
|
+
info: 30,
|
|
22
|
+
debug: 20,
|
|
23
|
+
trace: 10,
|
|
24
|
+
silent: Infinity,
|
|
25
|
+
};
|
|
26
|
+
const threshold = levelMapping[level] || 50;
|
|
16
27
|
const client = new client_cloudwatch_logs_1.CloudWatchLogsClient({
|
|
17
28
|
region: opts.region,
|
|
18
29
|
credentials: {
|
|
@@ -108,12 +119,14 @@ async function default_1(opts) {
|
|
|
108
119
|
await sendLogs();
|
|
109
120
|
}, 60 * 1000);
|
|
110
121
|
for await (const obj of source) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
122
|
+
if (obj.level >= threshold) {
|
|
123
|
+
const { time, ...rest } = obj;
|
|
124
|
+
const logEntry = {
|
|
125
|
+
message: JSON.stringify(rest),
|
|
126
|
+
timestamp: time,
|
|
127
|
+
};
|
|
128
|
+
logBatch.push(logEntry);
|
|
129
|
+
}
|
|
117
130
|
}
|
|
118
131
|
}, {
|
|
119
132
|
async close() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PinoCloudWatchTransport.js","sourceRoot":"","sources":["../../src/logger/PinoCloudWatchTransport.ts"],"names":[],"mappings":";;;;;AAyBA,
|
|
1
|
+
{"version":3,"file":"PinoCloudWatchTransport.js","sourceRoot":"","sources":["../../src/logger/PinoCloudWatchTransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.default = default_1;
|
|
7
|
+
const pino_abstract_transport_1 = __importDefault(require("pino-abstract-transport"));
|
|
8
|
+
const os_1 = __importDefault(require("os"));
|
|
9
|
+
const mongodb_1 = require("mongodb");
|
|
10
|
+
const uuid_1 = require("uuid");
|
|
11
|
+
async function default_1(opts) {
|
|
12
|
+
const networkInterfaces = os_1.default.networkInterfaces();
|
|
13
|
+
const ipAddress = Object.values(networkInterfaces)
|
|
14
|
+
.flat()
|
|
15
|
+
.find((details) => details.family === 'IPv4' && !details.internal)?.address;
|
|
16
|
+
const client = new mongodb_1.MongoClient(opts.mongoUrl, { useNewUrlParser: true, useUnifiedTopology: true });
|
|
17
|
+
await client.connect();
|
|
18
|
+
const db = client.db();
|
|
19
|
+
const collection = db.collection(opts.collectionName);
|
|
20
|
+
const level = opts.level || 'error';
|
|
21
|
+
const levelMapping = {
|
|
22
|
+
fatal: 60,
|
|
23
|
+
error: 50,
|
|
24
|
+
warn: 40,
|
|
25
|
+
info: 30,
|
|
26
|
+
debug: 20,
|
|
27
|
+
trace: 10,
|
|
28
|
+
silent: Infinity,
|
|
29
|
+
};
|
|
30
|
+
const levelMappingReverse = {
|
|
31
|
+
60: 'fatal',
|
|
32
|
+
50: 'error',
|
|
33
|
+
40: 'warn',
|
|
34
|
+
30: 'info',
|
|
35
|
+
20: 'debug',
|
|
36
|
+
10: 'trace',
|
|
37
|
+
Infinity: 'silent',
|
|
38
|
+
};
|
|
39
|
+
const threshold = levelMapping[level] || 50;
|
|
40
|
+
const getPrimarySpaceId = async () => {
|
|
41
|
+
if (process.env.STEEDOS_TENANT_ID) {
|
|
42
|
+
return process.env.STEEDOS_TENANT_ID;
|
|
43
|
+
}
|
|
44
|
+
const space = await db.collection('spaces').findOne({}, { sort: { created: 1 } });
|
|
45
|
+
if (space) {
|
|
46
|
+
process.env.STEEDOS_TENANT_ID = space._id;
|
|
47
|
+
}
|
|
48
|
+
return process.env.STEEDOS_TENANT_ID;
|
|
49
|
+
};
|
|
50
|
+
await getPrimarySpaceId();
|
|
51
|
+
return (0, pino_abstract_transport_1.default)(async (source) => {
|
|
52
|
+
console.info(`PinoMongoDBTransport connected to MongoDB at ${opts.mongoUrl}, logging level: ${level} (${threshold})`);
|
|
53
|
+
let isPaused = false;
|
|
54
|
+
let logBatch = [];
|
|
55
|
+
const insertLogs = async () => {
|
|
56
|
+
if (logBatch.length === 0)
|
|
57
|
+
return;
|
|
58
|
+
try {
|
|
59
|
+
await collection.insertMany(logBatch);
|
|
60
|
+
console.log(`Saved ${logBatch.length} log entries to MongoDB`);
|
|
61
|
+
logBatch = [];
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
console.error('Error saving log batch to MongoDB:', error);
|
|
65
|
+
console.log('Pausing log processing for 5 minutes...');
|
|
66
|
+
isPaused = true;
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
setInterval(async () => {
|
|
70
|
+
if (!isPaused) {
|
|
71
|
+
await insertLogs();
|
|
72
|
+
}
|
|
73
|
+
}, 5 * 1000);
|
|
74
|
+
for await (const obj of source) {
|
|
75
|
+
if (isPaused) {
|
|
76
|
+
await new Promise((resolve) => setTimeout(resolve, 5 * 60 * 1000));
|
|
77
|
+
isPaused = false;
|
|
78
|
+
}
|
|
79
|
+
if (obj.level >= threshold) {
|
|
80
|
+
const { level, msg, time, nodeID, pid, hostname, ns, mod, req, res, err, ...rest } = obj;
|
|
81
|
+
const logEntry = {
|
|
82
|
+
_id: (0, uuid_1.v4)(),
|
|
83
|
+
name: msg,
|
|
84
|
+
level: levelMappingReverse[level] || 'info',
|
|
85
|
+
node_id: nodeID,
|
|
86
|
+
ip: ipAddress,
|
|
87
|
+
pid,
|
|
88
|
+
hostname,
|
|
89
|
+
ns,
|
|
90
|
+
mod,
|
|
91
|
+
created: new Date(time),
|
|
92
|
+
space: process.env.STEEDOS_TENANT_ID || 'default',
|
|
93
|
+
data: { req, res, err, ...rest },
|
|
94
|
+
};
|
|
95
|
+
logBatch.push(logEntry);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}, {
|
|
99
|
+
async close() {
|
|
100
|
+
await client.close();
|
|
101
|
+
},
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=PinoMongodbTransport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PinoMongodbTransport.js","sourceRoot":"","sources":["../../src/logger/PinoMongodbTransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,39 +20,41 @@ const targets = [
|
|
|
20
20
|
options: { destination: 1 },
|
|
21
21
|
},
|
|
22
22
|
];
|
|
23
|
-
if (process.env.
|
|
23
|
+
if (process.env.B6_LOG_AWS_LOG_GROUP_NAME) {
|
|
24
24
|
targets.push({
|
|
25
|
-
target: path_1.default.join(__dirname, './
|
|
25
|
+
target: path_1.default.join(__dirname, './PinoCloudWatchTransport'),
|
|
26
26
|
options: {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
level: process.env.B6_LOG_AWS_LEVEL || 'error',
|
|
28
|
+
logGroupName: process.env.B6_LOG_AWS_LOG_GROUP_NAME,
|
|
29
|
+
logStreamName: process.env.B6_LOG_AWS_LOG_STREAM_NAME,
|
|
30
|
+
region: process.env.B6_LOG_AWS_REGION,
|
|
31
|
+
accessKeyId: process.env.B6_LOG_AWS_ACCESS_KEY_ID,
|
|
32
|
+
secretAccessKey: process.env.B6_LOG_AWS_SECRET_ACCESS_KEY,
|
|
31
33
|
},
|
|
32
34
|
});
|
|
33
35
|
}
|
|
34
|
-
if (process.env.
|
|
36
|
+
if (process.env.B6_LOG_MONGO_ENABLED === 'true') {
|
|
35
37
|
targets.push({
|
|
36
|
-
target: path_1.default.join(__dirname, './
|
|
38
|
+
target: path_1.default.join(__dirname, './PinoMongodbTransport'),
|
|
37
39
|
options: {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
accessKeyId: process.env.B6_LOGS_AWS_ACCESS_KEY_ID,
|
|
42
|
-
secretAccessKey: process.env.B6_LOGS_AWS_SECRET_ACCESS_KEY,
|
|
40
|
+
level: process.env.B6_LOG_MONGO_LEVEL || 'error',
|
|
41
|
+
mongoUrl: process.env.B6_LOG_MONGO_URL || process.env.MONGO_URL,
|
|
42
|
+
collectionName: 'logs',
|
|
43
43
|
},
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
exports.pinoConfig = {
|
|
47
47
|
pinoHttp: {
|
|
48
|
-
level: (
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
48
|
+
level: (process.env.B6_LOG_LEVEL || 'info'),
|
|
49
|
+
customLogLevel: (req, res, err) => {
|
|
50
|
+
if (err)
|
|
51
|
+
return 'error';
|
|
52
|
+
if (res.statusCode >= 500)
|
|
53
|
+
return 'error';
|
|
54
|
+
if (res.statusCode >= 400)
|
|
55
|
+
return 'warn';
|
|
56
|
+
return 'info';
|
|
57
|
+
},
|
|
56
58
|
autoLogging: {
|
|
57
59
|
ignore: (req) => req.url === '/api/v6/health',
|
|
58
60
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pinoConfig.js","sourceRoot":"","sources":["../../src/logger/pinoConfig.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,MAAM,OAAO,GAAG;IACd,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;QACnC,CAAC,CAAC;YACE,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,8BAA8B;aAC9C;SACF;QACH,CAAC,CAAC;YACE,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE;SAC5B;CACN,CAAC;AAEF,IAAI,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"pinoConfig.js","sourceRoot":"","sources":["../../src/logger/pinoConfig.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,MAAM,OAAO,GAAG;IACd,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;QACnC,CAAC,CAAC;YACE,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,8BAA8B;aAC9C;SACF;QACH,CAAC,CAAC;YACE,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE;SAC5B;CACN,CAAC;AAEF,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC;QACX,MAAM,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC;QACzD,OAAO,EAAE;YACP,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO;YAC9C,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;YACnD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;YACrD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;YACjD,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B;SAC1D;KACK,CAAC,CAAC;AACZ,CAAC;AAED,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM,EAAE,CAAC;IAChD,OAAO,CAAC,IAAI,CAAC;QACX,MAAM,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC;QACtD,OAAO,EAAE;YACP,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO;YAChD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS;YAC/D,cAAc,EAAE,MAAM;SACvB;KACK,CAAC,CAAC;AACZ,CAAC;AAEY,QAAA,UAAU,GAAW;IAChC,QAAQ,EAAE;QACR,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,CAAQ;QAClD,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAChC,IAAI,GAAG;gBAAE,OAAO,OAAO,CAAC;YACxB,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG;gBAAE,OAAO,OAAO,CAAC;YAC1C,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,WAAW,EAAE;YACX,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,gBAAgB;SAC9C;QAED,SAAS,EAAE;YACT,OAAO;SACR;QACD,MAAM,EAAE,CAAC,2BAA2B,EAAE,oBAAoB,CAAC;KAC5D;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "3.1.0
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
],
|
|
10
10
|
"dependencies": {
|
|
11
11
|
"@aws-sdk/client-cloudwatch-logs": "^3.721.0",
|
|
12
|
-
"@builder6/query-mongodb": "3.1.0
|
|
12
|
+
"@builder6/query-mongodb": "3.1.0",
|
|
13
13
|
"@socket.io/redis-adapter": "^8.3.0",
|
|
14
14
|
"socket.io-adapter": "^2.5.5"
|
|
15
15
|
},
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
"@nestjs/platform-ws": "^11.0.0",
|
|
23
23
|
"@nestjs/swagger": "^11.0.7",
|
|
24
24
|
"moleculer": "^0.14.35",
|
|
25
|
-
"nestjs-pino": "^4.
|
|
26
|
-
"pino-http": "^
|
|
25
|
+
"nestjs-pino": "^4.4.1",
|
|
26
|
+
"pino-http": "^11.0.0",
|
|
27
27
|
"pino-pretty": "^13.0.0"
|
|
28
28
|
},
|
|
29
29
|
"scripts": {
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"publishConfig": {
|
|
35
35
|
"access": "public"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "8fa9bc5979cfee49faa3707b009accd734c77337"
|
|
38
38
|
}
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.default = default_1;
|
|
7
|
-
const pino_abstract_transport_1 = __importDefault(require("pino-abstract-transport"));
|
|
8
|
-
const axios_1 = __importDefault(require("axios"));
|
|
9
|
-
async function default_1(opts) {
|
|
10
|
-
return (0, pino_abstract_transport_1.default)(async (source) => {
|
|
11
|
-
let isPaused = false;
|
|
12
|
-
let logBatch = [];
|
|
13
|
-
const sendLogs = async () => {
|
|
14
|
-
if (logBatch.length === 0)
|
|
15
|
-
return;
|
|
16
|
-
const url = `${opts.endpointUrl}/v0/${opts.baseId}/${opts.tableName}`;
|
|
17
|
-
try {
|
|
18
|
-
await axios_1.default.post(url, { records: logBatch.map((logEntry) => ({ fields: logEntry })) }, {
|
|
19
|
-
headers: {
|
|
20
|
-
Authorization: `Bearer ${opts.apiKey}`,
|
|
21
|
-
'Content-Type': 'application/json',
|
|
22
|
-
},
|
|
23
|
-
});
|
|
24
|
-
console.log(`Saved ${logBatch.length} log entries to Airtable`);
|
|
25
|
-
logBatch = [];
|
|
26
|
-
}
|
|
27
|
-
catch (error) {
|
|
28
|
-
console.error('Error saving log batch to Airtable:', error);
|
|
29
|
-
console.log('Pausing log processing for 5 minutes...');
|
|
30
|
-
isPaused = true;
|
|
31
|
-
}
|
|
32
|
-
};
|
|
33
|
-
setInterval(async () => {
|
|
34
|
-
if (!isPaused) {
|
|
35
|
-
await sendLogs();
|
|
36
|
-
}
|
|
37
|
-
}, 60 * 1000);
|
|
38
|
-
for await (const obj of source) {
|
|
39
|
-
if (isPaused) {
|
|
40
|
-
await new Promise((resolve) => setTimeout(resolve, 5 * 60 * 1000));
|
|
41
|
-
isPaused = false;
|
|
42
|
-
}
|
|
43
|
-
const logEntry = obj;
|
|
44
|
-
logBatch.push(logEntry);
|
|
45
|
-
}
|
|
46
|
-
}, {
|
|
47
|
-
async close() {
|
|
48
|
-
},
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
//# sourceMappingURL=PinoAirtableTransport.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PinoAirtableTransport.js","sourceRoot":"","sources":["../../src/logger/PinoAirtableTransport.ts"],"names":[],"mappings":";;;;;AAcA,4BAsDC;AApED,sFAA4C;AAC5C,kDAA0B;AAaX,KAAK,oBAAW,IAAI;IACjC,OAAO,IAAA,iCAAK,EACV,KAAK,EAAE,MAAM,EAAE,EAAE;QACf,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;YAC1B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAElC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAEtE,IAAI,CAAC;gBACH,MAAM,eAAK,CAAC,IAAI,CACd,GAAG,EACH,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,EAC/D;oBACE,OAAO,EAAE;wBACP,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE;wBACtC,cAAc,EAAE,kBAAkB;qBACnC;iBACF,CACF,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,SAAS,QAAQ,CAAC,MAAM,0BAA0B,CAAC,CAAC;gBAChE,QAAQ,GAAG,EAAE,CAAC;YAChB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;gBAC5D,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;gBACvD,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;QACH,CAAC,CAAC;QAEF,WAAW,CAAC,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,QAAQ,EAAE,CAAC;YACnB,CAAC;QACH,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAEd,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YAC/B,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;gBACnE,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC;YAED,MAAM,QAAQ,GAAG,GAAG,CAAC;YAErB,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC,EACD;QACE,KAAK,CAAC,KAAK;QAEX,CAAC;KACF,CACF,CAAC;AACJ,CAAC"}
|
|
File without changes
|