feat: send text in stream view

Author: lijiahao

app/background.js

@@ -33,7 +33,7 @@ export default class IpcConsoles extends IpcBase {
           linkedXboxId: consoleId,
         };
 
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
           http
             .post(
               'xccs.xboxlive.com',
@@ -87,7 +87,6 @@ export default class IpcConsoles extends IpcBase {
     }
 
     powerOn(consoleId: string) {
-        console.log('consoleId:', consoleId)
         return new Promise((resolve, reject) => {
             this.sendCommand(consoleId, 'Power', 'WakeUp').then(res => {
                 resolve(res)
@@ -97,6 +96,15 @@ export default class IpcConsoles extends IpcBase {
         });
     }
 
+    sendText(params) {
+      const { consoleId, text } = params
+      return this.sendCommand(consoleId, 'Shell', 'InjectString', [
+        {
+          replacementString: text,
+        },
+      ]);
+    }
+
     powerOff(consoleId: string) {
         return new Promise((resolve, reject) => {
             this.sendCommand(consoleId, 'Power', 'TurnOff').then(res => {

main/ipc/consoles.ts

@@ -39,7 +39,7 @@
     "uplot": "^1.6.30",
     "uuid-1345": "^1.0.2",
     "xbox-webapi": "^1.4.1",
-    "xstreaming-player": "0.2.7",
+    "xstreaming-player": "0.2.9",
     "xvfb-maybe": "^0.2.1"
   },
   "devDependencies": {

package.json

@@ -78,6 +78,10 @@ function ActionBar(props) {
     props.onAudio && props.onAudio();
   };
 
+  const handleText = () => {
+    props.onText && props.onText();
+  };
+
   const handlePressNexus = () => {
     props.onPressNexus && props.onPressNexus();
   };
@@ -117,12 +121,20 @@ function ActionBar(props) {
 
           {
             props.connectState === CONNECTED && (
-              <DropdownItem key="display" onClick={handleAudio}>
+              <DropdownItem key="audio" onClick={handleAudio}>
                 {t("Audio settings")}
               </DropdownItem>
             )
           }
 
+          {
+            (props.connectState === CONNECTED && props.type !== 'cloud') && (
+              <DropdownItem key="text" onClick={handleText}>
+                {t("Send text")}
+              </DropdownItem>
+            )
+          }
+
           {
             props.connectState === CONNECTED && (
               <DropdownItem key="pressNexus" onClick={handlePressNexus}>

renderer/components/ActionBar.tsx

@@ -0,0 +1,52 @@
+import { useState } from "react";
+import {
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+  Button,
+  Input,
+} from "@nextui-org/react";
+import { useTranslation } from "next-i18next";
+
+function TextModal(props) {
+  const { t } = useTranslation('cloud');
+  const [text, setText] = useState('')
+  const [loading, setLoading] = useState(false)
+
+  const handleClose = () => {
+    props.onClose && props.onClose();
+  };
+
+  const handleConfirm = () => {
+    props.onConfirm && props.onConfirm(text);
+    setLoading(true)
+    setTimeout(() => {
+      setLoading(false)
+    },  1000)
+  };
+
+  return (
+    <Modal isOpen={true} className="z-100" onClose={handleClose}>
+      <ModalContent>
+        <>
+          <ModalHeader className="flex flex-col gap-1">{t('Send text')}</ModalHeader>
+          <ModalBody>
+            <Input label="Text" placeholder="Enter text" onValueChange={value => setText(value)}/>
+          </ModalBody>
+          <ModalFooter>
+            <Button color="default" onPress={handleClose}>
+              {t("Cancel")}
+            </Button>
+            <Button color="primary" isLoading={loading} onPress={handleConfirm}>
+              {t("Confirm")}
+            </Button>
+          </ModalFooter>
+        </>
+      </ModalContent>
+    </Modal>
+  );
+}
+
+export default TextModal;

renderer/components/TextModal.tsx

@@ -10,6 +10,7 @@ import FailedModal from "../../components/FailedModal";
 import Loading from "../../components/Loading";
 import Perform from "../../components/Perform";
 import WarningModal from "../../components/WarningModal";
+import TextModal from "../../components/TextModal";
 import { useSettings } from "../../context/userContext";
 import { getStaticPaths, makeStaticProperties } from "../../lib/get-static";
 import Ipc from "../../lib/ipc";
@@ -38,6 +39,7 @@ function Stream() {
   const [showWarning, setShowWarning] = useState(false);
   const [showDisplay, setShowDisplay] = useState(false);
   const [showAudio, setShowAudio] = useState(false);
+  const [showTextModal, setShowTextModal] = useState(false);
   const [volume, setVolume] = useState(1);
   const [streamingType, setStreamingType] = useState('');
   const [consoleId, setConsoleId] = useState('');
@@ -484,6 +486,13 @@ function Stream() {
     });
   }
 
+  const handleSendText = (text: string) => {
+    Ipc.send("consoles", "sendText", {
+      consoleId,
+      text
+    });
+  }
+
   const onDisconnect = () => {
     setLoading(true);
     setShowPerformance(false);
@@ -558,6 +567,7 @@ function Stream() {
         }}
         onDisplay={() => setShowDisplay(true)}
         onAudio={() => setShowAudio(true)}
+        onText={() => setShowTextModal(true)}
         onPressNexus={handlePressNexus}
         onLongPressNexus={handleLongPressNexus}
       />
@@ -592,6 +602,22 @@ function Stream() {
         />
       )}
 
+      {
+        showTextModal && (
+          <TextModal 
+            onClose={() => setShowTextModal(false)}
+            onConfirm={value => {
+              let text = value.trim()
+              if (!text) return
+              if (text.length > 150) {
+                text = text.substring(0, 150);
+              }
+              handleSendText(text)
+            }}
+          />
+        )
+      }
+
       {showAudio && (
         <Audio
           volume={volume}

renderer/pages/[locale]/stream.tsx

@@ -39,5 +39,6 @@
   "Keep waiting": "Keep waiting",
   "Audio": "Audio",
   "Volume": "Volume",
-  "Audio settings": "Audio settings"
+  "Audio settings": "Audio settings",
+  "Send text": "Send text"
 }

renderer/public/locales/en/cloud.json

@@ -39,5 +39,6 @@
   "Keep waiting": "Keep waiting",
   "Audio": "Audio",
   "Volume": "Volume",
-  "Audio settings": "Audio settings"
+  "Audio settings": "Audio settings",
+  "Send text": "Send text"
 }

renderer/public/locales/jp/cloud.json

@@ -48,5 +48,6 @@
   "Connected": "Conectado",
   "Audio": "Audio",
   "Volume": "Volume",
-  "Audio settings": "Audio settings"
+  "Audio settings": "Audio settings",
+  "Send text": "Send text"
 }

renderer/public/locales/pt/cloud.json

@@ -49,5 +49,6 @@
   "Disconnecting...": "正在断开连接...",
   "Audio": "声音",
   "Volume": "音量",
-  "Audio settings": "声音设置"
+  "Audio settings": "声音设置",
+  "Send text": "发送文字"
 }