@l-v-yonsama/multi-platform-database-drivers 0.1.41 → 0.1.43

package/built/src/drivers/AwsDriver.d.ts

@@ -0,0 +1,26 @@
+import { BaseDriver } from './BaseDriver';
+import { DbConnection, DbDatabase } from '../resource';
+import { AwsCredentialIdentityProvider, AwsCredentialIdentity } from '@aws-sdk/types';
+import { AwsSQSServiceClient } from './aws/AwsSQSServiceClient';
+import { AwsCloudwatchServiceClient } from './aws/AwsCloudwatchServiceClient';
+import { AwsS3ServiceClient } from './aws/AwsS3ServiceClient';
+export interface Destroyable {
+    destroy(): void;
+}
+export type ClientConfigType = {
+    region?: string;
+    endpoint?: string;
+    credentials: AwsCredentialIdentityProvider | AwsCredentialIdentity;
+};
+export declare class AwsDriver extends BaseDriver {
+    sqsClient: AwsSQSServiceClient;
+    cloudwatchClient: AwsCloudwatchServiceClient;
+    s3Client: AwsS3ServiceClient;
+    constructor(conRes: DbConnection);
+    protected createClientConfig(): ClientConfigType;
+    private createAwsCredential;
+    connectSub(): Promise<string>;
+    getInfomationSchemas(): Promise<DbDatabase[]>;
+    test(with_connect?: boolean): Promise<string>;
+    closeSub(): Promise<string>;
+}

package/built/src/drivers/AwsDriver.js

@@ -0,0 +1,152 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AwsDriver = void 0;
+const tslib_1 = require("tslib");
+const BaseDriver_1 = require("./BaseDriver");
+const credential_providers_1 = require("@aws-sdk/credential-providers");
+const AwsSupplyCredentialType_1 = require("../types/AwsSupplyCredentialType");
+const AwsSQSServiceClient_1 = require("./aws/AwsSQSServiceClient");
+const AwsCloudwatchServiceClient_1 = require("./aws/AwsCloudwatchServiceClient");
+const AwsS3ServiceClient_1 = require("./aws/AwsS3ServiceClient");
+const AwsServiceType_1 = require("../types/AwsServiceType");
+class AwsDriver extends BaseDriver_1.BaseDriver {
+    constructor(conRes) {
+        super(conRes);
+    }
+    createClientConfig() {
+        const { url, awsSetting } = this.conRes;
+        const config = {
+            credentials: this.createAwsCredential(),
+        };
+        if (awsSetting === null || awsSetting === void 0 ? void 0 : awsSetting.region) {
+            config.region = awsSetting.region;
+        }
+        if (url) {
+            config.endpoint = url;
+        }
+        return config;
+    }
+    createAwsCredential() {
+        const { awsSetting, user, password } = this.conRes;
+        if (awsSetting && awsSetting.supplyCredentialType) {
+            switch (awsSetting.supplyCredentialType) {
+                case AwsSupplyCredentialType_1.SupplyCredentialType.sharedCredentialsFile:
+                    return (0, credential_providers_1.fromIni)({ profile: awsSetting.profile });
+                case AwsSupplyCredentialType_1.SupplyCredentialType.environmentVariables:
+                    return (0, credential_providers_1.fromEnv)();
+            }
+        }
+        return {
+            accessKeyId: user,
+            secretAccessKey: password,
+        };
+    }
+    connectSub() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const messageList = [];
+            const config = this.createClientConfig();
+            const cw = new AwsCloudwatchServiceClient_1.AwsCloudwatchServiceClient(this.conRes, config);
+            const sqs = new AwsSQSServiceClient_1.AwsSQSServiceClient(this.conRes, config);
+            const s3 = new AwsS3ServiceClient_1.AwsS3ServiceClient(this.conRes, config);
+            const { services } = this.conRes.awsSetting;
+            let message = '';
+            if (services.includes(AwsServiceType_1.AwsServiceType.Cloudwatch)) {
+                message = yield cw.connect();
+                if (message) {
+                    messageList.push(message);
+                    this.cloudwatchClient = null;
+                }
+                else {
+                    this.cloudwatchClient = cw;
+                }
+            }
+            if (services.includes(AwsServiceType_1.AwsServiceType.SQS)) {
+                message = yield sqs.connect();
+                if (message) {
+                    messageList.push(message);
+                    this.sqsClient = null;
+                }
+                else {
+                    this.sqsClient = sqs;
+                }
+            }
+            if (services.includes(AwsServiceType_1.AwsServiceType.S3)) {
+                message = yield s3.connect();
+                if (message) {
+                    messageList.push(message);
+                    this.s3Client = null;
+                }
+                else {
+                    this.s3Client = s3;
+                }
+            }
+            return messageList.join(',');
+        });
+    }
+    getInfomationSchemas() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const list = [];
+            for (const client of [
+                this.s3Client,
+                this.sqsClient,
+                this.cloudwatchClient,
+            ]) {
+                if (!client) {
+                    continue;
+                }
+                const db = yield client.getInfomationSchemas();
+                if (db) {
+                    list.push(db);
+                }
+            }
+            return list;
+        });
+    }
+    test(with_connect = false) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const messageList = [];
+            const config = this.createClientConfig();
+            const { services } = this.conRes.awsSetting;
+            if (services.includes(AwsServiceType_1.AwsServiceType.Cloudwatch)) {
+                const client = new AwsCloudwatchServiceClient_1.AwsCloudwatchServiceClient(this.conRes, config);
+                const message = yield client.test(with_connect);
+                if (message) {
+                    messageList.push(message);
+                }
+            }
+            if (services.includes(AwsServiceType_1.AwsServiceType.SQS)) {
+                const client = new AwsSQSServiceClient_1.AwsSQSServiceClient(this.conRes, config);
+                const message = yield client.test(with_connect);
+                if (message) {
+                    messageList.push(message);
+                }
+            }
+            if (services.includes(AwsServiceType_1.AwsServiceType.S3)) {
+                const client = new AwsS3ServiceClient_1.AwsS3ServiceClient(this.conRes, config);
+                const message = yield client.test(with_connect);
+                if (message) {
+                    messageList.push(message);
+                }
+            }
+            return messageList.join(',');
+        });
+    }
+    closeSub() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const messageList = [];
+            for (const client of [
+                this.sqsClient,
+                this.cloudwatchClient,
+                this.s3Client,
+            ]) {
+                const message = yield client.disconnect();
+                if (message) {
+                    messageList.push(message);
+                }
+            }
+            return messageList.join(',');
+        });
+    }
+}
+exports.AwsDriver = AwsDriver;
+//# sourceMappingURL=AwsDriver.js.map

