-
- {MessageRender(messages[index])}
- {StatusRender(messages[index].status)}
+
-
- );
-};
-
-const StatusRender = (status) => {
- switch (status) {
- case "sent":
- return
new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
-/** This is a hack around react-virtualized, should be removed when switching to react-virtuoso */
-const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`;
-
-function reactVirtualizedFix() {
- return {
- name: "flat:react-virtualized",
- configResolved: async () => {
- const require = createRequire(import.meta.url);
- const reactVirtualizedPath = require.resolve("react-virtualized");
- const { pathname: reactVirtualizedFilePath } = new url.URL(reactVirtualizedPath, import.meta.url);
- const file = reactVirtualizedFilePath.replace(
- path.join("dist", "commonjs", "index.js"),
- path.join("dist", "es", "WindowScroller", "utils", "onScroll.js")
- );
- const code = await fsPromises.readFile(file, "utf-8");
- const modified = code.replace(WRONG_CODE, "");
- await fsPromises.writeFile(file, modified);
- }
- };
-}
-/** End of hack */
-
export const logger = createLogger("info", {
allowClearScreen: false
});
@@ -108,7 +83,6 @@ export default defineConfig({
gcm_sender_id: "103953800507"
}
}),
- reactVirtualizedFix(),
react(),
eslint()
],
diff --git a/server/web-sockets/redisSocketEvents.js b/server/web-sockets/redisSocketEvents.js
index 044e550b7..de2f8e25a 100644
--- a/server/web-sockets/redisSocketEvents.js
+++ b/server/web-sockets/redisSocketEvents.js
@@ -1,7 +1,14 @@
const { admin } = require("../firebase/firebase-handler");
const { MARK_MESSAGES_AS_READ, GET_CONVERSATIONS, GET_CONVERSATION_DETAILS } = require("../graphql-client/queries");
+const logger = require("../utils/logger");
+const { phone } = require("phone");
+const { client: gqlClient } = require("../graphql-client/graphql-client");
+const queries = require("../graphql-client/queries");
+const twilio = require("twilio");
const client = require("../graphql-client/graphql-client").client;
+const twilioClient = twilio(process.env.TWILIO_AUTH_TOKEN, process.env.TWILIO_AUTH_KEY);
+
const redisSocketEvents = ({
io,
redisHelpers: { setSessionData, clearSessionData }, // Note: Used if we persist user to Redis
@@ -173,7 +180,96 @@ const redisSocketEvents = ({
socket.emit("error", { message: "Failed to mark messages as read" });
}
};
- // Mark Messages as Read
+
+ const sendMessage = (data) => {
+ const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid, user } = data;
+ console.dir({ data });
+ logger.log("sms-outbound", "DEBUG", user.email, null, {
+ messagingServiceSid: messagingServiceSid,
+ to: phone(to).phoneNumber,
+ mediaUrl: selectedMedia.map((i) => i.src),
+ text: body,
+ conversationid,
+ isoutbound: true,
+ userid: user.email,
+ image: selectedMedia?.length > 0,
+ image_path: selectedMedia?.length > 0 ? selectedMedia.map((i) => i.src) : []
+ });
+
+ if (!!to && !!messagingServiceSid && (!!body || !!selectedMedia?.length > 0) && !!conversationid) {
+ twilioClient.messages
+ .create({
+ body: body,
+ messagingServiceSid: messagingServiceSid,
+ to: phone(to).phoneNumber,
+ mediaUrl: selectedMedia.map((i) => i.src)
+ })
+ .then((message) => {
+ let newMessage = {
+ msid: message.sid,
+ text: body,
+ conversationid,
+ isoutbound: true,
+ userid: user.email,
+ image: selectedMedia?.length > 0,
+ image_path: selectedMedia?.length > 0 ? selectedMedia.map((i) => i.src) : []
+ };
+ gqlClient
+ .request(queries.INSERT_MESSAGE, { msg: newMessage, conversationid })
+ .then((r2) => {
+ //console.log("Responding GQL Message ID", JSON.stringify(r2));
+ logger.log("sms-outbound-success", "DEBUG", user.email, null, {
+ msid: message.sid,
+ conversationid
+ });
+
+ const data = {
+ type: "messaging-outbound",
+ conversationid: newMessage.conversationid || ""
+ };
+
+ // TODO Verify
+ // const messageData = response.insert_messages.returning[0];
+
+ // Broadcast new message to conversation room
+ const room = `conversation-${conversationid}`;
+ io.to(room).emit("new-message", newMessage);
+
+ admin.messaging().send({
+ topic: `${imexshopid}-messaging`,
+ data
+ });
+ })
+ .catch((e2) => {
+ logger.log("sms-outbound-error", "ERROR", user.email, null, {
+ msid: message.sid,
+ conversationid,
+ error: e2
+ });
+ });
+ })
+ .catch((e1) => {
+ logger.log("sms-outbound-error", "ERROR", user.email, null, {
+ conversationid,
+ error: e1
+ });
+ });
+ } else {
+ logger.log("sms-outbound-error", "ERROR", user.email, null, {
+ type: "missing-parameters",
+ messagingServiceSid: messagingServiceSid,
+ to: phone(to).phoneNumber,
+ text: body,
+ conversationid,
+ isoutbound: true,
+ userid: user.email,
+ image: selectedMedia?.length > 0,
+ image_path: selectedMedia?.length > 0 ? selectedMedia.map((i) => i.src) : []
+ });
+ }
+ };
+
+ socket.on("send-message", sendMessage);
socket.on("mark-as-read", markAsRead);
socket.on("join-conversation", joinConversation);
socket.on("open-messaging", openMessaging);
+
);
};
return (
+
+
+ {message.status && (
+
+ {message.isoutbound && (
+
+ {message.image_path &&
+ message.image_path.map((i, idx) => (
+
- {messages[index].isoutbound && (
-
+
+ 
+
+
+ ))}
+ {message.text}
- {i18n.t("messaging.labels.sentby", {
- by: messages[index].userid,
- time: dayjs(messages[index].created_at).format("MM/DD/YYYY @ hh:mm a")
- })}
-
- )}
+
+
+ )}
+
+ {i18n.t("messaging.labels.sentby", {
+ by: message.userid,
+ time: dayjs(message.created_at).format("MM/DD/YYYY @ hh:mm a")
+ })}
)}
-
+
-
- {({ height, width }) => (
-
+ renderMessage(index)}
+ followOutput="smooth" // Ensure smooth scrolling when new data is appended
+ style={{ height: "100%", width: "100%" }}
+ />
);
}
-
-const MessageRender = (message) => {
- return (
-
- {message.image_path &&
- message.image_path.map((i, idx) => (
-
-
-
-
-
-
- ))}
- {message.text}
-