Bump version: 1.1.4 -> 1.1.5

* Refactor {send,read}_message()

* Use binding for Take

---------

Co-authored-by: Ryze <50497128+ryze312@users.noreply.github.com>

.cargo/config.toml

@@ -1,2 +1,2 @@
 [build]
-target = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu"]
+target = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "aarch64-unknown-linux-gnu"]

Cargo.lock

@@ -10,10 +10,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "ff2mpv-rust"
-version = "1.1.2"
+version = "1.1.4"
 dependencies = [
  "serde",
  "serde_json",
+ "windows",
 ]
 
 [[package]]
@@ -24,9 +25,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "indexmap"
-version = "2.2.3"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -34,48 +35,48 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -84,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
  "indexmap",
  "itoa",
@@ -96,9 +97,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -110,3 +111,120 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "windows"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+dependencies = [
+ "windows-core",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"

Cargo.toml

@@ -1,12 +1,15 @@
 [package]
 name = "ff2mpv-rust"
-version = "1.1.2"
+version = "1.1.5"
 edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.*", features = ["derive"] }
 serde_json = { version = "1.0.*", features = ["preserve_order"] }
 
+[target.'cfg(windows)'.dependencies]
+windows = { version = "0.56", features = ["Win32_System_Threading"] }
+
 [profile.dev-optimized]
 inherits = "dev"
 opt-level = 3
@@ -14,3 +17,5 @@ opt-level = 3
 [profile.release]
 strip = "symbols"
 lto = "fat"
+panic = "abort"
+codegen-units = 1

src/browser.rs

@@ -1,13 +1,13 @@
+use std::io::{self, Read, Write};
+
 use serde::Deserialize;
-use std::io;
-use std::io::BufReader;
-use std::io::{Read, Write};
 
 use crate::error::FF2MpvError;
 
 #[derive(Deserialize)]
 pub struct FF2MpvMessage {
     pub url: String,
+    pub options: Vec<String>,
 }
 
 pub fn send_reply() -> Result<(), io::Error> {
@@ -22,23 +22,23 @@ pub fn get_mpv_message() -> Result<FF2MpvMessage, FF2MpvError> {
 }
 
 fn read_message() -> Result<String, io::Error> {
-    let mut stdin = io::stdin();
+    let mut stdin = io::stdin().lock();
-    let mut buf: [u8; 4] = [0; 4];
-    stdin.read_exact(&mut buf)?;
 
-    let length = u32::from_ne_bytes(buf);
+    let mut len = 0_u32.to_ne_bytes();
-    let mut reader = BufReader::new(stdin.take(length as u64));
+    stdin.read_exact(&mut len)?;
+    let len = u32::from_ne_bytes(len);
 
-    let mut string = String::with_capacity(length as usize);
+    let mut reader = stdin.take(len as u64);
-    reader.read_to_string(&mut string)?;
+    let mut msg = String::with_capacity(len as usize);
-    Ok(string)
+    reader.read_to_string(&mut msg)?;
+    Ok(msg)
 }
 
 fn send_message(message: &str) -> Result<(), io::Error> {
     let length = (message.len() as u32).to_ne_bytes();
     let message = message.as_bytes();
 
-    let mut stdout = io::stdout();
+    let mut stdout = io::stdout().lock();
     stdout.write_all(&length)?;
     stdout.write_all(message)?;
     Ok(())

src/command.rs

@@ -1,7 +1,8 @@
 use std::env;
 use std::io;
 use std::process;
-use serde_json::{self, json};
+
+use serde_json::json;
 
 use crate::browser;
 use crate::config::Config;
@@ -12,10 +13,9 @@ pub enum Command {
     ShowManifest,
     ShowManifestChromium,
     ValidateConfig,
-    FF2Mpv
+    FF2Mpv,
 }
 
-
 impl Command {
     pub fn execute(&self) -> Result<(), FF2MpvError> {
         match self {
@@ -23,7 +23,7 @@ impl Command {
             Command::ShowManifest => Self::show_manifest(false),
             Command::ShowManifestChromium => Self::show_manifest(true),
             Command::ValidateConfig => Self::validate_config(),
-            Command::FF2Mpv => Self::ff2mpv()
+            Command::FF2Mpv => Self::ff2mpv(),
         }
     }
 
@@ -43,7 +43,10 @@ impl Command {
     fn show_manifest(chromium: bool) -> Result<(), FF2MpvError> {
         let executable_path = env::current_exe()?;
         let allowed_keyvalue = if chromium {
-            ("allowed_origins", "chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg")
+            (
+                "allowed_origins",
+                "chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg/",
+            )
         } else {
             ("allowed_extensions", "ff2mpv@yossarian.net")
         };
@@ -72,7 +75,8 @@ impl Command {
     fn ff2mpv() -> Result<(), FF2MpvError> {
         let config = Config::build();
         let ff2mpv_message = browser::get_mpv_message()?;
-        Command::launch_mpv(config.player_command, config.player_args, &ff2mpv_message.url)?;
+        let args = [config.player_args, ff2mpv_message.options].concat();
+        Command::launch_mpv(config.player_command, args, &ff2mpv_message.url)?;
         browser::send_reply()?;
 
         Ok(())
@@ -88,19 +92,26 @@ impl Command {
         command.arg("--");
         command.arg(url);
 
-        // NOTE: On Windows, browser spawns process into a Job object.
+        Command::detach_mpv(&mut command);
-        // NOTE: We need to detach player from the job, so it won't get killed after we're done,
-        // NOTE: See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging#closing_the_native_app
-        #[cfg(target_family = "windows")]
-        {
-            use std::os::windows::process::CommandExt;
-            const CREATE_BREAKAWAY_FROM_JOB: u32 = 0x01000000;
-
-            command.creation_flags(CREATE_BREAKAWAY_FROM_JOB);
-        }
 
         command.spawn()?;
 
         Ok(())
     }
+
+    // NOTE: Make sure the subprocess is not killed.
+    //       See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging#closing_the_native_app
+
+    #[cfg(unix)]
+    fn detach_mpv(command: &mut process::Command) {
+        use std::os::unix::process::CommandExt;
+        command.process_group(0);
+    }
+
+    #[cfg(windows)]
+    fn detach_mpv(command: &mut process::Command) {
+        use std::os::windows::process::CommandExt;
+        use windows::Win32::System::Threading::CREATE_BREAKAWAY_FROM_JOB;
+        command.creation_flags(CREATE_BREAKAWAY_FROM_JOB.0);
+    }
 }

src/config.rs

@@ -1,6 +1,7 @@
 use std::env;
 use std::fs;
 use std::path::PathBuf;
+
 use serde::Deserialize;
 
 use crate::error::FF2MpvError;
@@ -16,7 +17,7 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             player_command: "mpv".to_owned(),
-            player_args: vec![]
+            player_args: vec![],
         }
     }
 }
@@ -40,7 +41,7 @@ impl Config {
         Ok(config)
     }
 
-    #[cfg(target_family = "unix")]
+    #[cfg(unix)]
     fn get_config_location() -> PathBuf {
         let mut path = PathBuf::new();
 
@@ -57,7 +58,7 @@ impl Config {
         path
     }
 
-    #[cfg(target_family = "windows")]
+    #[cfg(windows)]
     fn get_config_location() -> PathBuf {
         let mut path = PathBuf::new();
         let appdata = env::var("APPDATA").unwrap();

src/error.rs

@@ -1,6 +1,6 @@
-use std::io;
 use std::fmt;
 use std::fmt::Display;
+use std::io;
 
 pub enum FF2MpvError {
     NoConfig,