@l-v-yonsama/multi-platform-database-drivers 0.9.7 → 0.9.17
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/built/src/drivers/AwsDriver.js +8 -2
- package/built/src/drivers/AwsDriver.js.map +1 -1
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.d.ts +5 -0
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.js +132 -37
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.js.map +1 -1
- package/package.json +1 -1
|
@@ -270,9 +270,15 @@ class AwsDriver extends BaseSQLSupportDriver_1.BaseSQLSupportDriver {
|
|
|
270
270
|
kill(sesssionOrPid) {
|
|
271
271
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
272
272
|
if (this.dynamoClient) {
|
|
273
|
-
|
|
273
|
+
const message = yield this.dynamoClient.kill();
|
|
274
|
+
if (message) {
|
|
275
|
+
return message;
|
|
276
|
+
}
|
|
274
277
|
}
|
|
275
|
-
|
|
278
|
+
if (this.cloudwatchClient) {
|
|
279
|
+
return yield this.cloudwatchClient.kill();
|
|
280
|
+
}
|
|
281
|
+
return '';
|
|
276
282
|
});
|
|
277
283
|
}
|
|
278
284
|
count(params) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsDriver.js","sourceRoot":"","sources":["../../../src/drivers/AwsDriver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AwsDriver.js","sourceRoot":"","sources":["../../../src/drivers/AwsDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,12 @@ import { Scannable } from '../BaseDriver';
|
|
|
7
7
|
import { AwsServiceClient } from './AwsServiceClient';
|
|
8
8
|
export declare class AwsCloudwatchServiceClient extends AwsServiceClient implements Scannable {
|
|
9
9
|
logClient: CloudWatchLogsClient;
|
|
10
|
+
private interrupted;
|
|
11
|
+
private queryId?;
|
|
10
12
|
constructor(conRes: ConnectionSetting, config: ClientConfigType, awsDriver: AwsDriver);
|
|
11
13
|
connectSub(): Promise<string>;
|
|
12
14
|
protected testSub(): Promise<void>;
|
|
15
|
+
kill(): Promise<string>;
|
|
13
16
|
getLogEvents(params: {
|
|
14
17
|
logGroupName: string;
|
|
15
18
|
logStreamName: string;
|
|
@@ -19,6 +22,8 @@ export declare class AwsCloudwatchServiceClient extends AwsServiceClient impleme
|
|
|
19
22
|
query(params: StartQueryCommandInput): Promise<GetQueryResultsCommandOutput>;
|
|
20
23
|
scan(params: ScanParams): Promise<ResultSetData>;
|
|
21
24
|
scanLogGroup(params: ScanParams): Promise<ResultSetData>;
|
|
25
|
+
private createQueryInput;
|
|
26
|
+
private toDate;
|
|
22
27
|
scanLogStream(params: ScanParams): Promise<ResultSetData>;
|
|
23
28
|
getInfomationSchemas(): Promise<AwsDatabase>;
|
|
24
29
|
getLogStreams({ logGroupName, }: {
|
|
@@ -11,10 +11,13 @@ const AwsServiceClient_1 = require("./AwsServiceClient");
|
|
|
11
11
|
class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
12
12
|
constructor(conRes, config, awsDriver) {
|
|
13
13
|
super(conRes, config, awsDriver);
|
|
14
|
+
this.interrupted = false;
|
|
14
15
|
}
|
|
15
16
|
connectSub() {
|
|
16
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
18
|
this.logClient = new client_cloudwatch_logs_1.CloudWatchLogsClient(this.config);
|
|
19
|
+
this.interrupted = false;
|
|
20
|
+
this.queryId = undefined;
|
|
18
21
|
return this.test(false);
|
|
19
22
|
});
|
|
20
23
|
}
|
|
@@ -27,6 +30,24 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
27
30
|
}
|
|
28
31
|
});
|
|
29
32
|
}
|
|
33
|
+
kill() {
|
|
34
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
this.interrupted = true;
|
|
36
|
+
if (this.queryId) {
|
|
37
|
+
try {
|
|
38
|
+
const command = new client_cloudwatch_logs_1.StopQueryCommand({
|
|
39
|
+
queryId: this.queryId,
|
|
40
|
+
});
|
|
41
|
+
yield this.logClient.send(command);
|
|
42
|
+
}
|
|
43
|
+
catch (e) {
|
|
44
|
+
console.error(e);
|
|
45
|
+
}
|
|
46
|
+
this.queryId = undefined;
|
|
47
|
+
}
|
|
48
|
+
return '';
|
|
49
|
+
});
|
|
50
|
+
}
|
|
30
51
|
getLogEvents(params) {
|
|
31
52
|
var _a;
|
|
32
53
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -35,6 +56,10 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
35
56
|
const requiredLimit = (_a = params.limit) !== null && _a !== void 0 ? _a : 100;
|
|
36
57
|
let nextToken = undefined;
|
|
37
58
|
do {
|
|
59
|
+
if (this.interrupted) {
|
|
60
|
+
this.interrupted = false;
|
|
61
|
+
throw new Error('INTERRUPT');
|
|
62
|
+
}
|
|
38
63
|
const limit = Math.min(requiredLimit - list.length, 10000);
|
|
39
64
|
const result = yield this.logClient.send(new client_cloudwatch_logs_1.GetLogEventsCommand({
|
|
40
65
|
logGroupName,
|
|
@@ -58,10 +83,15 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
58
83
|
query(params) {
|
|
59
84
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
85
|
const { queryId } = yield this.logClient.send(new client_cloudwatch_logs_1.StartQueryCommand(params));
|
|
86
|
+
this.queryId = queryId;
|
|
61
87
|
let status = client_cloudwatch_logs_1.QueryStatus.Scheduled;
|
|
62
88
|
let results;
|
|
63
89
|
while (status === client_cloudwatch_logs_1.QueryStatus.Running || status === client_cloudwatch_logs_1.QueryStatus.Scheduled) {
|
|
64
|
-
|
|
90
|
+
if (this.interrupted) {
|
|
91
|
+
this.interrupted = false;
|
|
92
|
+
throw new Error('INTERRUPT');
|
|
93
|
+
}
|
|
94
|
+
yield (0, rdh_1.sleep)(900);
|
|
65
95
|
results = yield this.logClient.send(new client_cloudwatch_logs_1.GetQueryResultsCommand({
|
|
66
96
|
queryId,
|
|
67
97
|
}));
|
|
@@ -72,6 +102,7 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
72
102
|
break;
|
|
73
103
|
}
|
|
74
104
|
}
|
|
105
|
+
this.queryId = undefined;
|
|
75
106
|
return results;
|
|
76
107
|
});
|
|
77
108
|
}
|
|
@@ -89,6 +120,7 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
89
120
|
scanLogGroup(params) {
|
|
90
121
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
91
122
|
const { target, keyword, startTime, endTime, limit } = params;
|
|
123
|
+
const stTime = new Date().getTime();
|
|
92
124
|
const { status, results } = yield this.query({
|
|
93
125
|
logGroupName: target,
|
|
94
126
|
queryString: keyword,
|
|
@@ -96,67 +128,102 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
96
128
|
endTime,
|
|
97
129
|
limit,
|
|
98
130
|
});
|
|
131
|
+
const elapsedTimeMilli = new Date().getTime() - stTime;
|
|
99
132
|
if (status === client_cloudwatch_logs_1.QueryStatus.Cancelled) {
|
|
100
133
|
throw new Error('StartQueryCommand Cancelled');
|
|
101
134
|
}
|
|
102
135
|
if (status === client_cloudwatch_logs_1.QueryStatus.Failed) {
|
|
103
136
|
throw new Error('StartQueryCommand Failed');
|
|
104
137
|
}
|
|
138
|
+
let rdb;
|
|
105
139
|
if (!results || results.length === 0) {
|
|
106
|
-
|
|
140
|
+
rdb = rdh_1.ResultSetDataBuilder.createEmpty({
|
|
107
141
|
noRecordsReason: 'No records.',
|
|
108
|
-
}).build();
|
|
109
|
-
}
|
|
110
|
-
const keys = results[0]
|
|
111
|
-
.filter((it) => it.field !== undefined && it.field !== '@ptr')
|
|
112
|
-
.map((it) => {
|
|
113
|
-
const key = (0, rdh_1.createRdhKey)({
|
|
114
|
-
name: it.field,
|
|
115
|
-
type: rdh_1.GeneralColumnType.TEXT,
|
|
116
142
|
});
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
return key;
|
|
127
|
-
});
|
|
128
|
-
const rdb = new rdh_1.ResultSetDataBuilder(keys);
|
|
129
|
-
results.forEach((rowResult) => {
|
|
130
|
-
const values = {};
|
|
131
|
-
rowResult.forEach((it) => {
|
|
132
|
-
var _a;
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
const keys = results[0]
|
|
146
|
+
.filter((it) => it.field !== undefined && it.field !== '@ptr')
|
|
147
|
+
.map((it) => {
|
|
148
|
+
const key = (0, rdh_1.createRdhKey)({
|
|
149
|
+
name: it.field,
|
|
150
|
+
type: rdh_1.GeneralColumnType.TEXT,
|
|
151
|
+
});
|
|
133
152
|
if (it.field === '@timestamp') {
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
153
|
+
key.type = rdh_1.GeneralColumnType.TIMESTAMP;
|
|
154
|
+
}
|
|
155
|
+
else if (it.field === '@message') {
|
|
156
|
+
key.width = 500;
|
|
157
|
+
}
|
|
158
|
+
else if (it.field === '@logStream') {
|
|
159
|
+
key.width = 100;
|
|
160
|
+
}
|
|
161
|
+
return key;
|
|
162
|
+
});
|
|
163
|
+
rdb = new rdh_1.ResultSetDataBuilder(keys);
|
|
164
|
+
results.forEach((rowResult) => {
|
|
165
|
+
const values = {};
|
|
166
|
+
rowResult.forEach((it) => {
|
|
167
|
+
if (it.field === '@timestamp') {
|
|
168
|
+
values[it.field] = this.toDate(it.value);
|
|
137
169
|
}
|
|
138
170
|
else {
|
|
139
|
-
values[it.field] =
|
|
171
|
+
values[it.field] = it.value;
|
|
140
172
|
}
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
values[it.field] = it.value;
|
|
144
|
-
}
|
|
173
|
+
});
|
|
174
|
+
rdb.addRow(values);
|
|
145
175
|
});
|
|
146
|
-
|
|
176
|
+
}
|
|
177
|
+
rdb.setSqlStatement('');
|
|
178
|
+
rdb.setSummary({
|
|
179
|
+
elapsedTimeMilli,
|
|
180
|
+
selectedRows: rdb.rs.rows.length,
|
|
181
|
+
});
|
|
182
|
+
rdb.updateMeta({
|
|
183
|
+
queryInput: this.createQueryInput({
|
|
184
|
+
logGroupName: target,
|
|
185
|
+
queryString: keyword,
|
|
186
|
+
startTime,
|
|
187
|
+
endTime,
|
|
188
|
+
limit,
|
|
189
|
+
}),
|
|
190
|
+
logGroupName: target,
|
|
147
191
|
});
|
|
148
192
|
return rdb.build();
|
|
149
193
|
});
|
|
150
194
|
}
|
|
195
|
+
createQueryInput(params) {
|
|
196
|
+
Object.keys(params).forEach((key) => {
|
|
197
|
+
if (key === 'startTime' || key === 'endTime') {
|
|
198
|
+
const v = params[key];
|
|
199
|
+
if (v && typeof v === 'number') {
|
|
200
|
+
const dt = (0, rdh_1.toDate)(v * 1000);
|
|
201
|
+
if (dt) {
|
|
202
|
+
params[`${key}_iso`] = dt.toISOString();
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
});
|
|
207
|
+
return JSON.stringify(params, null, 2);
|
|
208
|
+
}
|
|
209
|
+
toDate(v) {
|
|
210
|
+
if (v && typeof v === 'string') {
|
|
211
|
+
const iso8601 = v === null || v === void 0 ? void 0 : v.replace(/([0-9]+-[0-9]+-[0-9]+) ([0-9]+:[0-9]+:[0-9]+(\.[0-9]+)?)/, '$1T$2Z');
|
|
212
|
+
return (0, rdh_1.toDate)(iso8601);
|
|
213
|
+
}
|
|
214
|
+
return (0, rdh_1.toDate)(v);
|
|
215
|
+
}
|
|
151
216
|
scanLogStream(params) {
|
|
152
217
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
153
218
|
const { target, parentTarget, startTime, limit } = params;
|
|
219
|
+
const stTime = new Date().getTime();
|
|
154
220
|
const list = yield this.getLogEvents({
|
|
155
221
|
logGroupName: parentTarget,
|
|
156
222
|
logStreamName: target,
|
|
157
223
|
startTime,
|
|
158
224
|
limit,
|
|
159
225
|
});
|
|
226
|
+
const elapsedTimeMilli = new Date().getTime() - stTime;
|
|
160
227
|
const ingestionTime = (0, rdh_1.createRdhKey)({
|
|
161
228
|
name: 'ingestionTime',
|
|
162
229
|
type: rdh_1.GeneralColumnType.TIMESTAMP,
|
|
@@ -176,12 +243,27 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
176
243
|
const rdb = new rdh_1.ResultSetDataBuilder(keys);
|
|
177
244
|
list.forEach((rowResult) => {
|
|
178
245
|
const values = {
|
|
179
|
-
ingestionTime:
|
|
180
|
-
timestamp:
|
|
246
|
+
ingestionTime: this.toDate(rowResult.ingestionTime),
|
|
247
|
+
timestamp: this.toDate(rowResult.timestamp),
|
|
181
248
|
message: rowResult.message,
|
|
182
249
|
};
|
|
183
250
|
rdb.addRow(values);
|
|
184
251
|
});
|
|
252
|
+
rdb.setSqlStatement('');
|
|
253
|
+
rdb.setSummary({
|
|
254
|
+
elapsedTimeMilli,
|
|
255
|
+
selectedRows: rdb.rs.rows.length,
|
|
256
|
+
});
|
|
257
|
+
rdb.updateMeta({
|
|
258
|
+
queryInput: this.createQueryInput({
|
|
259
|
+
logGroupName: parentTarget,
|
|
260
|
+
logStreamName: target,
|
|
261
|
+
startTime,
|
|
262
|
+
limit,
|
|
263
|
+
}),
|
|
264
|
+
logGroupName: parentTarget,
|
|
265
|
+
logStreamName: target,
|
|
266
|
+
});
|
|
185
267
|
return rdb.build();
|
|
186
268
|
});
|
|
187
269
|
}
|
|
@@ -198,6 +280,9 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
198
280
|
if (result.logGroups) {
|
|
199
281
|
for (const logGroup of result.logGroups) {
|
|
200
282
|
const res = new resource_1.DbLogGroup(logGroup.logGroupName, logGroup);
|
|
283
|
+
if (logGroup.storedBytes) {
|
|
284
|
+
res.comment = res.getProperties().storedBytes;
|
|
285
|
+
}
|
|
201
286
|
dbDatabase.addChild(res);
|
|
202
287
|
}
|
|
203
288
|
}
|
|
@@ -216,6 +301,10 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
216
301
|
let nextToken = undefined;
|
|
217
302
|
const list = [];
|
|
218
303
|
do {
|
|
304
|
+
if (this.interrupted) {
|
|
305
|
+
this.interrupted = false;
|
|
306
|
+
throw new Error('INTERRUPT');
|
|
307
|
+
}
|
|
219
308
|
const result = yield this.logClient.send(new client_cloudwatch_logs_1.DescribeLogStreamsCommand({
|
|
220
309
|
logGroupName,
|
|
221
310
|
descending: true,
|
|
@@ -240,6 +329,10 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
240
329
|
let nextToken = undefined;
|
|
241
330
|
const list = [];
|
|
242
331
|
do {
|
|
332
|
+
if (this.interrupted) {
|
|
333
|
+
this.interrupted = false;
|
|
334
|
+
throw new Error('INTERRUPT');
|
|
335
|
+
}
|
|
243
336
|
const result = yield this.logClient.send(new client_cloudwatch_logs_1.DescribeQueryDefinitionsCommand({
|
|
244
337
|
maxResults: 100,
|
|
245
338
|
nextToken,
|
|
@@ -255,6 +348,8 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
255
348
|
closeSub() {
|
|
256
349
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
257
350
|
yield this.logClient.destroy();
|
|
351
|
+
this.interrupted = false;
|
|
352
|
+
this.queryId = undefined;
|
|
258
353
|
});
|
|
259
354
|
}
|
|
260
355
|
getServiceName() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":";;;;AAEA,
|
|
1
|
+
{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":"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"}
|