@resultcrafter/aimanager-instagram-connector 0.3.0 → 0.4.1

package/aimanager/FacebookClient.js

@@ -45,21 +45,33 @@ class FacebookClient {
   }
 
   async send(message, page_access_token) {
-  
     winston.debug("(fbm) [FacebookClient] Sending message...");
-    
     return await axios({
       url: this.graph_url + "me/messages?access_token=" + page_access_token,
-      header: {
-        'Content-Type': 'application/json'
-      },
+      header: { 'Content-Type': 'application/json' },
       method: "POST",
       data: message
     }).then((response) => {
       winston.debug("(fbm) [FacebookClient] Message sent!");
       return response
     }).catch((err) => {
-      winston.error("(fbm) [FacebookClient] error send message: ", err.response.data);
+      winston.error("(fbm) [FacebookClient] error send message: ", err.response?.data || err.message);
+      throw err;
+    })
+  }
+
+  async sendToInstagram(message, accessToken) {
+    winston.debug("(ig) [FacebookClient] Sending to Instagram Graph API...");
+    return await axios({
+      url: "https://graph.instagram.com/v23.0/me/messages?access_token=" + accessToken,
+      header: { 'Content-Type': 'application/json' },
+      method: "POST",
+      data: message
+    }).then((response) => {
+      winston.debug("(ig) [FacebookClient] Instagram message sent!");
+      return response
+    }).catch((err) => {
+      winston.error("(ig) [FacebookClient] Instagram send error: ", err.response?.data || err.message);
       throw err;
     })
   }

package/aimanager/TiledeskChannel.js

@@ -58,7 +58,7 @@ class TiledeskChannel {
 
     } else if (messageInfo.channel == "instagram") {
       channel = messageInfo.instagram;
-      new_request_id = "support-group-" + this.settings.project_id + "-" + uuidv4().substring(0, 8) + "-fbm-" + channel.page_id + "-" + channel.sender_id;
+      new_request_id = "support-group-" + this.settings.project_id + "-" + uuidv4().substring(0, 8) + "-ig-" + channel.page_id + "-" + channel.sender_id;
 
     } else {
       winston.verbose("(fbm) [TiledeskChannel] Channel not supported");

package/aimanager/TiledeskInstagramTranslator.js

@@ -50,7 +50,7 @@ const path = require('path');
     }
 
     let instagram_message = {
-      //messaging_product: TiledeskInstagramTranslator.INSTAGRAM_MESSAGING_PRODUCT,
+      messaging_product: TiledeskInstagramTranslator.INSTAGRAM_MESSAGING_PRODUCT,
       recipient: { id: instagram_receiver }
     }
 
@@ -82,40 +82,20 @@ const path = require('path');
 
         instagram_message.message = {
           attachment: {
-            type: "template",
+            type: "video",
             payload: {
-              template_type: "open_graph",
-              elements: [
-                {
-                  //media_type: "video",
-                  url: tiledeskChannelMessage.metadata.src
-                  //url: tiledeskChannelMessage.metadata.src
-                  //url: // facebook url: 
-                  // https://developers.facebook.com/docs/instagram-platform/send-messages/template/media
-                  // https://developers.facebook.com/docs/instagram-platform/reference/attachment-upload-api
-                }
-              ]
+              url: tiledeskChannelMessage.metadata.src
             }
           }
         }
