node-red-contrib-line-messaging-api 0.4.4 → 0.4.6

package/nodes/_new/push/push.html

@@ -14,10 +14,13 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: "comment.png",
+        icon: "font-awesome/fa-comment",
         align: "right",
         paletteLabel: 'Push',
-        label: () => this.name || 'PushMessage_New'
+        label: function () {
+            return this.name || 'Push Message';
+        },
+        paletteLabel: "Push"
     });
 </script>
 

package/nodes/_new/reply/reply.html

@@ -13,12 +13,14 @@
         },
         inputs:1,
         outputs:1,
-        icon: "comment.png",
+        outputLabels: ["sentMessages（object）"],
+        icon: "font-awesome/fa-reply",
         align: "right",
         paletteLabel: 'Reply',
         label: function () {
-            return this.name || 'ReplyMessage_New';
-        }
+            return this.name || 'Reply Message';
+        },
+        paletteLabel: "Reply"
     });
 </script>
 
@@ -37,17 +39,17 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-channelSecret"><i class="icon-tag"></i> <span data-i18n="lineConfig.label.channelSecret">Secret</span></label>
+        <label for="node-input-channelSecret"><i class="icon-tag"></i> <span data-i18n="lineConfig.label.channelSecret">( Secret )</span></label>
         <input type="password" id="node-input-channelSecret" placeholder="ChannelSecret">
     </div>
 
     <div class="form-row">
-        <label for="node-input-channelAccessToken"><i class="icon-tag"></i> <span data-i18n="lineConfig.label.channelAccessToken">AccessToken</span></label>
+        <label for="node-input-channelAccessToken"><i class="icon-tag"></i> <span data-i18n="lineConfig.label.channelAccessToken">( AccessToken )</span></label>
         <input type="password" id="node-input-channelAccessToken" placeholder="ChannelAccessToken">
     </div>
 
     <div class="form-row">
-        <label for="node-input-replyMessage"><i class="icon-tag"></i> <span data-i18n="reply.label.message">ReplyMessage</span></label>
+        <label for="node-input-replyMessage"><i class="icon-tag"></i> <span data-i18n="reply.label.message"> Reply Message</span></label>
         <input type="text" id="node-input-replyMessage" placeholder="static text message here">
     </div>
 </script>

package/nodes/bloadcast/bloadcast.html

@@ -4,11 +4,7 @@
         color: '#01B301',
         defaults: {
             name: {value:""},
-        },
-
-        credentials: {
-            channelSecret:{value:"", type: "password", required:true},
-            channelAccessToken:{value:"", type: "password", required:true}
+            lineConfig: {value: "", type:"lineConfig", required:true},
         },
 
         inputs: 1,
@@ -29,18 +25,14 @@
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 
+    <!-- LINE Config -->
     <div class="form-row">
-        <label for="node-input-channelSecret"><i class="icon-tag"></i> <span data-i18n="bloadcast.label.channelSecret">チャンネルシークレット</span></label>
-        <input type="password" id="node-input-channelSecret" placeholder="ChannelSecret">
-    </div>
-
-    <div class="form-row">
-        <label for="node-input-channelAccessToken"><i class="icon-tag"></i> <span data-i18n="bloadcast.label.channelAccessToken">チャンネルアクセストークン</span></label>
-        <input type="password" id="node-input-channelAccessToken" placeholder="ChannelAccessToken">
+        <label for="node-input-lineConfig"><i class="icon-tag"></i> <span data-i18n="bloadcast.label.lineConfig">LINE Bot設定</span></label>
+        <input type="text" id="node-input-lineConfig">
     </div>
 
 </script>
 
 <script type="text/x-red" data-help-name="BloadcastMessage">
     <p>Broadcasts messages to all LINE Bot friends.</p>
-</script>
+</script>

package/nodes/bloadcast/bloadcast.js