package/built/src/drivers/AwsDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AwsDriver.js","sourceRoot":"","sources":["../../../src/drivers/AwsDriver.ts"],"names":[],"mappings":"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"}

package/built/src/drivers/DBDriverResolver.js

@@ -8,9 +8,7 @@ const types_1 = require("../types");
 const MySQLDriver_1 = require("./MySQLDriver");
 const PostgresDriver_1 = require("./PostgresDriver");
 const RedisDriver_1 = require("./RedisDriver");
-const AwsS3Driver_1 = require("./AwsS3Driver");
-const AwsSQSDriver_1 = require("./AwsSQSDriver");
-const AwsCloudwatchDriver_1 = require("./AwsCloudwatchDriver");
+const AwsDriver_1 = require("./AwsDriver");
 const uid = new short_unique_id_1.default();
 class DBDriverResolver {
     static getInstance() {
@@ -41,15 +39,8 @@ class DBDriverResolver {
             case types_1.DBType.Redis:
                 driver = new RedisDriver_1.RedisDriver(conRes);
                 break;
-            case types_1.DBType.AwsS3:
-            case types_1.DBType.Minio:
-                driver = new AwsS3Driver_1.AwsS3Driver(conRes);
-                break;
-            case types_1.DBType.AwsSQS:
-                driver = new AwsSQSDriver_1.AwsSQSDriver(conRes);
-                break;
-            case types_1.DBType.AwsCloudwatch:
-                driver = new AwsCloudwatchDriver_1.AwsCloudwatchDriver(conRes);
+            case types_1.DBType.Aws:
+                driver = new AwsDriver_1.AwsDriver(conRes);
                 break;
             default:
                 throw new Error(`${conRes.dbType} is not supported.`);

package/built/src/drivers/DBDriverResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/drivers/DBDriverResolver.ts"],"names":[],"mappings":";;;;AAAA,8EAA4C;AAE5C,0CAA8D;AAC9D,oCAAkC;AAClC,+CAA4C;AAC5C,qDAAkD;AAClD,+CAA4C;AAC5C,+CAA4C;AAC5C,iDAA8C;AAC9C,+DAA4D;AAE5D,MAAM,GAAG,GAAG,IAAI,yBAAa,EAAE,CAAC;AAEhC,MAAa,gBAAgB;IAK3B,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAGD;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,YAAoB;QAChC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,+BAA+B,YAAY,cAAc,CAC1D,CAAC;SACH;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,YAAY,CAAuB,OAA0B;QAC3D,MAAM,MAAM,GAAG,IAAI,uBAAY,iCAC1B,OAAO,KACV,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IACrB,CAAC;QAEH,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,QAAQ,MAAM,CAAC,MAAM,EAAE;YAIrB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,QAAQ;gBAClB,MAAM,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;gBACpC,MAAM;YACR,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YAIR,KAAK,cAAM,CAAC,KAAK,CAAC;YAClB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,MAAM;gBAChB,MAAM,GAAG,IAAI,2BAAY,CAAC,MAAM,CAAC,CAAC;gBAClC,MAAM;YACR,KAAK,cAAM,CAAC,aAAa;gBACvB,MAAM,GAAG,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC;gBACzC,MAAM;YAOR;gBACE,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,oBAAoB,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IAEK,QAAQ;;YACZ,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAO,MAAkB,EAAE,EAAE;gBAClD,IAAI;oBACF,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;iBAC3B;gBAAC,OAAO,CAAC,EAAE;oBACV,YAAY,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;iBAClC;YACH,CAAC,CAAA,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;CACF;AAxFD,4CAwFC"}
+{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/drivers/DBDriverResolver.ts"],"names":[],"mappings":";;;;AAAA,8EAA4C;AAE5C,0CAA8D;AAC9D,oCAAkC;AAClC,+CAA4C;AAC5C,qDAAkD;AAClD,+CAA4C;AAC5C,2CAAwC;AAExC,MAAM,GAAG,GAAG,IAAI,yBAAa,EAAE,CAAC;AAEhC,MAAa,gBAAgB;IAK3B,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAGD;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,YAAoB;QAChC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,+BAA+B,YAAY,cAAc,CAC1D,CAAC;SACH;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,YAAY,CAAuB,OAA0B;QAC3D,MAAM,MAAM,GAAG,IAAI,uBAAY,iCAC1B,OAAO,KACV,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IACrB,CAAC;QAEH,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,QAAQ,MAAM,CAAC,MAAM,EAAE;YAIrB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,QAAQ;gBAClB,MAAM,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;gBACpC,MAAM;YACR,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YAIR,KAAK,cAAM,CAAC,GAAG;gBACb,MAAM,GAAG,IAAI,qBAAS,CAAC,MAAM,CAAC,CAAC;gBAC/B,MAAM;YAOR;gBACE,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,oBAAoB,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IAEK,QAAQ;;YACZ,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAO,MAAkB,EAAE,EAAE;gBAClD,IAAI;oBACF,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;iBAC3B;gBAAC,OAAO,CAAC,EAAE;oBACV,YAAY,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;iBAClC;YACH,CAAC,CAAA,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;CACF;AAjFD,4CAiFC"}

package/built/src/drivers/{AwsCloudwatchDriver.d.ts → aws/AwsCloudwatchServiceClient.d.ts}

@@ -1,13 +1,14 @@
-import { Scannable } from './BaseDriver';
-import { DbConnection, DbDatabase, DbKey, LogMessageParams, ResultSetDataHolder } from '../resource';
-import { ScanParams } from '../types';
+import { DbConnection, DbDatabase, DbKey, LogMessageParams, ResultSetDataHolder } from '../../resource';
+import { ScanParams } from '../../types';
 import { CloudWatchLogsClient, GetQueryResultsCommandOutput, LogStream, QueryDefinition, StartQueryCommandInput } from '@aws-sdk/client-cloudwatch-logs';
-import { AwsBaseDriver, Destroyable } from './AwsBaseDriver';
-export declare class AwsCloudwatchDriver extends AwsBaseDriver implements Scannable {
+import { AwsServiceClient } from './AwsServiceClient';
+import { ClientConfigType } from '../AwsDriver';
+import { Scannable } from '../BaseDriver';
+export declare class AwsCloudwatchServiceClient extends AwsServiceClient implements Scannable {
     logClient: CloudWatchLogsClient;
-    constructor(conRes: DbConnection);
+    constructor(conRes: DbConnection, config: ClientConfigType);
     connectSub(): Promise<string>;
-    testSub(): Promise<string>;
+    protected testSub(): Promise<void>;
     getLogEvents(params: {
         logGroupName: string;
         logStreamName: string;
@@ -19,10 +20,10 @@ export declare class AwsCloudwatchDriver extends AwsBaseDriver implements Scanna
         startTime: number;
         endTime: number;
     }): Promise<ResultSetDataHolder>;
-    getInfomationSchemas(): Promise<Array<DbDatabase>>;
+    getInfomationSchemas(): Promise<DbDatabase>;
     getLogStreams({ logGroupName, }: {
         logGroupName: string;
     }): Promise<LogStream[]>;
     getQueries(): Promise<QueryDefinition[]>;
-    protected getClient(): Destroyable;
+    protected closeSub(): Promise<void>;
 }

package/built/src/drivers/{AwsCloudwatchDriver.js → aws/AwsCloudwatchServiceClient.js}

@@ -1,37 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwsCloudwatchDriver = void 0;
+exports.AwsCloudwatchServiceClient = void 0;
 const tslib_1 = require("tslib");
-const resource_1 = require("../resource");
-const types_1 = require("../types");
+const resource_1 = require("../../resource");
+const types_1 = require("../../types");
 const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
-const AwsBaseDriver_1 = require("./AwsBaseDriver");
-class AwsCloudwatchDriver extends AwsBaseDriver_1.AwsBaseDriver {
-    constructor(conRes) {
-        super(conRes);
+const AwsServiceClient_1 = require("./AwsServiceClient");
+const util_1 = require("../../util");
+class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
+    constructor(conRes, config) {
+        super(conRes, config);
     }
     connectSub() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const config = this.createClientConfig();
-            this.logClient = new client_cloudwatch_logs_1.CloudWatchLogsClient(config);
+            this.logClient = new client_cloudwatch_logs_1.CloudWatchLogsClient(this.config);
             return this.test(false);
         });
     }
     testSub() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let errorReason = '';
             if (this.logClient) {
-                try {
-                    yield this.logClient.send(new client_cloudwatch_logs_1.DescribeLogGroupsCommand({
-                        limit: 1,
-                    }));
-                }
-                catch (e) {
-                    console.error(e);
-                    errorReason = e.message;
-                }
+                yield this.logClient.send(new client_cloudwatch_logs_1.DescribeLogGroupsCommand({
+                    limit: 1,
+                }));
             }
-            return errorReason;
         });
     }
     getLogEvents(params) {
@@ -74,7 +66,7 @@ class AwsCloudwatchDriver extends AwsBaseDriver_1.AwsBaseDriver {
             let status = client_cloudwatch_logs_1.QueryStatus.Scheduled;
             let results;
             while (status === client_cloudwatch_logs_1.QueryStatus.Running || status === client_cloudwatch_logs_1.QueryStatus.Scheduled) {
-                yield (0, AwsBaseDriver_1.sleep)(1500);
+                yield (0, util_1.sleep)(1500);
                 results = yield this.logClient.send(new client_cloudwatch_logs_1.GetQueryResultsCommand({
                     queryId,
                 }));
@@ -124,11 +116,9 @@ class AwsCloudwatchDriver extends AwsBaseDriver_1.AwsBaseDriver {
     getInfomationSchemas() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {
-                return [];
+                return null;
             }
-            const dbResources = new Array();
             const dbDatabase = new resource_1.DbDatabase('Cloudwatch');
-            dbResources.push(dbDatabase);
             try {
                 let nextToken = undefined;
                 do {
@@ -146,7 +136,7 @@ class AwsCloudwatchDriver extends AwsBaseDriver_1.AwsBaseDriver {
             catch (e) {
                 console.error(e);
             }
-            return dbResources;
+            return dbDatabase;
         });
     }
     getLogStreams({ logGroupName, }) {
@@ -186,9 +176,11 @@ class AwsCloudwatchDriver extends AwsBaseDriver_1.AwsBaseDriver {
             return list;
         });
     }
-    getClient() {
-        return this.logClient;
+    closeSub() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.logClient.destroy();
+        });
     }
 }
-exports.AwsCloudwatchDriver = AwsCloudwatchDriver;
-//# sourceMappingURL=AwsCloudwatchDriver.js.map
+exports.AwsCloudwatchServiceClient = AwsCloudwatchServiceClient;
+//# sourceMappingURL=AwsCloudwatchServiceClient.js.map

package/built/src/drivers/aws/AwsCloudwatchServiceClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":"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"}

package/built/src/drivers/{AwsS3Driver.d.ts → aws/AwsS3ServiceClient.d.ts}

@@ -1,13 +1,14 @@
 import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3';
-import { Scannable } from './BaseDriver';
-import { DbConnection, DbDatabase, DbKey, ResultSetDataHolder, S3KeyParams } from '../resource';
-import { ScanParams } from '../types';
-import { AwsBaseDriver, Destroyable } from './AwsBaseDriver';
-export declare class AwsS3Driver extends AwsBaseDriver implements Scannable {
+import { DbConnection, DbDatabase, DbKey, ResultSetDataHolder, S3KeyParams } from '../../resource';
+import { ScanParams } from '../../types';
+import { AwsServiceClient } from './AwsServiceClient';
+import { ClientConfigType } from '../AwsDriver';
+import { Scannable } from '../BaseDriver';
+export declare class AwsS3ServiceClient extends AwsServiceClient implements Scannable {
     s3Client: S3Client;
-    constructor(conRes: DbConnection);
+    constructor(conRes: DbConnection, config: ClientConfigType);
     connectSub(): Promise<string>;
-    testSub(): Promise<string>;
+    protected testSub(): Promise<void>;
     listObjects({ bucket, prefix, limit, withValue, }: {
         bucket: string;
         prefix: string;
@@ -15,7 +16,7 @@ export declare class AwsS3Driver extends AwsBaseDriver implements Scannable {
         withValue: boolean;
     }): Promise<DbKey<S3KeyParams>[]>;
     scan(params: ScanParams): Promise<ResultSetDataHolder>;
-    getInfomationSchemas(): Promise<Array<DbDatabase>>;
+    getInfomationSchemas(): Promise<DbDatabase>;
     createBucket({ bucket }: {
         bucket: string;
     }): Promise<void>;
@@ -34,5 +35,5 @@ export declare class AwsS3Driver extends AwsBaseDriver implements Scannable {
     removeAllObjects({ bucket }: {
         bucket: string;
     }): Promise<void>;
-    protected getClient(): Destroyable;
+    protected closeSub(): Promise<void>;
 }

package/built/src/drivers/{AwsS3Driver.js → aws/AwsS3ServiceClient.js}

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwsS3Driver = void 0;
+exports.AwsS3ServiceClient = void 0;
 const tslib_1 = require("tslib");
 const client_s3_1 = require("@aws-sdk/client-s3");
-const resource_1 = require("../resource");
-const types_1 = require("../types");
-const AwsBaseDriver_1 = require("./AwsBaseDriver");
-class AwsS3Driver extends AwsBaseDriver_1.AwsBaseDriver {
-    constructor(conRes) {
-        super(conRes);
+const resource_1 = require("../../resource");
+const types_1 = require("../../types");
+const AwsServiceClient_1 = require("./AwsServiceClient");
+class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
+    constructor(conRes, config) {
+        super(conRes, config);
     }
     connectSub() {
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const config = Object.assign({}, this.createClientConfig());
-            if (this.conRes.dbType === types_1.DBType.Minio) {
-                config.s3ForcePathStyle = 'true';
+            const config = Object.assign({}, this.config);
+            if ((_a = this.conRes.awsSetting) === null || _a === void 0 ? void 0 : _a.s3ForcePathStyle) {
+                config.s3ForcePathStyle = (_b = this.conRes.awsSetting) === null || _b === void 0 ? void 0 : _b.s3ForcePathStyle;
             }
             this.s3Client = new client_s3_1.S3Client(config);
             return this.test(false);
@@ -22,17 +23,9 @@ class AwsS3Driver extends AwsBaseDriver_1.AwsBaseDriver {
     }
     testSub() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let errorReason = '';
             if (this.s3Client) {
-                try {
-                    yield this.s3Client.send(new client_s3_1.ListBucketsCommand({}));
-                }
-                catch (e) {
-                    console.error(e);
-                    errorReason = e.message;
-                }
+                yield this.s3Client.send(new client_s3_1.ListBucketsCommand({}));
             }
-            return errorReason;
         });
     }
     listObjects({ bucket, prefix, limit, withValue, }) {
@@ -107,11 +100,9 @@ class AwsS3Driver extends AwsBaseDriver_1.AwsBaseDriver {
     getInfomationSchemas() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {
-                return [];
+                return null;
             }
-            const dbResources = new Array();
             const dbDatabase = new resource_1.DbDatabase('S3');
-            dbResources.push(dbDatabase);
             try {
                 const buckets = yield this.s3Client.send(new client_s3_1.ListBucketsCommand({}));
                 if (buckets.Buckets) {
@@ -130,7 +121,7 @@ class AwsS3Driver extends AwsBaseDriver_1.AwsBaseDriver {
             catch (e) {
                 console.error(e);
             }
-            return dbResources;
+            return dbDatabase;
         });
     }
     createBucket({ bucket }) {
@@ -184,9 +175,11 @@ class AwsS3Driver extends AwsBaseDriver_1.AwsBaseDriver {
             }
         });
     }
-    getClient() {
-        return this.s3Client;
+    closeSub() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.s3Client.destroy();
+        });
     }
 }
-exports.AwsS3Driver = AwsS3Driver;
-//# sourceMappingURL=AwsS3Driver.js.map
+exports.AwsS3ServiceClient = AwsS3ServiceClient;
+//# sourceMappingURL=AwsS3ServiceClient.js.map

package/built/src/drivers/aws/AwsS3ServiceClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":"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"}

package/built/src/drivers/{AwsSQSDriver.d.ts → aws/AwsSQSServiceClient.d.ts}

@@ -1,17 +1,18 @@
 import { ReceiveMessageCommandInput, SQSClient } from '@aws-sdk/client-sqs';
-import { Scannable } from './BaseDriver';
-import { DbConnection, DbDatabase, DbKey, ResultSetDataHolder, SQSMessageParams } from '../resource';
-import { ScanParams } from '../types';
-import { AwsSQSAttributes } from '../types/AwsSQSAttributes';
-import { AwsBaseDriver, Destroyable } from './AwsBaseDriver';
-export declare class AwsSQSDriver extends AwsBaseDriver implements Scannable {
+import { DbConnection, DbDatabase, DbKey, ResultSetDataHolder, SQSMessageParams } from '../../resource';
+import { ScanParams } from '../../types';
+import { AwsSQSAttributes } from '../../types/AwsSQSAttributes';
+import { AwsServiceClient } from './AwsServiceClient';
+import { ClientConfigType } from '../AwsDriver';
+import { Scannable } from '../BaseDriver';
+export declare class AwsSQSServiceClient extends AwsServiceClient implements Scannable {
     sqsClient: SQSClient;
-    constructor(conRes: DbConnection);
-    connectSub(): Promise<string>;
-    testSub(): Promise<string>;
+    constructor(conRes: DbConnection, config: ClientConfigType);
+    protected connectSub(): Promise<string>;
+    protected testSub(): Promise<void>;
     receiveMessages(params: ReceiveMessageCommandInput): Promise<DbKey<SQSMessageParams>[]>;
     scan(params: ScanParams): Promise<ResultSetDataHolder>;
-    getInfomationSchemas(): Promise<Array<DbDatabase>>;
+    getInfomationSchemas(): Promise<DbDatabase>;
     private toAttributes;
     createQueue({ name, attributes, }: {
         name: string;
@@ -27,5 +28,5 @@ export declare class AwsSQSDriver extends AwsBaseDriver implements Scannable {
         url: string;
         receiptHandle: string;
     }): Promise<void>;
-    protected getClient(): Destroyable;
+    protected closeSub(): Promise<void>;
 }