@aws-amplify/core 4.4.1 → 4.4.2-api-logging.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/aws-amplify-core.js +1041 -202
- package/dist/aws-amplify-core.js.map +1 -1
- package/dist/aws-amplify-core.min.js +7 -7
- package/dist/aws-amplify-core.min.js.map +1 -1
- package/lib/Logger/ConsoleLogger.d.ts +12 -1
- package/lib/Logger/ConsoleLogger.js +69 -6
- package/lib/Logger/ConsoleLogger.js.map +1 -1
- package/lib/Platform/version.d.ts +1 -1
- package/lib/Platform/version.js +1 -1
- package/lib/Providers/APIProvider/APILoggingProvider.d.ts +28 -0
- package/lib/Providers/APIProvider/APILoggingProvider.js +320 -0
- package/lib/Providers/APIProvider/APILoggingProvider.js.map +1 -0
- package/lib/Providers/APIProvider/CloudWatchEventFormatter.d.ts +5 -0
- package/lib/Providers/APIProvider/CloudWatchEventFormatter.js +78 -0
- package/lib/Providers/APIProvider/CloudWatchEventFormatter.js.map +1 -0
- package/lib/Providers/APIProvider/Fetch.d.ts +10 -0
- package/lib/Providers/APIProvider/Fetch.js +13 -0
- package/lib/Providers/APIProvider/Fetch.js.map +1 -0
- package/lib/Providers/APIProvider/LoggerReachability/index.d.ts +3 -0
- package/lib/Providers/APIProvider/LoggerReachability/index.js +5 -0
- package/lib/Providers/APIProvider/LoggerReachability/index.js.map +1 -0
- package/lib/Providers/APIProvider/LoggerReachability/index.native.d.ts +3 -0
- package/lib/Providers/APIProvider/LoggerReachability/index.native.js +9 -0
- package/lib/Providers/APIProvider/LoggerReachability/index.native.js.map +1 -0
- package/lib/Providers/APIProvider/index.d.ts +1 -0
- package/lib/Providers/APIProvider/index.js +5 -0
- package/lib/Providers/APIProvider/index.js.map +1 -0
- package/lib/Providers/APIProvider/loggerConnectivity.d.ts +14 -0
- package/lib/Providers/APIProvider/loggerConnectivity.js +55 -0
- package/lib/Providers/APIProvider/loggerConnectivity.js.map +1 -0
- package/lib/Providers/AWSCloudWatchProvider.js +8 -1
- package/lib/Providers/AWSCloudWatchProvider.js.map +1 -1
- package/lib/Providers/index.d.ts +1 -0
- package/lib/Providers/index.js +2 -0
- package/lib/Providers/index.js.map +1 -1
- package/lib/Util/Constants.d.ts +3 -1
- package/lib/Util/Constants.js +4 -0
- package/lib/Util/Constants.js.map +1 -1
- package/lib/Util/Reachability.js +7 -5
- package/lib/Util/Reachability.js.map +1 -1
- package/lib/Util/Retry.js +2 -2
- package/lib/Util/Retry.js.map +1 -1
- package/lib/Util/StringUtils.d.ts +1 -0
- package/lib/Util/StringUtils.js +11 -6
- package/lib/Util/StringUtils.js.map +1 -1
- package/lib/types/index.js +4 -0
- package/lib/types/index.js.map +1 -1
- package/lib/types/types.d.ts +38 -1
- package/lib/types/types.js +4 -0
- package/lib/types/types.js.map +1 -1
- package/lib-esm/Logger/ConsoleLogger.d.ts +12 -1
- package/lib-esm/Logger/ConsoleLogger.js +67 -4
- package/lib-esm/Logger/ConsoleLogger.js.map +1 -1
- package/lib-esm/Platform/version.d.ts +1 -1
- package/lib-esm/Platform/version.js +1 -1
- package/lib-esm/Providers/APIProvider/APILoggingProvider.d.ts +28 -0
- package/lib-esm/Providers/APIProvider/APILoggingProvider.js +315 -0
- package/lib-esm/Providers/APIProvider/APILoggingProvider.js.map +1 -0
- package/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.d.ts +5 -0
- package/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js +76 -0
- package/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js.map +1 -0
- package/lib-esm/Providers/APIProvider/Fetch.d.ts +10 -0
- package/lib-esm/Providers/APIProvider/Fetch.js +11 -0
- package/lib-esm/Providers/APIProvider/Fetch.js.map +1 -0
- package/lib-esm/Providers/APIProvider/LoggerReachability/index.d.ts +3 -0
- package/lib-esm/Providers/APIProvider/LoggerReachability/index.js +3 -0
- package/lib-esm/Providers/APIProvider/LoggerReachability/index.js.map +1 -0
- package/lib-esm/Providers/APIProvider/LoggerReachability/index.native.d.ts +3 -0
- package/lib-esm/Providers/APIProvider/LoggerReachability/index.native.js +4 -0
- package/lib-esm/Providers/APIProvider/LoggerReachability/index.native.js.map +1 -0
- package/lib-esm/Providers/APIProvider/index.d.ts +1 -0
- package/lib-esm/Providers/APIProvider/index.js +2 -0
- package/lib-esm/Providers/APIProvider/index.js.map +1 -0
- package/lib-esm/Providers/APIProvider/loggerConnectivity.d.ts +14 -0
- package/lib-esm/Providers/APIProvider/loggerConnectivity.js +50 -0
- package/lib-esm/Providers/APIProvider/loggerConnectivity.js.map +1 -0
- package/lib-esm/Providers/AWSCloudWatchProvider.js +8 -1
- package/lib-esm/Providers/AWSCloudWatchProvider.js.map +1 -1
- package/lib-esm/Providers/index.d.ts +1 -0
- package/lib-esm/Providers/index.js +1 -0
- package/lib-esm/Providers/index.js.map +1 -1
- package/lib-esm/Util/Constants.d.ts +3 -1
- package/lib-esm/Util/Constants.js +3 -1
- package/lib-esm/Util/Constants.js.map +1 -1
- package/lib-esm/Util/Reachability.js +5 -3
- package/lib-esm/Util/Reachability.js.map +1 -1
- package/lib-esm/Util/Retry.js +2 -2
- package/lib-esm/Util/Retry.js.map +1 -1
- package/lib-esm/Util/StringUtils.d.ts +1 -0
- package/lib-esm/Util/StringUtils.js +11 -6
- package/lib-esm/Util/StringUtils.js.map +1 -1
- package/lib-esm/types/index.js +1 -0
- package/lib-esm/types/index.js.map +1 -1
- package/lib-esm/types/types.d.ts +38 -1
- package/lib-esm/types/types.js +3 -0
- package/lib-esm/types/types.js.map +1 -1
- package/package.json +2 -2
- package/src/Logger/ConsoleLogger.ts +54 -2
- package/src/Platform/version.ts +1 -1
- package/src/Providers/APIProvider/APILoggingProvider.ts +286 -0
- package/src/Providers/APIProvider/CloudWatchEventFormatter.ts +100 -0
- package/src/Providers/APIProvider/Fetch.ts +10 -0
- package/src/Providers/APIProvider/LoggerReachability/index.native.ts +4 -0
- package/src/Providers/APIProvider/LoggerReachability/index.ts +2 -0
- package/src/Providers/APIProvider/index.ts +1 -0
- package/src/Providers/APIProvider/loggerConnectivity.ts +49 -0
- package/src/Providers/AWSCloudWatchProvider.ts +9 -1
- package/src/Providers/index.ts +1 -0
- package/src/Util/Constants.ts +4 -0
- package/src/Util/Reachability.ts +9 -7
- package/src/Util/Retry.ts +2 -2
- package/src/Util/StringUtils.ts +15 -6
- package/src/types/types.ts +106 -62
|
@@ -1,5 +1,12 @@
|
|
|
1
|
-
import { LoggingProvider } from '../types';
|
|
1
|
+
import { LoggerEvent, LoggingProvider } from '../types';
|
|
2
2
|
import { Logger } from './logger-interface';
|
|
3
|
+
export declare const LOG_LEVELS: {
|
|
4
|
+
VERBOSE: number;
|
|
5
|
+
DEBUG: number;
|
|
6
|
+
INFO: number;
|
|
7
|
+
WARN: number;
|
|
8
|
+
ERROR: number;
|
|
9
|
+
};
|
|
3
10
|
export declare enum LOG_TYPE {
|
|
4
11
|
DEBUG = "DEBUG",
|
|
5
12
|
ERROR = "ERROR",
|
|
@@ -16,6 +23,8 @@ export declare class ConsoleLogger implements Logger {
|
|
|
16
23
|
level: LOG_TYPE | string;
|
|
17
24
|
private _pluggables;
|
|
18
25
|
private _config;
|
|
26
|
+
private static pluggables;
|
|
27
|
+
static addPluggable(pluggable: LoggingProvider): void;
|
|
19
28
|
/**
|
|
20
29
|
* @constructor
|
|
21
30
|
* @param {string} name - Name of the logger
|
|
@@ -25,6 +34,8 @@ export declare class ConsoleLogger implements Logger {
|
|
|
25
34
|
_padding(n: any): string;
|
|
26
35
|
_ts(): string;
|
|
27
36
|
configure(config?: object): object;
|
|
37
|
+
_logGlobal(type: LOG_TYPE | string, ...msg: any[]): void;
|
|
38
|
+
_generateLoggerEvent(type: LOG_TYPE | string, msg: any[]): LoggerEvent;
|
|
28
39
|
/**
|
|
29
40
|
* Write log
|
|
30
41
|
* @method
|
|
@@ -44,7 +44,7 @@ var __spread = (this && this.__spread) || function () {
|
|
|
44
44
|
};
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
46
|
var Constants_1 = require("../Util/Constants");
|
|
47
|
-
|
|
47
|
+
exports.LOG_LEVELS = {
|
|
48
48
|
VERBOSE: 1,
|
|
49
49
|
DEBUG: 2,
|
|
50
50
|
INFO: 3,
|
|
@@ -74,6 +74,9 @@ var ConsoleLogger = /** @class */ (function () {
|
|
|
74
74
|
this.level = level;
|
|
75
75
|
this._pluggables = [];
|
|
76
76
|
}
|
|
77
|
+
ConsoleLogger.addPluggable = function (pluggable) {
|
|
78
|
+
ConsoleLogger.pluggables.push(pluggable);
|
|
79
|
+
};
|
|
77
80
|
ConsoleLogger.prototype._padding = function (n) {
|
|
78
81
|
return n < 10 ? '0' + n : '' + n;
|
|
79
82
|
};
|
|
@@ -89,6 +92,64 @@ var ConsoleLogger = /** @class */ (function () {
|
|
|
89
92
|
this._config = config;
|
|
90
93
|
return this._config;
|
|
91
94
|
};
|
|
95
|
+
ConsoleLogger.prototype._logGlobal = function (type) {
|
|
96
|
+
var e_1, _a;
|
|
97
|
+
var msg = [];
|
|
98
|
+
for (var _i = 1; _i < arguments.length; _i++) {
|
|
99
|
+
msg[_i - 1] = arguments[_i];
|
|
100
|
+
}
|
|
101
|
+
try {
|
|
102
|
+
for (var _b = __values(ConsoleLogger.pluggables), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
103
|
+
var pluggable = _c.value;
|
|
104
|
+
pluggable.pushLogs([this._generateLoggerEvent(type, msg)]);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
108
|
+
finally {
|
|
109
|
+
try {
|
|
110
|
+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
111
|
+
}
|
|
112
|
+
finally { if (e_1) throw e_1.error; }
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
ConsoleLogger.prototype._generateLoggerEvent = function (type, msg) {
|
|
116
|
+
var strMessage = '';
|
|
117
|
+
var data;
|
|
118
|
+
var error;
|
|
119
|
+
if (msg.length === 1 && typeof msg[0] === 'string') {
|
|
120
|
+
strMessage = msg[0];
|
|
121
|
+
}
|
|
122
|
+
else if (msg.length === 1) {
|
|
123
|
+
data = msg[0];
|
|
124
|
+
}
|
|
125
|
+
else if (typeof msg[0] === 'string') {
|
|
126
|
+
var obj = msg.slice(1);
|
|
127
|
+
if (obj.length === 1) {
|
|
128
|
+
obj = obj[0];
|
|
129
|
+
}
|
|
130
|
+
strMessage = msg[0];
|
|
131
|
+
if (obj instanceof Error) {
|
|
132
|
+
error = {
|
|
133
|
+
message: obj.message,
|
|
134
|
+
name: obj.name,
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
data = obj;
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
data = msg;
|
|
141
|
+
}
|
|
142
|
+
return {
|
|
143
|
+
message: strMessage,
|
|
144
|
+
timestamp: Date.now(),
|
|
145
|
+
loggerInfo: {
|
|
146
|
+
level: type.toLowerCase(),
|
|
147
|
+
name: this.name,
|
|
148
|
+
data: data,
|
|
149
|
+
error: error,
|
|
150
|
+
},
|
|
151
|
+
};
|
|
152
|
+
};
|
|
92
153
|
/**
|
|
93
154
|
* Write log
|
|
94
155
|
* @method
|
|
@@ -97,11 +158,12 @@ var ConsoleLogger = /** @class */ (function () {
|
|
|
97
158
|
* @param {string|object} msg - Logging message or object
|
|
98
159
|
*/
|
|
99
160
|
ConsoleLogger.prototype._log = function (type) {
|
|
100
|
-
var
|
|
161
|
+
var e_2, _a;
|
|
101
162
|
var msg = [];
|
|
102
163
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
103
164
|
msg[_i - 1] = arguments[_i];
|
|
104
165
|
}
|
|
166
|
+
this._logGlobal.apply(this, __spread([type], msg));
|
|
105
167
|
var logger_level_name = this.level;
|
|
106
168
|
if (ConsoleLogger.LOG_LEVEL) {
|
|
107
169
|
logger_level_name = ConsoleLogger.LOG_LEVEL;
|
|
@@ -109,8 +171,8 @@ var ConsoleLogger = /** @class */ (function () {
|
|
|
109
171
|
if (typeof window !== 'undefined' && window.LOG_LEVEL) {
|
|
110
172
|
logger_level_name = window.LOG_LEVEL;
|
|
111
173
|
}
|
|
112
|
-
var logger_level = LOG_LEVELS[logger_level_name];
|
|
113
|
-
var type_level = LOG_LEVELS[type];
|
|
174
|
+
var logger_level = exports.LOG_LEVELS[logger_level_name];
|
|
175
|
+
var type_level = exports.LOG_LEVELS[type];
|
|
114
176
|
if (!(type_level >= logger_level)) {
|
|
115
177
|
// Do nothing if type is not greater than or equal to logger level (handle undefined)
|
|
116
178
|
return;
|
|
@@ -151,12 +213,12 @@ var ConsoleLogger = /** @class */ (function () {
|
|
|
151
213
|
plugin.pushLogs([logEvent]);
|
|
152
214
|
}
|
|
153
215
|
}
|
|
154
|
-
catch (
|
|
216
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
155
217
|
finally {
|
|
156
218
|
try {
|
|
157
219
|
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
158
220
|
}
|
|
159
|
-
finally { if (
|
|
221
|
+
finally { if (e_2) throw e_2.error; }
|
|
160
222
|
}
|
|
161
223
|
};
|
|
162
224
|
/**
|
|
@@ -246,6 +308,7 @@ var ConsoleLogger = /** @class */ (function () {
|
|
|
246
308
|
ConsoleLogger.prototype.listPluggables = function () {
|
|
247
309
|
return this._pluggables;
|
|
248
310
|
};
|
|
311
|
+
ConsoleLogger.pluggables = [];
|
|
249
312
|
ConsoleLogger.LOG_LEVEL = null;
|
|
250
313
|
return ConsoleLogger;
|
|
251
314
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleLogger.js","sourceRoot":"","sources":["../../src/Logger/ConsoleLogger.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIH,+CAA4D;
|
|
1
|
+
{"version":3,"file":"ConsoleLogger.js","sourceRoot":"","sources":["../../src/Logger/ConsoleLogger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "4.4.
|
|
1
|
+
export declare const version = "4.4.1";
|
package/lib/Platform/version.js
CHANGED
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { LoggingProvider, APILoggingProviderOptions } from '../../types/types';
|
|
2
|
+
import { InputLogEvent } from '@aws-sdk/client-cloudwatch-logs';
|
|
3
|
+
declare class APILoggingProvider implements LoggingProvider {
|
|
4
|
+
static readonly PROVIDER_NAME = "API";
|
|
5
|
+
static readonly CATEGORY = "Logging";
|
|
6
|
+
private config;
|
|
7
|
+
private connectivity;
|
|
8
|
+
private online;
|
|
9
|
+
private bufferInterval;
|
|
10
|
+
private eventBuffer;
|
|
11
|
+
constructor(config?: APILoggingProviderOptions);
|
|
12
|
+
getProviderName(): string;
|
|
13
|
+
getCategoryName(): string;
|
|
14
|
+
configure(config: APILoggingProviderOptions): object | APILoggingProviderOptions;
|
|
15
|
+
pushLogs(events: InputLogEvent[]): void;
|
|
16
|
+
private validateConfig;
|
|
17
|
+
private normalizeConfig;
|
|
18
|
+
private initialize;
|
|
19
|
+
private disable;
|
|
20
|
+
private subscribeConnectivity;
|
|
21
|
+
private unsubscribeConnectivity;
|
|
22
|
+
private startInterval;
|
|
23
|
+
private clearInterval;
|
|
24
|
+
private verifyEvent;
|
|
25
|
+
private uploadEvents;
|
|
26
|
+
private genericLogEventBatch;
|
|
27
|
+
}
|
|
28
|
+
export { APILoggingProvider };
|
|
@@ -0,0 +1,320 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (_) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
50
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
51
|
+
if (!m) return o;
|
|
52
|
+
var i = m.call(o), r, ar = [], e;
|
|
53
|
+
try {
|
|
54
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
55
|
+
}
|
|
56
|
+
catch (error) { e = { error: error }; }
|
|
57
|
+
finally {
|
|
58
|
+
try {
|
|
59
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
60
|
+
}
|
|
61
|
+
finally { if (e) throw e.error; }
|
|
62
|
+
}
|
|
63
|
+
return ar;
|
|
64
|
+
};
|
|
65
|
+
var __spread = (this && this.__spread) || function () {
|
|
66
|
+
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
|
|
67
|
+
return ar;
|
|
68
|
+
};
|
|
69
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
70
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
71
|
+
};
|
|
72
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
73
|
+
var Logger_1 = require("../../Logger");
|
|
74
|
+
var loggerConnectivity_1 = __importDefault(require("./loggerConnectivity"));
|
|
75
|
+
var types_1 = require("../../types/types");
|
|
76
|
+
var __1 = require("../../../");
|
|
77
|
+
var Fetch_1 = require("./Fetch");
|
|
78
|
+
var Constants_1 = require("../../Util/Constants");
|
|
79
|
+
var StringUtils_1 = require("../../Util/StringUtils");
|
|
80
|
+
var logger = new Logger_1.ConsoleLogger('APILoggingProvider');
|
|
81
|
+
var HTTPS = 'https';
|
|
82
|
+
var LOCALHOST = 'http://localhost';
|
|
83
|
+
var DEFAULT_INTERVAL = 3000;
|
|
84
|
+
// Exclude these to avoid infinite loop
|
|
85
|
+
var DEFAULT_CLASS_EXCLUDE_LIST = [
|
|
86
|
+
'APILoggingProvider',
|
|
87
|
+
'AWSCloudWatch',
|
|
88
|
+
'Retry',
|
|
89
|
+
];
|
|
90
|
+
var LAMBDA_PAYLOAD_LIMIT = 6 * 1024 * 1024; // 6MB
|
|
91
|
+
/*
|
|
92
|
+
Todo:
|
|
93
|
+
* Refactor this into a FSM - managing state will become complex when remote config functionality gets added in P1
|
|
94
|
+
*/
|
|
95
|
+
var APILoggingProvider = /** @class */ (function () {
|
|
96
|
+
function APILoggingProvider(config) {
|
|
97
|
+
this.online = false;
|
|
98
|
+
this.eventBuffer = [];
|
|
99
|
+
this.configure(config);
|
|
100
|
+
}
|
|
101
|
+
APILoggingProvider.prototype.getProviderName = function () {
|
|
102
|
+
return APILoggingProvider.PROVIDER_NAME;
|
|
103
|
+
};
|
|
104
|
+
APILoggingProvider.prototype.getCategoryName = function () {
|
|
105
|
+
return APILoggingProvider.CATEGORY;
|
|
106
|
+
};
|
|
107
|
+
APILoggingProvider.prototype.configure = function (config) {
|
|
108
|
+
try {
|
|
109
|
+
this.validateConfig(config);
|
|
110
|
+
this.config = this.normalizeConfig(config);
|
|
111
|
+
if (this.config.enabled === true) {
|
|
112
|
+
this.initialize();
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
this.disable();
|
|
116
|
+
}
|
|
117
|
+
return this.config;
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
logger.error('Unable to start: ', error);
|
|
121
|
+
}
|
|
122
|
+
};
|
|
123
|
+
APILoggingProvider.prototype.pushLogs = function (events) {
|
|
124
|
+
var _this = this;
|
|
125
|
+
var _a;
|
|
126
|
+
if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.enabled) === false) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
events.forEach(function (event) {
|
|
130
|
+
if (!types_1.isLoggerEvent(event)) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
var message = event.message, timestamp = event.timestamp, _a = event.loggerInfo, level = _a.level, data = _a.data, name = _a.name, _b = _a.error, _c = _b === void 0 ? {} : _b, errorMessage = _c.message, errorName = _c.name;
|
|
134
|
+
var error = errorName &&
|
|
135
|
+
errorMessage && {
|
|
136
|
+
errorMessage: errorMessage,
|
|
137
|
+
errorName: errorName,
|
|
138
|
+
};
|
|
139
|
+
var combinedEvent = {
|
|
140
|
+
level: level,
|
|
141
|
+
error: error,
|
|
142
|
+
message: message,
|
|
143
|
+
context: {
|
|
144
|
+
category: name,
|
|
145
|
+
data: __assign(__assign({}, data), _this.config.metadata),
|
|
146
|
+
logTime: timestamp,
|
|
147
|
+
},
|
|
148
|
+
};
|
|
149
|
+
if (_this.verifyEvent(combinedEvent)) {
|
|
150
|
+
_this.eventBuffer.push(combinedEvent);
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
};
|
|
154
|
+
APILoggingProvider.prototype.validateConfig = function (config) {
|
|
155
|
+
if (typeof (config === null || config === void 0 ? void 0 : config.endpoint) !== 'string') {
|
|
156
|
+
throw new Error("Invalid configuration. `config.endpoint` must be a string. Received: " + typeof (config === null || config === void 0 ? void 0 : config.endpoint));
|
|
157
|
+
}
|
|
158
|
+
var protocolStr = config.endpoint.substring(0, 5).toLowerCase();
|
|
159
|
+
var isUsingLocalhost = config.endpoint.substring(0, LOCALHOST.length).toLowerCase() ===
|
|
160
|
+
LOCALHOST;
|
|
161
|
+
if (protocolStr !== HTTPS && !isUsingLocalhost) {
|
|
162
|
+
throw new Error("Invalid configuration. Only HTTPS endpoints are supported. Received: " + protocolStr);
|
|
163
|
+
}
|
|
164
|
+
};
|
|
165
|
+
APILoggingProvider.prototype.normalizeConfig = function (config) {
|
|
166
|
+
var _a, _b, _c;
|
|
167
|
+
var normalizedConfig = {
|
|
168
|
+
endpoint: config.endpoint,
|
|
169
|
+
apiKey: config.apiKey,
|
|
170
|
+
metadata: config.metadata,
|
|
171
|
+
enabled: (_a = config.enabled) !== null && _a !== void 0 ? _a : true,
|
|
172
|
+
level: (_b = config.level) !== null && _b !== void 0 ? _b : Logger_1.LOG_TYPE.WARN,
|
|
173
|
+
bufferInterval: (_c = config.bufferInterval) !== null && _c !== void 0 ? _c : DEFAULT_INTERVAL,
|
|
174
|
+
excludeClassList: config.excludeClassList instanceof Array
|
|
175
|
+
? __spread(DEFAULT_CLASS_EXCLUDE_LIST, config.excludeClassList) : DEFAULT_CLASS_EXCLUDE_LIST,
|
|
176
|
+
};
|
|
177
|
+
return normalizedConfig;
|
|
178
|
+
};
|
|
179
|
+
APILoggingProvider.prototype.initialize = function () {
|
|
180
|
+
this.subscribeConnectivity();
|
|
181
|
+
};
|
|
182
|
+
APILoggingProvider.prototype.disable = function () {
|
|
183
|
+
this.clearInterval();
|
|
184
|
+
this.unsubscribeConnectivity();
|
|
185
|
+
this.eventBuffer = [];
|
|
186
|
+
};
|
|
187
|
+
APILoggingProvider.prototype.subscribeConnectivity = function () {
|
|
188
|
+
var _this = this;
|
|
189
|
+
if (this.connectivity) {
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
192
|
+
this.connectivity = new loggerConnectivity_1.default();
|
|
193
|
+
this.connectivity.status().subscribe(function (_a) {
|
|
194
|
+
var online = _a.online;
|
|
195
|
+
if (online && !_this.online) {
|
|
196
|
+
_this.startInterval();
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
_this.clearInterval();
|
|
200
|
+
}
|
|
201
|
+
_this.online = online;
|
|
202
|
+
logger.debug('Connectivity status: ', online);
|
|
203
|
+
});
|
|
204
|
+
};
|
|
205
|
+
APILoggingProvider.prototype.unsubscribeConnectivity = function () {
|
|
206
|
+
if (this.connectivity) {
|
|
207
|
+
this.connectivity.unsubscribe();
|
|
208
|
+
this.connectivity = undefined;
|
|
209
|
+
}
|
|
210
|
+
};
|
|
211
|
+
APILoggingProvider.prototype.startInterval = function () {
|
|
212
|
+
var _this = this;
|
|
213
|
+
if (this.bufferInterval) {
|
|
214
|
+
this.clearInterval();
|
|
215
|
+
}
|
|
216
|
+
this.bufferInterval = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
217
|
+
var error_1;
|
|
218
|
+
return __generator(this, function (_a) {
|
|
219
|
+
switch (_a.label) {
|
|
220
|
+
case 0:
|
|
221
|
+
_a.trys.push([0, 2, , 3]);
|
|
222
|
+
return [4 /*yield*/, this.uploadEvents()];
|
|
223
|
+
case 1:
|
|
224
|
+
_a.sent();
|
|
225
|
+
return [3 /*break*/, 3];
|
|
226
|
+
case 2:
|
|
227
|
+
error_1 = _a.sent();
|
|
228
|
+
logger.error("Could not upload log events", error_1);
|
|
229
|
+
return [3 /*break*/, 3];
|
|
230
|
+
case 3: return [2 /*return*/];
|
|
231
|
+
}
|
|
232
|
+
});
|
|
233
|
+
}); }, this.config.bufferInterval);
|
|
234
|
+
};
|
|
235
|
+
APILoggingProvider.prototype.clearInterval = function () {
|
|
236
|
+
clearInterval(this.bufferInterval);
|
|
237
|
+
this.bufferInterval = undefined;
|
|
238
|
+
};
|
|
239
|
+
/*
|
|
240
|
+
Filter out events that don't adhere to config settings
|
|
241
|
+
*/
|
|
242
|
+
APILoggingProvider.prototype.verifyEvent = function (event) {
|
|
243
|
+
var level = event.level, context = event.context;
|
|
244
|
+
var configLevelValue = Logger_1.LOG_LEVELS[this.config.level];
|
|
245
|
+
var eventLevelValue = Logger_1.LOG_LEVELS[level];
|
|
246
|
+
if (eventLevelValue < configLevelValue) {
|
|
247
|
+
return false;
|
|
248
|
+
}
|
|
249
|
+
if (this.config.excludeClassList.includes(context.category)) {
|
|
250
|
+
return false;
|
|
251
|
+
}
|
|
252
|
+
return true;
|
|
253
|
+
};
|
|
254
|
+
APILoggingProvider.prototype.uploadEvents = function () {
|
|
255
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
256
|
+
var eventBatch, body, options;
|
|
257
|
+
var _this = this;
|
|
258
|
+
return __generator(this, function (_a) {
|
|
259
|
+
switch (_a.label) {
|
|
260
|
+
case 0:
|
|
261
|
+
eventBatch = this.genericLogEventBatch(this.eventBuffer);
|
|
262
|
+
if (eventBatch.length < 1) {
|
|
263
|
+
return [2 /*return*/];
|
|
264
|
+
}
|
|
265
|
+
body = {
|
|
266
|
+
logs: eventBatch,
|
|
267
|
+
};
|
|
268
|
+
options = Fetch_1.postOptions(body);
|
|
269
|
+
return [4 /*yield*/, __1.jitteredExponentialRetry(function (endpoint, options) { return __awaiter(_this, void 0, void 0, function () {
|
|
270
|
+
var error_2;
|
|
271
|
+
return __generator(this, function (_a) {
|
|
272
|
+
switch (_a.label) {
|
|
273
|
+
case 0:
|
|
274
|
+
_a.trys.push([0, 2, , 3]);
|
|
275
|
+
return [4 /*yield*/, fetch(endpoint, options)];
|
|
276
|
+
case 1:
|
|
277
|
+
_a.sent(); // fetch doesnt return info for no-cors request
|
|
278
|
+
return [3 /*break*/, 3];
|
|
279
|
+
case 2:
|
|
280
|
+
error_2 = _a.sent();
|
|
281
|
+
// fetch will only fail in the event of a network error. Don't retry
|
|
282
|
+
if (error_2.message === 'Failed to fetch') {
|
|
283
|
+
throw new __1.NonRetryableError(error_2.message);
|
|
284
|
+
}
|
|
285
|
+
// all other errors are logged and retried
|
|
286
|
+
logger.warn(error_2);
|
|
287
|
+
throw error_2;
|
|
288
|
+
case 3: return [2 /*return*/];
|
|
289
|
+
}
|
|
290
|
+
});
|
|
291
|
+
}); }, [this.config.endpoint, options])];
|
|
292
|
+
case 1:
|
|
293
|
+
_a.sent();
|
|
294
|
+
// remove events from buffer after the request succeeds
|
|
295
|
+
this.eventBuffer.splice(0, eventBatch.length);
|
|
296
|
+
return [2 /*return*/];
|
|
297
|
+
}
|
|
298
|
+
});
|
|
299
|
+
});
|
|
300
|
+
};
|
|
301
|
+
APILoggingProvider.prototype.genericLogEventBatch = function (buffer) {
|
|
302
|
+
var totalByteSize = 0;
|
|
303
|
+
var currentEventIdx = 0;
|
|
304
|
+
while (currentEventIdx < buffer.length) {
|
|
305
|
+
var currentEvent = buffer[currentEventIdx];
|
|
306
|
+
var eventSize = StringUtils_1.getStringByteSize(JSON.stringify(currentEvent));
|
|
307
|
+
if (totalByteSize + eventSize > LAMBDA_PAYLOAD_LIMIT) {
|
|
308
|
+
break;
|
|
309
|
+
}
|
|
310
|
+
totalByteSize += eventSize;
|
|
311
|
+
currentEventIdx += 1;
|
|
312
|
+
}
|
|
313
|
+
return buffer.slice(0, currentEventIdx);
|
|
314
|
+
};
|
|
315
|
+
APILoggingProvider.PROVIDER_NAME = Constants_1.API_LOGGING_PROVIDER_NAME;
|
|
316
|
+
APILoggingProvider.CATEGORY = Constants_1.API_LOGGING_PROVIDER_CATEGORY;
|
|
317
|
+
return APILoggingProvider;
|
|
318
|
+
}());
|
|
319
|
+
exports.APILoggingProvider = APILoggingProvider;
|
|
320
|
+
//# sourceMappingURL=APILoggingProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"APILoggingProvider.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/APILoggingProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { InputLogEvent } from '@aws-sdk/client-cloudwatch-logs';
|
|
2
|
+
import { GenericLogEvent } from '../../types/types';
|
|
3
|
+
export declare const cloudWatchEventFromGeneric: (event: GenericLogEvent) => InputLogEvent;
|
|
4
|
+
export declare const truncateOversizedEvent: (event: InputLogEvent) => InputLogEvent;
|
|
5
|
+
export declare const cloudWatchLogEventBatch: (buffer: InputLogEvent[]) => InputLogEvent[];
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
+
var t = {};
|
|
4
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
+
t[p] = s[p];
|
|
6
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
+
t[p[i]] = s[p[i]];
|
|
10
|
+
}
|
|
11
|
+
return t;
|
|
12
|
+
};
|
|
13
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
+
var Constants_1 = require("../../Util/Constants");
|
|
15
|
+
var __1 = require("../../");
|
|
16
|
+
var logger = new __1.ConsoleLogger('APILoggingProvider');
|
|
17
|
+
var TRUNCATE_MAX_LENGTH = 5000;
|
|
18
|
+
exports.cloudWatchEventFromGeneric = function (event) {
|
|
19
|
+
var timestamp = event.context.logTime, message = __rest(event, ["context"]);
|
|
20
|
+
return {
|
|
21
|
+
timestamp: timestamp,
|
|
22
|
+
message: JSON.stringify(event),
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
exports.truncateOversizedEvent = function (event) {
|
|
26
|
+
var timestamp = event.timestamp, message = event.message;
|
|
27
|
+
try {
|
|
28
|
+
var messageJson = JSON.parse(message);
|
|
29
|
+
var truncatedObj = {
|
|
30
|
+
level: messageJson.level,
|
|
31
|
+
class: messageJson.class,
|
|
32
|
+
message: messageJson.message.substring(0, TRUNCATE_MAX_LENGTH),
|
|
33
|
+
};
|
|
34
|
+
if (messageJson.data != null) {
|
|
35
|
+
truncatedObj['data'] = "OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Truncated: " + JSON.stringify(messageJson.data).substring(0, TRUNCATE_MAX_LENGTH);
|
|
36
|
+
}
|
|
37
|
+
return {
|
|
38
|
+
timestamp: timestamp,
|
|
39
|
+
message: JSON.stringify(truncatedObj),
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
logger.warn('Could not truncate oversized event', error);
|
|
44
|
+
var truncated = JSON.stringify({
|
|
45
|
+
level: 'UNKNOWN',
|
|
46
|
+
class: 'Unknown',
|
|
47
|
+
message: 'OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Could not parse event to truncate',
|
|
48
|
+
});
|
|
49
|
+
return {
|
|
50
|
+
timestamp: timestamp,
|
|
51
|
+
message: truncated,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
exports.cloudWatchLogEventBatch = function (buffer) {
|
|
56
|
+
var totalByteSize = 0;
|
|
57
|
+
var currentEventIdx = 0;
|
|
58
|
+
while (currentEventIdx < buffer.length) {
|
|
59
|
+
var currentEvent = buffer[currentEventIdx];
|
|
60
|
+
var eventSize = __1.getStringByteSize(currentEvent.message) + Constants_1.AWS_CLOUDWATCH_BASE_BUFFER_SIZE;
|
|
61
|
+
if (eventSize > Constants_1.AWS_CLOUDWATCH_MAX_EVENT_SIZE) {
|
|
62
|
+
var errString = "Log event exceeds maximum size for CloudWatch logs. Log size: " + eventSize + ". Truncating log message.";
|
|
63
|
+
logger.debug(errString);
|
|
64
|
+
currentEvent = exports.truncateOversizedEvent(currentEvent);
|
|
65
|
+
buffer[currentEventIdx] = currentEvent;
|
|
66
|
+
eventSize =
|
|
67
|
+
new TextEncoder().encode(currentEvent.message).length +
|
|
68
|
+
Constants_1.AWS_CLOUDWATCH_BASE_BUFFER_SIZE;
|
|
69
|
+
}
|
|
70
|
+
if (totalByteSize + eventSize > Constants_1.AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE) {
|
|
71
|
+
break;
|
|
72
|
+
}
|
|
73
|
+
totalByteSize += eventSize;
|
|
74
|
+
currentEventIdx += 1;
|
|
75
|
+
}
|
|
76
|
+
return buffer.slice(0, currentEventIdx);
|
|
77
|
+
};
|
|
78
|
+
//# sourceMappingURL=CloudWatchEventFormatter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CloudWatchEventFormatter.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/CloudWatchEventFormatter.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,kDAI8B;AAE9B,4BAAoE;AAEpE,IAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,oBAAoB,CAAC,CAAC;AAChD,IAAM,mBAAmB,GAAG,IAAI,CAAC;AAEpB,QAAA,0BAA0B,GAAG,UACzC,KAAsB;IAGV,IAAA,iCAAkB,EAC7B,oCAAU,CACD;IAEV,OAAO;QACN,SAAS,WAAA;QACT,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC;AAEW,QAAA,sBAAsB,GAAG,UAAC,KAAoB;IAClD,IAAA,2BAAS,EAAE,uBAAO,CAAW;IAErC,IAAI;QACH,IAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAExC,IAAM,YAAY,GAAG;YACpB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAC;SAC9D,CAAC;QAEF,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE;YAC7B,YAAY,CACX,MAAM,CACN,GAAG,4DAA0D,IAAI,CAAC,SAAS,CAC3E,WAAW,CAAC,IAAI,CAChB,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAG,CAAC;SACtC;QAED,OAAO;YACN,SAAS,WAAA;YACT,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;SACrC,CAAC;KACF;IAAC,OAAO,KAAK,EAAE;QACf,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAEzD,IAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,SAAS;YAChB,OAAO,EACN,+EAA+E;SAChF,CAAC,CAAC;QAEH,OAAO;YACN,SAAS,WAAA;YACT,OAAO,EAAE,SAAS;SAClB,CAAC;KACF;AACF,CAAC,CAAC;AAEW,QAAA,uBAAuB,GAAG,UACtC,MAAuB;IAEvB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,OAAO,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;QACvC,IAAI,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,SAAS,GACZ,qBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,2CAA+B,CAAC;QAE3E,IAAI,SAAS,GAAG,yCAA6B,EAAE;YAC9C,IAAM,SAAS,GAAG,mEAAiE,SAAS,8BAA2B,CAAC;YACxH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAExB,YAAY,GAAG,8BAAsB,CAAC,YAAY,CAAC,CAAC;YACpD,MAAM,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC;YAEvC,SAAS;gBACR,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM;oBACrD,2CAA+B,CAAC;SACjC;QAED,IAAI,aAAa,GAAG,SAAS,GAAG,+CAAmC,EAAE;YACpE,MAAM;SACN;QAED,aAAa,IAAI,SAAS,CAAC;QAC3B,eAAe,IAAI,CAAC,CAAC;KACrB;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;AACzC,CAAC,CAAC"}
|