pg-mvc-service 2.0.10 → 2.0.12

package/dist/clients/AwsS3Client.js

@@ -15,12 +15,17 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwsS3Client = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const Base64Client_1 = require("./Base64Client");
+const Exception_1 = require("../exceptions/Exception");
+const axios_1 = __importDefault(require("axios"));
 class AwsS3Client {
-    get urlPrefix() {
+    get UrlPrefix() {
         return `https://${this.bucketName}.s3.${this.region}.amazonaws.com`;
     }
     constructor(params) {
@@ -55,7 +60,7 @@ class AwsS3Client {
     }
     url(path, fileName = '') {
         path = path.replace(/^\/|\/$/g, '');
-        let url = `${this.urlPrefix}`;
+        let url = `${this.UrlPrefix}`;
         if (path !== '') {
             url += '/' + path;
         }
@@ -122,7 +127,45 @@ class AwsS3Client {
                 ContentType: type
             });
             yield this.client.send(command);
-            return `${this.urlPrefix}/${key}`;
+            return `${this.UrlPrefix}/${key}`;
+        });
+    }
+    uploadFromUrl(path, fileName, url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // URLからデータを取得
+                const response = yield axios_1.default.get(url, {
+                    responseType: 'arraybuffer',
+                    timeout: 30000,
+                });
+                // Content-Typeを取得
+                const contentType = response.headers['content-type'] || 'application/octet-stream';
+                const key = this.makeKey(path, fileName);
+                const command = new client_s3_1.PutObjectCommand({
+                    Bucket: this.bucketName,
+                    Key: key,
+                    Body: Buffer.from(response.data),
+                    ContentType: contentType,
+                    ContentLength: response.data.length
+                });
+                yield this.client.send(command);
+                // アップロードされたファイルのURLを返す
+                return this.url(path, fileName);
+            }
+            catch (error) {
+                if (axios_1.default.isAxiosError(error)) {
+                    if (error.response) {
+                        throw new Exception_1.UnprocessableException(`Failed to download from URL. HTTP ${error.response.status}: ${error.response.statusText}`);
+                    }
+                    else if (error.request) {
+                        throw new Exception_1.UnprocessableException('Failed to connect to the URL. Please check if the URL is accessible.');
+                    }
+                    else {
+                        throw new Exception_1.UnprocessableException('Invalid URL format.');
+                    }
+                }
+                throw new Exception_1.UnprocessableException('Failed to upload from URL.');
+            }
         });
     }
     uploadStackText(path, fileName, text) {
@@ -265,5 +308,27 @@ class AwsS3Client {
             }
         });
     }
+    deleteFromUrl(url_1) {
+        return __awaiter(this, arguments, void 0, function* (url, isFileUrl = true) {
+            const path = url.replace(this.UrlPrefix + '/', '');
+            if (url === path) {
+                throw new Exception_1.UnprocessableException('The specified URL cannot be deleted because the bucket and region do not match.');
+            }
+            if (path.trim() === "") {
+                throw new Exception_1.UnprocessableException('This URL is invalid.');
+            }
+            if (isFileUrl) {
+                const pathSplits = path.split('/');
+                const file = pathSplits.pop();
+                if (file === undefined) {
+                    throw new Exception_1.UnprocessableException('This URL is invalid.');
+                }
+                yield this.deleteFile(pathSplits.join('/'), file);
+            }
+            else {
+                yield this.deleteDir(path);
+            }
+        });
+    }
 }
 exports.AwsS3Client = AwsS3Client;

package/dist/models/TableModel.js

