pg-mvc-service 2.0.2 → 2.0.4

package/dist/clients/Base64Client.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Base64Client = void 0;
 const pdf_lib_1 = require("pdf-lib");
 const sharp_1 = __importDefault(require("sharp"));
+const type_utils_n_daira_1 = require("type-utils-n-daira");
 class Base64Client {
     constructor() { }
     // public encode(text: string): string {
@@ -150,5 +151,62 @@ class Base64Client {
             return Buffer.from(pdfBytes);
         });
     }
+    static isJpeg(value) {
+        if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value) === false) {
+            return false;
+        }
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/jpeg,') === false && value.startsWith('data:image/jpg,') === false) {
+                return false;
+            }
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+            return valueParts[1].startsWith(this.PREFIX_JPEG_DATA);
+        }
+        return value.startsWith(this.PREFIX_JPEG_DATA);
+    }
+    static isPng(value) {
+        if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value) === false) {
+            return false;
+        }
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/png,') === false) {
+                return false;
+            }
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+            return valueParts[1].startsWith(this.PREFIX_PNG_DATA);
+        }
+        return value.startsWith(this.PREFIX_PNG_DATA);
+    }
+    static tryConvertToPng(base64Value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (type_utils_n_daira_1.ValidateStringUtil.isBase64(base64Value) === false) {
+                return false;
+            }
+            const base64Data = base64Value.startsWith('data:') ? base64Value.split(',')[1] : base64Value;
+            if (this.isPng(base64Data)) {
+                return base64Data;
+            }
+            else if (this.isJpeg(base64Data)) {
+                const buffer = Buffer.from(base64Data, 'base64');
+                try {
+                    const pngBuffer = yield (0, sharp_1.default)(buffer)
+                        .ensureAlpha().png().toBuffer();
+                    return pngBuffer.toString('base64');
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return false;
+        });
+    }
 }
 exports.Base64Client = Base64Client;
+Base64Client.PREFIX_JPEG_DATA = '/9j/';
+Base64Client.PREFIX_PNG_DATA = 'iVBORw0KGgo';

package/dist/models/TableModel.js

@@ -339,7 +339,7 @@ class TableModel {
         }
         throw new Exception_1.UnprocessableException(code, message);
     }
