Merge branch 'release/1.5.0' into main

.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

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

README.md

@@ -5,6 +5,7 @@
     <br/>
     :zzz: A collection of utilities to assist with sleeping in virtual reality. :zzz:
 </p>
+
 <p align="center">
     <a><img alt="Latest Version" src="https://img.shields.io/github/v/tag/Raphiiko/Oyasumi?color=informational&label=version&sort=semver"></a>
     <a><img alt="Production Build Status" src="https://github.com/Raphiiko/Oyasumi/actions/workflows/build-release.yml/badge.svg"/></a>
@@ -28,10 +29,6 @@
   If you want to come chat, join our <a href="https://discord.gg/7MqdPJhYxC"><img src="https://user-images.githubusercontent.com/111654848/192362041-f09cc066-a964-446f-aa2c-fa7a7a31ec05.png" width="16" style="fill: white" /> Discord Server</a>!
 </p>
 
-<p align="center">
-  :exclamation:<a href="https://github.com/Raphiiko/Oyasumi/wiki/Adding-Translations#%E6%97%A5%E6%9C%AC%E8%AA%9E%E8%A8%B3%E6%8F%90%E4%BE%9Bdeepl">Looking for Japanese translators / 日本語翻訳者募集中</a>:exclamation:
-</p>
-
 ## Getting started
 
 Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oyasumi/releases) page.
@@ -42,35 +39,34 @@ Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oya
 <td><p align="center"><b>Sleeping Animations</b></p></td>
 <td><p align="center"><b>GPU Power Limiting</b></p></td>
 <td><p align="center"><b>MSI Afterburner Automations</b></p></td>
-<td><p align="center"><b>Sleep Detection</b></p></td>
+<td><p align="center"><b>Sleep Automations</b></p></td>
 <td><p align="center"><b>Device Overview</b></p></td>
 </tr>
 <tr>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735301-27261123-cd07-48ce-b54a-1851bd346be6.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735445-f2487aaf-5e09-4add-87d7-ea5564077330.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213736607-e954b974-4bfa-4d9a-9576-a960513cc709.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735136-61043a03-8bc3-4c3a-a2fc-7fc8a5e46483.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221258665-6e31caf3-b037-477f-9245-75af27f4b4ec.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221258580-a9cf380c-6e64-4ef9-aa8b-97bdb473bbfa.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221258490-7baa4575-c479-4ca6-a4ab-f99ac976fcd1.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221258355-8ddde3a4-eb4a-4dff-904e-158337223955.png" width="100%" crossorigin></p></td>
 <td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735354-51b8c1fb-e39c-44e0-8317-de0c91063d1a.png" width="100%" crossorigin></p></td>
 </tr>
 <tr>
 <td><p align="center"><b>Status Automations</b></p></td>
 <td><p align="center"><b>General Settings</b></p></td>
 <td><p align="center"><b>Auto Accept Invite Requests</b></p></td>
 <td><p align="center"><b>Battery Automations</b></p></td>
-<td><p align="center"><b>About</b></p></td>
+<td><p align="center"><b>Sleep Detection</b></p></td>
 
 </tr>
 <tr>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735647-78c138f5-ceb6-40e3-a0ce-5900dec3d826.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735688-01e76bfd-33ea-429f-a0a4-b2c301f4cc21.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213736192-94f7ed10-04b3-47c0-8a58-5620aecac34d.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213735510-946bd5a2-74cc-41f2-98c4-af43c4063bd7.png" width="100%" crossorigin></p></td>
-<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/213737349-7fef79d1-4afd-481a-95dc-e94ee1d1312c.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221258922-ebf8fcbd-9223-42da-b54b-584e7ec3b1fe.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221259843-694a9449-82b9-4c34-8fdf-8ddd18c1bff0.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221259235-ded642d2-9614-45d7-9477-d33ab7e467f7.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221259448-e7d5d869-fba6-414c-b167-b06cfb6b1fa4.png" width="100%" crossorigin></p></td>
+<td><p align="center"><img src="https://user-images.githubusercontent.com/111654848/221259916-cdd66e56-f489-4db7-8759-fab60994735c.png" width="100%" crossorigin></p></td>
 </tr>
 </table>
 </p>
 
-
 ## Features
 
 <table align="right">
@@ -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))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oyasumi",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "author": "Raphiiko",
   "license": "MIT",
   "type": "module",

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"]
 

src-elevated-sidecar/src/main.rs

@@ -1,33 +1,34 @@
 #![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};
 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<String> = 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;