-
-        /*
-        instagram_message.type = 'video'
-        instagram_message.video = {
-          link: tiledeskChannelMessage.metadata.src,
-          //caption: tiledeskChannelMessage.metadata.name || tiledeskChannelMessage.text
-        }
-
-        */
       }
 
       else if (tiledeskChannelMessage.metadata.type && tiledeskChannelMessage.metadata.type.startsWith('application')) {
 
-        instagram_message.type = 'document'
-        instagram_message.document = {
-          link: tiledeskChannelMessage.metadata.src,
-          caption: tiledeskChannelMessage.metadata.name || tiledeskChannelMessage.text
-        }
+        var docText = tiledeskChannelMessage.text || '';
+        if (tiledeskChannelMessage.metadata.name) docText += '\n' + tiledeskChannelMessage.metadata.name;
+        docText += '\n' + tiledeskChannelMessage.metadata.src;
+        instagram_message.message = { text: docText };
       }
 
       else {

package/index.js

@@ -113,7 +113,7 @@ router.post('/install', async (req, res) => {
         "project_id": project_id,
         "app_id": app_id,
         "token": token,
-        "oauth_url": BASE_URL + '/auth/instagram/start'
+        "oauth_url": BASE_URL + '/auth/instagram/start?project_id=' + project_id + '&token=' + token + '&app_id=' + app_id
       }
     }));
 
@@ -328,17 +328,60 @@ router.post('/update_advanced', async (req, res) => {
   })
 })
 
