node-red-contrib-line-messaging-api 0.2.1 → 0.3.0

package/nodes/_new/notify/notify.html

@@ -12,7 +12,8 @@
         outputs:1,
         icon: "comment.png",
         align: "right",
-        label: () => this.name || 'Notify_New',
+        paletteLabel: 'Notify',
+        label: () => this.name || 'Notify',
     });
 </script>
 
@@ -29,6 +30,8 @@
         </label>
         <input type="password" id="node-input-AccessToken" placeholder="LINE Notify AccessToken">
     </div>
+
+    <p> ※LINE Notifyは2025/3/31でサービス終了となります。利用をやめてPushメッセージなどに移行してください。 https://developers.line.biz/ja/news/2024/10/07/line-notify-will-be-discontinued/ </p>
 </script>
 
 <script type="text/x-red" data-help-name="Notify_New">

package/nodes/_new/notify/notify.js

@@ -30,7 +30,7 @@ module.exports = (RED) => {
                 const REQUEST_OPTIONS = {
                     method: 'POST',
                     headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded',
+                        'Content-Type': 'application/json',
                         'Authorization': `Bearer ${LINE_NOTIFY_TOKEN}`
                     },
                     body: new URLSearchParams(params).toString()

package/nodes/_new/push/push.html

@@ -14,7 +14,7 @@
         outputs: 1,
         icon: "comment.png",
         align: "right",
-        paletteLabel: 'Push_New',
+        paletteLabel: 'Push',
         label: () => this.name || 'PushMessage_New'
     });
 </script>
@@ -39,6 +39,13 @@
         <label for="node-input-targetId"><i class="icon-tag"></i> User Id or Group ID</label>
         <input type="text" id="node-input-targetId" placeholder="User Id or Group ID">
     </div>
+
+    <!-- <div class="form-row">
+        <label for="story">Tell us your story:</label>
+            <textarea id="story" name="story" rows="5" cols="33">
+                It was a dark and stormy night...
+            </textarea>
+    </div> -->
 </script>
 
 <script type="text/x-red" data-help-name="PushMessage_New">

package/nodes/_new/push/push.js

@@ -20,29 +20,57 @@ module.exports = (RED) => {
             console.error('token not found1');
             return;
         }
-
+        // const client = new line.messagingApi.MessagingApiClient(lineconfig);
         const client = new line.Client(lineconfig);
 
         node.on('input', async (msg, send, done) => {
             try {
                 const userId = msg.targetId || node.credentials.targetId;
-
-                //Flex Messageなどに対応
-                if(typeof msg.payload === 'object' && msg.payload.type){
-                    msg.payload = await client.pushMessage(userId, msg.payload);
-                }
-                //テキストのみの場合
-                else{
-                    msg.payload = await client.pushMessage(userId, {
-                        type: 'text',
-                        text: msg.payload,
-                    });
+                let sendMessages = [];
+                console.log(`---オブジェクトメッセージ---`);
+                console.log(typeof msg.payload);
+                
+                //複数メッセージかどうか 
+                if(typeof msg.payload === 'object' && Array.isArray(msg.payload)){
+                    // console.log(`---複数メッセージ---`);
+                    // 配列渡してくるときは自分で何かやりたい人なので、そのまま渡す
+                    sendMessages = msg.payload;
+                }else{
+                    console.log(`---単体メッセージ---`);
+                    //Flex Messageやその他メッセージに対応(type指定がある場合)
+                    if(typeof msg.payload === 'object' && msg.payload.type){
+                        sendMessages = [msg.payload];
+                    }
+                    //テキストのみの場合
+                    else{
+                        // v2 判定: {変数名} の形式が含まれているか確認
+                        const variablePattern = /\{[a-zA-Z0-9_]+\}/;
+                        const isV2Message = typeof msg.payload === 'string' && variablePattern.test(msg.payload) && msg.substitution;
+                        if (isV2Message) {
+                            // console.log(`---テキストメッセージv2---`,msg.substitution);
+                            sendMessages = [{
+                                type: 'textV2',
+                                text: msg.payload,
+                                substitution: msg.substitution,
+                            }]
+                        }else{
+                            // console.log(`---テキストメッセージv1---`);
+                            sendMessages = [{
+                                type: 'text',
+                                text: msg.payload,
+                            }]
+                        }
+                    }
                 }
 
+                msg.payload = await client.pushMessage(userId, sendMessages);
                 send(msg);
             } catch (error) {
-                console.log(error);
-                done(error);
+                // console.log(error.originalError.response.data);
+                // msg.payload = error.body;
+                msg.payload = error.originalError.response.data;
+                send(msg);
+                node.error("エラー発生", msg.payload);
             }
         });
     }