@@ -7,11 +7,16 @@ module.exports = (RED) => {
         const node = this;
         RED.nodes.createNode(node, config);
 
-        let lineconfig;
+        let lineconfig = {};
         try {
             lineconfig = require('../../env');
         } catch (error) {
-            lineconfig = { channelSecret: node.credentials.channelSecret, channelAccessToken: node.credentials.channelAccessToken};
+            node.lineConfig = RED.nodes.getNode(config.lineConfig); //共通のlineConfigを取得
+
+            lineconfig = {
+                channelSecret: node.lineConfig.credentials.LineChannelSecret,
+                channelAccessToken: node.lineConfig.credentials.LineChannelAccessToken
+            };
         }
 
         if(lineconfig.channelSecret === '' || lineconfig.channelAccessToken === '') {
@@ -43,10 +48,5 @@ module.exports = (RED) => {
         });
     }
 
-    RED.nodes.registerType("BloadcastMessage", main, {
-        credentials: {
-            channelSecret: {type:"password"},
-            channelAccessToken: {type:"password"},
-        },
-    });
-}
+    RED.nodes.registerType("BloadcastMessage", main);
+}

package/nodes/bloadcast/locales/ja/bloadcast.json

@@ -2,8 +2,7 @@
     "bloadcast": {
         "label": {
             "name": "名前",
-            "channelSecret": "チャンネルシークレット",
-            "channelAccessToken": "チャンネルアクセストークン"
+            "lineConfig": "LINE Bot設定"
         }
     }
-}
+}

package/nodes/getBotInfo/getBotInfo.html

@@ -8,11 +8,12 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: "watch.png",
+        icon: "font-awesome/fa-robot",
         align: 'right',
         label: function () {
-            return this.name || 'getBotInfo';
+            return this.name || 'Get Bot Info';
         },
+        paletteLabel: 'Get BotInfo',
     });
 </script>
 
@@ -36,9 +37,9 @@
     </div>
 
     <!-- Bot情報取得ボタン -->
-    <div class="form-row">
+    <!-- <div class="form-row">
         <button type="button" id="node-getbotinfo-fetch"><span data-i18n="getBotInfo.label.fetchBotInfo">Bot情報を取得</span></button>
-    </div>
+    </div> -->
     
 </script>
 

package/nodes/getBotInfo/getBotInfo.js

@@ -38,7 +38,7 @@ module.exports = (RED) => {
                 done(error);
             }
 
-            console.log("Message received:", msg.payload);
+            // console.log("Message received:", msg.payload);
         });
     }
 

package/nodes/getProfile/getProfile.html

@@ -8,11 +8,12 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: "watch.png",
+        icon: "font-awesome/fa-user",
         align: 'right',
         label: function () {
-            return this.name || 'getProfile';
+            return this.name || 'Get Profile';
         },
+        paletteLabel: 'Get Profile',
     });
 </script>
 

package/nodes/limit/limit.html

@@ -4,9 +4,7 @@
         color: '#01B301',
         defaults: {
             name: {value:""},
-        },
-        credentials: {
-            AccessToken: { type: "password", required: true }
+            lineConfig: {value: "", type:"lineConfig", required:true},
         },
         inputs:1,
         outputs:1,
@@ -25,15 +23,16 @@
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 
+    <!-- LINE Config -->
     <div class="form-row">
-        <label for="node-input-AccessToken">
+        <label for="node-input-lineConfig">
             <i class="icon-tag"></i>
-            <span data-i18n="limit.label.accessToken">チャンネルアクセストークン</span>
-        </label>
-        <input type="password" id="node-input-AccessToken" placeholder="LINE Limit AccessToken">
+            <span data-i18n="limit.label.lineConfig">LINE Bot設定</span>
+        </label> 
+        <input type="text" id="node-input-lineConfig">
     </div>
 </script>
 
 <script type="text/x-red" data-help-name="Limit">
     <p>Returns the current month's message quota limits.</p>
-</script>
+</script>

package/nodes/limit/limit.js

@@ -4,7 +4,22 @@ module.exports = (RED) => {
     const main = function(config){
         const node = this;
         RED.nodes.createNode(node, config);
-        const LINE_TOKEN = node.credentials.AccessToken;
+        let lineconfig = {};
+        try {
+            lineconfig = require('../../env');
+        } catch (error) {
+            node.lineConfig = RED.nodes.getNode(config.lineConfig); //共通のlineConfigを取得
+
+            lineconfig = {
+                channelSecret: node.lineConfig.credentials.LineChannelSecret,
+                channelAccessToken: node.lineConfig.credentials.LineChannelAccessToken
+            };
+        }
+        if(lineconfig.channelAccessToken === undefined || lineconfig.channelAccessToken === '') {
+            console.error('LINE token not found');
+            return;
+        }
+        const LINE_TOKEN = lineconfig.channelAccessToken;
 
         node.on('input', async (msg, send, done) => {
             const mes = msg.payload;
@@ -52,9 +67,5 @@ module.exports = (RED) => {
         });
     }
 
-    RED.nodes.registerType("Limit", main, {
-        credentials: {
-            AccessToken: {type:"password"}
-        }
-    });
-}
+    RED.nodes.registerType("Limit", main);
+}

