From 9e508f3c8528dddf09c8f5c852b0cc11e9ed6ea7 Mon Sep 17 00:00:00 2001 From: sidmohanty11 Date: Sun, 3 Apr 2022 16:14:34 +0530 Subject: [PATCH] working with prod socket conn and removing env deps --- app/.env.local.sample | 8 -------- app/components/inappchat/inappchat.js | 6 ++---- app/components/inappchat/lib/api.js | 17 ++++++----------- app/pages/virtualconf/greenroom/index.js | 8 +++----- app/pages/virtualconf/mainstage/[id].js | 6 +++--- 5 files changed, 14 insertions(+), 31 deletions(-) diff --git a/app/.env.local.sample b/app/.env.local.sample index edb7dd0e..a67adecb 100644 --- a/app/.env.local.sample +++ b/app/.env.local.sample @@ -36,13 +36,5 @@ ROCKETCHAT_CLIENT_SECRET="client secret" ROCKETCHAT_URL="base url of rocket chat server" ### END: Environment variables for RocketChat OAuth legacy -# INAPPCHAT -# for development it defaults to: http://localhost:3000 -# in prod, it should be: [PROTOCOL]://[DOMAIN]:[PORT] -NEXT_PUBLIC_ROCKET_CHAT_HOST=requiredInProd -# id of the room where conf will take place -NEXT_PUBLIC_ROCKET_CHAT_CONF_RID=required -# id of the greenroom -NEXT_PUBLIC_ROCKET_CHAT_GREENROOM_RID=required NEXT_PUBLIC_ROCKET_CHAT_GREENROOM_RTMP="rtmp://bkk.contribute.live-video.net/app/{stream_key}" diff --git a/app/components/inappchat/inappchat.js b/app/components/inappchat/inappchat.js index 790fd2b0..b59773ec 100644 --- a/app/components/inappchat/inappchat.js +++ b/app/components/inappchat/inappchat.js @@ -22,17 +22,15 @@ import MDPreview from '../mdpreview'; import InappchatTextInput from './inappchattextinput'; import { useMediaQuery } from '@rocket.chat/fuselage-hooks'; -const rcClient = new Rocketchat({ logger: console, protocol: 'ddp' }); const InAppChat = ({ host, closeChat, rid }) => { const [messages, setMessages] = useState([]); const emojiAnimationRef = useRef(); - const isSmallScreen = useMediaQuery("(max-width: 992px)"); const cookies = { rc_token: Cookie.get('rc_token'), rc_uid: Cookie.get('rc_uid') }; const isAuth = cookies.rc_token && cookies.rc_uid; - const rcURL = new URL(host); const useSsl = !/http:\/\//.test(host); + const rcClient = new Rocketchat({ logger: console, protocol: 'ddp', host, useSsl }); function getRandomInt(max) { return Math.floor(Math.random() * Math.floor(max)); @@ -93,7 +91,7 @@ const InAppChat = ({ host, closeChat, rid }) => { useEffect(() => { const runRealtime = async (token, rid) => { try { - await rcClient.connect({ host: rcURL.host, useSsl }); + await rcClient.connect(); await rcClient.resume({ token }); await rcClient.subscribe("stream-room-messages", rid); rcClient.onMessage((data) => { diff --git a/app/components/inappchat/lib/api.js b/app/components/inappchat/lib/api.js index 42a6f3c3..f75808a6 100644 --- a/app/components/inappchat/lib/api.js +++ b/app/components/inappchat/lib/api.js @@ -1,18 +1,13 @@ +import axios from 'axios'; + export const getMessages = async (host, rid, cookies) => { try { - const messages = await fetch( - `${host}/api/v1/channels.messages?roomId=${rid}`, - { - headers: { - "Content-Type": "application/json", + const messages = await axios.get(`${host}/api/v1/channels.messages?roomId=${rid}`, { headers: { + "Content-Type": "application/json", "X-Auth-Token": cookies.rc_token ?? "", "X-User-Id": cookies.rc_uid ?? "", - }, - method: "GET", - } - ); - - return await messages.json(); + } }) + return messages.data; } catch (err) { console.log(err.message); } diff --git a/app/pages/virtualconf/greenroom/index.js b/app/pages/virtualconf/greenroom/index.js index b962fba7..0143409d 100644 --- a/app/pages/virtualconf/greenroom/index.js +++ b/app/pages/virtualconf/greenroom/index.js @@ -4,11 +4,9 @@ import styles from "../../../styles/Mainstage.module.css"; import { Container, Row, Col } from "react-bootstrap"; import Jitsibroadcaster from "../../../components/clientsideonly/jitsibroadcaster"; import InAppChat from "../../../components/inappchat/inappchat"; -const greenroom_rid = process.env.NEXT_PUBLIC_ROCKET_CHAT_GREENROOM_RID; -const host = - process.env.NODE_ENV === "development" - ? "http://localhost:3000" - : "https://community.liaison.rocketchat.digital"; + +const greenroom_rid = "GENERAL"; +const host = process.env.NODE_ENV === "development" ? "http://localhost:3000" : "https://community.liaison.rocketchat.digital"; const Greenroom = () => { const [openChat, setOpenChat] = useState(false); diff --git a/app/pages/virtualconf/mainstage/[id].js b/app/pages/virtualconf/mainstage/[id].js index 83dd342d..19891746 100644 --- a/app/pages/virtualconf/mainstage/[id].js +++ b/app/pages/virtualconf/mainstage/[id].js @@ -6,10 +6,10 @@ import InAppChat from '../../../components/inappchat/inappchat'; import { useMediaQuery } from '@rocket.chat/fuselage-hooks'; import styles from '../../../styles/Videostreamer.module.css'; -const rid = process.env.NEXT_PUBLIC_ROCKET_CHAT_CONF_RID; +const rid = "GENERAL"; const host = process.env.NODE_ENV === "development" ? "http://localhost:3000" : "https://community.liaison.rocketchat.digital"; -export default function ConfMainStage({ cookies }) { +export default function ConfMainStage() { const [openChat, setOpenChat] = useState(true); const isSmallScreen = useMediaQuery('(max-width: 992px)'); @@ -46,7 +46,7 @@ export default function ConfMainStage({ cookies }) {