pg-mvc-service 2.0.42 → 2.0.43

package/src/clients/Base64Client.ts

@@ -1,305 +0,0 @@
-import axios from 'axios';
-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';
-export type TGif = 'image/gif';
-export type TImage = TPng | TJpeg | TGif;
-
-export type TPdf = 'application/pdf';
-export type TJson = 'application/json';
-
-export class Base64Client {
-    public readonly PREFIX_JPEG_DATA = '/9j/';
-    public readonly PREFIX_PNG_DATA = 'iVBORw0KGgo';
-
-    constructor() { }
-
-    // public encode(text: string): string {
-    //     return Buffer.from(text).toString('base64');
-    // }
-
-    public tryDecode(base64: string): Buffer<ArrayBuffer> | false {
-        try {
-            // Data URLのパターンをチェック
-            if (base64.startsWith('data:')) {
-                const matches = base64.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
-                if (!matches || matches.length !== 3) {
-                    return false;
-                }
-                // base64部分のみを取得
-                base64 = matches[2];
-            }
-
-            if (base64.length % 4 !== 0) {
-                return false;
-            }
-
-            const regex = /^[A-Za-z0-9+/]*={0,2}$/;
-            if (!regex.test(base64)) {
-                return false;
-            }
-
-            return Buffer.from(base64, 'base64');
-        } catch {
-            return false;
-        }
-    }
-
-    public getMimeType(data: string | Buffer<ArrayBuffer>): TImage | TPdf {
-        try {
-            let buffer;
-            if (typeof data === 'string') {
-                // Data URLのパターンをチェック
-                if (data.startsWith('data:')) {
-                    const matches = data.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
-                    if (!matches || matches.length !== 3) {
-                        throw new Error('Invalid Data URL format');
-                    }
-                    // base64部分のみを取得
-                    data = matches[2];
-                }
-                buffer = this.tryDecode(data);
-            } else {
-                buffer = data;
-            }
-
-            if (buffer === false) {
-                throw new Error('Cannot getMineType because the input is not in base64 format.');
-            }
-
-            const header = buffer.subarray(0, 4);
-            if (header[0] === 0x25 && header[1] === 0x50 && header[2] === 0x44 && header[3] === 0x46) {
-                return 'application/pdf';
-            } else if (header[0] === 0x89 && header[1] === 0x50 && header[2] === 0x4E && header[3] === 0x47) {
-                return 'image/png';
-            } else if (header[0] === 0xFF && header[1] === 0xD8) {
-                return 'image/jpeg';
-            } else if (header[0] === 0x47 && header[1] === 0x49 && header[2] === 0x46 && header[3] === 0x38) {
-                return 'image/gif';
-            }
-
-            throw new Error('Cannot getMimeType because the file type is not PDF, PNG, JPEG, or GIF.');
-        } catch {
-            throw new Error('Cannot getMineType because the input is not in base64 format.');
-        }
-    }
-
-    public async mergeToPdfBase64(datas: string[]): Promise<string> {
-        const mergedPdf = await PDFDocument.create();
-
-        for (const data of datas) {
-            const buffer = this.tryDecode(data);
-            if (buffer === false) {
-                throw new Error('Cannot mergeToPdf because the input is not in base64 format.');
-            }
-
-            const fileType = this.getMimeType(buffer);
-            if (fileType === 'application/pdf') {
-                const pdfDoc = await PDFDocument.load(buffer);
-                const pages = await mergedPdf.copyPages(pdfDoc, pdfDoc.getPageIndices());
-                pages.forEach(page => mergedPdf.addPage(page));
-            } else {
-                // convert from image to pdf
-                const imagePdf = await this.convertImageToPdf(buffer);
-                const pdfDoc = await PDFDocument.load(imagePdf);
-                const pages = await mergedPdf.copyPages(pdfDoc, pdfDoc.getPageIndices());
-                pages.forEach(page => mergedPdf.addPage(page));
-            }
-        }
-
-        // 結合したPDFをBase64に変換
-        const mergedPdfBytes = await mergedPdf.save();
-        return Buffer.from(mergedPdfBytes).toString('base64');
-    }
-
-    private async convertImageToPdf(imageBuffer: Buffer): Promise<Buffer> {
-        const fileType = this.getMimeType(imageBuffer);
-
-        let optimizedImage;
-        if (fileType === 'image/gif') {
-            // gifの場合はpngに変換して処理
-            optimizedImage = await sharp(imageBuffer)
-                .png()
-                .toBuffer();
-        } else {
-            optimizedImage = await sharp(imageBuffer).toBuffer();
-        }
-
-        // 新しいPDFドキュメントを作成
-        const pdfDoc = await PDFDocument.create();
-        const page = pdfDoc.addPage();
-
-        // 画像をPDFに埋め込み
-        
-        let image;
-        if (fileType === 'image/jpeg') {
-            image = await pdfDoc.embedJpg(optimizedImage);
-        } else {
-            image = await pdfDoc.embedPng(optimizedImage);
-        }
-        const { width, height } = image.scale(1);
-        
-        // ページサイズを画像に合わせる
-        page.setSize(width, height);
-        
-        // 画像を描画
-        page.drawImage(image, {
-            x: 0,
-            y: 0,
-            width,
-            height,
-        });
-
-        // PDFをバッファに変換
-        const pdfBytes = await pdfDoc.save();
-        return Buffer.from(pdfBytes);
-    }
-
-    public 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 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 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;
-    }
-
-    public async resizeImage(base64Data: string, toSize: {w: number} | {h: number} | {w: number; h: number; func: 'max' | 'min'}| {rate: number}): Promise<string> {
-        if (ValidateStringUtil.isBase64(base64Data) === false) {
-            throw new Error("The specified data is not in base64 format");
-        }
-
-        const imageBuffer = Buffer.from(base64Data, 'base64');
-        const metadata = await sharp(imageBuffer).metadata();
-        const { width, height, format } = metadata;
-        if (width === undefined || height === undefined) {
-            throw new Error("Failed to retrieve image dimensions");
-        }
-        
-        let rate = 1;
-        if ('rate' in toSize) {
-            rate = toSize.rate;
-        } else if ('w' in toSize && 'h' in toSize && 'func' in toSize) {
-            const wRate = toSize.w / width;
-            const hRate = toSize.h / height;
-            switch (toSize.func) {
-                case 'max':
-                    rate = Math.max(wRate, hRate);
-                    break;
-                case 'min':
-                    rate = Math.min(wRate, hRate);
-                    break;
-            }
-
-        } else if ('w' in toSize) {
-            rate = toSize.w / width;
-        } else if ('h' in toSize) {
-            rate = toSize.h / height;
-        }
-
-        // 画像は1倍より大きくできないので
-        if (rate >= 1 || rate <= 0) {
-            return base64Data;
-        }
-
-        let resizedImage: Buffer;
-
-        // フォーマットに応じて処理を分岐
-        const targetWidth = Math.round(width * rate);
-        const targetHeight = Math.round(height * rate);
-        if (format === 'png') {
-            resizedImage = await sharp(imageBuffer)
-                .resize(targetWidth, targetHeight, {
-                    fit: 'inside',
-                    withoutEnlargement: true
-                })
-                .png({ quality: 90 })
-                .toBuffer();
-        } else {
-            // JPEG、その他のフォーマット
-            resizedImage = await sharp(imageBuffer)
-                .resize(targetWidth, targetHeight, {
-                    fit: 'inside',
-                    withoutEnlargement: true
-                })
-                .jpeg({ quality: 90 })
-                .toBuffer();
-        }
-
-        return resizedImage.toString('base64');
-    }
-
-    public async fetchImageAsBase64(imageUrl: string): Promise<string> {
-        const res = await axios.get(imageUrl, {
-            responseType: 'arraybuffer'  // これを追加
-        });
-
-        // Content-Typeをチェック
-        const contentType = res.headers['content-type'];
-        if (!contentType?.startsWith('image/')) {
-            throw new Error(`Invalid content type: ${contentType}. Expected image/*`);
-        }
-
-        // ArrayBufferをBufferに変換してBase64にエンコード
-        const buffer = Buffer.from(res.data);
-        return buffer.toString('base64');
-    }
-}