package/nodes/limit/locales/ja/limit.json

@@ -2,7 +2,7 @@
     "limit": {
         "label": {
             "name": "名前",
-            "accessToken": "チャンネルアクセストークン"
+            "lineConfig": "LINE Bot設定"
         }
     }
-}
+}

package/nodes/loading/loading.html

@@ -4,13 +4,14 @@
         color: '#01B301',
         defaults: {
             name: {value:""},
-            targetId: {value:"", required:true},
+            // targetId: {value:"", required:true},
             lineConfig: {value: "", type:"lineConfig", required:true}, //共通のlineConfigを使う
-            loadingSeconds: {value: 20}
+            loadingSeconds: {value: 20},
+            waitForCompletion: {value: false}
         },
         inputs:1,
         outputs:1,
-        icon: "timer.png",
+        icon: "font-awesome/fa-spinner",
         align: "right",
         label: function() {
             return this.name||"Loading";
@@ -33,10 +34,10 @@
     </div>
 
     <!-- chat ID / User ID -->
-    <div class="form-row">
+    <!-- <div class="form-row">
         <label for="node-input-targetId"><i class="icon-tag"></i> <span data-i18n="loading.label.targetId">ユーザーID</span></label>
         <input type="text" id="node-input-targetId" placeholder="User Id">
-    </div>
+    </div> -->
 
     <div class="form-row">
         <label for="node-input-loadingSeconds">
@@ -58,12 +59,18 @@
         </select>
     </div>
 
-    <p>
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-waitForCompletion" style="width:auto; margin-right:6px;">
+        <span data-i18n="loading.label.waitForCompletion">完了まで待機する</span>
+    </div>
+
+    <!-- <p>
         Displays a loading indicator for the specified duration. Currently supports individual chats only (user IDs starting with 'U'). 
         See <a href="https://developers.line.biz/ja/reference/messaging-api/#display-a-loading-indicator" target="_blank">official documentation</a> for details.
-    </p>
+    </p> -->
 </script>
 
 <script type="text/html" data-help-name="Loading">
     <p>Displays a loading indicator animation to LINE users.</p>
-</script>
+</script>

package/nodes/loading/loading.js

@@ -2,32 +2,64 @@ module.exports = (RED) => {
     'use strict';
 
     const line = require('@line/bot-sdk');
+    const { setTimeout: sleep } = require('node:timers/promises');
 
     const main = function(config){
+        // const node = this;
+        // RED.nodes.createNode(node, config);
+
+        // let lineconfig;
+        // try {
+        //     lineconfig = require('../../env');
+        // } catch (error) {
+        //     lineconfig = { 
+        //         // channelSecret: node.credentials.channelSecret,
+        //         channelAccessToken: node.credentials.channelAccessToken
+        //     };
+        // }
+        // if(lineconfig.channelAccessToken === undefined || lineconfig.channelAccessToken === '') {
+        //     console.error('token not found');
+        //     return;
+        // }
+        // const client = new line.messagingApi.MessagingApiClient(lineconfig);
+        // // const client = new line.Client(lineconfig);
+
         const node = this;
         RED.nodes.createNode(node, config);
 
-        let lineconfig;
+        let lineconfig = {};
         try {
             lineconfig = require('../../env');
         } catch (error) {
+            node.lineConfig = RED.nodes.getNode(config.lineConfig); //共通のlineConfigを取得
+
             lineconfig = { 
-                // channelSecret: node.credentials.channelSecret,
-                channelAccessToken: node.credentials.channelAccessToken
+                channelSecret: node.lineConfig.credentials.LineChannelSecret,
+                channelAccessToken: node.lineConfig.credentials.LineChannelAccessToken
             };
         }
         if(lineconfig.channelAccessToken === undefined || lineconfig.channelAccessToken === '') {
-            console.error('token not found');
+            console.error('LINE token not found');
             return;
         }
         const client = new line.messagingApi.MessagingApiClient(lineconfig);
-        // const client = new line.Client(lineconfig);
 
         node.on('input', async (msg, send, done) => {
 
             //chat
-            const chatId = msg.targetId || node.credentials.targetId;
+            // const chatId = msg.line.event
+            let chatId = '';
+            if(msg.line?.event?.source?.userId !== undefined){
+                chatId = msg.line.event.source.userId;
+            }else if(msg.line?.event?.source?.groupId !== undefined){
+                chatId = msg.line.event.source.groupId;
+            }
+            console.log('chatId:', chatId);
+            // return;
             const loadingSeconds = msg.loadingSeconds || config.loadingSeconds;
+            const waitForCompletion = (msg.waitForCompletion !== undefined)
+                ? msg.waitForCompletion
+                : config.waitForCompletion;
             // console.log(chatId,loadingSeconds);
             
             try {
@@ -35,6 +67,9 @@ module.exports = (RED) => {
                     chatId: chatId, //現状user idのみ
                     loadingSeconds: loadingSeconds,
                 });
+                if (waitForCompletion) {
+                    await sleep(loadingSeconds * 1000); // 指定秒数待機させる
+                }
 
                 // レスポンスが {}（空のJSONオブジェクト）なら成功らしい
                 if (res && Object.keys(res).length === 0) {
@@ -54,4 +89,4 @@ module.exports = (RED) => {
     }
 
     RED.nodes.registerType("Loading", main);
-}
+}

package/nodes/loading/locales/ja/loading.json

@@ -4,7 +4,8 @@
             "name": "名前",
             "lineConfig": "LINE Bot設定",
             "targetId": "ユーザーID",
-            "loadingSeconds": "ローディング秒数"
+            "loadingSeconds": "ローディング秒数",
+            "waitForCompletion": "ローディング秒数分、実際の処理も待機する"
         }
     }
-}
+}

