diff --git a/public/electron.js b/public/electron.js index bf29b14..418befa 100644 --- a/public/electron.js +++ b/public/electron.js @@ -4,7 +4,7 @@ const path = require("path"); const isDev = require("electron-is-dev"); let notRelease = process.env.NOT_RELEASE || false; const { TCPConnection } = require("../src/Socket/socket.js"); -const {autoUpdater} = require("electron-updater"); +const { autoUpdater } = require("electron-updater"); const log = require('electron-log'); const localIpAddress = require("local-ip-address") @@ -48,8 +48,8 @@ const createWindow = () => { // load the index.html of the app. (or localhost on port 3000 if you're in development) const startURL = isDev || notRelease ? "http://localhost:3000/app" - : `file://${path.join(__dirname, '../build/index.html')}`; - + : `file://${path.join(__dirname, '../build/index.html')}`; + mainWindow.loadURL(startURL) @@ -72,7 +72,7 @@ ipcMain.on("getLocalIP", (event, _) => { return true; }); -ipcMain.on("getAllMics", (event, arg) => { +ipcMain.on("/microphones/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -105,7 +105,7 @@ ipcMain.on("getAllMics", (event, arg) => { } }); -ipcMain.on("getAllScenes", (event, arg) => { +ipcMain.on("/scenes/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -134,7 +134,7 @@ ipcMain.on("getAllScenes", (event, arg) => { } }); -ipcMain.on("getActReactCouples", (event, arg) => { +ipcMain.on("/areas/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -146,60 +146,60 @@ ipcMain.on("getActReactCouples", (event, arg) => { actReactId: 1, isActive: true, action: { - actionId: 1, - type: "WORD_DETECT", - params: { - words: ['bouloubouga'] - } + actionId: 1, + type: "WORD_DETECT", + params: { + words: ['bouloubouga'] + } }, reaction: { - name: "Changement de scene sur la scene 2", - reactionId: 1, - type: "SCENE_SWITCH", - params: { - scene: "Scene 2", - uuid: "4f712d61-094a-4b7b-9905-4fa928329de4" - } + name: "Changement de scene sur la scene 2", + reactionId: 1, + type: "SCENE_SWITCH", + params: { + scene: "Scene 2", + uuid: "4f712d61-094a-4b7b-9905-4fa928329de4" + } } }, - { + { actReactId: 2, isActive: true, action: { - actionId: 2, - type: "KEY_PRESSED", - params: { - key: "m" - } + actionId: 2, + type: "KEY_PRESSED", + params: { + key: "m" + } }, reaction: { - name: "Changement de scene sur la scene 3", - reactionId: 4, - type: "SCENE_SWITCH", - params: { - scene: "Scene qui n'existe pas", - uuid: "2772a187-cc04-4058-9148-beaaba7a2145" - } + name: "Changement de scene sur la scene 3", + reactionId: 4, + type: "SCENE_SWITCH", + params: { + scene: "Scene qui n'existe pas", + uuid: "2772a187-cc04-4058-9148-beaaba7a2145" + } } }, - { + { actReactId: 3, isActive: true, action: { - actionId: 3, - type: "APP_LAUNCH", - params: { - app_name: "discord" - } + actionId: 3, + type: "APP_LAUNCH", + params: { + app_name: "discord" + } }, reaction: { - name: "Changement de scene sur la scene 3", - reactionId: 4, - type: "SCENE_SWITCH", - params: { - scene: "Scene qui n'existe pas", - uuid: "2772a187-cc04-4058-9148-beaaba7a2145" - } + name: "Changement de scene sur la scene 3", + reactionId: 4, + type: "SCENE_SWITCH", + params: { + scene: "Scene qui n'existe pas", + uuid: "2772a187-cc04-4058-9148-beaaba7a2145" + } } }, ], @@ -215,7 +215,7 @@ ipcMain.on("getActReactCouples", (event, arg) => { } }); -ipcMain.on("getSubtitlesSettings", (event, arg) => { +ipcMain.on("/subtitles/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -246,7 +246,7 @@ ipcMain.on("getSubtitlesSettings", (event, arg) => { } }); -ipcMain.on("getAllTextFields", (event, arg) => { +ipcMain.on("/text-fields/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -282,7 +282,7 @@ ipcMain.on("getAllTextFields", (event, arg) => { } }); -ipcMain.on("getAllDisplaySources", (event, arg) => { +ipcMain.on("/display-sources/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -318,7 +318,7 @@ ipcMain.on("getAllDisplaySources", (event, arg) => { } }); -ipcMain.on("getAllLinksMicsToVideoSource", (event, arg) => { +ipcMain.on("/mtdsis/get", (event, arg) => { if (isDev) { let res = { statusCode: 200, @@ -347,7 +347,7 @@ ipcMain.on("getAllLinksMicsToVideoSource", (event, arg) => { } }); -ipcMain.on("setCompressorLevel", (event, arg) => { +ipcMain.on("/microphones/auto-leveler/set", (event, arg) => { if (isDev) { let res = { message: "OK", @@ -363,7 +363,7 @@ ipcMain.on("setCompressorLevel", (event, arg) => { } }); -ipcMain.on("setSubtitles", (event, arg) => { +ipcMain.on("/subtitles/set", (event, arg) => { if (isDev) { let res = { message: "OK", @@ -379,7 +379,7 @@ ipcMain.on("setSubtitles", (event, arg) => { } }); -ipcMain.on("setActionReaction", (event, arg) => { +ipcMain.on("/areas/create", (event, arg) => { if (isDev) { let res = { message: "OK", @@ -400,7 +400,7 @@ ipcMain.on("setActionReaction", (event, arg) => { } }); -ipcMain.on("linkMicToVideoSource", (event, arg) => { +ipcMain.on("/mtdsis/create", (event, arg) => { if (isDev) { let res = { message: "OK", @@ -416,7 +416,7 @@ ipcMain.on("linkMicToVideoSource", (event, arg) => { } }); -ipcMain.on("removeActReact", (event, arg) => { +ipcMain.on("/areas/remove", (event, arg) => { if (isDev) { console.log("removeActReact") let res = { @@ -437,7 +437,7 @@ ipcMain.on("removeActReact", (event, arg) => { }); ipcMain.on("compressor-level-updated", (evt, arg) => { // Get from socket broadcast - mainWindow.webContents.send('compressor-level-updated'); // To renderer + mainWindow.webContents.send('compressor-level-updated'); // To renderer }); ipcMain.on("scenes-updated", (evt, arg) => { // Get from socket broadcast @@ -479,23 +479,23 @@ const createLoadingScreen = () => { .then((res) => { clearInterval(refreshIntervalId); boadcastConn.connectBroadcast() - .then((broadcast_res) => { - console.log("TCPConnection and Broadcast is connected"); - launchingApplication(); - clearInterval(refreshIntervalId); - return res; - }).catch((err) => { - tcpConn.disconnectSocket() - if (isDev) { - console.log("DEV MODE"); + .then((broadcast_res) => { + console.log("TCPConnection and Broadcast is connected"); + launchingApplication(); clearInterval(refreshIntervalId); - return null; - } else { - console.log("Can't locate the server", err); - setInterval(refreshIntervalId, 5000) - return null; - } - }) + return res; + }).catch((err) => { + tcpConn.disconnectSocket() + if (isDev) { + console.log("DEV MODE"); + clearInterval(refreshIntervalId); + return null; + } else { + console.log("Can't locate the server", err); + setInterval(refreshIntervalId, 5000) + return null; + } + }) }).catch((err) => { if (isDev) { console.log("DEV MODE"); diff --git a/src/Components/ActionsReactions/ActionsReactions.tsx b/src/Components/ActionsReactions/ActionsReactions.tsx index 3bb3353..6690ef0 100644 --- a/src/Components/ActionsReactions/ActionsReactions.tsx +++ b/src/Components/ActionsReactions/ActionsReactions.tsx @@ -76,7 +76,7 @@ export const ActionsReactions = () => { */ const getActionReactionFromServer = (): Promise => { return new Promise(async (resolve, reject) => { - const result: getActReactCouplesFormat = await ipcRenderer.sendSync("getActReactCouples", "ping"); + const result: getActReactCouplesFormat = await ipcRenderer.sendSync("/areas/get", "ping"); resolve(result); }); }; @@ -88,7 +88,7 @@ export const ActionsReactions = () => { */ const removeActionReactionFromServer = (actionReactionId: number): Promise => { return new Promise(async (resolve, reject) => { - const result: removeActReactAnswer = await ipcRenderer.sendSync("removeActReact", { + const result: removeActReactAnswer = await ipcRenderer.sendSync("/areas/remove", { actReactId: actionReactionId, }); resolve(result); @@ -270,7 +270,7 @@ export const ActionsReactions = () => { */ const getAllScenes = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllScenes = await ipcRenderer.sendSync("getAllScenes", "ping"); + const result: AllScenes = await ipcRenderer.sendSync("/scenes/get", "ping"); resolve(result); }); }; @@ -321,17 +321,21 @@ export const ActionsReactions = () => {
{actionsReactionsList.map((item: any, index: any) => { return ( - + # {index + 1} @@ -351,9 +355,7 @@ export const ActionsReactions = () => { {warningMessageDisplaySceneMissing(item) === true ? ( - + diff --git a/src/Components/ActionsReactions/AppLaunch/AppLaunch.tsx b/src/Components/ActionsReactions/AppLaunch/AppLaunch.tsx index b7ba31f..05a0515 100644 --- a/src/Components/ActionsReactions/AppLaunch/AppLaunch.tsx +++ b/src/Components/ActionsReactions/AppLaunch/AppLaunch.tsx @@ -121,7 +121,7 @@ export const AppLaunch = (props: any) => { */ const getActionReactionFromServer = (): Promise => { return new Promise(async (resolve, reject) => { - const result: getActReactCouplesFormat = await ipcRenderer.sendSync("getActReactCouples", "ping"); + const result: getActReactCouplesFormat = await ipcRenderer.sendSync("/areas/get", "ping"); resolve(result); }); }; @@ -133,7 +133,7 @@ export const AppLaunch = (props: any) => { */ const sendActionReactionToServer = (newActionReaction: action_reaction): Promise => { return new Promise(async (resolve, reject) => { - const result: actionReactionFormat = await ipcRenderer.sendSync("setActionReaction", newActionReaction); + const result: actionReactionFormat = await ipcRenderer.sendSync("/areas/create", newActionReaction); resolve(result); }); }; @@ -196,7 +196,7 @@ export const AppLaunch = (props: any) => { */ const removeAndUpdateActReaction = (params: any, eventArr: any) => { return new Promise(async (resolve, reject) => { - const result: removeActReactAnswer = await ipcRenderer.sendSync("removeActReact", params); + const result: removeActReactAnswer = await ipcRenderer.sendSync("/areas/remove", params); if (result.statusCode === 200) { console.log("Remove ActReaction", result.data.actReactId); updateActionReactionArray(); diff --git a/src/Components/ActionsReactions/CreateReactions/CreateReactions.tsx b/src/Components/ActionsReactions/CreateReactions/CreateReactions.tsx index fdf5043..46fef4f 100644 --- a/src/Components/ActionsReactions/CreateReactions/CreateReactions.tsx +++ b/src/Components/ActionsReactions/CreateReactions/CreateReactions.tsx @@ -86,7 +86,7 @@ export const CreateReactions = () => { */ const getAllScenes = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllScenes = await ipcRenderer.sendSync("getAllScenes", "ping"); + const result: AllScenes = await ipcRenderer.sendSync("/scenes/get", "ping"); resolve(result); }); }; diff --git a/src/Components/ActionsReactions/KeyPressed/KeyPressed.tsx b/src/Components/ActionsReactions/KeyPressed/KeyPressed.tsx index 614fdb4..29a13a0 100644 --- a/src/Components/ActionsReactions/KeyPressed/KeyPressed.tsx +++ b/src/Components/ActionsReactions/KeyPressed/KeyPressed.tsx @@ -76,14 +76,14 @@ export const KeyPressed = (props: any) => { const getActionReactionFromServer = (): Promise => { return new Promise(async (resolve, reject) => { - const result: getActReactCouplesFormat = await ipcRenderer.sendSync("getActReactCouples", "ping"); // Send a synchronous request to the server to get action-reaction pairs + const result: getActReactCouplesFormat = await ipcRenderer.sendSync("/areas/get", "ping"); // Send a synchronous request to the server to get action-reaction pairs resolve(result); }); }; const sendActionReactionToServer = (newActionReaction: action_reaction): Promise => { return new Promise(async (resolve, reject) => { - const result: actionReactionFormat = await ipcRenderer.sendSync("setActionReaction", newActionReaction); // Send a synchronous request to the server to set an action-reaction pair + const result: actionReactionFormat = await ipcRenderer.sendSync("/areas/create", newActionReaction); // Send a synchronous request to the server to set an action-reaction pair resolve(result); }); }; @@ -130,7 +130,7 @@ export const KeyPressed = (props: any) => { const removeAndUpdateActReaction = (params: any, eventArr: any) => { return new Promise(async (resolve, reject) => { - const result: removeActReactAnswer = await ipcRenderer.sendSync("removeActReact", params); // Send a synchronous request to the server to remove an action-reaction pair + const result: removeActReactAnswer = await ipcRenderer.sendSync("/areas/remove", params); // Send a synchronous request to the server to remove an action-reaction pair if (result.statusCode === 200) { console.log("Remove ActReaction", result.data.actReactId); updateActionReactionArray(); // Update the action-reaction array after removing an action-reaction pair diff --git a/src/Components/ActionsReactions/WordDetection/WordDetection.tsx b/src/Components/ActionsReactions/WordDetection/WordDetection.tsx index 97d9947..63bf60e 100644 --- a/src/Components/ActionsReactions/WordDetection/WordDetection.tsx +++ b/src/Components/ActionsReactions/WordDetection/WordDetection.tsx @@ -72,14 +72,14 @@ export const WordDetection = (props: any) => { const getActionReactionFromServer = (): Promise => { return new Promise(async (resolve, reject) => { - const result: getActReactCouplesFormat = await ipcRenderer.sendSync("getActReactCouples", "ping"); // Send a synchronous IPC message to get action-reaction couples from the server + const result: getActReactCouplesFormat = await ipcRenderer.sendSync("/areas/get", "ping"); // Send a synchronous IPC message to get action-reaction couples from the server resolve(result); }); }; const sendActionReactionToServer = (newActionReaction: action_reaction): Promise => { return new Promise(async (resolve, reject) => { - const result: actionReactionFormat = await ipcRenderer.sendSync("setActionReaction", newActionReaction); // Send a synchronous IPC message to set a new action-reaction pair on the server + const result: actionReactionFormat = await ipcRenderer.sendSync("/areas/create", newActionReaction); // Send a synchronous IPC message to set a new action-reaction pair on the server resolve(result); }); }; @@ -125,7 +125,7 @@ export const WordDetection = (props: any) => { const removeAndUpdateActReaction = (params: any, eventArr: any) => { return new Promise(async (resolve, reject) => { - const result: removeActReactAnswer = await ipcRenderer.sendSync("removeActReact", params); // Send a synchronous IPC message to remove the action-reaction pair from the server + const result: removeActReactAnswer = await ipcRenderer.sendSync("/areas/remove", params); // Send a synchronous IPC message to remove the action-reaction pair from the server if (result.statusCode === 200) { console.log("Remove ActReaction", result.data.actReactId); updateActionReactionArray(); diff --git a/src/Components/CompressorLevel/CompressorLevel.tsx b/src/Components/CompressorLevel/CompressorLevel.tsx index 2be3754..c0dde88 100644 --- a/src/Components/CompressorLevel/CompressorLevel.tsx +++ b/src/Components/CompressorLevel/CompressorLevel.tsx @@ -2,8 +2,8 @@ import React, { useEffect } from "react"; import CustomizedSlider from "../Slider/Slider"; import { AllMics, Mic } from "../../Socket/interfaces"; import { resultFormat } from "../../Socket/interfaces"; -import IconButton from '@mui/material/IconButton'; -import Tooltip from '@mui/material/Tooltip'; +import IconButton from "@mui/material/IconButton"; +import Tooltip from "@mui/material/Tooltip"; import { MdHelpOutline } from "react-icons/md"; import "./CompressorLevel.css"; @@ -12,9 +12,7 @@ import useAxiosPrivate from "../../hooks/useAxiosPrivate"; const ipcRenderer = window.require("electron").ipcRenderer; export const CompressorLevel = () => { - const [exampleCompressorArray, setExampleCompressorArray] = React.useState< - Mic[] - >([]); + const [exampleCompressorArray, setExampleCompressorArray] = React.useState([]); const [load, setload] = React.useState(true); const [point, setpoint] = React.useState("."); @@ -34,18 +32,15 @@ export const CompressorLevel = () => { const getAllCompressors = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllMics = await ipcRenderer.sendSync("getAllMics", "ping"); + const result: AllMics = await ipcRenderer.sendSync("/microphones/get", "ping"); resolve(result); }); }; const setVolumeToCompressor = (mic: Mic): Promise => { return new Promise(async (resolve, reject) => { - const result: resultFormat = await ipcRenderer.sendSync( - "setCompressorLevel", - mic - ); - console.log("setVolumeToCompressor invoke", result); + const result: resultFormat = await ipcRenderer.sendSync("/microphones/auto-leveler/set", mic); + console.log("/microphones/auto-leveler/set invoke", result); resolve(result); }); }; @@ -76,7 +71,7 @@ export const CompressorLevel = () => { }); }; - ipcRenderer.on('compressor-level-updated', handleCompressorLevelUpdated); + ipcRenderer.on("compressor-level-updated", handleCompressorLevelUpdated); async function sleep(): Promise { return new Promise((resolve) => { @@ -92,7 +87,7 @@ export const CompressorLevel = () => { sleep().then((res) => setload(res)); return () => { - ipcRenderer.removeListener('compressor-level-updated', handleCompressorLevelUpdated); + ipcRenderer.removeListener("compressor-level-updated", handleCompressorLevelUpdated); }; }, []); @@ -115,12 +110,13 @@ export const CompressorLevel = () => { ) : ( <>
-

List of mics: - - - - - +

+ List of mics: + + + + +

{exampleCompressorArray.length === 0 ? ( <> @@ -129,8 +125,7 @@ export const CompressorLevel = () => { ) : (
- {exampleCompressorArray && - exampleCompressorArray.length > 0 ? ( + {exampleCompressorArray && exampleCompressorArray.length > 0 ? ( exampleCompressorArray.map((item, index) => { return ( { const [allMics, setAllMics] = React.useState([]); const [allDisplaySources, setAllDisplaySources] = React.useState([]); // TODO To use - const [allLinksMicsToVideoSource, setAllLinksMicsToVideoSource] = React.useState< - linkMicsToVideoSource[] - >([]); + const [allLinksMicsToVideoSource, setAllLinksMicsToVideoSource] = React.useState([]); // loading const [load, setload] = React.useState(true); @@ -89,12 +87,16 @@ export const LinkMicToVideoSource = (props: any) => { } = event; setNewVideoSourceListParam( // On autofill we get a stringified value. - typeof value === 'string' ? value.split(',') : value, + typeof value === "string" ? value.split(",") : value ); - } + }; const handleSave = () => { - if (newVideoSourceListParam === undefined || newVideoSourceListParam === null || newVideoSourceListParam.length === 0) { + if ( + newVideoSourceListParam === undefined || + newVideoSourceListParam === null || + newVideoSourceListParam.length === 0 + ) { toast("You must select a video source.", { type: "error", }); @@ -117,15 +119,16 @@ export const LinkMicToVideoSource = (props: any) => { return ""; }); - console.log("newVideoSourceListParam", newVideoSourceListParam) - console.log("LINK", newMicParam, videoSourceListParamsUuids) + console.log("newVideoSourceListParam", newVideoSourceListParam); + console.log("LINK", newMicParam, videoSourceListParamsUuids); linkMicToVideoSource(newMicParam, videoSourceListParamsUuids) .then((res) => { - toast("Mic(s) linked to video source.", { - type: "success", - }); - }).catch((err) => { + toast("Mic(s) linked to video source.", { + type: "success", + }); + }) + .catch((err) => { toast("ERROR", { type: "error", }); @@ -146,7 +149,7 @@ export const LinkMicToVideoSource = (props: any) => { const getAllMics = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllMics = await ipcRenderer.sendSync("getAllMics", "ping"); + const result: AllMics = await ipcRenderer.sendSync("/microphones/get", "ping"); if (result.statusCode === 200) { resolve(result.data.mics); } else { @@ -160,10 +163,7 @@ export const LinkMicToVideoSource = (props: any) => { const getAllLinksMicsToVideoSource = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllLinksMicsToVideoSourceResult = await ipcRenderer.sendSync( - "getAllLinksMicsToVideoSource", - "ping" - ); + const result: AllLinksMicsToVideoSourceResult = await ipcRenderer.sendSync("/mtdsis/get", "ping"); if (result.statusCode === 200) { resolve(result.data.display_sources); } else { @@ -177,7 +177,7 @@ export const LinkMicToVideoSource = (props: any) => { const linkMicToVideoSource = (micUuid: string, videoSourceUuids: string[]): Promise => { return new Promise(async (resolve, reject) => { - const result: resultFormat = await ipcRenderer.sendSync("linkMicToVideoSource", { + const result: resultFormat = await ipcRenderer.sendSync("/mtdsis/create", { mic_ids: micUuid, display_source_id: videoSourceUuids, }); @@ -238,7 +238,7 @@ export const LinkMicToVideoSource = (props: any) => { const getAllDisplaySources = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllDisplaySourcesResult = await ipcRenderer.sendSync("getAllDisplaySources", "ping"); + const result: AllDisplaySourcesResult = await ipcRenderer.sendSync("/display-sources/get", "ping"); if (result.statusCode === 200) { resolve(result.data); } else { @@ -323,7 +323,12 @@ export const LinkMicToVideoSource = (props: any) => { // Random key key={l.mic_id} secondaryAction={ - + } @@ -335,7 +340,7 @@ export const LinkMicToVideoSource = (props: any) => { @@ -363,19 +368,17 @@ export const LinkMicToVideoSource = (props: any) => { labelId="select-event-label" id="select-event" value={newMicParam} - onChange={(action) => - setNewMicParam(action.target.value as string) - } + onChange={(action) => setNewMicParam(action.target.value as string)} autoWidth label="TextField" > {allMics.map((mic) => { - return ( - - {mic.micName} - - ); - })} + return ( + + {mic.micName} + + ); + })} Select display source(s): @@ -402,8 +405,6 @@ export const LinkMicToVideoSource = (props: any) => { ))} - - diff --git a/src/Components/Subtitles/Subtitles.tsx b/src/Components/Subtitles/Subtitles.tsx index 97b7adc..ccac499 100644 --- a/src/Components/Subtitles/Subtitles.tsx +++ b/src/Components/Subtitles/Subtitles.tsx @@ -12,12 +12,7 @@ import { ListItem, ListItemText, OutlinedInput, - Popover, - Switch, - TextField, - Typography, } from "@mui/material"; -import Divider from "@mui/material/Divider"; import React, { Fragment, useEffect } from "react"; import InputLabel from "@mui/material/InputLabel"; import MenuItem from "@mui/material/MenuItem"; @@ -33,7 +28,6 @@ import { import { toast } from "react-toastify"; import { BsTrash } from "react-icons/bs"; import "./Subtitles.css"; -import { Theme } from "@mui/material/styles"; import MicNoneIcon from "@material-ui/icons/MicNone"; const ipcRenderer = window.require("electron").ipcRenderer; @@ -77,7 +71,7 @@ export const Subtitles = () => { const getAllCompressors = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllMics = await ipcRenderer.sendSync("getAllMics", "ping"); + const result: AllMics = await ipcRenderer.sendSync("/microphones/get", "ping"); resolve(result); }); }; @@ -155,7 +149,7 @@ export const Subtitles = () => { linked_mics: linkedMics, uuid: uuid, }; - const result: resultFormat = ipcRenderer.sendSync("setSubtitles", param); + const result: resultFormat = ipcRenderer.sendSync("/subtitles/set", param); resolve(result); }); }; @@ -166,21 +160,21 @@ export const Subtitles = () => { linked_mics: [], // Empty linked_mics means that the text field will be deleted uuid: uuid, }; - const result: resultFormat = ipcRenderer.sendSync("setSubtitles", param); + const result: resultFormat = ipcRenderer.sendSync("/subtitles/set", param); resolve(result); }); }; const getSubtitlesSettings = (): Promise => { return new Promise(async (resolve, reject) => { - const result: AllSubtitlesSettings = await ipcRenderer.sendSync("getSubtitlesSettings", "ping"); + const result: AllSubtitlesSettings = await ipcRenderer.sendSync("/subtitles/get", "ping"); resolve(result); }); }; const getAllTextFields = (): Promise => { return new Promise(async (resolve, reject) => { - const result: any = await ipcRenderer.sendSync("getAllTextFields", "ping"); + const result: any = await ipcRenderer.sendSync("/text-fields/get", "ping"); resolve(result); }); }; diff --git a/src/Socket/socket.js b/src/Socket/socket.js index 797fb7e..1a576c1 100644 --- a/src/Socket/socket.js +++ b/src/Socket/socket.js @@ -10,13 +10,13 @@ class TCPConnection { connect() { return new Promise((resolve, reject) => { - this.socket = net.createConnection({port: this.port, host: this.host}, () => { + this.socket = net.createConnection({ port: this.port, host: this.host }, () => { console.log('TCPConnection initialized'); resolve(this.socket); }); this.socket.once('data', (data) => { try { - data = data.toString().replace('\t','').replace('\r','').replace('\n','').replace(/\0/g, ''); // Remove all useless characters + data = data.toString().replace('\t', '').replace('\r', '').replace('\n', '').replace(/\0/g, ''); // Remove all useless characters const payload = JSON.parse(data); console.log(payload); } catch (error) { @@ -42,7 +42,7 @@ class TCPConnection { connectBroadcast() { return new Promise((resolve, reject) => { - this.socket = net.createConnection({port: this.port, host: this.host}, () => { + this.socket = net.createConnection({ port: this.port, host: this.host }, () => { console.log('TCPConnection broadcast initialized'); this.setBrocast({ "enable": true }).then( () => { @@ -54,20 +54,20 @@ class TCPConnection { try { console.log("BEFORE toString", data) data = data.toString() - data = data.replace('\t','').replace('\r','').replace(/\0/g, ''); // Remove all useless characters + data = data.replace('\t', '').replace('\r', '').replace(/\0/g, ''); // Remove all useless characters // Split the data by newline character const jsonStrings = data.split('\n'); - + // Add the JSON strings to the queue jsonStrings.forEach((jsonString) => { if (jsonString.trim() !== '') { let payload = JSON.parse(jsonString); - + if (payload.message === 'BROADCAST') { let type = payload.data.type - + if (type === 'audioSourceCreated' || type === 'audioSourceRemoved' || type === 'audioSourceNameChanged' || type === 'compressorSettingsChanged') { this.ipcMain.emit('compressor-level-updated') } else if (type === 'sceneCreated' || type === 'sceneRemoved' || type === 'sceneNameChanged') { @@ -109,12 +109,12 @@ class TCPConnection { } } - sendData(obj, callback){ + sendData(obj, callback) { obj = JSON.stringify(obj) + "\r\n"; this.socket.write(obj); this.socket.once('data', (data) => { try { - data = data.toString().replace('\t','').replace('\r','').replace('\n','').replace(/\0/g, ''); // Remove all useless characters + data = data.toString().replace('\t', '').replace('\r', '').replace('\n', '').replace(/\0/g, ''); // Remove all useless characters const payload = JSON.parse(data); callback(payload, null); } catch (error) { @@ -131,16 +131,16 @@ class TCPConnection { getAllMics() { let obj = { - command: 'getAllMics', + command: '/microphones/get', }; - console.log('getAllMics -> ', JSON.stringify(obj)); + console.log('/microphones/get -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { this.sendData(obj, (data, error) => { if (data) { - console.log('getAllMics resolve', data); + console.log('/microphones/get resolve', data); resolve(data); } else { - console.log('getAllMics error', error); + console.log('/microphones/get error', error); this.socket.end(); this.ipcMain.emit('connection-server-lost') reject(error); @@ -151,7 +151,7 @@ class TCPConnection { getAllScenes() { let obj = { - command: 'getAllScenes', + command: '/scenes/get', }; console.log('getAllScenes -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { @@ -171,7 +171,7 @@ class TCPConnection { getActReactCouples() { let obj = { - command: 'getActReactCouples', + command: '/areas/get', }; console.log('getActReactCouples -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { @@ -191,7 +191,7 @@ class TCPConnection { getSubtitlesSettings() { let obj = { - command: 'getSubtitlesSettings', + command: '/subtitles/get', }; console.log('getSubtitlesSettings -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { @@ -211,7 +211,7 @@ class TCPConnection { getAllTextFields() { let obj = { - command: 'getAllTextFields', + command: '/text-fields/get', }; console.log('getAllTextFields -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { @@ -251,7 +251,7 @@ class TCPConnection { getAllDisplaySources() { let obj = { - command: 'getAllDisplaySources', + command: '/display-sources/get', }; console.log('getAllDisplaySources -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { @@ -271,7 +271,7 @@ class TCPConnection { getAllLinksMicsToVideoSource() { let obj = { - command: 'getAllLinksMicsToVideoSource', + command: '/mtdsis/get', }; console.log('getAllLinksMicsToVideoSource -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { @@ -291,17 +291,17 @@ class TCPConnection { setVolumeToMic(args) { let obj = { - command: 'setCompressorLevel', + command: '/microphones/auto-leveler/set', params: args }; - console.log('setVolumeToMic -> ', JSON.stringify(obj)); + console.log('/microphones/auto-leveler/set -> ', JSON.stringify(obj)); return new Promise((resolve, reject) => { this.sendData(obj, (data, error) => { if (data) { - console.log('setVolumeToMic resolve', data); + console.log('/microphones/auto-leveler/set resolve', data); resolve(data); } else { - console.log('setVolumeToMic error', error); + console.log('/microphones/auto-leveler/set error', error); this.socket.end(); this.ipcMain.emit('connection-server-lost') reject(error); @@ -312,7 +312,7 @@ class TCPConnection { setSubtitles(args) { let obj = { - command: 'setSubtitles', + command: '/subtitles/set', params: args }; console.log('setSubtitles -> ', JSON.stringify(obj)); @@ -333,7 +333,7 @@ class TCPConnection { setActionReaction(args) { let obj = { - command: 'setActionReaction', + command: '/areas/create', params: args }; console.log('setActionReaction -> ', JSON.stringify(obj)); @@ -354,7 +354,7 @@ class TCPConnection { linkMicToVideoSource(args) { let obj = { - command: 'linkMicToVideoSource', + command: '/mtdsis/create', params: args }; console.log('linkMicToVideoSource -> ', JSON.stringify(obj)); @@ -375,7 +375,7 @@ class TCPConnection { removeActReact(args) { let obj = { - command: 'removeActReact', + command: '/areas/remove', params: args }; console.log('removeActReact -> ', JSON.stringify(obj)); @@ -396,7 +396,7 @@ class TCPConnection { setBrocast(args) { let obj = { - command: 'subscribeBroadcast', + command: '/broadcast/subscribe', params: args }; console.log('subscribeBroadcast -> ', JSON.stringify(obj));