@ingestkorea/client-sens 1.4.0 → 1.4.1

package/.github/pull_request_template.md

@@ -0,0 +1,14 @@
+### Issue
+Issue number, if available, prefixed with "#"
+
+### Description
+What does this implement/fix? Explain your changes.
+
+### Testing
+How was this change tested?
+
+### Additional context
+Add any other context about the PR here.
+
+---
+By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

package/README.md

@@ -83,14 +83,17 @@ let command = new SendAlimtalkCommand(params);
 ```ts
 /**
  * Automatically set message type('SMS' | 'LMS') according to content-length(euc-kr)
- * SMS: max 80bytes
+ * SMS: max 90bytes
  * LMS: max 2000bytes
  */
 let params: SendSMSCommandInput = {
   from: '01012345678',
-  content: CONTENT,
+  content: DEFAULT_CONTENT,
   messages: [
-    { to: '01087654321' }
+    {
+      to: '01087654321',
+      content: OPTIONAL_CONTENT // optional // this OPTIONAL_CONTENT override above DEFAULT_CONTENT
+    }
   ]
 };
 let command = new SendSMSCommand(params);

package/dist-cjs/commands/SendSMSCommand.js

@@ -18,11 +18,10 @@ const util_error_handler_1 = require("@ingestkorea/util-error-handler");
 class SendSMSCommand extends models_1.SensCommand {
     constructor(input) {
         super(input);
-        const content = textTrimming(input.content);
-        const messageType = messageTypeChecker(content);
-        this.input = Object.assign(Object.assign({}, input), { from: phoneNumPretty(input.from), content: content, type: input.type === messageType ? input.type : messageType, messages: input.messages.map(message => {
-                return Object.assign(Object.assign({ to: phoneNumPretty(message.to) }, (message.content != undefined && { content: textTrimming(message.content) })), (message.subject != undefined && messageType === 'LMS' && { subject: textTrimming(message.subject) }));
-            }) });
+        const content = trimText(input.content);
+        const { messages, messageType: childMessageType } = resolveInputMessages(input.messages);
+        const messageType = childMessageType == 'LMS' ? childMessageType : checkMessageType(content);
+        this.input = Object.assign(Object.assign({}, input), { from: prettyPhoneNum(input.from), content: content, type: messageType, messages: messages });
     }
     ;
     serialize(input, config) {
@@ -46,25 +45,41 @@ class SendSMSCommand extends models_1.SensCommand {
 }
 exports.SendSMSCommand = SendSMSCommand;
 ;
-const textTrimming = (input) => input.trim();
-const phoneNumPretty = (input) => input.replace(/\-/gi, "");
-const messageTypeChecker = (input) => {
-    const MAXIMUM = 2000;
-    const euckrByte = input.split('').reduce((acc, text) => {
+const trimText = (input) => input.trim();
+const prettyPhoneNum = (input) => input.replace(/\-/gi, "");
+const getTextBytes = (input) => {
+    return input.split('').reduce((acc, text) => {
         let byte = Buffer.from(text).length;
         let modulo = byte % 3;
         modulo ? acc += 1 : acc += 2;
         return acc;
     }, 0);
-    if (!euckrByte)
+};
+const checkMessageType = (input) => {
+    const SMS_MAX = 90;
+    const LMS_MAX = 2000;
+    const euckrBytes = getTextBytes(input);
+    if (!euckrBytes)
         throw new util_error_handler_1.IngestkoreaError({
             code: 400, type: 'Bad Request',
             message: 'Invalid Request', description: `Please check input message`
         });
-    if (euckrByte > MAXIMUM)
+    if (euckrBytes > LMS_MAX)
         throw new util_error_handler_1.IngestkoreaError({
             code: 400, type: 'Bad Request',
-            message: 'Invalid Request', description: `Maximum message length is ${MAXIMUM}bytes`
+            message: 'Invalid Request', description: `Maximum message length is ${LMS_MAX}bytes`
         });
-    return euckrByte > 80 ? 'LMS' : 'SMS';
+    return euckrBytes > SMS_MAX ? 'LMS' : 'SMS';
+};
+const resolveInputMessages = (messages) => {
+    let resolvedMessageType = 'SMS';
+    let resolvedMessages = messages.map(message => {
+        const resolvedContent = message.content != undefined ? trimText(message.content) : '';
+        const resolvedSubject = message.subject != undefined ? trimText(message.subject) : '';
+        const messageType = !!resolvedContent != false ? checkMessageType(resolvedContent) : 'SMS';
+        if (messageType === 'LMS')
+            resolvedMessageType = messageType;
+        return Object.assign(Object.assign({ to: prettyPhoneNum(message.to) }, (!!resolvedContent != false && { content: resolvedContent })), (!!resolvedSubject != false && messageType === 'LMS' && { subject: resolvedSubject }));
+    });
+    return { messages: resolvedMessages, messageType: resolvedMessageType };
 };

package/dist-es/commands/SendSMSCommand.js

@@ -6,20 +6,15 @@ import { IngestkoreaError } from '@ingestkorea/util-error-handler';
 export class SendSMSCommand extends SensCommand {
     constructor(input) {
         super(input);
-        const content = textTrimming(input.content);
-        const messageType = messageTypeChecker(content);
+        const content = trimText(input.content);
+        const { messages, messageType: childMessageType } = resolveInputMessages(input.messages);
+        const messageType = childMessageType == 'LMS' ? childMessageType : checkMessageType(content);
         this.input = {
             ...input,
-            from: phoneNumPretty(input.from),
+            from: prettyPhoneNum(input.from),
             content: content,
-            type: input.type === messageType ? input.type : messageType,
-            messages: input.messages.map(message => {
-                return {
-                    to: phoneNumPretty(message.to),
-                    ...(message.content != undefined && { content: textTrimming(message.content) }),
-                    ...(message.subject != undefined && messageType === 'LMS' && { subject: textTrimming(message.subject) }),
-                };
-            })
+            type: messageType,
+            messages: messages
         };
     }
     ;
@@ -39,25 +34,45 @@ export class SendSMSCommand extends SensCommand {
     ;
 }
 ;
-const textTrimming = (input) => input.trim();
-const phoneNumPretty = (input) => input.replace(/\-/gi, "");
-const messageTypeChecker = (input) => {
-    const MAXIMUM = 2000;
-    const euckrByte = input.split('').reduce((acc, text) => {
+const trimText = (input) => input.trim();
+const prettyPhoneNum = (input) => input.replace(/\-/gi, "");
+const getTextBytes = (input) => {
+    return input.split('').reduce((acc, text) => {
         let byte = Buffer.from(text).length;
         let modulo = byte % 3;
         modulo ? acc += 1 : acc += 2;
         return acc;
     }, 0);
-    if (!euckrByte)
+};
+const checkMessageType = (input) => {
+    const SMS_MAX = 90;
+    const LMS_MAX = 2000;
+    const euckrBytes = getTextBytes(input);
+    if (!euckrBytes)
         throw new IngestkoreaError({
             code: 400, type: 'Bad Request',
             message: 'Invalid Request', description: `Please check input message`
         });
-    if (euckrByte > MAXIMUM)
+    if (euckrBytes > LMS_MAX)
         throw new IngestkoreaError({
             code: 400, type: 'Bad Request',
-            message: 'Invalid Request', description: `Maximum message length is ${MAXIMUM}bytes`
+            message: 'Invalid Request', description: `Maximum message length is ${LMS_MAX}bytes`
         });
-    return euckrByte > 80 ? 'LMS' : 'SMS';
+    return euckrBytes > SMS_MAX ? 'LMS' : 'SMS';
+};
+const resolveInputMessages = (messages) => {
+    let resolvedMessageType = 'SMS';
+    let resolvedMessages = messages.map(message => {
+        const resolvedContent = message.content != undefined ? trimText(message.content) : '';
+        const resolvedSubject = message.subject != undefined ? trimText(message.subject) : '';
+        const messageType = !!resolvedContent != false ? checkMessageType(resolvedContent) : 'SMS';
+        if (messageType === 'LMS')
+            resolvedMessageType = messageType;
+        return {
+            to: prettyPhoneNum(message.to),
+            ...(!!resolvedContent != false && { content: resolvedContent }),
+            ...(!!resolvedSubject != false && messageType === 'LMS' && { subject: resolvedSubject }),
+        };
+    });
+    return { messages: resolvedMessages, messageType: resolvedMessageType };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ingestkorea/client-sens",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "INGESTKOREA SDK Naver Cloud Platform SENS Client for Node.js.",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",