-    validateOptions(options, isInsert) {
+    validateOptions(options, isInsert, pkOrId) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Object.keys(options).length === 0) {
                 throw new Error('At least one key-value pair is required in options.');
@@ -432,7 +432,7 @@ class TableModel {
     update(pkOrId, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            yield this.validateOptions(options, false);
+            yield this.validateOptions(options, false, pkOrId);
             const updateSetQuery = UpdateExpression_1.default.createUpdateSet(this, options);
             let whereQuery;
             if (typeof pkOrId === 'string' || typeof pkOrId === 'number' || typeof pkOrId === 'boolean') {

package/dist/reqestResponse/ReqResType.js

@@ -114,55 +114,6 @@ class ReqResType {
                 return false;
         }
     }
-    /**
-     * 値がメールアドレス形式であるかどうかを検証します
-     * Validates if the given value is in the format of an email address
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がメールアドレス形式であるかどうか, Whether the value is in the format of an email address
-     */
-    isMail(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        const pattern = new RegExp('^[a-zA-Z0-9_%+-]+([.][a-zA-Z0-9_%+-]+)*@[a-zA-Z0-9]+([-.]?[a-zA-Z0-9]+)*\\.[a-zA-Z]{2,}$');
-        return pattern.test(value);
-    }
-    /**
-     * 値がHTTPS URLであるかどうかを検証します
-     * Validates if the given value is an HTTPS URL
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がHTTPS URLであるかどうか, Whether the value is an HTTPS URL
-     */
-    isHttps(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        const urlPattern = new RegExp('^(https?:\\/\\/[^\\s/$.?#].[^\\s]*)$');
-        return urlPattern.test(value);
-    }
-    /**
-     * 値がBase64形式であるかどうかを検証します
-     * Validates if the given value is in Base64 format
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がBase64形式であるかどうか, Whether the value is in Base64 format
-     */
-    isBase64(value) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        // base64は4倍の長さである必要がある
-        if (value.length % 4 !== 0) {
-            return false;
-        }
-        // 基本的なbase64パターン
-        // 使用可能な文字
-        // ・ アルファベット（A-Z, a-z）
-        // ・ 数字（0-9）
-        // ・ +と/（基本文字）
-        // ・ =（パディング文字）
-        const base64Pattern = /^[A-Za-z0-9+/]*={0,2}$/;
-        return base64Pattern.test(value);
-    }
     /**
      * プロパティの型をSwagger形式に変換します
      * Converts the property type to Swagger format

package/dist/reqestResponse/RequestType.js

@@ -7,6 +7,7 @@ exports.RequestType = void 0;
 const ReqResType_1 = __importDefault(require("./ReqResType"));
 const Exception_1 = require("../exceptions/Exception");
 const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
+const type_utils_n_daira_1 = require("type-utils-n-daira");
 class RequestType extends ReqResType_1.default {
     constructor() {
         super(...arguments);
@@ -532,7 +533,7 @@ class RequestType extends ReqResType_1.default {
                 this.throwInputError(isRequestBody ? "UUID_21" : "UUID_91", keys, value);
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "MAIL_21" : "MAIL_91", keys, value);
@@ -565,13 +566,13 @@ class RequestType extends ReqResType_1.default {
                 return value.replace('T', ' ');
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "HTTPS_21" : "HTTPS_91", keys, value);
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "BASE64_21" : "BASE64_91", keys, value);

package/dist/reqestResponse/ResponseType.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseType = void 0;
+const type_utils_n_daira_1 = require("type-utils-n-daira");
 const StringUtil_1 = __importDefault(require("../Utils/StringUtil"));
 const ReqResType_1 = __importDefault(require("./ReqResType"));
 class ResponseType extends ReqResType_1.default {
@@ -210,7 +211,7 @@ class ResponseType extends ReqResType_1.default {
                 return undefined;
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 return undefined;
@@ -252,13 +253,13 @@ class ResponseType extends ReqResType_1.default {
                 return undefined;
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 return undefined;
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (type_utils_n_daira_1.ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {
@@ -31,6 +31,7 @@
     "axios": "1.10.0",
     "crypto": "1.0.1",
     "pdf-lib": "1.17.1",
-    "sharp": "0.34.1"
+    "sharp": "0.34.1",
+    "type-utils-n-daira": "1.0.11"
   }
 }

package/src/clients/Base64Client.ts

@@ -1,5 +1,6 @@
 import { PDFDocument } from 'pdf-lib';
 import sharp from 'sharp';
+import { ValidateStringUtil } from 'type-utils-n-daira';
 
 export type TPng = 'image/png';
 export type TJpeg = 'image/jpeg';
@@ -10,6 +11,9 @@ export type TPdf = 'application/pdf';
 export type TJson = 'application/json';
 
 export class Base64Client {
+    public static readonly PREFIX_JPEG_DATA = '/9j/';
+    public static readonly PREFIX_PNG_DATA = 'iVBORw0KGgo';
+
     constructor() { }
 
     // public encode(text: string): string {
@@ -152,4 +156,68 @@ export class Base64Client {
         const pdfBytes = await pdfDoc.save();
         return Buffer.from(pdfBytes);
     }
+
+    public static isJpeg(value: any): value is string {
+        if (ValidateStringUtil.isBase64(value) === false) {
+            return false
+        }
+
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/jpeg,') === false && value.startsWith('data:image/jpg,') === false) {
+                return false;
+            }
+
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+
+            return valueParts[1].startsWith(this.PREFIX_JPEG_DATA);
+        }
+
+        return value.startsWith(this.PREFIX_JPEG_DATA);
+    }
+
+    public static isPng(value: any): value is string {
+        if (ValidateStringUtil.isBase64(value) === false) {
+            return false
+        }
+
+        if (value.startsWith('data:')) {
+            if (value.startsWith('data:image/png,') === false) {
+                return false;
+            }
+
+            const valueParts = value.split(',');
+            if (valueParts.length !== 2) {
+                return false;
+            }
+
+            return valueParts[1].startsWith(this.PREFIX_PNG_DATA);
+        }
+
+        return value.startsWith(this.PREFIX_PNG_DATA);
+    }
+
+    public static async tryConvertToPng(base64Value: any): Promise<string | false> {
+        if (ValidateStringUtil.isBase64(base64Value) === false) {
+            return false;
+        }
+
+        const base64Data = base64Value.startsWith('data:') ? base64Value.split(',')[1] : base64Value;
+        if (this.isPng(base64Data)) {
+            return base64Data;
+        } else if (this.isJpeg(base64Data)) {
+            const buffer = Buffer.from(base64Data, 'base64');
+            try {
+                const pngBuffer = await sharp(buffer)
+                    .ensureAlpha().png().toBuffer();
+                return pngBuffer.toString('base64');
+            } catch (e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
 }

package/src/models/TableModel.ts

@@ -400,7 +400,7 @@ export class TableModel {
         throw new UnprocessableException(code, message);
     }
 
-    protected async validateOptions(options: {[key: string]: any}, isInsert: boolean): Promise<void> {
+    protected async validateOptions(options: {[key: string]: any}, isInsert: boolean, pkOrId?: string | number | boolean | {[key: string]: any}): Promise<void> {
         if (Object.keys(options).length === 0) {
             throw new Error('At least one key-value pair is required in options.');
         }
@@ -502,7 +502,7 @@ export class TableModel {
     }
 
     public async update(pkOrId: string | number | boolean | {[key: string]: any}, options: {[key: string]: any}) : Promise<void> {
-        await this.validateOptions(options, false);
+        await this.validateOptions(options, false, pkOrId);
 
         const updateSetQuery = UpdateExpression.createUpdateSet(this, options);
         let whereQuery: TQuery;

package/src/reqestResponse/ReqResType.ts

@@ -151,62 +151,6 @@ export default class ReqResType {
         }
     }
 
-    /**
-     * 値がメールアドレス形式であるかどうかを検証します
-     * Validates if the given value is in the format of an email address
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がメールアドレス形式であるかどうか, Whether the value is in the format of an email address
-     */
-    protected isMail(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-
-        const pattern = new RegExp('^[a-zA-Z0-9_%+-]+([.][a-zA-Z0-9_%+-]+)*@[a-zA-Z0-9]+([-.]?[a-zA-Z0-9]+)*\\.[a-zA-Z]{2,}$');
-        return pattern.test(value);
-    }
-
-    /**
-     * 値がHTTPS URLであるかどうかを検証します
-     * Validates if the given value is an HTTPS URL
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がHTTPS URLであるかどうか, Whether the value is an HTTPS URL
-     */
-    protected isHttps(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-
-        const urlPattern = new RegExp('^(https?:\\/\\/[^\\s/$.?#].[^\\s]*)$');
-        return urlPattern.test(value);
-    }
-
-    /**
-     * 値がBase64形式であるかどうかを検証します
-     * Validates if the given value is in Base64 format
-     * @param value - 検証する値, The value to be validated
-     * @returns {boolean} - 値がBase64形式であるかどうか, Whether the value is in Base64 format
-     */
-    protected isBase64(value: any) {
-        if (typeof value !== 'string') {
-            return false;
-        }
-        
-        // base64は4倍の長さである必要がある
-        if (value.length % 4 !== 0) {
-            return false;
-        }
-        
-        // 基本的なbase64パターン
-        // 使用可能な文字
-        // ・ アルファベット（A-Z, a-z）
-        // ・ 数字（0-9）
-        // ・ +と/（基本文字）
-        // ・ =（パディング文字）
-        const base64Pattern = /^[A-Za-z0-9+/]*={0,2}$/;
-        return base64Pattern.test(value);
-    }
-
     /**
      * プロパティの型をSwagger形式に変換します
      * Converts the property type to Swagger format

package/src/reqestResponse/RequestType.ts

@@ -2,6 +2,7 @@ import { Request } from 'express';
 import ReqResType, { EnumType, PrimitiveType, PropertyType } from "./ReqResType";
 import { InputErrorException } from '../exceptions/Exception';
 import StringUtil from '../Utils/StringUtil';
+import { ValidateStringUtil } from 'type-utils-n-daira';
 
 // エラーメッセージの型定義
 export interface ErrorMessageType {
@@ -575,7 +576,7 @@ export class RequestType extends ReqResType {
                 this.throwInputError(isRequestBody ? "UUID_21" : "UUID_91", keys, value);
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "MAIL_21" : "MAIL_91", keys, value);
@@ -611,13 +612,13 @@ export class RequestType extends ReqResType {
                 return value.replace('T', ' ');
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "HTTPS_21" : "HTTPS_91", keys, value);
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 this.throwInputError(isRequestBody ? "BASE64_21" : "BASE64_91", keys, value);

package/src/reqestResponse/ResponseType.ts

@@ -1,3 +1,4 @@
+import { ValidateStringUtil } from "type-utils-n-daira";
 import StringUtil from "../Utils/StringUtil";
 import ReqResType from "./ReqResType";
 
@@ -226,7 +227,7 @@ export class ResponseType extends ReqResType {
                 return undefined;
             case 'mail':
             case 'mail?':
-                if (this.isMail(value)) {
+                if (ValidateStringUtil.isMail(value)) {
                     return value;
                 }
                 return undefined;
@@ -274,13 +275,13 @@ export class ResponseType extends ReqResType {
                 return undefined;
             case 'https':
             case 'https?':
-                if (this.isHttps(value)) {
+                if (ValidateStringUtil.isHttps(value)) {
                     return value;
                 }
                 return undefined;
             case 'base64':
             case 'base64?':
-                if (this.isBase64(value)) {
+                if (ValidateStringUtil.isBase64(value)) {
                     return value;
                 }
                 return undefined;