pg-mvc-service 2.0.27 → 2.0.29

package/dist/cron/BaseCron.js

@@ -14,6 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCron = void 0;
 const PoolManager_1 = __importDefault(require("../PoolManager"));
+const AwsS3Client_1 = require("../clients/AwsS3Client");
+const Base64Client_1 = require("../clients/Base64Client");
 class BaseCron {
     constructor() {
         this.isTest = process.env.NODE_ENV === 'test';
@@ -97,10 +99,36 @@ class BaseCron {
     }
     tearDown() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isExecuteRollback === false) {
-                this.rollback();
+            try {
+                if (this.isExecuteRollback === false) {
+                    yield this.rollback();
+                }
+            }
+            finally {
+                // クライアント接続をリリース
+                if (this.client) {
+                    this.client.release();
+                    this.client = undefined;
+                }
             }
         });
     }
+    get S3Client() {
+        if (this.s3Client === undefined) {
+            this.s3Client = new AwsS3Client_1.AwsS3Client({
+                bucketName: process.env.S3_BUCKET_NAME,
+                region: process.env.S3_REGION,
+                accessKeyId: process.env.S3_ACCESS_KEY_ID,
+                secretAccessKey: process.env.S3_SECRET_ACCESS_KEY
+            });
+        }
+        return this.s3Client;
+    }
+    get Base64Client() {
+        if (this.base64Client === undefined) {
+            this.base64Client = new Base64Client_1.Base64Client();
+        }
+        return this.base64Client;
+    }
 }
 exports.BaseCron = BaseCron;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.27",
+  "version": "2.0.29",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/cron/BaseCron.ts

@@ -1,6 +1,8 @@
 import { Pool, PoolClient } from "pg";
 import { DateType, DayType, HourType, MinuteSecondType, MonthType } from "./CronType";
 import PoolManager from "../PoolManager";
+import { AwsS3Client } from "../clients/AwsS3Client";
+import { Base64Client } from "../clients/Base64Client";
 
 export class BaseCron {
 
@@ -84,8 +86,37 @@ export class BaseCron {
     }
 
     public async tearDown() {
-        if (this.isExecuteRollback === false) {
-            this.rollback();
+        try {
+            if (this.isExecuteRollback === false) {
+                await this.rollback();
+            }
+        } finally {
+            // クライアント接続をリリース
+            if (this.client) {
+                this.client.release();
+                this.client = undefined;
+            }
         }
     }
+
+    private s3Client?: AwsS3Client;
+    get S3Client(): AwsS3Client {
+        if (this.s3Client === undefined) {
+            this.s3Client = new AwsS3Client({
+                bucketName: process.env.S3_BUCKET_NAME,
+                region: process.env.S3_REGION,
+                accessKeyId: process.env.S3_ACCESS_KEY_ID,
+                secretAccessKey: process.env.S3_SECRET_ACCESS_KEY
+            });
+        }
+        return this.s3Client;
+    }
+
+    private base64Client? : Base64Client;
+    get Base64Client(): Base64Client {
+        if (this.base64Client === undefined) {
+            this.base64Client = new Base64Client();
+        }
+        return this.base64Client;
+    }
 }