Merge branch 'develop' into steam-beta

CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Crash for some users without bluetooth adapters when disabling lighthouse control.
+
+## [1.11.2]
+
+### Added
+
+- Crash reporting for Rust panics and JS errors in main UI.
+
+### Changed
+
+- Updated telemetry to integrate with [Aptabase](https://aptabase.com/). A
+  new [privacy policy](https://aptabase.com/legal/privacy) applies.
+
+## [1.11.1]
+
+### Added
+
+- Option for opening the developer tools in release builds.
+
+## [1.11.0]
+
 ### Added
 
 - Automations for controlling the volume and mute state of all system audio devices.
@@ -19,24 +41,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for custom Windows power policies
 - Custom nicknames for controller, tracker, and base station devices.
 - Option for ignoring specific basestations in automations.
-- Support for setting custom hotkeys (With actions for sleep mode toggling/enabling/disabling, running sleep preparation, running the shutdown sequence, and turning devices on and off)
+- Support for setting custom hotkeys (With actions for sleep mode toggling/enabling/disabling, running sleep
+  preparation, running the shutdown sequence, and turning devices on and off)
 - Detection for initialization failures and error handling.
 - Added support for OSCQuery
-- Status information view to the settings, for showing technical information regarding OyasumiVR and some of its internals.
+- Status information view to the settings, for showing technical information regarding OyasumiVR and some of its
+  internals.
 - Automation for running a OSC script whenever the user prepares to go to sleep.
-- Added OSC command for turning on and turning off all base stations.
+- Added OSC commands for turning on and turning off all base stations.
 
 ### Changed
 
-- When your VRChat session expires and you've opted to store your credentials, OyasumiVR will automatically attempt to log you back in.
+- When your VRChat session expires and you've opted to store your credentials, OyasumiVR will automatically attempt to
+  log you back in.
 - Improved reliability of base station power management
 - Brightness automations no longer apply on start as a default setting
 - Updated to Tauri v1.5
 - Rewrote OSC control (Old OSC addresses remain supported, but check the wiki page on OSC control for any updates)
 
 ### Fixed
 
-- Updated missing and improved existing Simplified Chinese translations (by [雾雨花精灵](https://github.com/flower-elf) and [i0nTempest](https://twitter.com/i0ntempest)).
+- Updated missing and improved existing Simplified Chinese translations (by [雾雨花精灵](https://github.com/flower-elf)
+  and [i0nTempest](https://twitter.com/i0ntempest)).
 - Default bindings sometimes triggering haptics for some users.
 - Improved search performance in the friend selection modal for automatically accepting invite requests.
 
@@ -112,7 +138,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Simple mode for brightness control that consolidates image- and display brightness.
 - Brightness control dialog to directly control brightness from the main window.
 - Brightness control sliders to directly control brightness from the overlay.
-- Sleep preparation automation for brightness control, to allow for dimming brightness levels already before going to sleep.
+- Sleep preparation automation for brightness control, to allow for dimming brightness levels already before going to
+  sleep.
 - Sleep preparation button in the overlay and on the overview, to trigger automations that support this feature.
 - Copy buttons to the brightness automation configuration for copying current brightness levels.
 - Options to apply sleep-mode based brightness levels on OyasumiVR and SteamVR startup.
@@ -129,7 +156,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Updated translations to use ICU syntax.
-- Migrated from Legacy OpenVR Input system to SteamVR's current input system (Controller bindings are now configured in SteamVR!)
+- Migrated from Legacy OpenVR Input system to SteamVR's current input system (Controller bindings are now configured in
+  SteamVR!)
 - Bundled dotnet runtime requirements with overlay sidecar module. (Separate installation no longer required)
 
 ### Fixed
@@ -175,7 +203,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- Custom VRCFury installation prefabs for GoGo Loco. (You can now use GoGo Loco's own installation prefabs from GoGo Loco 1.8.0 onwards!)
+- Custom VRCFury installation prefabs for GoGo Loco. (You can now use GoGo Loco's own installation prefabs from GoGo
+  Loco 1.8.0 onwards!)
 
 ## [1.8.0]
 
@@ -393,12 +422,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Status automations for automatically changing your VRChat status based on the amount of players in your world.
 - VRChat login for features that require accessing the VRChat API. (e.g. Status automations)
 - Possibility for specific options to be triggered over OSC (and thus using VRChat avatar parameters):
-  - Sleep Mode
-  - Sleeping Animation Automations
-  - Status Automations
-  - Turning off controllers
-  - Turning off trackers
-  - Turning off trackers & controllers
+    - Sleep Mode
+    - Sleeping Animation Automations
+    - Status Automations
+    - Turning off controllers
+    - Turning off trackers
+    - Turning off trackers & controllers
 - Status bar for showing the current sleep mode and logged-in VRChat account, as well as the status of that account.
 - Better logging
 
@@ -416,7 +445,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Marked the preset for [ごろ寝システム (Sleep System) by みんみんみーん](https://booth.pm/ko/items/2886739) to also support v2.3 and
+- Marked the preset for [ごろ寝システム (Sleep System) by みんみんみーん](https://booth.pm/ko/items/2886739) to also
+  support v2.3 and
   the new EX version.
 - Changed presets to support multiple info links (to show both んみんみーん's EX and non-EX version)
 
@@ -430,7 +460,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Sleeping animation automations for automatically changing the sleeping animation of your avatar based on your sleeping
   position.
-  - Preset for [ごろ寝システム (Sleep System) v2.2 by みんみんみーん](https://booth.pm/ko/items/2886739).
+    - Preset for [ごろ寝システム (Sleep System) v2.2 by みんみんみーん](https://booth.pm/ko/items/2886739).
 - Setting to start Oyasumi with administrator privileges by default
 - Editor for writing OSC scripts
 - In-app updater & changelog

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oyasumi",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "author": "Raphiiko",
   "license": "MIT",
   "type": "module",
@@ -47,6 +47,7 @@
     "@angular/platform-browser": "^16.1.8",
     "@angular/platform-browser-dynamic": "^16.1.8",
     "@angular/router": "^16.1.8",
+    "@aptabase/tauri": "^0.4.1",
     "@fontsource/fira-code": "^4.5.12",
     "@fontsource/noto-sans-jp": "^4.5.12",
     "@fontsource/noto-sans-kr": "^4.5.12",
@@ -138,4 +139,4 @@
       "git add"
     ]
   }
-}
+}

src-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oyasumivr"
-version = "1.11.0"
+version = "1.11.2"
 description = ""
 authors = ["Raphiiko"]
 license = "MIT"
@@ -84,6 +84,7 @@ human_bytes = { version = "0.4.3" }
 system_shutdown = "4.0.1"
 async-recursion = "1.0.5"
 enumset = "1.1.3"
+tauri-plugin-aptabase = "0.5"
 
 [dependencies.oyasumivr_oscquery]
 git = "https://github.com/Raphiiko/oyasumivr_oscquery.git"
@@ -112,6 +113,7 @@ features = [
   "shell-execute",
   "shell-open",
   "updater",
+  "devtools",
 ]
 
 [dependencies.ovr_overlay]

src-core/src/commands/debug.rs

@@ -0,0 +1,6 @@
+use tauri::Manager;
+
+#[tauri::command]
+pub async fn open_dev_tools(app_handle: tauri::AppHandle) {
+    app_handle.get_window("main").unwrap().open_devtools();
+}

src-core/src/commands/mod.rs

@@ -3,3 +3,4 @@ pub mod log_utils;
 pub mod notifications;
 pub mod nvml;
 pub mod splash;
+pub mod debug;

src-core/src/flavour.rs

@@ -1,4 +1,6 @@
-#[derive(PartialEq)]
+use serde::Serialize;
+
+#[derive(PartialEq, Serialize)]
 pub enum BuildFlavour {
     Dev,
     Standalone,

src-core/src/globals.rs

@@ -5,6 +5,7 @@ pub const CORE_GRPC_DEV_PORT: u16 = 5176;
 pub const CORE_HTTP_DEV_PORT: u16 = 5177;
 pub const OVERLAY_SIDECAR_GRPC_DEV_PORT: u16 = 5174;
 pub const OVERLAY_SIDECAR_GRPC_WEB_DEV_PORT: u16 = 5175;
+pub const APTABASE_APP_KEY: &str = "A-EU-0936106873";
 
 lazy_static! {
     pub static ref TAURI_APP_HANDLE: Mutex<Option<tauri::AppHandle>> = Default::default();