package/src/clients/EncryptClient.ts

@@ -1,100 +0,0 @@
-import crypto from 'crypto';
-
-export class EncryptClient {
-    private secretKeyHex?: string;
-    get SecretKey(): Buffer<ArrayBuffer> { 
-        if (this.secretKeyHex === undefined) {
-            throw new Error("Please set the secret key.");
-        }
-        return Buffer.from(this.secretKeyHex, 'hex');
-    }
-    private hmacKeyBase64?: string;
-    get HmacKey(): Buffer<ArrayBuffer> { 
-        if (this.hmacKeyBase64 === undefined) {
-            throw new Error("Please set the hmac key.");
-        }
-        return Buffer.from(this.hmacKeyBase64, 'base64');
-    }
-
-    constructor(params: {secretKeyHex?: string, hmacKeyBase64?: string}) {
-        this.secretKeyHex = params?.secretKeyHex;
-        this.hmacKeyBase64 = params?.hmacKeyBase64;
-    }
-
-    public encryptAndSign(data: string | {[key: string]: any}): string {
-        const iv = crypto.randomBytes(12);
-        const cipher = crypto.createCipheriv('aes-256-gcm', this.SecretKey, iv);
-        
-        const plaintext = typeof data === 'string' ? data : JSON.stringify(data);
-        const encrypted = Buffer.concat([cipher.update(plaintext, 'utf8'), cipher.final()]);
-        const authTag = cipher.getAuthTag();
-        
-        const combined = Buffer.concat([iv, authTag, encrypted]);
-        const payload = this.base64urlEncode(combined);
-        
-        const hmac = crypto.createHmac('sha256', this.HmacKey).update(payload).digest();
-        const signature = this.base64urlEncode(hmac);
-        
-        return `${payload}.${signature}`;
-    }
-
-    public isValidToken(token: string): boolean {
-        // 形式チェック、.で区切られているか？
-        const [payload, signature] = token.split('.');
-        if (!payload || !signature) {
-            return false;
-        }
-
-        // 改竄チェック
-        const expectedSig = crypto.createHmac('sha256', this.HmacKey).update(payload).digest();
-        const expectedSigStr = this.base64urlEncode(expectedSig);
-
-        if (signature !== expectedSigStr) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public decrypt<T>(token: string): T {
-        // 形式チェック、.で区切られているか？
-        const [payload, signature] = token.split('.');
-        if (!payload || !signature) {
-            throw new Error('Invalid token format');
-        }
-
-        // 改竄チェック
-        const expectedSig = crypto.createHmac('sha256', this.HmacKey).update(payload).digest();
-        const expectedSigStr = this.base64urlEncode(expectedSig);
-        if (signature !== expectedSigStr){
-            throw new Error('The token appears to have been tampered with');
-        }
-
-        const combined = this.base64urlDecode(payload);
-        const iv = combined.subarray(0, 12);
-        const authTag = combined.subarray(12, 28);
-        const encrypted = combined.subarray(28);
-        
-        const decipher = crypto.createDecipheriv('aes-256-gcm', this.SecretKey, iv);
-        decipher.setAuthTag(authTag);
-        
-        const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
-        return JSON.parse(decrypted.toString('utf8')) as T;
-    }
-
-
-    private base64urlEncode(buffer: Buffer): string {
-        return buffer.toString('base64')
-            .replace(/\+/g, '-')
-            .replace(/\//g, '_')
-            .replace(/=+$/, '');
-    }
-    
-    private base64urlDecode(str: string): Buffer {
-        str = str.replace(/-/g, '+').replace(/_/g, '/');
-        while (str.length % 4 !== 0) {
-            str += '=';
-        }
-        return Buffer.from(str, 'base64');
-    }
-}

package/src/clients/StringClient.ts

@@ -1,19 +0,0 @@
-import { randomBytes } from 'crypto';
-import StringUtil from '../Utils/StringUtil';
-
-export class StringClient {
-    constructor() { }
-
-    public generateUUIDv7(): string {
-        const timestamp = BigInt(Date.now()) * BigInt(10000) + BigInt(process.hrtime.bigint() % BigInt(10000));
-        const timeHex = timestamp.toString(16).padStart(16, '0');
-    
-        const randomHex = randomBytes(8).toString('hex');
-    
-        return `${timeHex.slice(0, 8)}-${timeHex.slice(8, 12)}-7${timeHex.slice(13, 16)}-${randomHex.slice(0, 4)}-${randomHex.slice(4)}`;
-    }
-
-    public isUUID(value: any) {
-        return StringUtil.isUUID(value);
-    }
-}

package/src/cron/BaseCron.ts

@@ -1,122 +0,0 @@
-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 {
-
-    protected readonly isTest: boolean = process.env.NODE_ENV === 'test';
-    protected dbUser?: string = this.isTest ? process.env.TEST_DB_USER : process.env.DB_USER;
-    protected dbHost?: string = this.isTest ? process.env.TEST_DB_HOST : process.env.DB_HOST;
-    protected dbName?: string = this.isTest ? process.env.TEST_DB_DATABASE : process.env.DB_DATABASE;
-    protected dbPassword?: string = this.isTest ? process.env.TEST_DB_PASSWORD : process.env.DB_PASSWORD;
-    protected dbPort?: string | number = this.isTest ? process.env.TEST_DB_PORT : process.env.DB_PORT;
-    protected dbIsSslConnect: boolean = (this.isTest ? process.env.TEST_DB_IS_SSL : process.env.DB_IS_SSL) === 'true';
-
-    private isExecuteRollback: boolean = false;
-    private pool?: Pool;
-    private client?: PoolClient;
-    protected get Client(): PoolClient { 
-        if (this.client === undefined) {
-            throw new Error("Please call this.PoolClient after using the setClient method.");
-        }
-        return this.client;
-    }
-
-    protected async commit(): Promise<void> {
-        await this.Client.query('COMMIT');
-        this.isExecuteRollback = false;
-    }
-
-    protected async rollback(): Promise<void> {
-        if (this.isExecuteRollback) {
-            await this.Client.query('ROLLBACK');
-        }
-        this.isExecuteRollback = false;
-    }
-
-    // **********************************************************************
-    // こちらのメソッド、プロパティを各サブクラスで設定してください
-    // **********************************************************************
-    protected cronCode: string = '';
-    protected minute: MinuteSecondType | '*' = '*';
-    protected hour: HourType | '*' = '*';
-    protected date: DateType | '*' = '*';
-    protected month: MonthType | '*' = '*';
-    protected day: DayType | '*' = '*';
-    public async run() { }
-
-    // **********************************************************************
-    // ベースクラスで設定
-    // **********************************************************************
-    get CronSchedule(): string {
-        let schedule = '';
-        schedule += this.minute.toString() + ' ';
-        schedule += this.hour.toString() + ' ';
-        schedule += this.date.toString() + ' ';
-        schedule += this.month.toString() + ' ';
-        schedule += this.day.toString();
-        return schedule;
-    }
-    get CronCode(): string { return this.cronCode; }
-
-    public async setUp() {
-        if (this.dbUser === undefined) {
-            throw new Error("Database user is not configured");
-        }
-        if (this.dbHost === undefined) {
-            throw new Error("Database host is not configured");
-        }
-        if (this.dbName === undefined) {
-            throw new Error("Database name is not configured");
-        }
-        if (this.dbPassword === undefined) {
-            throw new Error("Database password is not configured");
-        }
-        if (this.dbPort === undefined) {
-            throw new Error("Database port is not configured");
-        }
-
-        this.pool = PoolManager.getPool(this.dbUser, this.dbHost, this.dbName, this.dbPassword, this.dbPort, this.dbIsSslConnect);
-        this.pool.query(`SET TIME ZONE '${process.env.TZ ?? 'Asia/Tokyo'}';`);
-        this.client = await this.pool.connect();
-        await this.Client.query('BEGIN');
-        this.isExecuteRollback = true;
-    }
-
-    public async tearDown() {
-        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;
-    }
-}

package/src/cron/CronExecuter.ts

@@ -1,34 +0,0 @@
-const cron = require('node-cron');
-import fs from 'fs';
-import path from 'path';
-import { BaseCron } from "./BaseCron";
-
-export const runCron = async (dir: string, logCallback?: (ex: Error) => Promise<void>) => {
-    const files = fs.readdirSync(dir);
-    for (let file of files) {
-        if (['BaseCron.ts'].includes(file)) {
-            continue;
-        }
-
-        const filePath = path.join(dir, file);
-        const module = await import(filePath);
-        const cronClass = module.default;
-        const cronInstance: BaseCron = new cronClass();
-
-        cron.schedule(cronInstance.CronSchedule, async () => {
-            try {
-                await cronInstance.setUp();
-                await cronInstance.run();
-            } catch (ex: unknown) {
-                if (logCallback !== undefined && ex instanceof Error) {
-                    await logCallback(ex).
-                        catch(() => {
-                            // ログ送信時にエラーになっても握りつぶす
-                        });
-                }
-            } finally {
-                await cronInstance.tearDown();
-            }
-        });
-    }
-}

package/src/cron/CronType.ts

@@ -1,25 +0,0 @@
-export type DayType = 
-         1 |  2 |  3 |  4 |  5 |  6 |  7
-
-export type MonthType = 
-         1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 
-   10 | 11 | 12
-
-export type DateType = 
-         1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 
-   10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 |
-   20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 
-   30 | 31
-
-export type HourType = 
-     0 |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 
-    10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 |
-    20 | 21 | 22 | 23
-
-export type MinuteSecondType = 
-    0 |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 
-   10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 |
-   20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 
-   30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 |
-   40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 |
-   50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59