+function getOutboundToken(settings, entryId) {
+  if (settings && settings.pages && settings.pages.length > 0) {
+    var page = settings.pages.find(function(p) { return p.id === entryId; });
+    if (page && page.access_token) {
+      return { token: page.access_token, type: 'facebook_page' };
+    }
+  }
+  if (settings && settings.ig_oauth_token && settings.ig_oauth_token.access_token) {
+    return { token: settings.ig_oauth_token.access_token, type: 'instagram_oauth' };
+  }
+  return null;
+}
+
+function parseRecipient(recipient_id) {
+  var result = { entry_id: null, ig_receiver: null, prefix: 'ig' };
+  if (!recipient_id) return result;
+
+  if (recipient_id.indexOf('ig-') > -1) {
+    result.entry_id = recipient_id.substring(recipient_id.lastIndexOf('ig-') + 3, recipient_id.lastIndexOf('-'));
+    result.ig_receiver = recipient_id.substring(recipient_id.lastIndexOf('-') + 1);
+    result.prefix = 'ig';
+  } else if (recipient_id.indexOf('fbm-') > -1) {
+    result.entry_id = recipient_id.substring(recipient_id.lastIndexOf('fbm-') + 4, recipient_id.lastIndexOf('-'));
+    result.ig_receiver = recipient_id.substring(recipient_id.lastIndexOf('-') + 1);
+    result.prefix = 'fbm';
+  }
+  return result;
+}
+
+async function sendInstagramMessage(instagramJsonMessage, accessToken, authType, fbClient) {
+  if (!isValidIGSID(instagramJsonMessage.recipient.id)) {
+    winston.error("(ig) Invalid IGSID format: " + instagramJsonMessage.recipient.id);
+    return { success: false, error: "Invalid IGSID format" };
+  }
+  if (authType === 'instagram_oauth') {
+    return await fbClient.sendToInstagram(instagramJsonMessage, accessToken);
+  }
+  return await fbClient.send(instagramJsonMessage, accessToken);
+}
+
 router.post('/tiledesk', async (req, res) => {
-  winston.verbose("(fbm) Message received from AI Manager");
-  winston.debug("(fbm) Message received from AI Manager body: ", req.body);
+  winston.verbose("(ig) Message received from AI Manager");
 
   let tiledeskChannelMessage = req.body.payload;
   let project_id = req.body.payload.id_project;
 
-  // get settings from mongo
   let CONTENT_KEY = "instagram-" + project_id;
   let settings = await db.get(CONTENT_KEY);
 
+  if (!settings) {
+    winston.warn("(ig) No settings found for project " + project_id);
+    return res.sendStatus(200);
+  }
+
   var text = req.body.payload.text;
   let sender_id = req.body.payload.sender;
   let attributes = req.body.payload.attributes;
@@ -348,171 +391,129 @@ router.post('/tiledesk', async (req, res) => {
     commands = attributes.commands;
   }
 
-  if (sender_id.indexOf("fbm") > -1) {
-    winston.debug("(fbm) Skip same sender");
+  if (sender_id && (sender_id.indexOf("fbm") > -1 || sender_id.indexOf("ig") > -1)) {
+    winston.debug("(ig) Skip same sender");
     return res.sendStatus(200);
   }
 
-  if (attributes && attributes.subtype === "info") {
-    winston.debug("(fbm) Skip subtype (info)");
-    return res.sendStatus(200);
-  }
-  
-  if (attributes && attributes.subtype === "private") {
-    winston.verbose("(wab) Skip subtype (private)");
+  if (attributes && (attributes.subtype === "info" || attributes.subtype === "private" || attributes.subtype === 'info/support')) {
+    winston.debug("(ig) Skip subtype: " + attributes.subtype);
     return res.sendStatus(200);
   }
 
-  if (attributes && attributes.subtype === 'info/support') {
-    winston.debug("(fbm) Skip subtype: " + attributes.subtype);
-    return res.sendStatus(200);
-  }
+  var parsed = parseRecipient(tiledeskChannelMessage.recipient);
+  var entry_id = parsed.entry_id;
+  var ig_receiver = parsed.ig_receiver;
 
-  let recipient_id = tiledeskChannelMessage.recipient;
-  let sender = tiledeskChannelMessage.sender;
-  let page_id = recipient_id.substring(recipient_id.lastIndexOf("fbm-") + 4, recipient_id.lastIndexOf("-"));
-  let instagram_receiver = recipient_id.substring(recipient_id.lastIndexOf("-") + 1);
-
-  winston.verbose("(fbm) sender: " + sender);
-  winston.verbose("(fbm) text: " + text);
-  winston.verbose("(fbm) attributes: ", attributes);
-  winston.verbose("(fbm) tiledesk sender_id: " + sender_id);
-  winston.verbose("(fbm) recipient_id: " + recipient_id);
-  winston.verbose("(fbm) page_id: " + page_id);
-  winston.verbose("(fbm) instagram_receiver: " + instagram_receiver);
+  winston.verbose("(ig) entry_id: " + entry_id + ", ig_receiver: " + ig_receiver + ", prefix: " + parsed.prefix);
 
   // Return an info message option
-  if (settings.expired &&
-    settings.expired === true) {
-
-    winston.verbose("settings expired: " + settings.expired);
+  if (settings.expired === true) {
+    winston.verbose("(ig) Settings expired");
     let tiledeskJsonMessage = {
       text: 'Expired. Upgrade Plan.',
       sender: "system",
       senderFullname: "System",
-      attributes: {
-        subtype: 'info',
-        messagelabel: { key: 'PLAN_EXPIRED'  } // for translation
-      },
+      attributes: { subtype: 'info', messagelabel: { key: 'PLAN_EXPIRED' } },
       channel: { name: 'instagram' }
     }
     let message_info = {
       channel: "instagram",
-      instagram: {
-        page_id: page_id,
-        sender_id: instagram_receiver
-      }
+      instagram: { page_id: entry_id, sender_id: ig_receiver }
     }
-
     const tdChannel = new TiledeskChannel({ settings: settings, API_URL: API_URL })
     try {
       await tdChannel.send(tiledeskJsonMessage, message_info, settings.department_id);
-      winston.verbose("(wab) Expiration message sent to AI Manager")
       return res.sendStatus(200);
     } catch (err) {
-      return res.status(500).send({ success: false, error: "Error sending exoìpiration message" });
+      return res.status(500).send({ success: false, error: "Error sending expiration message" });
     }
   }
 
-  const page_detail = settings.pages.find(p => p.id === page_id);
+  var tokenInfo = getOutboundToken(settings, entry_id);
+  if (!tokenInfo) {
+    winston.error("(ig) No access token available for outbound message (no pages, no OAuth)");
+    return res.status(200).send({ message: "skipped - no token" });
+  }
+
   const fbClient = new FacebookClient({ GRAPH_URL: GRAPH_URL, FB_APP_ID: FB_APP_ID, APP_SECRET: APP_SECRET, BASE_URL: BASE_URL });
   const messageHandler = new MessageHandler({ tiledeskChannelMessage: tiledeskChannelMessage });
   const tlr = new TiledeskInstagramTranslator();
 
+  function sendMessageViaInstagram(jsonMsg, cb) {
+    sendInstagramMessage(jsonMsg, tokenInfo.token, tokenInfo.type, fbClient).then(function(response) {
+      winston.debug("(ig) Message sent via " + tokenInfo.type);
+      if (cb) cb(null, response);
+    }).catch(function(err) {
+      winston.error("(ig) Send error: ", err?.response?.data || err.message);
+      if (cb) cb(err);
+    });
+  }
+
   if (commands) {
-    let i = 0;
-    async function execute(command) {
-      // message
+    var cmdIdx = 0;
+    function executeCommand(command) {
       if (command.type === "message") {
-        let tiledeskCommandMessage = await messageHandler.generateMessageObject(command);
-        winston.debug("(fbm) message generated from command: ", tiledeskCommandMessage)
-
-
-        let messagesList = await messageHandler.splitMessageFromTiledesk(tiledeskCommandMessage);
-
-        let j = 0;
-        async function send(message) {
-          let instagramJsonMessage = await tlr.toInstagram(message, instagram_receiver)
-          winston.verbose("(fbm) instagramJsonMessage" + JSON.stringify(instagramJsonMessage));
-
-
-          if (instagramJsonMessage) {
-            fbClient.send(instagramJsonMessage, page_detail.access_token).then((response) => {
-              winston.debug("(fbm) Message sent to Instagram!" + response.status + response.statusText);
-              j += 1;
-              if (j < messagesList.length) {
-                send(messagesList[j])
-              } else {
-                winston.debug("(fbm) End of splitted message -> go to next command")
-                i += 1;
-                if (i < commands.length) {
-                  execute(commands[i]);
+        messageHandler.generateMessageObject(command).then(function(tiledeskCommandMessage) {
+          messageHandler.splitMessageFromTiledesk(tiledeskCommandMessage).then(function(messagesList) {
+            var msgIdx = 0;
+            function sendNextMessage(msg) {
+              tlr.toInstagram(msg, ig_receiver).then(function(instagramJsonMessage) {
+                if (instagramJsonMessage) {
+                  sendMessageViaInstagram(instagramJsonMessage, function(err) {
+                    if (!err) {
+                      msgIdx++;
+                      if (msgIdx < messagesList.length) {
+                        sendNextMessage(messagesList[msgIdx]);
+                      } else {
+                        cmdIdx++;
+                        if (cmdIdx < commands.length) {
+                          executeCommand(commands[cmdIdx]);
+                        }
+                      }
+                    }
+                  });
                 } else {
-                  winston.debug("(fbm) End of commands")
+                  cmdIdx++;
+                  if (cmdIdx < commands.length) executeCommand(commands[cmdIdx]);
                 }
-              }
-            }).catch((err) => {
-              winston.error("(fbm) error send message: ", err?.response?.data || err.message || err);
-            });
-          } else {
-            winston.error("(fbm) instagramJsonMessage is undefined!")
-          }
-        }
-        send(messagesList[0]);
-      }
-
-      // wait
-      if (command.type === "wait") {
-        setTimeout(() => {
-          i += 1;
-          if (i < commands.length) {
-            execute(commands[i]);
-          } else {
-            winston.debug("(fbm) End of commands")
-          }
-        }, command.time)
+              });
+            }
+            sendNextMessage(messagesList[0]);
+          });
+        });
+      } else if (command.type === "wait") {
+        setTimeout(function() {
+          cmdIdx++;
+          if (cmdIdx < commands.length) executeCommand(commands[cmdIdx]);
+        }, command.time);
       }
     }
-    execute(commands[0]);
-  }
-
-  else if (tiledeskChannelMessage.text || tiledeskChannelMessage.metadata) {
-
-    let messagesList = await messageHandler.splitMessageFromTiledesk(tiledeskChannelMessage);
-    winston.debug("(fbm) message splitted in " + messagesList.length + " messages");
-
-    let j = 0;
-    async function send(message) {
-      let instagramJsonMessage = await tlr.toInstagram(message, instagram_receiver);
-      winston.verbose("(fbm) instagramJsonMessage", instagramJsonMessage)
-
-      if (instagramJsonMessage) {
-        fbClient.send(instagramJsonMessage, page_detail.access_token).then((response) => {
-          winston.verbose("(fbm) Message sent to Instagram!" + response.status + " " + response.statusText);
-          j += 1;
-          if (j < messagesList.length) {
-            send(messagesList[j])
-          } else {
-            winston.debug("(fbm) End of splitted message")
+    executeCommand(commands[0]);
+  } else if (tiledeskChannelMessage.text || tiledeskChannelMessage.metadata) {
+    messageHandler.splitMessageFromTiledesk(tiledeskChannelMessage).then(function(messagesList) {
+      var msgIdx = 0;
+      function sendNext(msg) {
+        tlr.toInstagram(msg, ig_receiver).then(function(instagramJsonMessage) {
+          if (instagramJsonMessage) {
+            sendMessageViaInstagram(instagramJsonMessage, function() {
+              msgIdx++;
+              if (msgIdx < messagesList.length) sendNext(messagesList[msgIdx]);
+            });
           }
-        }).catch((err) => {
-          winston.error("(fbm) error send message: ", err)
-        })
-      } else {
-        winston.error("(fbm) instagramJsonMessage is undefined!")
+        });
       }
-    }
-    send(messagesList[0]);
-
-  }
-
-  else {
-    winston.debug("(fbm) no command, no text --> skip")
+      sendNext(messagesList[0]);
+    });
   }
 
   return res.status(200).send({ message: "sent" });
 })
 
+function isValidIGSID(id) {
+  return /^\d{10,20}$/.test(String(id));
+}
+
 function convertTestWebhook(body) {
   if (body.field && body.value) {
     winston.info("(ig) Converting test webhook from Meta dashboard");
@@ -727,6 +728,25 @@ router.get('/auth/instagram/start', async (req, res) => {
   }
 });
 
+function oauthCallbackResponse(res, success, data) {
+  var username = data && data.username ? data.username : '';
+  var error = data && data.error ? data.error : '';
+  var redirectUri = data && data.redirect_uri ? data.redirect_uri : '';
+  res.send('<!DOCTYPE html><html><body><script>' +
+    'if (window.opener) {' +
+    '  window.opener.postMessage({' +
+    '    type: "oauth-complete",' +
+    '    success: ' + (success ? 'true' : 'false') + ',' +
+    (username ? '    username: "' + username.replace(/"/g, '\\"') + '",' : '') +
+    (error ? '    error: "' + error.replace(/"/g, '\\"') + '"' : '') +
+    '  }, "*");' +
+    '  window.close();' +
+    '} else {' +
+    '  window.location.href = "' + redirectUri.replace(/"/g, '') + '";' +
+    '}' +
+    '</script></body></html>');
+}
+
 router.get('/oauth-callback', async (req, res) => {
   winston.verbose("(ig) /oauth-callback");
 
@@ -734,16 +754,17 @@ router.get('/oauth-callback', async (req, res) => {
   var stateStr = req.query.state;
   if (!code || !stateStr) {
     winston.error("(ig) Missing code or state parameter");
-    return res.status(400).send("Missing authorization code or state");
+    return oauthCallbackResponse(res, false, { error: 'Missing authorization code or state' });
   }
 
   var state = instagramOAuth.verifyState(stateStr);
   if (!state) {
     winston.error("(ig) Invalid or expired state");
-    return res.status(400).send("Invalid or expired state parameter. Please try connecting again.");
+    return oauthCallbackResponse(res, false, { error: 'Invalid or expired state parameter' });
   }
 
   var projectId = state.project_id;
+  var redirect_uri = DASHBOARD_BASE_URL + "/#/project/" + projectId + "/integrations?name=instagram";
 
   try {
     var tokenData = await instagramOAuth.exchangeCodeForToken(code);
@@ -757,11 +778,10 @@ router.get('/oauth-callback', async (req, res) => {
     settings.connected = true;
     await db.set(CONTENT_KEY, settings);
 
-    var redirect_uri = DASHBOARD_BASE_URL + "/#/project/" + projectId + "/integrations?name=instagram";
-    res.redirect(redirect_uri);
+    oauthCallbackResponse(res, true, { username: tokenData.username, redirect_uri: redirect_uri });
   } catch (err) {
     winston.error("(ig) OAuth callback error: ", err?.response?.data || err.message || err);
-    res.status(500).send("Authentication failed: " + (err.message || 'Unknown error'));
+    oauthCallbackResponse(res, false, { error: err.message || 'Authentication failed', redirect_uri: redirect_uri });
   }
 })
 
@@ -820,7 +840,8 @@ router.post('/enablePage', async (req, res) => {
         brand_name: BRAND_NAME,
         show_info_message: settings.show_info_message !== undefined ? settings.show_info_message : true,
         instagram_username: settings.instagram_username || settings.user_info?.username || 'Instagram Account',
-        subscription_id: settings.subscription_id
+        subscription_id: settings.subscription_id,
+        oauth_url: BASE_URL + '/auth/instagram/start?project_id=' + project_id + '&token=' + token + '&app_id=' + app_id
       }
       var html = template(replacements)
       return res.send(html);
@@ -845,7 +866,8 @@ router.post('/enablePage', async (req, res) => {
         show_alert_modal: true,
         show_info_message: settings.show_info_message !== undefined ? settings.show_info_message : true,
         instagram_username: settings.instagram_username || settings.user_info?.username || 'Instagram Account',
-        subscription_id: settings.subscription_id
+        subscription_id: settings.subscription_id,
+        oauth_url: BASE_URL + '/auth/instagram/start?project_id=' + project_id + '&token=' + token + '&app_id=' + app_id
       }
       var html = template(replacements)
       return res.send(html);
@@ -893,7 +915,8 @@ router.post('/disablePage', async (req, res) => {
       brand_name: BRAND_NAME,
       show_info_message: settings.show_info_message !== undefined ? settings.show_info_message : true,
       instagram_username: settings.instagram_username || settings.user_info?.username || 'Instagram Account',
-      subscription_id: settings.subscription_id
+      subscription_id: settings.subscription_id,
+      oauth_url: BASE_URL + '/auth/instagram/start?project_id=' + project_id + '&token=' + token + '&app_id=' + app_id
     }
     var html = template(replacements)
     return res.send(html);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resultcrafter/aimanager-instagram-connector",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "AI Manager Instagram DM connector",
   "main": "index.js",
   "scripts": {

package/template/configure.html

@@ -242,6 +242,18 @@
 
   <script>
 
+    var oauthPopup = null;
+
+    window.addEventListener('message', function(event) {
+      if (event.data && event.data.type === 'oauth-complete') {
+        if (event.data.success) {
+          window.location.reload();
+        } else {
+          alert('Instagram connection failed: ' + (event.data.error || 'Unknown error'));
+        }
+      }
+    });
+
     function connectInstagram() {
       var width = 600;
       var height = 700;
@@ -259,7 +271,7 @@
         } catch (e) {
 
         }
-      }, 1000);
+      }, 2000);
     }
 
     function update_advanced() {