package/nodes/markAsRead/markAsRead.html

@@ -8,11 +8,14 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: "check.png",
+        inputLabels: ["LINE Messages Object"],
+        outputLabels: ["LINE Messages Object or Error Message"],
+        icon: "font-awesome/fa-check-square",
         align: 'right',
         label: function () {
-            return this.name || 'markAsRead';
+            return this.name || 'Mark As Read';
         },
+        paletteLabel: 'MarkAsRead',
     });
 </script>
 

package/nodes/push/push.html

@@ -17,7 +17,8 @@
         paletteLabel: 'Push_old',
         label: function() {
             return this.name || 'PushMessage';
-        }
+        },
+        paletteLabel: "(old) Push"
     });
 </script>
 

package/nodes/reply/reply.html

@@ -17,7 +17,8 @@
         paletteLabel: 'Reply_old',
         label: function () {
             return this.name || 'ReplyMessage';
-        }
+        },
+        paletteLabel: "(old) Reply"
     });
 </script>
 

package/nodes/webhook/webhook.html

@@ -8,6 +8,7 @@
         },
         inputs: 0,
         outputs: 1,
+        outputLabels: ['msg.line'],
         icon: 'inject.svg',
         paletteLabel: 'Webhook',
         label: function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-line-messaging-api",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Node-RED nodes for LINE Messaging API integration. Build LINE Bots easily with visual programming.",
   "main": "line.js",
   "repository": {
@@ -39,8 +39,8 @@
   "author": "n0bisuke",
   "license": "Apache 2.0",
   "dependencies": {
-    "@line/bot-sdk": "^10.5.0",
-    "body-parser": "^1.19.1",
-    "cors": "^2.8.5"
+    "@line/bot-sdk": "~10.5.0",
+    "body-parser": "~1.19.1",
+    "cors": "~2.8.5"
   }
 }

package/.claude/settings.local.json

@@ -1,12 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(mkdir:*)",
-      "Bash(mv:*)",
-      "Bash(grep:*)",
-      "Bash(find:*)",
-      "Bash(rm:*)"
-    ],
-    "deny": []
-  }
-}