@ingestkorea/client-sens 1.6.0 → 1.8.0

package/dist-es/commands/SendAlimtalkCommand.js

@@ -1,44 +1,52 @@
-import { SensCommand } from "../models";
-import { serializeIngestkorea_restJson_SendAlimtalkCommand, deserializeIngestkorea_restJson_SendAlimtalkCommand, } from "../protocols/SendAlimtalk";
-import { IngestkoreaError } from "@ingestkorea/util-error-handler";
-export class SendAlimtalkCommand extends SensCommand {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendAlimtalkCommand = void 0;
+const index_js_1 = require("../models/index.js");
+const SendAlimtalk_js_1 = require("../protocols/SendAlimtalk.js");
+class SendAlimtalkCommand extends index_js_1.SensCommand {
     constructor(input) {
         super(input);
         this.input = {
-            ...input,
             plusFriendId: input.plusFriendId,
             templateCode: input.templateCode,
-            messages: input.messages.map(resolveAlimtalkMessage),
+            messages: resolveAlimtalkMessages(input.messages, {
+                maxRecipients: index_js_1.ALIMTALK_MAX_RECIPIENTS,
+                maxContentLength: index_js_1.ALIMTALK_MAX_CONTENT_LENGTH,
+            }),
         };
-    }
-    async serialize(input, config) {
-        if (!config.serviceId.kakao)
-            throw new IngestkoreaError({
-                code: 400,
-                type: "Bad Request",
-                message: "Invalid Params",
-                description: "Please Check Kakao ServiceId",
-            });
-        let request = await serializeIngestkorea_restJson_SendAlimtalkCommand(input, config);
-        return request;
-    }
-    async deserialize(response) {
-        let output = await deserializeIngestkorea_restJson_SendAlimtalkCommand(response);
-        return output;
+        this.serializer = SendAlimtalk_js_1.se_SendAlimtalkCommand;
+        this.deserializer = SendAlimtalk_js_1.de_SendAlimtalkCommand;
     }
 }
-const resolveAlimtalkMessage = (message) => {
-    const ALIMTALK_MAX = 1000;
-    if (message.content.length > ALIMTALK_MAX)
-        throw new IngestkoreaError({
+exports.SendAlimtalkCommand = SendAlimtalkCommand;
+const resolveAlimtalkMessages = (messages, config) => {
+    if (!messages.length || messages.length > config.maxRecipients) {
+        throw new index_js_1.SensError({
             code: 400,
             type: "Bad Request",
-            message: "Invalid Params",
-            description: `Maximum message length is ${ALIMTALK_MAX}`,
+            message: "알림톡 동시 발송 범위 오류",
+            invalidInputs: [
+                {
+                    type: "not-valid.args",
+                    message: `메세지 동시 발송은 최소 1명, 최대 ${config.maxRecipients}명까지 가능합니다.`,
+                },
+            ],
         });
-    return {
-        to: message.to.replace(/\-/gi, ""),
-        content: message.content,
-        ...(message.buttons != undefined && { buttons: message.buttons }),
-    };
+    }
+    const result = messages.map((message) => {
+        if (message.content.length > config.maxContentLength) {
+            throw new index_js_1.SensError({
+                code: 400,
+                type: "Bad Request",
+                message: "알림톡 최대 길이 초과",
+                invalidInputs: [{ type: "not-valid.args", message: `메세지 최대 길이는 ${config.maxContentLength}글자입니다` }],
+            });
+        }
+        return {
+            to: message.to.replace(/\-/gi, ""),
+            content: message.content,
+            ...(message.buttons && message.buttons.length && { buttons: message.buttons }),
+        };
+    });
+    return result;
 };

package/dist-es/commands/SendMMSCommand.js

@@ -1,119 +1,89 @@
-import { SensCommand } from "../models";
-import { serializeIngestkorea_restJson_SendMMSCommand, deserializeIngestkorea_restJson_SendMMSCommand, } from "../protocols/SendMMS";
-import { IngestkoreaError } from "@ingestkorea/util-error-handler";
-import { LMS_MAX, MMS_FILE_MAX, trimText, prettyPhoneNum, getContentLength } from "./constants";
-import { parse } from "node:path";
-import { randomUUID } from "node:crypto";
-import { readFileSync, existsSync } from "node:fs";
-export class SendMMSCommand extends SensCommand {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendMMSCommand = void 0;
+const node_path_1 = require("node:path");
+const node_crypto_1 = require("node:crypto");
+const node_fs_1 = require("node:fs");
+const index_js_1 = require("../models/index.js");
+const SendMMS_js_1 = require("../protocols/SendMMS.js");
+const constants_1 = require("./constants");
+const SendSMSCommand_js_1 = require("./SendSMSCommand.js");
+class SendMMSCommand extends index_js_1.SensCommand {
     constructor(input) {
         super(input);
+        const content = input.content ? (0, constants_1.trimText)(input.content) : "내용없음";
+        const subject = input.subject ? (0, constants_1.trimText)(input.subject) : "제목없음";
+        const messages = (0, SendSMSCommand_js_1.resolveInputMessages)(input.messages, { defaultContent: content, defaultSubject: subject });
         this.input = {
-            ...input,
-            from: prettyPhoneNum(input.from),
-            content: resolveInputContent(input.content),
-            type: resolveInputMessageType(input.type),
-            messages: resolveInputMessages(input.messages),
-            files: resolveInputFiles(input.files),
+            from: (0, constants_1.prettyPhoneNum)(input.from),
+            content,
+            messages,
+            type: "MMS",
+            contentType: input.contentType ? input.contentType : "COMM",
+            countryCode: input.countryCode ? input.countryCode : "82",
+            subject,
+            files: (input.files || []).map((file) => {
+                return resolveSendFile(file, { maxKiB: index_js_1.MMS_MAX_SUPPORT_FILE_SIZE, supportExt: index_js_1.MMS_SUPPORT_FILE_EXTENSION });
+            }),
         };
-    }
-    async serialize(input, config) {
-        if (!config.serviceId.sms)
-            throw new IngestkoreaError({
-                code: 400,
-                type: "Bad Request",
-                message: "Invalid Params",
-                description: "Please Check SMS ServiceId",
-            });
-        let request = await serializeIngestkorea_restJson_SendMMSCommand(input, config);
-        return request;
-    }
-    async deserialize(response) {
-        let output = await deserializeIngestkorea_restJson_SendMMSCommand(response);
-        return output;
+        this.serializer = SendMMS_js_1.se_SendMMSCommand;
+        this.deserializer = SendMMS_js_1.de_SendMMSCommand;
     }
 }
-const resolveInputContent = (content) => {
-    const resolvedContent = trimText(content);
-    const contentLength = getContentLength(resolvedContent);
-    if (!contentLength)
-        throw new IngestkoreaError({
+exports.SendMMSCommand = SendMMSCommand;
+const resolveSendFile = (file, options) => {
+    const parsed = (0, node_path_1.parse)(file.name); // { dir, name, ext, base }
+    const ext = parsed.ext.toLocaleLowerCase();
+    if (!options.supportExt.includes(ext)) {
+        throw new index_js_1.SensError({
             code: 400,
             type: "Bad Request",
-            message: "Invalid Request",
-            description: `Please check input message`,
+            message: "지원하지 않는 확장자입니다.",
+            invalidInputs: [
+                { type: "not-valid.args", message: `${options.supportExt.join(", ")} 형식의 첨부파일만 지원합니다.` },
+            ],
         });
-    if (contentLength > LMS_MAX)
-        throw new IngestkoreaError({
+    }
+    if (file.body) {
+        const buffer = Buffer.from(file.body, "base64");
+        checkSizeLimit(buffer, options.maxKiB);
+        const hash = (0, node_crypto_1.createHash)("md5").update(buffer).digest("hex");
+        return {
+            name: (0, node_path_1.format)({ name: hash, ext }),
+            body: file.body,
+        };
+    }
+    if (!(0, node_fs_1.existsSync)(file.name)) {
+        throw new index_js_1.SensError({
             code: 400,
             type: "Bad Request",
-            message: "Invalid Request",
-            description: `Maximum message length is ${LMS_MAX}bytes`,
+            message: "파일이 존재하지 않습니다.",
+            invalidInputs: [{ type: "not-valid.args", message: `${file.name} 파일이 존재하지 않습니다.` }],
         });
-    return resolvedContent;
-};
-const resolveInputMessages = (messages) => messages.map((message) => {
+    }
+    const buffer = (0, node_fs_1.readFileSync)(file.name);
+    checkSizeLimit(buffer, options.maxKiB);
+    const hash = (0, node_crypto_1.createHash)("md5").update(buffer).digest("hex");
     return {
-        to: prettyPhoneNum(message.to),
-        ...(message.content != undefined && { content: resolveInputContent(message.content) }),
-        ...(message.subject != undefined && { subject: trimText(message.subject) }),
+        name: (0, node_path_1.format)({ name: hash, ext }),
+        body: buffer.toString("base64"),
     };
-});
-const resolveInputMessageType = (type) => {
-    if (type == "SMS" || type == "LMS")
-        throw new IngestkoreaError({
-            code: 400,
-            type: "Bad Request",
-            message: "Invalid Request",
-            description: `Please Call SendSMSCommand`,
-        });
-    return "MMS";
 };
-const resolveInputFiles = (files) => {
-    if (!files.length)
-        throw new IngestkoreaError({
+const checkSizeLimit = (buffer, maxKiB) => {
+    const byteSize = buffer.length;
+    const kibSize = Math.ceil(byteSize / 1024);
+    if (kibSize > maxKiB) {
+        throw new index_js_1.SensError({
             code: 400,
             type: "Bad Request",
-            message: "Invalid Request",
-            description: `Please Check Input Files`,
+            message: `최대 첨부가능 용량이 초과되었습니다.`,
+            invalidInputs: [
+                {
+                    type: "not-valid.args",
+                    message: `최대 ${maxKiB}KiB까지 전송 가능합니다. 현재 ${kibSize}KiB`,
+                },
+            ],
         });
-    const output = files.map((file) => {
-        const resolvedFileName = verifyFileName(file.name);
-        const resolvedFileBody = file.body != undefined ? file.body : getFileBody(file.name);
-        let byte = Buffer.from(resolvedFileBody, "base64").length;
-        let kib = Math.ceil(byte / 1024);
-        if (kib > MMS_FILE_MAX)
-            throw new IngestkoreaError({
-                code: 400,
-                type: "Bad Request",
-                message: "Invalid Request",
-                description: `Input File is ${kib}KiByte. Maximum File Size is ${MMS_FILE_MAX}Kibyte`,
-            });
-        return { name: resolvedFileName, body: resolvedFileBody };
-    });
-    return output;
-};
-const verifyFileName = (fileName) => {
-    let { ext } = parse(fileName);
-    const uuid = randomUUID();
-    const extension = ext.replace(/jpeg|jpg/gi, "jpg");
-    if (extension != ".jpg")
-        throw new IngestkoreaError({
-            code: 400,
-            type: "Bad Request",
-            message: "Invalid Request",
-            description: `File Extension is not .jpg or .jpeg`,
-        });
-    return [uuid, extension].join("");
-};
-/** @returns base64 */
-const getFileBody = (fileName) => {
-    if (!existsSync(fileName))
-        throw new IngestkoreaError({
-            code: 400,
-            type: "Bad Request",
-            message: "Invalid Request",
-            description: `${fileName} does not exist.`,
-        });
-    return readFileSync(fileName, { encoding: "base64" });
+    }
+    return;
 };

package/dist-es/commands/SendSMSCommand.js

@@ -1,80 +1,65 @@
-import { SensCommand } from "../models";
-import { serializeIngestkorea_restJson_SendSMSCommand, deserializeIngestkorea_restJson_SendSMSCommand, } from "../protocols/SendSMS";
-import { IngestkoreaError } from "@ingestkorea/util-error-handler";
-import { SMS_MAX, LMS_MAX, trimText, prettyPhoneNum, getContentLength } from "./constants";
-export class SendSMSCommand extends SensCommand {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveInputMessages = exports.SendSMSCommand = void 0;
+const index_js_1 = require("../models/index.js");
+const SendSMS_js_1 = require("../protocols/SendSMS.js");
+const constants_1 = require("./constants");
+class SendSMSCommand extends index_js_1.SensCommand {
     constructor(input) {
         super(input);
-        const { content, messageType: defaultMessageType } = resolveInputContent(input.content);
-        const { messages, messageType: childMessageType } = resolveInputMessages(input.messages);
+        const content = input.content ? (0, constants_1.trimText)(input.content) : "내용없음";
+        const subject = input.subject ? (0, constants_1.trimText)(input.subject) : "제목없음";
+        const messages = (0, exports.resolveInputMessages)(input.messages, { defaultContent: content, defaultSubject: subject });
+        const isLMS = !!messages.filter((msg) => !!msg.subject).length;
         this.input = {
-            ...input,
-            from: prettyPhoneNum(input.from),
-            content: content,
-            type: defaultMessageType === childMessageType ? defaultMessageType : "LMS",
-            messages: messages,
+            from: (0, constants_1.prettyPhoneNum)(input.from),
+            content,
+            messages,
+            type: isLMS ? "LMS" : "SMS",
+            contentType: input.contentType ? input.contentType : "COMM",
+            countryCode: input.countryCode ? input.countryCode : "82",
+            ...(isLMS && { subject }),
         };
-    }
-    async serialize(input, config) {
-        if (!config.serviceId.sms)
-            throw new IngestkoreaError({
-                code: 400,
-                type: "Bad Request",
-                message: "Invalid Params",
-                description: "Please Check SMS ServiceId",
-            });
-        let request = await serializeIngestkorea_restJson_SendSMSCommand(input, config);
-        return request;
-    }
-    async deserialize(response) {
-        let output = await deserializeIngestkorea_restJson_SendSMSCommand(response);
-        return output;
+        this.serializer = SendSMS_js_1.se_SendSMSCommand;
+        this.deserializer = SendSMS_js_1.de_SendSMSCommand;
     }
 }
+exports.SendSMSCommand = SendSMSCommand;
+const resolveInputMessages = (messages, config) => {
+    const output = messages
+        .filter((d) => !!d)
+        .map((message) => {
+        const content = message.content ? (0, constants_1.trimText)(message.content) : config.defaultContent;
+        const subject = message.subject ? (0, constants_1.trimText)(message.subject) : config.defaultSubject;
+        const msgType = getMessageType({ content });
+        return {
+            to: (0, constants_1.prettyPhoneNum)(message.to),
+            content,
+            ...(msgType === "LMS" && { subject }),
+        };
+    });
+    return output;
+};
+exports.resolveInputMessages = resolveInputMessages;
 const getMessageType = (input) => {
-    const contentLength = getContentLength(input);
-    if (!contentLength)
-        throw new IngestkoreaError({
+    const SMS_MAX_CONTENT_LENGTH = 90;
+    const LMS_MAX_CONTENT_LENGTH = 2000;
+    const contentLength = (0, constants_1.getContentLength)(input.content);
+    if (!contentLength) {
+        throw new index_js_1.SensError({
             code: 400,
             type: "Bad Request",
-            message: "Invalid Request",
-            description: `Please check input message`,
+            message: "메세지 내용이 없습니다.",
+            invalidInputs: [{ type: "not-valid.args", message: "메세지 내용을 확인해주세요." }],
         });
-    if (contentLength > LMS_MAX)
-        throw new IngestkoreaError({
+    }
+    if (contentLength > LMS_MAX_CONTENT_LENGTH) {
+        throw new index_js_1.SensError({
             code: 400,
             type: "Bad Request",
-            message: "Invalid Request",
-            description: `Maximum message length is ${LMS_MAX}bytes`,
+            message: "메세지 최대 크기 초과",
+            invalidInputs: [{ type: "not-valid.args", message: `메세지 최대 길이는 ${LMS_MAX_CONTENT_LENGTH}글자입니다` }],
         });
-    return contentLength > SMS_MAX ? "LMS" : "SMS";
-};
-const resolveInputContent = (content) => {
-    const resolvedContent = trimText(content);
-    const messageType = getMessageType(resolvedContent);
-    return {
-        content: resolvedContent,
-        messageType: messageType,
-    };
-};
-const resolveInputMessages = (messages) => {
-    let init = {
-        messages: [],
-        messageType: "SMS",
-    };
-    const output = messages.reduce((acc, message) => {
-        const to = prettyPhoneNum(message.to);
-        const content = message.content != undefined ? trimText(message.content) : undefined;
-        const subject = message.subject != undefined ? trimText(message.subject) : undefined;
-        const messageType = content != undefined ? getMessageType(content) : "SMS";
-        if (messageType == "LMS")
-            acc.messageType = messageType;
-        acc.messages.push({
-            to: to,
-            ...(content != undefined && { content: content }),
-            ...(subject != undefined && acc.messageType === "LMS" && { subject: subject }),
-        });
-        return acc;
-    }, init);
-    return output;
+    }
+    return contentLength > SMS_MAX_CONTENT_LENGTH ? "LMS" : "SMS";
 };

package/dist-es/commands/constants.js

@@ -1,10 +1,12 @@
-export const SMS_MAX = 90;
-export const LMS_MAX = 2000;
-export const MMS_FILE_MAX = 300; // KiByte
-export const trimText = (input) => input.trim();
-export const prettyPhoneNum = (input) => input.replace(/\-/gi, "");
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContentLength = exports.prettyPhoneNum = exports.trimText = void 0;
+const trimText = (input) => input.trim();
+exports.trimText = trimText;
+const prettyPhoneNum = (input) => input.replace(/\-/gi, "");
+exports.prettyPhoneNum = prettyPhoneNum;
 /** @returns content-length(euc-kr) */
-export const getContentLength = (input) => {
+const getContentLength = (input) => {
     return input.split("").reduce((acc, text) => {
         let byte = Buffer.from(text).length;
         let modulo = byte % 3;
@@ -12,3 +14,4 @@ export const getContentLength = (input) => {
         return acc;
     }, 0);
 };
+exports.getContentLength = getContentLength;

package/dist-es/commands/index.js

@@ -1,10 +1,27 @@
-export * from "./SendAlimtalkCommand";
-export * from "./GetAlimtalkStatusCommand";
-export * from "./GetAlimtalkResultCommand";
-export * from "./GetAlimtalkTemplateCommand";
-export * from "./ListAlimtalkTemplatesCommand";
-export * from "./ListAlimtalkChannelsCommand";
-export * from "./SendSMSCommand";
-export * from "./SendMMSCommand";
-export * from "./GetSMSStatusCommand";
-export * from "./GetSMSResultCommand";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./GetAlimtalkResultCommand.js"), exports);
+__exportStar(require("./GetAlimtalkStatusCommand.js"), exports);
+__exportStar(require("./GetAlimtalkTemplateCommand.js"), exports);
+__exportStar(require("./GetSMSResultCommand.js"), exports);
+__exportStar(require("./GetSMSStatusCommand.js"), exports);
+__exportStar(require("./ListAlimtalkChannelsCommand.js"), exports);
+__exportStar(require("./ListAlimtalkStatusCommand.js"), exports);
+__exportStar(require("./ListAlimtalkTemplatesCommand.js"), exports);
+__exportStar(require("./SendAlimtalkCommand.js"), exports);
+__exportStar(require("./SendMMSCommand.js"), exports);
+__exportStar(require("./SendSMSCommand.js"), exports);

package/dist-es/index.js

@@ -1,2 +1,18 @@
-export * from "./commands";
-export * from "./SensClient";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./commands/index.js"), exports);
+__exportStar(require("./SensClient.js"), exports);

package/dist-es/middleware/constants.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NCP_SIGNATURE = exports.NCP_TIMESTAMP = exports.NCP_ACCESS_KEY = exports.INGESTKOREA_RETRY_DELAY = exports.INGESTKOREA_RETRY = exports.INGESTKOREA_REQUEST_LOG = exports.INGESTKOREA_USER_AGENT = void 0;
+exports.INGESTKOREA_USER_AGENT = "x-ingestkorea-user-agent";
+exports.INGESTKOREA_REQUEST_LOG = "x-ingestkorea-request";
+exports.INGESTKOREA_RETRY = "x-ingestkorea-attempts";
+exports.INGESTKOREA_RETRY_DELAY = "x-ingestkorea-total-retry-delay";
+exports.NCP_ACCESS_KEY = "x-ncp-iam-access-key";
+exports.NCP_TIMESTAMP = "x-ncp-apigw-timestamp";
+exports.NCP_SIGNATURE = "x-ncp-apigw-signature-v2";

package/dist-es/middleware/index.js

@@ -1,4 +1,19 @@
-export * from "./middleware-sign";
-export * from "./middleware-metadata";
-export * from "./middleware-retry";
-export * from "./middleware-sort-headers";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./middleware-metadata.js"), exports);
+__exportStar(require("./middleware-retry.js"), exports);
+__exportStar(require("./middleware-sign.js"), exports);

package/dist-es/middleware/middleware-metadata.js

@@ -1,6 +1,12 @@
-const REQUEST_HEADER = "x-ingestkorea-request";
-export const middlewareIngestkoreaMetadata = async (request, config) => {
-    request.headers["x-ingestkorea-user-agent"] = "@ingestkorea/client-sens/1.6.x";
-    request.headers[REQUEST_HEADER] = "attempt=1";
-    return request;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.middlewareIngestkoreaMetadata = void 0;
+const constants_js_1 = require("./constants.js");
+const middlewareIngestkoreaMetadata = (next) => async (input, context) => {
+    input.request.headers = {
+        ...input.request.headers,
+        [constants_js_1.INGESTKOREA_USER_AGENT]: "@ingestkorea/client-sens/1.8.x",
+    };
+    return next(input, context);
 };
+exports.middlewareIngestkoreaMetadata = middlewareIngestkoreaMetadata;

package/dist-es/middleware/middleware-retry.js

@@ -1,51 +1,60 @@
-import { IngestkoreaError } from "@ingestkorea/util-error-handler";
-const REQUEST_HEADER = "x-ingestkorea-request";
-export const middlewareRetry = async (request, config, handler) => {
-    const maxAttempts = 3;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.middlewareRetry = void 0;
+const util_error_handler_1 = require("@ingestkorea/util-error-handler");
+const constants_js_1 = require("./constants.js");
+const middlewareRetry = (next) => async (input, context) => {
+    var _a, _b;
+    var _c;
+    const MAX_RETRIES = 3;
+    const BASE_DELAY_MS = 500;
+    const MAX_DELAY_MS = 5000;
     let attempts = 0;
     let totalRetryDelay = 0;
-    let lastError = new IngestkoreaError({
+    (_a = (_c = input.request).headers) !== null && _a !== void 0 ? _a : (_c.headers = {});
+    let lastError = new util_error_handler_1.IngestkoreaError({
         code: 400,
         type: "Bad Request",
         message: "Invalid Request",
-        description: { attempts, maxAttempts, totalRetryDelay },
+        description: { attempts, maxRetries: MAX_RETRIES, totalRetryDelay },
     });
-    while (true) {
+    while (attempts < MAX_RETRIES) {
+        const attemptNo = attempts + 1;
+        const requestLog = `attempt=${attemptNo}; max=${MAX_RETRIES}; totalRetryDelay=${totalRetryDelay}`;
+        input.request.headers[constants_js_1.INGESTKOREA_REQUEST_LOG] = requestLog;
         try {
-            request.headers[REQUEST_HEADER] = `attempt=${attempts + 1}; max=${maxAttempts}; totalRetryDelay=${totalRetryDelay}`;
-            let { response } = await handler.handle(request);
-            return {
-                output: {
-                    $metadata: {
-                        attempts: attempts + 1,
-                        totalRetryDelay: totalRetryDelay,
-                    },
-                },
-                response,
-            };
+            const { response } = await next(input, context);
+            response.headers[constants_js_1.INGESTKOREA_RETRY] = attemptNo.toString();
+            response.headers[constants_js_1.INGESTKOREA_RETRY_DELAY] = totalRetryDelay.toString();
+            return { response };
         }
-        catch (err) {
+        catch (error) {
             attempts++;
-            if (attempts == maxAttempts) {
-                lastError.error.description.attempts = attempts;
-                throw lastError;
-            }
-            const delay = attempts * 1000;
-            totalRetryDelay += delay;
-            lastError.error.description = { attempts, maxAttempts, totalRetryDelay };
-            if (err instanceof IngestkoreaError) {
+            lastError.error.description = { attempts, maxRetries: MAX_RETRIES, totalRetryDelay };
+            if (error instanceof util_error_handler_1.IngestkoreaError) {
                 lastError.error.description = {
                     ...lastError.error.description,
-                    detail: err.error.description,
+                    detail: error.error.description,
                 };
             }
-            if (err instanceof Error) {
+            else {
                 lastError.error.description = {
                     ...lastError.error.description,
-                    detail: err.message,
+                    detail: String((_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error),
                 };
             }
+            if (attempts >= MAX_RETRIES) {
+                lastError.error.description = { attempts, maxRetries: MAX_RETRIES, totalRetryDelay };
+                throw lastError;
+            }
+            const exp = BASE_DELAY_MS * 2 ** (attempts - 1);
+            const capped = Math.min(MAX_DELAY_MS, exp);
+            const delay = Math.floor(Math.random() * capped);
+            totalRetryDelay += delay;
+            lastError.error.description = { attempts, maxRetries: MAX_RETRIES, totalRetryDelay };
             await new Promise((resolve) => setTimeout(resolve, delay));
         }
     }
+    throw lastError;
 };
+exports.middlewareRetry = middlewareRetry;