pg-mvc-service 1.0.8 → 1.0.9

package/dist/clients/AwsS3Client.js

@@ -136,7 +136,8 @@ class AwsS3Client {
     }
     getText(path, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, e_1, _b, _c;
+            var _d;
             try {
                 const command = new client_s3_1.GetObjectCommand({
                     Bucket: this.bucketName,
@@ -146,18 +147,39 @@ class AwsS3Client {
                 if (res.Body === undefined) {
                     throw new Error(`Failed to get text data. Response body is undefined.`);
                 }
-                if (((_a = res.ContentType) === null || _a === void 0 ? void 0 : _a.startsWith('text/')) === false) {
+                if (((_d = res.ContentType) === null || _d === void 0 ? void 0 : _d.startsWith('text/')) === false) {
                     throw new Error(`Cannot get text data from non-text file. ContentType: ${res.ContentType}`);
                 }
                 // v3ではBodyがReadableStreamなので、変換が必要
-                const stream = res.Body;
-                const reader = stream.getReader();
                 const chunks = [];
-                while (true) {
-                    const { done, value } = yield reader.read();
-                    if (done)
-                        break;
-                    chunks.push(value);
+                if (res.Body && typeof res.Body === 'object' && 'getReader' in res.Body) {
+                    // ReadableStreamの場合
+                    const stream = res.Body;
+                    const reader = stream.getReader();
+                    while (true) {
+                        const { done, value } = yield reader.read();
+                        if (done)
+                            break;
+                        chunks.push(value);
+                    }
+                }
+                else {
+                    try {
+                        // Node.js Readableの場合
+                        for (var _e = true, _f = __asyncValues(res.Body), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
+                            _c = _g.value;
+                            _e = false;
+                            const chunk = _c;
+                            chunks.push(chunk);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
                 }
                 const buffer = Buffer.concat(chunks);
                 return buffer.toString('utf-8');
@@ -183,7 +205,7 @@ class AwsS3Client {
     }
     getDataFronJson(path, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, e_1, _b, _c;
+            var _a, e_2, _b, _c;
             const command = new client_s3_1.GetObjectCommand({
                 Bucket: this.bucketName,
                 Key: this.makeKey(path, fileName),
@@ -205,12 +227,12 @@ class AwsS3Client {
                     chunks.push(chunk);
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_2) throw e_2.error; }
             }
             const buffer = Buffer.concat(chunks);
             const jsonString = buffer.toString('utf-8');

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rollback = exports.migrate = exports.MigrateDatabase = exports.MigrateTable = exports.createTableDoc = exports.TableModel = exports.ResponseType = exports.RequestType = exports.EncryptClient = exports.StringClient = exports.Base64Client = exports.AwsS3Client = exports.createSwagger = exports.BusinessLogicException = exports.DbConflictException = exports.ForbiddenException = exports.InputErrorException = exports.AuthException = exports.MaintenanceException = exports.Service = void 0;
+exports.rollback = exports.migrate = exports.MigrateDatabase = exports.MigrateTable = exports.createTableDoc = exports.TableModel = exports.ResponseType = exports.RequestType = exports.EncryptClient = exports.StringClient = exports.Base64Client = exports.AwsS3Client = exports.createSwagger = exports.UnprocessableException = exports.DbConflictException = exports.ForbiddenException = exports.InputErrorException = exports.AuthException = exports.MaintenanceException = exports.Service = void 0;
 var Service_1 = require("./Service");
 Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return Service_1.Service; } });
 var Exception_1 = require("./exceptions/Exception");
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "AuthException", { enumerable: true, get: functio
 Object.defineProperty(exports, "InputErrorException", { enumerable: true, get: function () { return Exception_1.InputErrorException; } });
 Object.defineProperty(exports, "ForbiddenException", { enumerable: true, get: function () { return Exception_1.ForbiddenException; } });
 Object.defineProperty(exports, "DbConflictException", { enumerable: true, get: function () { return Exception_1.DbConflictException; } });
-Object.defineProperty(exports, "BusinessLogicException", { enumerable: true, get: function () { return Exception_1.UnprocessableException; } });
+Object.defineProperty(exports, "UnprocessableException", { enumerable: true, get: function () { return Exception_1.UnprocessableException; } });
 var Swagger_1 = require("./documents/Swagger");
 Object.defineProperty(exports, "createSwagger", { enumerable: true, get: function () { return Swagger_1.createSwagger; } });
 var AwsS3Client_1 = require("./clients/AwsS3Client");

package/package.json

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

package/src/clients/AwsS3Client.ts

@@ -147,14 +147,22 @@ export class AwsS3Client {
             }
 
             // v3ではBodyがReadableStreamなので、変換が必要
-            const stream = res.Body as ReadableStream;
-            const reader = stream.getReader();
             const chunks: Uint8Array[] = [];
-            
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done) break;
-                chunks.push(value);
+            if (res.Body && typeof res.Body === 'object' && 'getReader' in res.Body) {
+                // ReadableStreamの場合
+                const stream = res.Body as ReadableStream;
+                const reader = stream.getReader();
+                
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done) break;
+                    chunks.push(value);
+                }
+            } else {
+                // Node.js Readableの場合
+                for await (const chunk of res.Body as any) {
+                    chunks.push(chunk);
+                }
             }
             
             const buffer = Buffer.concat(chunks);