@@ -325,7 +325,7 @@ class TableModel {
             let tempVars = [...this.vars];
             const data = yield this.executeQuery(sql, tempVars);
             const countData = yield this.executeQuery(countSql, tempVars);
-            return { datas: data.rows, count: Number(countData.rows[0].count), lastPage: Math.ceil(Number(countData.rows[0].count) / this.PageCount) };
+            return { datas: data.rows, total_count: Number(countData.rows[0].count), last_page: Math.ceil(Number(countData.rows[0].count) / this.PageCount) };
         });
     }
     throwException(code, type, columnName, value) {

package/package.json

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

package/src/clients/AwsS3Client.ts

@@ -1,12 +1,14 @@
 import { _Object, DeleteObjectsCommand, GetObjectCommand, ListObjectsV2Command, PutObjectCommand, S3Client, ScanRange } from '@aws-sdk/client-s3';
 import { Base64Client } from './Base64Client';
+import { UnprocessableException } from '../exceptions/Exception';
+import axios from 'axios';
 
 export class AwsS3Client {
     private client: S3Client;
 
     private readonly bucketName;
     private readonly region;
-    get urlPrefix(): string {
+    get UrlPrefix(): string {
         return `https://${this.bucketName}.s3.${this.region}.amazonaws.com`;
     }
 
@@ -49,7 +51,7 @@ export class AwsS3Client {
 
     public url(path: string, fileName: string = '') {
         path = path.replace(/^\/|\/$/g, '');
-        let url = `${this.urlPrefix}`;
+        let url = `${this.UrlPrefix}`;
         if (path !== '') {
             url += '/' + path;
         }
@@ -118,7 +120,46 @@ export class AwsS3Client {
         });
         await this.client.send(command);
         
-        return `${this.urlPrefix}/${key}`;
+        return `${this.UrlPrefix}/${key}`;
+    }
+
+    public async uploadFromUrl(path: string, fileName: string, url: string): Promise<string> {
+        try {
+            // URLからデータを取得
+            const response = await axios.get(url, {
+                responseType: 'arraybuffer',
+                timeout: 30000,
+            });
+
+            // Content-Typeを取得
+            const contentType = response.headers['content-type'] || 'application/octet-stream';
+            
+            const key = this.makeKey(path, fileName);
+            const command = new PutObjectCommand({
+                Bucket: this.bucketName,
+                Key: key,
+                Body: Buffer.from(response.data),
+                ContentType: contentType,
+                ContentLength: response.data.length
+            });
+            
+            await this.client.send(command);
+            
+            // アップロードされたファイルのURLを返す
+            return this.url(path, fileName);
+            
+        } catch (error) {
+            if (axios.isAxiosError(error)) {
+                if (error.response) {
+                    throw new UnprocessableException(`Failed to download from URL. HTTP ${error.response.status}: ${error.response.statusText}`);
+                } else if (error.request) {
+                    throw new UnprocessableException('Failed to connect to the URL. Please check if the URL is accessible.');
+                } else {
+                    throw new UnprocessableException('Invalid URL format.');
+                }
+            }
+            throw new UnprocessableException('Failed to upload from URL.');
+        }
     }
 
     public async uploadStackText(path: string, fileName: string, text: string) {
@@ -234,4 +275,26 @@ export class AwsS3Client {
             await this.client.send(deleteCommand);
         }
     }
+
+    public async deleteFromUrl(url: string, isFileUrl: boolean = true): Promise<void> {
+        const path = url.replace(this.UrlPrefix + '/', '');
+        if (url === path) {
+            throw new UnprocessableException('The specified URL cannot be deleted because the bucket and region do not match.');
+        }
+
+        if (path.trim() === "") {
+            throw new UnprocessableException('This URL is invalid.');
+        }
+
+        if (isFileUrl) {
+            const pathSplits = path.split('/');
+            const file = pathSplits.pop();
+            if (file === undefined) {
+                throw new UnprocessableException('This URL is invalid.');
+            }
+            await this.deleteFile(pathSplits.join('/'), file);
+        } else {
+            await this.deleteDir(path);
+        }
+    }
 }

package/src/models/TableModel.ts

@@ -369,7 +369,7 @@ export class TableModel {
         return data.rows as Array<T>;
     }
 
-    public async executeSelectWithCount<T = any>(): Promise<{ datas: Array<T>, count: number, lastPage: number}> {
+    public async executeSelectWithCount<T = any>(): Promise<{ datas: Array<T>, total_count: number, last_page: number}> {
         if (this.selectExpressions.length == 0) {
             this.select();
         }
@@ -380,7 +380,7 @@ export class TableModel {
         const data = await this.executeQuery(sql, tempVars);
 
         const countData = await this.executeQuery(countSql, tempVars);
-        return { datas: data.rows as Array<T>, count: Number(countData.rows[0].count), lastPage: Math.ceil(Number(countData.rows[0].count) / this.PageCount)};
+        return { datas: data.rows as Array<T>, total_count: Number(countData.rows[0].count), last_page: Math.ceil(Number(countData.rows[0].count) / this.PageCount)};
     }
 
     protected readonly errorMessages: TOptionErrorMessage =