diff --git a/.github/workflows/build-development.yml b/.github/workflows/build-development.yml
index 3d7a63d7..9831fdaa 100644
--- a/.github/workflows/build-development.yml
+++ b/.github/workflows/build-development.yml
@@ -69,7 +69,7 @@ jobs:
tag_name: oyasumi-vDEV-new
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - uses: tauri-apps/tauri-action@v0
+ - uses: Raphiiko/tauri-action@dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
@@ -80,6 +80,8 @@ jobs:
releaseBody: ${{ steps.changelog_reader.outputs.changes }}
releaseDraft: false
prerelease: true
+ includeDebug: true
+ includeRelease: false
- name: Get current development release ID if it exists
uses: actions/github-script@v6
continue-on-error: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d92c1c56..d89c61fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [1.5.0]
+
+### Added
+
+- [EXPERIMENTAL] Sleep detection based on the movement of the user's VR headset.
+- Automation for disabling sleep mode when SteamVR has been stopped.
+- Configuration options for setting the OSC hosts and ports Oyasumi interacts with.
+- Support for XSOverlay and Desktop notifications.
+- Notifications for when sleep mode is enabled and disabled.
+
+### Changed
+
+- The elevated sidecar will be launched on start if the main application is launched with administrator privileges.
+- Layout of Sleep Detection pane has been updated to match recent views.
+- Configuration options for sleep detection automations can now be edited while the automations are inactive.
+- Removing friends from the player list for automatic invite request accepts, now requires confirmation.
+
+### Fixed
+
+- Various improvements to the Japanese translations (by [なき](https://twitter.com/NoYu_idea))
+- Various small bugs
+
## [1.4.1]
### Added
@@ -40,13 +62,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Update check to run every week after application start, in case Oyasumi is left running for a long time.
-- Update check to rerun every 10 minutes until at least one check has succeeded, in case Oyasumi is started while offline.
+- Update check to rerun every 10 minutes until at least one check has succeeded, in case Oyasumi is started while
+ offline.
## [1.3.0]
### Added
-- New feature for automatically accepting invite requests while on orange/green status, optionally based on a white- or blacklist.
+- New feature for automatically accepting invite requests while on orange/green status, optionally based on a white- or
+ blacklist.
- Korean language support, thanks to [@soumt-r](https://github.com/soumt-r).
### Changed
@@ -58,7 +82,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
-- Fixed issue where the main window would load before the app was ready, due to a bug in a new version of the `tao` crate.
+- Fixed issue where the main window would load before the app was ready, due to a bug in a new version of the `tao`
+ crate.
## [1.2.1]
@@ -93,11 +118,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Sleeping animation automation preset for [GoGo Loco v1.7.1 by franada](https://booth.pm/en/items/3290806).
-- Sleeping animation automation (workaround) preset for [GoGo Loco v1.6.2 - v1.7.0 by franada](https://booth.pm/en/items/3290806).
+- Sleeping animation automation (workaround) preset
+ for [GoGo Loco v1.6.2 - v1.7.0 by franada](https://booth.pm/en/items/3290806).
### Changed
-- Marked the preset for [ごろ寝システム (Sleep System) by みんみんみーん](https://booth.pm/ko/items/2886739) to also support v2.3 and the new EX version.
+- 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)
### Fixed
@@ -108,7 +135,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
-- Sleeping animation automations for automatically changing the sleeping animation of your avatar based on your sleeping position.
+- 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).
- Setting to start Oyasumi with administrator privileges by default
- Editor for writing OSC scripts
@@ -121,13 +149,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
-- Navigation item for GPU Automations to show an error icon when the feature is enabled, but no administrator privileges were detected.
+- Navigation item for GPU Automations to show an error icon when the feature is enabled, but no administrator privileges
+ were detected.
- Switched to Fontsource for the application font, to remove the dependency on Google for providing fonts at runtime.
- Added own updater UI to replace the default Tauri update dialog.
### Fixed
-- The main window can now be interacted with through the SteamVR overlay or other overlays like XSOverlay, when given administrator privileges.
+- The main window can now be interacted with through the SteamVR overlay or other overlays like XSOverlay, when given
+ administrator privileges.
- Fixed turning off devices sometimes triggering the "disabling sleep mode when a device is turned on" automation.
- Fixed Oyasumi freezing when SteamVR is stopped while it is still running.
@@ -136,7 +166,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Global sleep mode to more clearly separate triggers and actions for easier future expansion.
-- Version migrations for app settings and automation configurations, to aid preservation of configuration during future updates.
+- Version migrations for app settings and automation configurations, to aid preservation of configuration during future
+ updates.
- GPU Automations for automatically adjusting the power limits of NVIDIA GPUs
### Changed
diff --git a/README.md b/README.md
index 0c6d1774..76640ef4 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
:zzz: A collection of utilities to assist with sleeping in virtual reality. :zzz:
+
@@ -28,10 +29,6 @@
If you want to come chat, join our Discord Server!
-
## Getting started
Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oyasumi/releases) page.
@@ -42,14 +39,14 @@ Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oya
Sleeping Animations
GPU Power Limiting
MSI Afterburner Automations
-
Sleep Detection
+
Sleep Automations
Device Overview
-
-
-
-
+
+
+
+
@@ -57,20 +54,19 @@ Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oya
General Settings
Auto Accept Invite Requests
Battery Automations
-
About
+
Sleep Detection
-
-
-
-
-
+
+
+
+
+
-
## Features
@@ -102,19 +98,21 @@ Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oya
- :email: Automatically accept invite requests
- Automatically let friends in while you are asleep!
- Configure whose invite requests are accepted using a black- or whitelist.
-- :zzz: Manage automations with a sleep mode in various ways:
+- :zzz: Automatically enable and disable sleep mode for triggering automations
- Detect falling asleep:
+ - When Oyasumi guesses you are asleep based on your movement
- When a controller or tracker battery percentage falls below a threshold
- When turning off your controllers
- On a time schedule
- Detect waking up:
- When turning on a controller or tracker
- On a time schedule
+ - When SteamVR is stopped
- :calling: [Premade expression menu](https://github.com/Raphiiko/Oyasumi/wiki/Oyasumi-Expression-Menu) for controlling some features right from within VRChat
- 🗺️ Multi language support
- English
- Dutch (Nederlands)
- - Japanese (日本語)
+ - Japanese (日本語) (Outsourced + Community contributions by [なき](https://twitter.com/NoYu_idea))
- Korean\* (한국어) (Community contribution by [Soumt](https://github.com/soumt-r))
- Traditional Chinese\* (繁體中文) (Community contribution by [狐 Kon](https://github.com/XoF-eLtTiL))
- Simplified Chinese\* (简体中文) (Community contribution by [狐 Kon](https://github.com/XoF-eLtTiL))
diff --git a/package.json b/package.json
index 30833f3d..a0c6866b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oyasumi",
- "version": "1.4.1",
+ "version": "1.5.0",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
diff --git a/src-elevated-sidecar/Cargo.lock b/src-elevated-sidecar/Cargo.lock
index 13aeb6ff..5103f4b5 100644
--- a/src-elevated-sidecar/Cargo.lock
+++ b/src-elevated-sidecar/Cargo.lock
@@ -678,7 +678,7 @@ dependencies = [
[[package]]
name = "oyasumi-elevated-sidecar"
-version = "1.4.0"
+version = "1.5.0"
dependencies = [
"codesigned",
"directories",
@@ -693,16 +693,16 @@ dependencies = [
"simplelog",
"sysinfo",
"tokio",
- "winapi",
- "windows-sys 0.36.1",
]
[[package]]
name = "oyasumi-shared"
-version = "1.4.0"
+version = "1.5.0"
dependencies = [
"openvr",
"serde",
+ "winapi",
+ "windows-sys 0.36.1",
]
[[package]]
diff --git a/src-elevated-sidecar/Cargo.toml b/src-elevated-sidecar/Cargo.toml
index e72fe10d..05141d8c 100644
--- a/src-elevated-sidecar/Cargo.toml
+++ b/src-elevated-sidecar/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "oyasumi-elevated-sidecar"
-version = "1.4.1"
+version = "1.5.0"
authors = ["Raphiiko"]
license = "MIT"
edition = "2021"
@@ -27,11 +27,5 @@ features = ["full"]
version = "0.14.20"
features = ["full"]
-[dependencies.windows-sys]
-version = "0.36.1"
-features = ["Win32_UI_Shell", "Win32_Foundation"]
-[dependencies.winapi]
-version = "0.3.9"
-features = ["handleapi", "processthreadsapi", "winnt", "securitybaseapi", "impl-default"]
diff --git a/src-elevated-sidecar/src/main.rs b/src-elevated-sidecar/src/main.rs
index 827584e3..33f88ee5 100644
--- a/src-elevated-sidecar/src/main.rs
+++ b/src-elevated-sidecar/src/main.rs
@@ -1,9 +1,10 @@
#![cfg_attr(
- all(not(debug_assertions), target_os = "windows"),
- windows_subsystem = "windows"
+all(not(debug_assertions), target_os = "windows"),
+windows_subsystem = "windows"
)]
#[macro_use(lazy_static)]
extern crate lazy_static;
+
use hyper::service::{make_service_fn, service_fn};
use hyper::Server;
use log::{error, info};
@@ -11,23 +12,23 @@ use oyasumi_shared::models::ElevatedSidecarInitRequest;
use std::convert::Infallible;
use std::env;
use std::fs::{
- // OpenOptions,
+ // OpenOptions,
File
};
use std::net::SocketAddr;
use std::path::Path;
use std::time::Duration;
use sysinfo::{Pid, PidExt, System, SystemExt};
-use windows::{is_elevated, relaunch_with_elevation};
-mod afterburner;
-mod http_handler;
-mod nvml;
-mod windows;
use directories::BaseDirs;
+use oyasumi_shared::windows::{is_elevated, relaunch_with_elevation};
use simplelog::{
ColorChoice, CombinedLogger, Config, LevelFilter, TermLogger, TerminalMode, WriteLogger,
};
+mod afterburner;
+mod http_handler;
+mod nvml;
+
#[tokio::main]
async fn main() {
// Initialize logging
@@ -56,7 +57,7 @@ async fn main() {
// .unwrap(),
),
])
- .unwrap();
+ .unwrap();
// Get port of host http server from 1st argument
let args: Vec = env::args().collect();
if args.len() < 3 {
@@ -98,7 +99,7 @@ async fn main() {
sidecar_port: server.local_addr().port(),
sidecar_pid: std::process::id(),
})
- .unwrap(),
+ .unwrap(),
)
.send()
.await;
diff --git a/src-shared/Cargo.lock b/src-shared/Cargo.lock
index 22af33c2..d8a3789f 100644
--- a/src-shared/Cargo.lock
+++ b/src-shared/Cargo.lock
@@ -43,10 +43,12 @@ dependencies = [
[[package]]
name = "oyasumi-shared"
-version = "1.4.0"
+version = "1.5.0"
dependencies = [
"openvr",
"serde",
+ "winapi",
+ "windows-sys",
]
[[package]]
@@ -103,3 +105,68 @@ name = "unicode-ident"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
diff --git a/src-shared/Cargo.toml b/src-shared/Cargo.toml
index 267ecbe3..fec3eb2e 100644
--- a/src-shared/Cargo.toml
+++ b/src-shared/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "oyasumi-shared"
-version = "1.4.1"
+version = "1.5.0"
authors = ["Raphiiko"]
edition = "2021"
license = "MIT"
@@ -13,3 +13,10 @@ serde = { version = "1.0", features = ["derive"] }
git = "https://github.com/Raphiiko/oyasumi-rust-openvr"
rev = "c2f95d27a6f911cf360420b2279f0d1c9f2af52e"
+[dependencies.windows-sys]
+version = "0.36.1"
+features = ["Win32_UI_Shell", "Win32_Foundation"]
+
+[dependencies.winapi]
+version = "0.3.9"
+features = ["handleapi", "processthreadsapi", "winnt", "securitybaseapi", "impl-default"]
\ No newline at end of file
diff --git a/src-shared/src/lib.rs b/src-shared/src/lib.rs
index ff929469..5bbdfe2a 100644
--- a/src-shared/src/lib.rs
+++ b/src-shared/src/lib.rs
@@ -1 +1,2 @@
-pub mod models;
\ No newline at end of file
+pub mod models;
+pub mod windows;
\ No newline at end of file
diff --git a/src-shared/src/models.rs b/src-shared/src/models.rs
index 7fa27b73..1a015657 100644
--- a/src-shared/src/models.rs
+++ b/src-shared/src/models.rs
@@ -1,5 +1,5 @@
-use serde::{Deserialize, Serialize};
use openvr::TrackedDeviceClass;
+use serde::{Deserialize, Serialize};
// SIDECAR COMMUNICATION
@@ -93,3 +93,27 @@ pub struct OVRDevicePose {
pub struct DeviceUpdateEvent {
pub device: OVRDevice,
}
+
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SleepDetectorStateReport {
+ pub distance_in_last_15_minutes: f64,
+ pub distance_in_last_10_minutes: f64,
+ pub distance_in_last_5_minutes: f64,
+ pub distance_in_last_1_minute: f64,
+ pub distance_in_last_10_seconds: f64,
+ pub rotation_in_last_15_minutes: f64,
+ pub rotation_in_last_10_minutes: f64,
+ pub rotation_in_last_5_minutes: f64,
+ pub rotation_in_last_1_minute: f64,
+ pub rotation_in_last_10_seconds: f64,
+ pub start_time: u128,
+ pub last_log: u128,
+}
+
+
+#[derive(Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GestureDetected {
+ pub gesture: String,
+}
\ No newline at end of file
diff --git a/src-elevated-sidecar/src/windows.rs b/src-shared/src/windows.rs
similarity index 100%
rename from src-elevated-sidecar/src/windows.rs
rename to src-shared/src/windows.rs
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 1411c8c5..bc344e28 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -53,6 +53,15 @@ version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "async-broadcast"
version = "0.4.1"
@@ -280,9 +289,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.2.1"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cairo-rs"
@@ -715,6 +724,17 @@ dependencies = [
"syn",
]
+[[package]]
+name = "dbus"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "winapi",
+]
+
[[package]]
name = "deflate"
version = "0.7.20"
@@ -1466,9 +1486,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "hyper"
-version = "0.14.23"
+version = "0.14.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
+checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
dependencies = [
"bytes",
"futures-channel",
@@ -1724,6 +1744,15 @@ version = "0.2.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+[[package]]
+name = "libdbus-sys"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0"
+dependencies = [
+ "pkg-config",
+]
+
[[package]]
name = "line-wrap"
version = "0.1.1"
@@ -1783,6 +1812,19 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+[[package]]
+name = "mac-notification-sys"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5"
+dependencies = [
+ "cc",
+ "dirs-next",
+ "objc-foundation",
+ "objc_id",
+ "time 0.3.17",
+]
+
[[package]]
name = "malloc_buf"
version = "0.0.6"
@@ -1821,6 +1863,15 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+[[package]]
+name = "matrixmultiply"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84"
+dependencies = [
+ "rawpointer",
+]
+
[[package]]
name = "md5"
version = "0.7.0"
@@ -1900,6 +1951,33 @@ dependencies = [
"windows-sys 0.42.0",
]
+[[package]]
+name = "nalgebra"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a"
+dependencies = [
+ "approx",
+ "matrixmultiply",
+ "nalgebra-macros",
+ "num-complex",
+ "num-rational",
+ "num-traits",
+ "simba",
+ "typenum",
+]
+
+[[package]]
+name = "nalgebra-macros"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "native-tls"
version = "0.2.11"
@@ -1982,6 +2060,18 @@ dependencies = [
"minimal-lexical",
]
+[[package]]
+name = "notify-rust"
+version = "4.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e"
+dependencies = [
+ "dbus",
+ "log",
+ "mac-notification-sys",
+ "tauri-winrt-notification",
+]
+
[[package]]
name = "ntapi"
version = "0.4.0"
@@ -2001,6 +2091,15 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-complex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -2219,8 +2318,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "oyasumi"
-version = "1.4.0"
+version = "1.5.0"
dependencies = [
+ "bytes",
"chrono",
"cronjob",
"futures",
@@ -2230,6 +2330,7 @@ dependencies = [
"md5",
"mime",
"mime_guess",
+ "nalgebra",
"openvr",
"openvr_sys",
"oyasumi-shared",
@@ -2237,6 +2338,7 @@ dependencies = [
"rosc",
"serde",
"serde_json",
+ "soloud",
"substring",
"sysinfo",
"tauri",
@@ -2255,10 +2357,12 @@ dependencies = [
[[package]]
name = "oyasumi-shared"
-version = "1.4.0"
+version = "1.5.0"
dependencies = [
"openvr",
"serde",
+ "winapi",
+ "windows-sys 0.36.1",
]
[[package]]
@@ -2573,6 +2677,15 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "quick-xml"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "quote"
version = "1.0.21"
@@ -2672,6 +2785,12 @@ dependencies = [
"cty",
]
+[[package]]
+name = "rawpointer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
+
[[package]]
name = "rayon"
version = "1.5.3"
@@ -2852,6 +2971,15 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+[[package]]
+name = "safe_arch"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "safemem"
version = "0.3.3"
@@ -2987,9 +3115,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.87"
+version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
dependencies = [
"itoa 1.0.4",
"ryu",
@@ -3123,6 +3251,19 @@ dependencies = [
"libc",
]
+[[package]]
+name = "simba"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
+dependencies = [
+ "approx",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "wide",
+]
+
[[package]]
name = "siphasher"
version = "0.3.10"
@@ -3154,6 +3295,26 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "soloud"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b27367e7bceeceb167477f3d0dc633bb822327b44dceb59d5814ee7788f9a3"
+dependencies = [
+ "bitflags",
+ "paste",
+ "soloud-sys",
+]
+
+[[package]]
+name = "soloud-sys"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507a862f3ce15071b74bc8e8e4c40dfa9f6c44fc3b96e60cb55b5aad08333727"
+dependencies = [
+ "cmake",
+]
+
[[package]]
name = "soup2"
version = "0.2.1"
@@ -3235,6 +3396,27 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+[[package]]
+name = "strum"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "substring"
version = "1.4.5"
@@ -3375,6 +3557,7 @@ dependencies = [
"http",
"ignore",
"minisign-verify",
+ "notify-rust",
"objc",
"once_cell",
"open",
@@ -3579,6 +3762,17 @@ dependencies = [
"windows 0.39.0",
]
+[[package]]
+name = "tauri-winrt-notification"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b"
+dependencies = [
+ "quick-xml",
+ "strum",
+ "windows 0.39.0",
+]
+
[[package]]
name = "tempfile"
version = "3.3.0"
@@ -4212,6 +4406,16 @@ dependencies = [
"cc",
]
+[[package]]
+name = "wide"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feff0a412894d67223777b6cc8d68c0dab06d52d95e9890d5f2d47f10dd9366c"
+dependencies = [
+ "bytemuck",
+ "safe_arch",
+]
+
[[package]]
name = "winapi"
version = "0.3.9"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 9377329e..e1b53901 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "oyasumi"
-version = "1.4.1"
+version = "1.5.0"
description = ""
authors = ["Raphiiko"]
license = "MIT"
@@ -18,7 +18,7 @@ tauri-build = { version = "1.0.4", features = [] }
oyasumi-shared = { path = "../src-shared", version = '*' }
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.1.1", features = ["dialog-message", "dialog-open", "fs-exists", "fs-read-dir", "fs-read-file", "http-request", "process-exit", "shell-execute", "shell-open", "updater"] }
+tauri = { version = "1.1.1", features = ["dialog-message", "dialog-open", "fs-exists", "fs-read-dir", "fs-read-file", "http-request", "notification-all", "process-exit", "shell-execute", "shell-open", "updater"] }
lazy_static = "1.4.0"
cronjob = "0.4.17"
openvr_sys = "2.0.3"
@@ -35,6 +35,9 @@ mime = "0.3.16"
md5 = "0.7.0"
mime_guess = "2.0.4"
substring = "1.4.5"
+bytes = "1.4.0"
+nalgebra = "0.32.1"
+soloud = "1.0.2"
[dependencies.windows-sys]
version = "0.36.1"
@@ -49,7 +52,7 @@ version = "1.21.1"
features = ["full"]
[dependencies.hyper]
-version = "0.14.20"
+version = "0.14.24"
features = ["full"]
[dependencies.tauri-plugin-single-instance]
@@ -76,7 +79,7 @@ rev = "c2f95d27a6f911cf360420b2279f0d1c9f2af52e"
[features]
# by default Tauri runs in production mode
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
-default = [ "custom-protocol" ]
+default = ["custom-protocol"]
# this feature is used used for production builds where `devPath` points to the filesystem
# DO NOT remove this
-custom-protocol = [ "tauri/custom-protocol" ]
+custom-protocol = ["tauri/custom-protocol"]
diff --git a/src-tauri/sounds/credit.txt b/src-tauri/sounds/credit.txt
new file mode 100644
index 00000000..bbd3c7bb
--- /dev/null
+++ b/src-tauri/sounds/credit.txt
@@ -0,0 +1,2 @@
+Notification sounds by Aarni Koskela (akx).
+https://github.com/akx/Notifications
diff --git a/src-tauri/sounds/notification_bell.ogg b/src-tauri/sounds/notification_bell.ogg
new file mode 100644
index 00000000..7822f9a1
Binary files /dev/null and b/src-tauri/sounds/notification_bell.ogg differ
diff --git a/src-tauri/sounds/notification_block.ogg b/src-tauri/sounds/notification_block.ogg
new file mode 100644
index 00000000..cdcc935f
Binary files /dev/null and b/src-tauri/sounds/notification_block.ogg differ
diff --git a/src-tauri/src/background/openvr.rs b/src-tauri/src/background/openvr.rs
index 899b399c..2ea0f29e 100644
--- a/src-tauri/src/background/openvr.rs
+++ b/src-tauri/src/background/openvr.rs
@@ -9,11 +9,12 @@ use log::info;
use openvr::TrackedDeviceIndex;
use oyasumi_shared::models::{DeviceUpdateEvent, OVRDevice, OVRDevicePose};
use serde::Serialize;
+use sleep_detector::SleepDetector;
use substring::Substring;
use sysinfo::SystemExt;
use tauri::Manager;
-use crate::TAURI_WINDOW;
+use crate::{gesture_detector::GestureDetector, sleep_detector, TAURI_WINDOW};
#[derive(Serialize, Clone)]
pub enum OpenVRStatus {
@@ -34,7 +35,7 @@ pub struct OpenVRManager {
impl OpenVRManager {
pub fn new() -> OpenVRManager {
- let manager = OpenVRManager {
+ let mut manager = OpenVRManager {
state: Arc::new(OpenVRManagerState {
active: Mutex::new(false),
status: Mutex::new(OpenVRStatus::INACTIVE),
@@ -60,8 +61,8 @@ impl OpenVRManager {
*_active = active;
}
- fn openvr_loop(&self) {
- let core: OpenVRManagerCore = OpenVRManagerCore::new(self.state.clone());
+ fn openvr_loop(&mut self) {
+ let mut core: OpenVRManagerCore = OpenVRManagerCore::new(self.state.clone());
thread::spawn(move || {
core.openvr_loop();
});
@@ -70,14 +71,20 @@ impl OpenVRManager {
struct OpenVRManagerCore {
state: Arc,
+ sleep_detector: SleepDetector,
+ gesture_detector: GestureDetector,
}
impl OpenVRManagerCore {
pub fn new(state: Arc) -> OpenVRManagerCore {
- OpenVRManagerCore { state }
+ OpenVRManagerCore {
+ state,
+ sleep_detector: SleepDetector::new(),
+ gesture_detector: GestureDetector::new(),
+ }
}
- fn openvr_loop(&self) {
+ fn openvr_loop(&mut self) {
// Thread dependencies
let mut sysinfo = sysinfo::System::new_all();
@@ -89,12 +96,13 @@ impl OpenVRManagerCore {
let mut ovr_system: Option = None;
// Manager State
- let state_active = self.state.active.lock().unwrap();
// Main Loop
'ovr_loop: loop {
thread::sleep(Duration::from_millis(32));
+ let state_active = self.state.active.lock().unwrap();
if *state_active {
+ drop(state_active);
// If we're not active, try to initialize OpenVR
if let None = ovr_context {
// Stop if we cannot yet (re)initialize OpenVR
@@ -211,7 +219,7 @@ impl OpenVRManagerCore {
}
}
- fn refresh_device_poses(&self, system: &openvr::System) {
+ fn refresh_device_poses(&mut self, system: &openvr::System) {
let poses =
system.device_to_absolute_tracking_pose(openvr::TrackingUniverseOrigin::Standing, 0.0);
for n in 0..poses.len() {
@@ -244,6 +252,11 @@ impl OpenVRManagerCore {
let pos = openvr_sys::HmdVector3_t {
v: [matrix[0][3], matrix[1][3], matrix[2][3]],
};
+ // Update sleep and gesture detectors (0 == HMD)
+ if n == 0 {
+ self.sleep_detector.log_pose(pos.v, [q.x, q.y, q.z, q.w]);
+ self.gesture_detector.log_pose(pos.v, [q.x, q.y, q.z, q.w]);
+ }
// Emit event
{
let window_guard = TAURI_WINDOW.lock().unwrap();
diff --git a/src-tauri/src/commands/notifications.rs b/src-tauri/src/commands/notifications.rs
new file mode 100644
index 00000000..d1be5ae2
--- /dev/null
+++ b/src-tauri/src/commands/notifications.rs
@@ -0,0 +1,8 @@
+use std::net::UdpSocket;
+
+#[tauri::command]
+pub fn xsoverlay_send_message(message: Vec) {
+ let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
+ let _ = socket.set_broadcast(true);
+ let _ = socket.send_to(&message, "127.0.0.1:42069");
+}
diff --git a/src-tauri/src/commands/os.rs b/src-tauri/src/commands/os.rs
index ce47e080..f86fcd8e 100644
--- a/src-tauri/src/commands/os.rs
+++ b/src-tauri/src/commands/os.rs
@@ -1,5 +1,48 @@
+use std::{collections::HashMap, sync::Mutex};
+
use log::error;
use serde::{Deserialize, Serialize};
+use soloud::*;
+
+lazy_static! {
+ static ref SOUNDS: Mutex>> = Mutex::new(HashMap::new());
+ static ref SOLOUD: Mutex = Mutex::new(Soloud::default().unwrap());
+}
+
+pub fn load_sounds() {
+ let mut sounds = SOUNDS.lock().unwrap();
+ sounds.insert(
+ String::from("notification_bell"),
+ std::fs::read("sounds/notification_bell.ogg").unwrap(),
+ );
+ sounds.insert(
+ String::from("notification_block"),
+ std::fs::read("sounds/notification_block.ogg").unwrap(),
+ );
+}
+
+#[tauri::command]
+pub fn play_sound(name: String) {
+ std::thread::spawn(move || {
+ let mut wav = audio::Wav::default();
+ {
+ let sound_data_guard = SOUNDS.lock().unwrap();
+ let sound_data = sound_data_guard.get(&name).unwrap();
+ wav.load_mem(sound_data).unwrap();
+ }
+ {
+ let sl = SOLOUD.lock().unwrap();
+ sl.play(&wav);
+ }
+ loop {
+ std::thread::sleep(std::time::Duration::from_millis(100));
+ let sl = SOLOUD.lock().unwrap();
+ if sl.active_voice_count() == 0 {
+ break;
+ }
+ }
+ });
+}
#[tauri::command]
pub async fn run_command(command: String, args: Vec) -> Result {
diff --git a/src-tauri/src/gesture_detector.rs b/src-tauri/src/gesture_detector.rs
new file mode 100644
index 00000000..fac362d2
--- /dev/null
+++ b/src-tauri/src/gesture_detector.rs
@@ -0,0 +1,137 @@
+use nalgebra::{Quaternion, UnitQuaternion};
+use oyasumi_shared::models::GestureDetected;
+use tauri::Manager;
+
+use crate::{utils::get_time, TAURI_WINDOW};
+
+const MAX_EVENT_AGE_MS: u128 = 5000; // 5 seconds
+
+#[derive(Clone, Copy)]
+struct YawEvent {
+ yaw: f64,
+ timestamp: u128,
+}
+
+pub struct GestureDetector {
+ events: Vec,
+ last_detection: u128,
+}
+
+impl GestureDetector {
+ pub fn new() -> Self {
+ Self {
+ events: Vec::new(),
+ last_detection: 0,
+ }
+ }
+
+ pub fn log_pose(&mut self, _position: [f32; 3], quaternion: [f64; 4]) {
+ // Determine yaw
+ let q = UnitQuaternion::from_quaternion(Quaternion::new(
+ quaternion[3],
+ quaternion[0],
+ quaternion[1],
+ quaternion[2],
+ ));
+ let yaw = (2.0 * q.as_ref().imag().y.atan2(q.as_ref().scalar()))
+ * (180.0 / std::f64::consts::PI)
+ + 180.0;
+ // Log yaw event
+ let event = YawEvent {
+ yaw,
+ timestamp: get_time(),
+ };
+ self.events.push(event);
+ // Remove old events
+ let oldest_time = event.timestamp - MAX_EVENT_AGE_MS;
+ let old_event_count = self
+ .events
+ .iter()
+ .take_while(|e| e.timestamp < oldest_time)
+ .count();
+ self.events.drain(..old_event_count);
+ // Convert events to relative movements
+ let mut movements = Vec::new();
+ for i in 0..self.events.len() - 1 {
+ let yaw1 = self.events[i].yaw;
+ let yaw2 = self.events[i + 1].yaw;
+ let yaw_diff = yaw2 - yaw1;
+ let yaw_diff = if yaw_diff > 180.0 {
+ yaw_diff - 360.0
+ } else if yaw_diff < -180.0 {
+ yaw_diff + 360.0
+ } else {
+ yaw_diff
+ };
+ movements.push(yaw_diff);
+ }
+ // Detect head shake
+ if get_time() - self.last_detection >= 5000 {
+ if self.detect_head_shake(movements) {
+ self.last_detection = get_time();
+ {
+ let window_guard = TAURI_WINDOW.lock().unwrap();
+ let window = window_guard.as_ref().unwrap();
+ window
+ .emit_all(
+ "GESTURE_DETECTED",
+ GestureDetected {
+ gesture: "head_shake".to_string(),
+ },
+ )
+ .ok();
+ }
+ }
+ }
+ }
+
+ fn detect_head_shake(&self, movements: Vec) -> bool {
+ let mut data = movements.clone();
+ let mut offset_dir = 1.0;
+ let mut change: Option;
+ let change_dir_a = self.detect_angular_change(data.clone(), -15.0);
+ let change_dir_b = self.detect_angular_change(data.clone(), 15.0);
+ if change_dir_a.is_some() {
+ change = change_dir_a;
+ } else if change_dir_b.is_some() {
+ change = change_dir_b;
+ offset_dir = -1.0;
+ } else {
+ return false;
+ }
+ data = data[change.unwrap()..].to_vec();
+ change = self.detect_angular_change(data.clone(), 30.0 * offset_dir);
+ if change.is_none() {
+ return false;
+ }
+ data = data[change.unwrap()..].to_vec();
+ change = self.detect_angular_change(data.clone(), -15.0 * offset_dir);
+ if change.is_none() {
+ return false;
+ }
+ return true;
+ }
+
+ fn detect_angular_change(&self, mut data: Vec, mut offset: f64) -> Option {
+ let mut delta = 0.0;
+ // Flip data if we're looking for a negative offset
+ if offset < 0.0 {
+ data = data.iter().map(|x| -x).collect();
+ offset *= -1.0;
+ }
+ // Loop over all data points
+ for i in 0..data.len() {
+ delta += data[i];
+ // if delta is negative, reset to 0
+ if delta < 0.0 {
+ delta = 0.0;
+ }
+ // If we have passed the given offset, angular change has been detected
+ if delta >= offset {
+ return Some(i);
+ }
+ }
+ // Desired angular change could not be found
+ return None;
+ }
+}
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 57180ff4..ce14b401 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -6,10 +6,12 @@
#[macro_use(lazy_static)]
extern crate lazy_static;
+use crate::commands::admin::start_elevation_sidecar;
use crate::image_cache::ImageCache;
use background::openvr::OpenVRManager;
use cronjob::CronJob;
-use log::LevelFilter;
+use log::{info, LevelFilter};
+use oyasumi_shared::windows::is_elevated;
use std::{net::UdpSocket, sync::Mutex};
use tauri::Manager;
use tauri_plugin_fs_extra::FsExtra;
@@ -21,20 +23,26 @@ mod commands {
pub mod afterburner;
pub mod http;
pub mod log_parser;
+ pub mod notifications;
pub mod nvml;
pub mod openvr;
pub mod os;
pub mod osc;
pub mod splash;
}
+
mod background {
pub mod http_server;
pub mod log_parser;
pub mod openvr;
pub mod osc;
}
+
mod elevated_sidecar;
+mod gesture_detector;
mod image_cache;
+mod sleep_detector;
+mod utils;
lazy_static! {
static ref OPENVR_MANAGER: Mutex> = Default::default();
@@ -101,17 +109,35 @@ fn main() {
*OPENVR_MANAGER.lock().unwrap() = Some(openvr_manager);
// Spawn HTTP server thread
background::http_server::spawn_http_server_thread();
+ // Load sounds
+ commands::os::load_sounds();
});
// Setup start of minute cronjob
let mut cron = CronJob::new("CRON_MINUTE_START", on_cron_minute_start);
cron.seconds("0");
CronJob::start_job_threaded(cron);
+ // If we have admin privileges, prelaunch the elevation sidecar
+ if is_elevated() {
+ info!("[Core] Main process is running with elevation. Pre-launching sidecar...");
+ loop {
+ {
+ let main_http_port = MAIN_HTTP_SERVER_PORT.lock().unwrap();
+ if main_http_port.is_some() {
+ start_elevation_sidecar();
+ break;
+ }
+ }
+ }
+ } else {
+ info!("[Core] Main process is running without elevation. Sidecar will be launched on demand.");
+ }
Ok(())
})
.invoke_handler(tauri::generate_handler![
commands::openvr::openvr_get_devices,
commands::openvr::openvr_status,
commands::os::run_command,
+ commands::os::play_sound,
commands::splash::close_splashscreen,
commands::nvml::nvml_status,
commands::nvml::nvml_get_devices,
@@ -126,6 +152,7 @@ fn main() {
commands::log_parser::init_vrc_log_watcher,
commands::http::get_http_server_port,
commands::afterburner::msi_afterburner_set_profile,
+ commands::notifications::xsoverlay_send_message,
])
.run(tauri::generate_context!())
.expect("An error occurred while running the application");
diff --git a/src-tauri/src/sleep_detector.rs b/src-tauri/src/sleep_detector.rs
new file mode 100644
index 00000000..e31b980d
--- /dev/null
+++ b/src-tauri/src/sleep_detector.rs
@@ -0,0 +1,207 @@
+use oyasumi_shared::models::SleepDetectorStateReport;
+use tauri::Manager;
+
+use crate::{utils::get_time, TAURI_WINDOW};
+
+const MAX_EVENT_AGE_MS: u128 = 900000; // 15 minutes
+
+#[derive(Clone, Copy)]
+struct PoseEvent {
+ x: f32,
+ y: f32,
+ z: f32,
+ quaternion: [f64; 4],
+ timestamp: u128, // in milliseconds
+}
+
+impl PoseEvent {
+ fn distance_to(&self, other: &PoseEvent) -> f64 {
+ let dx: f64 = (self.x - other.x).into();
+ let dy: f64 = (self.y - other.y).into();
+ let dz: f64 = (self.z - other.z).into();
+ (dx * dx + dy * dy + dz * dz).sqrt()
+ }
+ fn angular_distance_degrees(&self, other: &PoseEvent) -> f64 {
+ let q1 = self.quaternion;
+ let q2 = other.quaternion;
+ let dot_product = q1[0] * q2[0] + q1[1] * q2[1] + q1[2] * q2[2] + q1[3] * q2[3];
+ let angle = 2.0 * dot_product.abs().clamp(-1.0, 1.0).acos();
+ let angle_degrees = angle * 180.0 / std::f64::consts::PI;
+ angle_degrees
+ }
+}
+
+pub struct SleepDetector {
+ events: Vec,
+ distance_in_last_15_minutes: f64,
+ distance_in_last_10_minutes: f64,
+ distance_in_last_5_minutes: f64,
+ distance_in_last_1_minute: f64,
+ distance_in_last_10_seconds: f64,
+ rotation_in_last_15_minutes: f64,
+ rotation_in_last_10_minutes: f64,
+ rotation_in_last_5_minutes: f64,
+ rotation_in_last_1_minute: f64,
+ rotation_in_last_10_seconds: f64,
+ // reqwest_client: reqwest::Client,
+ start_time: u128,
+ last_log: u128,
+ next_state_report: u128,
+}
+
+impl SleepDetector {
+ pub fn new() -> Self {
+ Self {
+ events: Vec::new(),
+ distance_in_last_10_seconds: 0.0,
+ distance_in_last_1_minute: 0.0,
+ distance_in_last_5_minutes: 0.0,
+ distance_in_last_10_minutes: 0.0,
+ distance_in_last_15_minutes: 0.0,
+ rotation_in_last_10_seconds: 0.0,
+ rotation_in_last_1_minute: 0.0,
+ rotation_in_last_5_minutes: 0.0,
+ rotation_in_last_10_minutes: 0.0,
+ rotation_in_last_15_minutes: 0.0,
+ // reqwest_client: reqwest::Client::new(),
+ start_time: 0,
+ last_log: 0,
+ next_state_report: 0,
+ }
+ }
+
+ pub fn log_pose(&mut self, position: [f32; 3], quaternion: [f64; 4]) {
+ // Add the event
+ let event = PoseEvent {
+ x: position[0],
+ y: position[1],
+ z: position[2],
+ quaternion,
+ timestamp: get_time(),
+ };
+ self.events.push(event);
+ // Remove old events
+ let oldest_time = event.timestamp - MAX_EVENT_AGE_MS;
+ let old_event_count = self
+ .events
+ .iter()
+ .take_while(|e| e.timestamp < oldest_time)
+ .count();
+ self.events.drain(..old_event_count);
+ // Calculate new distances
+ self.distance_in_last_15_minutes = self.distance_in_window(900000);
+ self.distance_in_last_10_minutes = self.distance_in_window(600000);
+ self.distance_in_last_5_minutes = self.distance_in_window(300000);
+ self.distance_in_last_1_minute = self.distance_in_window(60000);
+ self.distance_in_last_10_seconds = self.distance_in_window(10000);
+ self.rotation_in_last_15_minutes = self.rotation_in_window(900000);
+ self.rotation_in_last_10_minutes = self.rotation_in_window(600000);
+ self.rotation_in_last_5_minutes = self.rotation_in_window(300000);
+ self.rotation_in_last_1_minute = self.rotation_in_window(60000);
+ self.rotation_in_last_10_seconds = self.rotation_in_window(10000);
+ // Set new start time if there hasn't been any data in over a minute
+ if get_time() - self.last_log > 60000 {
+ self.start_time = get_time();
+ }
+ // Update the last log time
+ self.last_log = event.timestamp;
+ // Send a state report if it's been over a second since the last one
+ if get_time() > self.next_state_report {
+ self.next_state_report = get_time() + 1000;
+ self.send_state_report();
+ }
+ }
+
+ fn distance_in_window(&mut self, window_ms: u128) -> f64 {
+ let start_time = get_time() - window_ms;
+ let start_index = self
+ .events
+ .iter()
+ .position(|e| e.timestamp >= start_time)
+ .unwrap_or(0);
+ let events = &self.events[start_index..];
+ let mut total_distance = 0.0;
+ let mut i = 0;
+ while i < events.len() - 1 {
+ let event_a = &events[i];
+ let event_b = &events[i + 1];
+ let distance = event_a.distance_to(event_b);
+ total_distance += distance;
+ i += 1;
+ }
+ total_distance
+ }
+
+ fn rotation_in_window(&mut self, window_ms: u128) -> f64 {
+ let start_time = get_time() - window_ms;
+ let start_index = self
+ .events
+ .iter()
+ .position(|e| e.timestamp >= start_time)
+ .unwrap_or(0);
+ let events = &self.events[start_index..];
+ let mut total_rotation = 0.0;
+ let mut i = 0;
+ while i < events.len() - 1 {
+ let event_a = &events[i];
+ let event_b = &events[i + 1];
+ let rotation = event_a.angular_distance_degrees(event_b);
+ total_rotation += rotation;
+ i += 1;
+ }
+ total_rotation
+ }
+
+ fn send_state_report(&self) {
+ {
+ let window_guard = TAURI_WINDOW.lock().unwrap();
+ let window = window_guard.as_ref().unwrap();
+ window
+ .emit_all(
+ "SLEEP_DETECTOR_STATE_REPORT",
+ SleepDetectorStateReport {
+ distance_in_last_15_minutes: self.distance_in_last_15_minutes,
+ distance_in_last_10_minutes: self.distance_in_last_10_minutes,
+ distance_in_last_5_minutes: self.distance_in_last_5_minutes,
+ distance_in_last_1_minute: self.distance_in_last_1_minute,
+ distance_in_last_10_seconds: self.distance_in_last_10_seconds,
+ rotation_in_last_15_minutes: self.rotation_in_last_15_minutes,
+ rotation_in_last_10_minutes: self.rotation_in_last_10_minutes,
+ rotation_in_last_5_minutes: self.rotation_in_last_5_minutes,
+ rotation_in_last_1_minute: self.rotation_in_last_1_minute,
+ rotation_in_last_10_seconds: self.rotation_in_last_10_seconds,
+ start_time: self.start_time,
+ last_log: self.last_log,
+ },
+ )
+ .ok();
+ // self.send_influxdb_report();
+ }
+ }
+
+ // #[tokio::main]
+ // async fn send_influxdb_report(&self) {
+ // let f = self.reqwest_client
+ // .post("http://localhost:8086/api/v2/write?org=org&bucket=bucket&precision=ms")
+ // .header("Authorization", "Token yXuwflYgacQn8GQp7VmXV23jdC5mG3k5XVBHiA7_Ojv7xCLZyB-FttolJcCRop4knUvN-vi_uMxbZjaBa5SfbQ==") // Yes this is a token I checked in. It's for a local test database, for debugging. Don't worry about it.
+ // .header("Content-Type", "text/plain; charset=utf-8")
+ // .header("Accept", "application/json")
+ // .body(format!(
+ // "sleep_detector distance_in_last_15_minutes={},distance_in_last_10_minutes={},distance_in_last_5_minutes={},distance_in_last_1_minute={},distance_in_last_10_seconds={},rotation_in_last_15_minutes={},rotation_in_last_10_minutes={},rotation_in_last_5_minutes={},rotation_in_last_1_minute={},rotation_in_last_10_seconds={} {}",
+ // self.distance_in_last_15_minutes,
+ // self.distance_in_last_10_minutes,
+ // self.distance_in_last_5_minutes,
+ // self.distance_in_last_1_minute,
+ // self.distance_in_last_10_seconds,
+ // self.rotation_in_last_15_minutes,
+ // self.rotation_in_last_10_minutes,
+ // self.rotation_in_last_5_minutes,
+ // self.rotation_in_last_1_minute,
+ // self.rotation_in_last_10_seconds,
+ // self.last_log
+ // ))
+ // .send();
+ // // Block until the request is sent
+ // let _ = futures::executor::block_on(f);
+ // }
+}
diff --git a/src-tauri/src/utils.rs b/src-tauri/src/utils.rs
new file mode 100644
index 00000000..13de98de
--- /dev/null
+++ b/src-tauri/src/utils.rs
@@ -0,0 +1,7 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+pub fn get_time() -> u128 {
+ let now = SystemTime::now();
+ let since_the_epoch = now.duration_since(UNIX_EPOCH).expect("Time went backwards");
+ since_the_epoch.as_millis()
+}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 9d414dfe..7740e139 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
},
"package": {
"productName": "Oyasumi",
- "version": "1.4.1"
+ "version": "1.5.0"
},
"tauri": {
"allowlist": {
@@ -18,7 +18,8 @@
"readDir": true,
"exists": true,
"scope": [
- "$HOME/AppData/LocalLow/VRChat/**/*"
+ "$HOME/AppData/LocalLow/VRChat/**/*",
+ "$RESOURCE/*"
]
},
"shell": {
@@ -39,6 +40,9 @@
"https://assets.vrchat.com/*",
"https://files.vrchat.cloud/*"
]
+ },
+ "notification": {
+ "all": true
}
},
"bundle": {
@@ -67,7 +71,9 @@
"providerShortName": null,
"signingIdentity": null
},
- "resources": [],
+ "resources": [
+ "sounds/*.ogg"
+ ],
"shortDescription": "",
"targets": "all",
"windows": {
@@ -110,7 +116,7 @@
"center": true,
"theme": "Dark",
"transparent": true,
- "userAgent": "Oyasumi/1.4.1 (https://github.com/Raphiiko/Oyasumi)"
+ "userAgent": "Oyasumi/1.5.0 (https://github.com/Raphiiko/Oyasumi)"
},
{
"width": 500,
@@ -122,8 +128,8 @@
"center": true,
"theme": "Dark",
"transparent": true,
- "userAgent": "Oyasumi/1.4.1 (https://github.com/Raphiiko/Oyasumi)"
+ "userAgent": "Oyasumi/1.5.0 (https://github.com/Raphiiko/Oyasumi)"
}
]
}
-}
\ No newline at end of file
+}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 61ea87d5..8b153666 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,8 +11,13 @@ import { GpuAutomationsViewComponent } from './views/dashboard-view/views/gpu-au
import { OscAutomationsViewComponent } from './views/dashboard-view/views/osc-automations-view/osc-automations-view.component';
import { StatusAutomationsViewComponent } from './views/dashboard-view/views/status-automations-view/status-automations-view.component';
import { AutoInviteRequestAcceptViewComponent } from './views/dashboard-view/views/auto-invite-request-accept-view/auto-invite-request-accept-view.component';
+import { SleepDebugViewComponent } from './views/sleep-debug-view/sleep-debug-view.component';
const routes: Routes = [
+ {
+ path: 'sleepDebug',
+ component: SleepDebugViewComponent,
+ },
{
path: 'dashboard',
component: DashboardViewComponent,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b33858c8..25ed2809 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -83,12 +83,20 @@ import { InviteAutomationsService } from './services/invite-automations.service'
import { GpuPowerlimitingPaneComponent } from './views/dashboard-view/views/gpu-automations-view/gpu-powerlimiting-pane/gpu-powerlimiting-pane.component';
import { MsiAfterburnerPaneComponent } from './views/dashboard-view/views/gpu-automations-view/msi-afterburner-pane/msi-afterburner-pane.component';
import { invoke } from '@tauri-apps/api';
+import { SleepModeChangeOnSteamVRStatusAutomationService } from './services/sleep-detection-automations/sleep-mode-change-on-steamvr-status-automation.service';
+import { ImageFallbackDirective } from './directives/image-fallback.directive';
+import { SleepDebugViewComponent } from './views/sleep-debug-view/sleep-debug-view.component';
+import { SleepModeForSleepDetectorAutomationService } from './services/sleep-detection-automations/sleep-mode-for-sleep-detector-automation.service';
+import { SleepDetectorCalibrationModalComponent } from './views/dashboard-view/views/sleep-detection-view/sleep-detector-calibration-modal/sleep-detector-calibration-modal.component';
+import { SleepDetectorEnableSleepModeModalComponent } from './views/dashboard-view/views/sleep-detection-view/sleep-detector-enable-sleepmode-modal/sleep-detector-enable-sleep-mode-modal.component';
+import { SettingsNotificationsTabComponent } from './views/dashboard-view/views/settings-view/settings-notifications-tab/settings-notifications-tab.component';
export function createTranslateLoader(http: HttpClient) {
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
}
@NgModule({
+ bootstrap: [AppComponent],
declarations: [
AppComponent,
DashboardViewComponent,
@@ -98,9 +106,12 @@ export function createTranslateLoader(http: HttpClient) {
DeviceListComponent,
DeviceListItemComponent,
VarDirective,
+ ImageFallbackDirective,
AboutViewComponent,
OverviewViewComponent,
SleepDetectionViewComponent,
+ SleepDetectorCalibrationModalComponent,
+ SleepDetectorEnableSleepModeModalComponent,
TimeEnableSleepModeModalComponent,
TimeDisableSleepModeModalComponent,
BatteryPercentageEnableSleepModeModalComponent,
@@ -121,6 +132,7 @@ export function createTranslateLoader(http: HttpClient) {
UpdateModalComponent,
LanguageSelectModalComponent,
SettingsGeneralTabComponent,
+ SettingsNotificationsTabComponent,
SettingsUpdatesTabComponent,
SettingsDebugTabComponent,
SettingsVRChatTabComponent,
@@ -133,6 +145,7 @@ export function createTranslateLoader(http: HttpClient) {
FriendSelectionModalComponent,
GpuPowerlimitingPaneComponent,
MsiAfterburnerPaneComponent,
+ SleepDebugViewComponent,
],
imports: [
CommonModule,
@@ -166,7 +179,6 @@ export function createTranslateLoader(http: HttpClient) {
},
},
],
- bootstrap: [AppComponent],
})
export class AppModule {
constructor(
@@ -186,9 +198,11 @@ export class AppModule {
// GPU automations
private gpuAutomations: GpuAutomationsService,
// Sleep mode automations
+ private sleepModeForSleepDetectorAutomationService: SleepModeForSleepDetectorAutomationService,
private sleepModeEnableOnControllersPoweredOffAutomation: SleepModeEnableOnControllersPoweredOffAutomationService,
private sleepModeEnableAtBatteryPercentageAutomation: SleepModeEnableAtBatteryPercentageAutomationService,
private sleepModeEnableAtTimeAutomationService: SleepModeEnableAtTimeAutomationService,
+ private sleepModeChangeOnSteamVRStatusAutomationService: SleepModeChangeOnSteamVRStatusAutomationService,
private sleepModeDisableAtTimeAutomationService: SleepModeDisableAtTimeAutomationService,
private sleepModeDisableOnDevicePowerOnAutomationService: SleepModeDisableOnDevicePowerOnAutomationService,
// Battery automations
@@ -231,9 +245,11 @@ export class AppModule {
// GPU automations
this.gpuAutomations.init(),
// Sleep mode automations
+ this.sleepModeForSleepDetectorAutomationService.init(),
this.sleepModeEnableOnControllersPoweredOffAutomation.init(),
this.sleepModeEnableAtBatteryPercentageAutomation.init(),
this.sleepModeEnableAtTimeAutomationService.init(),
+ this.sleepModeChangeOnSteamVRStatusAutomationService.init(),
this.sleepModeDisableAtTimeAutomationService.init(),
this.sleepModeDisableOnDevicePowerOnAutomationService.init(),
// Battery automations
diff --git a/src/app/components/confirm-modal/confirm-modal.component.html b/src/app/components/confirm-modal/confirm-modal.component.html
index c4ae8a16..904f4afd 100644
--- a/src/app/components/confirm-modal/confirm-modal.component.html
+++ b/src/app/components/confirm-modal/confirm-modal.component.html
@@ -1,16 +1,16 @@
- {{ title || 'comp.confirm-modal.defaultTitle' | translate }}
+ {{ title || 'comp.confirm-modal.defaultTitle' | tsTranslate }}
@@ -28,10 +29,6 @@
If you want to come chat, join our 
Discord Server!
+ 
+ 
+ 
+ 
+