package/nodes/_new/reply/reply.html

@@ -1,5 +1,5 @@
 <script>
-    RED.nodes.registerType('ReplyMessage',{
+    RED.nodes.registerType('ReplyMessage_New',{
         category: 'LINE',
         color: '#01B301',
         defaults: {
@@ -11,17 +11,17 @@
             channelAccessToken: {type:"password", required:true},
         },
         inputs:1,
-        outputs:0,
+        outputs:1,
         icon: "comment.png",
         align: "right",
         paletteLabel: 'Reply',
         label: function () {
-            return this.name || 'ReplyMessage';
+            return this.name || 'ReplyMessage_New';
         }
     });
 </script>
 
-<script type="text/x-red" data-template-name="ReplyMessage">
+<script type="text/x-red" data-template-name="ReplyMessage_New">
     <div class="form-row">
         <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
@@ -43,6 +43,6 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="ReplyMessage">
+<script type="text/x-red" data-help-name="ReplyMessage_New">
     <p>A simple node that converts the message payloads into all ReplyMessage characters</p>
 </script>

package/nodes/_new/reply/reply.js

@@ -53,15 +53,20 @@ module.exports = (RED) => {
         }
 
         // 新仕様
-        const reply = (msg) => {
+        const reply = async (msg) => {
+            console.log(typeof msg.payload, msg.payload);
             if (!msg.line || !msg.line.event || !msg.line.event.type) {
                 throw 'no valid LINE event found within msg';
             } else if (!msg.line.event.replyToken) {
                 throw 'no replyable LINE event received';
             } else if (!msg.payload) {
                 throw 'reply content (msg.payload) is empty';
-            } else if (typeof msg.payload === 'object' && msg.payload.type) {
-                // payloadがオブジェクトの場合はメッセージオブジェクト扱いで送信される
+            } else if(typeof msg.payload === 'object' && Array.isArray(msg.payload) && msg.payload.length !== 0 && msg.payload[0].type){
+                // payloadが配列かつメッセージオブジェクトが中身の場合
+                return client.replyMessage(msg.line.event.replyToken, msg.payload);                
+            }
+            else if (typeof msg.payload === 'object' && msg.payload.type) {
+                // payloadがオブジェクトの場合
                 return client.replyMessage(msg.line.event.replyToken, msg.payload);
             } else {
                 // payloadがそれ以外なら強制的に文字列に変換しテキストメッセージ扱いで送信する
@@ -76,9 +81,8 @@ module.exports = (RED) => {
             if (msg.line && msg.line.event) {
                 // 新仕様
                 try {
-                    const result = await reply(msg);
-                    console.info(result);
-                    send(msg);
+                    msg.payload = await reply(msg);
+                    send(msg); //次のノードへ
                     done();
                 } catch (err) {
                     console.warn(err);
@@ -104,7 +108,7 @@ module.exports = (RED) => {
         });
     }
 
-    RED.nodes.registerType('ReplyMessage', main, {
+    RED.nodes.registerType('ReplyMessage_New', main, {
         credentials: {
             channelSecret: { type:'password' },
             channelAccessToken: { type:'password' },

package/nodes/limit/limit.html

@@ -27,7 +27,7 @@
     <div class="form-row">
         <label for="node-input-AccessToken">
             <i class="icon-tag"></i>
-            LINE Limit AccessToken
+            Channel Access Token
         </label>
         <input type="password" id="node-input-AccessToken" placeholder="LINE Limit AccessToken">
     </div>

package/nodes/limit/limit.js

@@ -1,38 +1,51 @@
 module.exports = (RED) => {
     'use strict';
-    
-    const axiosBase = require('axios');
 
     const main = function(config){
         const node = this;
         RED.nodes.createNode(node, config);
         const LINE_TOKEN = node.credentials.AccessToken;
-        const axios = axiosBase.create({
-            baseURL: `https://api.line.me/v2/bot/message/quota`,
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Authorization': `Bearer ${LINE_TOKEN}`
-            }
-        });
 
         node.on('input', async (msg, send, done) => {
             const mes = msg.payload;
             try {
-                const resLimit = await axios.get(`/`);
-                const resCurrent = await axios.get(`/consumption`);
+                // LINEのクォータ情報を取得するAPIのURL
+                const quotaUrl = `https://api.line.me/v2/bot/message/quota`;
+                const consumptionUrl = `${quotaUrl}/consumption`;
+
+                // Fetch APIを使ってクォータ情報を取得
+                const resLimit = await fetch(quotaUrl, {
+                    method: 'GET',
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                        'Authorization': `Bearer ${LINE_TOKEN}`
+                    }
+                });
+
+                const resCurrent = await fetch(consumptionUrl, {
+                    method: 'GET',
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                        'Authorization': `Bearer ${LINE_TOKEN}`
+                    }
+                });
+
+                // レスポンスをJSONとして解析
+                const dataLimit = await resLimit.json();
+                const dataCurrent = await resCurrent.json();
 
                 const output = {
-                    type: resLimit.data.type,
-                    limit: resLimit.data.value,
-                    totalUsage: resCurrent.data.totalUsage,
-                    usagePercentage: resCurrent.data.totalUsage / resLimit.data.value
-                }
+                    type: dataLimit.type,
+                    limit: dataLimit.value,
+                    totalUsage: dataCurrent.totalUsage,
+                    usagePercentage: dataCurrent.totalUsage / dataLimit.value
+                };
 
                 msg.payload = output;
                 send(msg);
                 done();
             } catch (error) {
-                console.log(error);
+                console.error(error);
                 done(error);
             }
 

package/nodes/notify/notify.html

@@ -12,8 +12,9 @@
         outputs:0,
         icon: "comment.png",
         align: "right",
+        paletteLabel: 'Notify_old',
         label: function() {
-            return this.name||"Notify";
+            return this.name||"Notify_old";
         }
     });
 </script>
@@ -31,7 +32,7 @@
         </label>
         <input type="password" id="node-input-AccessToken" placeholder="LINE Notify AccessToken">
     </div>
-
+    <p> ※LINE Notifyは2025/3/31でサービス終了となります。利用をやめてPushメッセージなどに移行してください。 https://developers.line.biz/ja/news/2024/10/07/line-notify-will-be-discontinued/ </p>
     <p>こちらのノードは旧バージョンになります。Newバージョンの利用を検討してください。</p>
     <p>This node is the old version, please consider using the New version.</p>
 </script>

package/nodes/push/push.html

@@ -14,7 +14,7 @@
         outputs: 0,
         icon: "comment.png",
         align: "right",
-        paletteLabel: 'Push',
+        paletteLabel: 'Push_old',
         label: function() {
             return this.name || 'PushMessage';
         }

package/nodes/reply/reply.html

@@ -14,7 +14,7 @@
         outputs:0,
         icon: "comment.png",
         align: "right",
-        paletteLabel: 'Reply',
+        paletteLabel: 'Reply_old',
         label: function () {
             return this.name || 'ReplyMessage';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-line-messaging-api",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Node-REDでLINE Botが作れます。",
   "main": "line.js",
   "repository": {
@@ -14,21 +14,23 @@
   "node-red": {
     "nodes": {
       "Webhook": "./nodes/webhook/webhook.js",
-      "ReplyMessage": "./nodes/reply/reply.js",
-      "PushMessage": "./nodes/push/push.js",
+      "ReplyMessage_New": "./nodes/_new/reply/reply.js",
+      "PushMessage_New": "./nodes/_new/push/push.js",
       "BloadcastMessage": "./nodes/bloadcast/bloadcast.js",
       "Limit": "./nodes/limit/limit.js",
-      "Notify": "./nodes/notify/notify.js",
-      "Notify_new": "./nodes/_new/notify/notify.js",
-      "ReplyMessage_new": "./nodes/_new/reply/reply.js",
-      "PushMessage_new": "./nodes/_new/push/push.js"
+      "ReplyMessage": "./nodes/reply/reply.js",
+      "PushMessage": "./nodes/push/push.js",
+      "Notify_New": "./nodes/_new/notify/notify.js",
+      "Notify": "./nodes/notify/notify.js"
     }
   },
-  "keywords": ["node-red"],
+  "keywords": [
+    "node-red"
+  ],
   "author": "n0bisuke",
   "license": "Apache 2.0",
   "dependencies": {
-    "@line/bot-sdk": "^7.2.0",
+    "@line/bot-sdk": "^9.5.0",
     "body-parser": "^1.19.1",
     "cors": "^2.8.5",
     "express": "^4.17.1"