feat: trigger rumble support

package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "xstreaming",
   "description": "xstreaming",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": "Geocld <[email protected]>",
   "main": "app/background.js",
   "scripts": {
@@ -39,7 +39,7 @@
     "uplot": "^1.6.30",
     "uuid-1345": "^1.0.2",
     "xbox-webapi": "^1.4.1",
-    "xstreaming-player": "^0.2.4",
+    "xstreaming-player": "0.2.5",
     "xvfb-maybe": "^0.2.1"
   },
   "devDependencies": {
@@ -52,7 +52,7 @@
     "@typescript-eslint/parser": "^8.6.0",
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.1.3",
-    "electron": "28",
+    "electron": "33",
     "electron-builder": "^24.13.3",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.2",

renderer/common/settings.ts

@@ -139,6 +139,14 @@ const getSettingsMetas = (t) => {
           'Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)',
         )
       },
+      {
+        name: 'audio_bitrate',
+        type: 'bitrate',
+        title: t('Audio bitrate'),
+        description: t(
+          'Set the streaming audio bitrate',
+        )
+      },
     ],
     gamepad: [
       {
@@ -183,6 +191,20 @@ const getSettingsMetas = (t) => {
           {value: false, label: t('Disable')},
         ],
       },
+      {
+        name: 'force_trigger_rumble',
+        type: 'radio',
+        title: t('Trigger rumble'),
+        description: t(
+          'trigger_rumble_description',
+        ),
+        data: [
+          {value: '', label: t('Disable')},
+          {value: 'all', label: t('All')},
+          {value: 'left', label: t('Left trigger')},
+          {value: 'right', label: t('Right trigger')},
+        ],
+      },
     ],
     xhome: [
       {

renderer/context/userContext.defaults.ts

@@ -6,6 +6,8 @@ export const defaultSettings = {
   xhome_bitrate: 20,
   xcloud_bitrate_mode: "Auto",
   xcloud_bitrate: 20,
+  audio_bitrate_mode: "Auto",
+  audio_bitrate: 20,
   preferred_game_language: "en-US",
   force_region_ip: "",
   codec: "",
@@ -14,6 +16,7 @@ export const defaultSettings = {
   gamepad_kernal: "Native",
   dead_zone: 0.1,
   edge_compensation: 0,
+  force_trigger_rumble: '',
   power_on: false,
   video_format: "",
   virtual_gamepad_opacity: 0.6,

renderer/pages/[locale]/stream.tsx

@@ -85,6 +85,10 @@ function Stream() {
         xPlayer.setGamepadMaping(settings.gamepad_maping)
       }
 
+      if (settings.force_trigger_rumble) {
+        xPlayer.setForceTriggerRumble(settings.force_trigger_rumble)
+      }
+
       // Set bitrate
       if (streamType === "cloud") {
         if (
@@ -110,6 +114,18 @@ function Stream() {
         }
       }
 
+      // Set audio bitrate
+      if (
+        settings.audio_bitrate_mode === "Custom" &&
+        settings.audio_bitrate !== 0
+      ) {
+        console.log(
+          "setAudioBitrate:",
+          settings.audio_bitrate + "Mb/s"
+        );
+        xPlayer.setAudioBitrate(settings.audio_bitrate);
+      }
+
       xPlayer.setConnectFailHandler(() => {
         // Not connected
         if (connectStateRef.current === "") {

renderer/pages/[locale]/test.tsx

@@ -211,7 +211,35 @@ function GamepadTester() {
             }
           }}
         >
-          Vibration test
+          Vibration
+        </Button>
+
+        <Button
+          color="secondary"
+          onClick={() => {
+            const gamepads = navigator.getGamepads();
+            console.log("gamepads:", gamepads);
+            for (let i = 0; i < gamepads.length; i++) {
+              const gp = gamepads[i];
+              if (gp) {
+                // @ts-ignore
+                if (gp.vibrationActuator.effects && gp.vibrationActuator.effects.includes('trigger-rumble')) {
+                  gp.vibrationActuator.playEffect('trigger-rumble', {
+                      duration: 255,
+                      leftTrigger: 1,
+                      rightTrigger: 1,
+                      strongMagnitude: 0,
+                      weakMagnitude: 1,
+                  });
+
+                } else {
+                  window.alert('trigger rumble is not supported!')
+                }
+              }
+            }
+          }}
+        >
+          Trigger rumble
         </Button>
       </div>
       <div id="gamepads"></div>

renderer/public/locales/en/settings.json

@@ -41,12 +41,19 @@
   "If your device supports newer codecs, it can reduce the video bandwidth requirements": "If your device supports newer codecs, it can reduce the video bandwidth requirements",
   "Host stream bitrate": "Host stream bitrate",
   "Cloud stream bitrate": "Cloud stream bitrate",
+  "Audio bitrate": "Audio bitrate",
+  "Set the streaming audio bitrate": "Set the streaming audio bitrate",
   "Set the host streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "Set the host streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)",
   "Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)",
   "Joystick dead zone": "Joystick dead zone",
   "Config joystick dead zone": "Config joystick dead zone",
   "Vibration": "Vibration",
   "If your controller supports vibration, you can set whether it vibrates during the game": "If your controller supports vibration, you can set whether it vibrates during the game",
+  "Trigger rumble": "Trigger rumble",
+  "trigger_rumble_description": "Force controller trigger rumbled(Only work in Xbox one/s/x controller)",
+  "All": "All",
+  "Left trigger": "Left trigger",
+  "Right trigger": "Right trigger",
   "Ipv6": "Ipv6",
   "Prioritize using IPv6 connection": "Prioritize using IPv6 connection",
   "Signal server": "Signal server",

renderer/public/locales/jp/settings.json

@@ -41,12 +41,19 @@
   "If your device supports newer codecs, it can reduce the video bandwidth requirements": "If your device supports newer codecs, it can reduce the video bandwidth requirements",
   "Host stream bitrate": "Host stream bitrate",
   "Cloud stream bitrate": "Cloud stream bitrate",
+  "Audio bitrate": "Audio bitrate",
+  "Set the streaming audio bitrate": "Set the streaming audio bitrate",
   "Set the host streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "Set the host streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)",
   "Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)",
   "Joystick dead zone": "Joystick dead zone",
   "Config joystick dead zone": "Config joystick dead zone",
   "Vibration": "Vibration",
   "If your controller supports vibration, you can set whether it vibrates during the game": "If your controller supports vibration, you can set whether it vibrates during the game",
+  "Trigger rumble": "Trigger rumble",
+  "trigger_rumble_description": "Force controller trigger rumbled(Only work in Xbox one/s/x controller)",
+  "All": "All",
+  "Left trigger": "Left trigger",
+  "Right trigger": "Right trigger",
   "Ipv6": "Ipv6",
   "Prioritize using IPv6 connection": "Prioritize using IPv6 connection",
   "Signal server": "Signal server",

renderer/public/locales/zh/settings.json

@@ -40,12 +40,19 @@
   "If your device supports newer codecs, it can reduce the video bandwidth requirements": "如果您的设备支持较新的编解码器，则可以降低视频带宽要求。",
   "Host stream bitrate": "主机串流码率",
   "Cloud stream bitrate": "云游戏码率",
+  "Audio bitrate": "声音",
+  "Set the streaming audio bitrate": "设置声音码率",
   "Set the host streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "设置主机串流码率(注意：并不是码率越高越好，最终码率以串流协商为准)",
   "Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "设置主机串流码率(注意：并不是码率越高越好，最终码率以串流协商为准)",
   "Joystick dead zone": "摇杆死区",
   "Config joystick dead zone": "设置摇杆死区",
   "Vibration": "振动",
   "If your controller supports vibration, you can set whether it vibrates during the game": "如果手柄支持振动，可以设置游戏中是否振动。",
+  "Trigger rumble": "扳机振动",
+  "trigger_rumble_description": "强制扳机振动(只有你的手柄支持扳机振动才生效)",
+  "All": "全部",
+  "Left trigger": "左扳机",
+  "Right trigger": "右扳机",
   "Ipv6": "Ipv6",
   "Prioritize using IPv6 connection": "优先使用Ipv6连接",
   "Signal server": "信令服务器",

renderer/public/locales/zht/settings.json

@@ -40,13 +40,20 @@
   "If your device supports newer codecs, it can reduce the video bandwidth requirements": "如果您的設備支持較新的編解碼器，則可以降低視頻帶寬要求。",
   "Host stream bitrate": "主機串流碼率",
   "Cloud stream bitrate": "雲遊戲碼率",
+  "Audio bitrate": "声音碼率",
+  "Set the streaming audio bitrate": "設置主機串流声音碼率",
   "Set the host streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "設置主機串流碼率(注意：並不是碼率越高越好，最終碼率以串流協商為準)",
   "Set the cloud streaming bitrate (Note: Higher bitrate is not always better; the final bitrate will be determined by streaming negotiation)": "設置雲遊戲碼率(注意：並不是碼率越高越好，最終碼率以串流協商為準)",
   "Joystick dead zone": "搖桿死區",
   "Config joystick dead zone": "設置搖桿死區",
   "Vibration": "振動",
   "If your controller supports vibration, you can set whether it vibrates during the game": "如果手柄支持振動，可以設置遊戲中是否振動。",
+  "Trigger rumble": "扳机振動",
+  "trigger_rumble_description": "强制扳机振動(手柄支持扳机振動才生效)",
   "Ipv6": "Ipv6",
+  "All": "全部",
+  "Left trigger": "左扳机",
+  "Right trigger": "右扳机",
   "Prioritize using IPv6 connection": "優先使用Ipv6連接",
   "Signal server": "信令伺服器",
   "The signaling server is a server for stream negotiation. If the host cannot connect, please try modifying this option": "信令伺服器用於串流開始握手階段，如出現無法連接主機/雲遊戲的情況，請嘗試修改此選項(該選項關閉APP後將重置)",