fix(tcp): use threads to allow multiple conns

Bumps [paste](https://github.com/dtolnay/paste) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/dtolnay/paste/releases)
- [Commits](https://github.com/dtolnay/paste/compare/1.0.8...1.0.9)

---
updated-dependencies:
- dependency-name: paste
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/windows.yaml

@@ -91,15 +91,17 @@ jobs:
             target/${{ matrix.target }}/release/komorebic.pdb
             target/wix/komorebi-*.msi
           retention-days: 7
+
+      # Release
       - name: Generate changelog
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/v')
         shell: bash
         run: |
           if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
           kokai release --no-emoji --add-links github:commits,issues --ref "$(git tag --points-at HEAD)" >"CHANGELOG.md"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/v')
         with:
           version: latest
           args: release --skip-validate --rm-dist --release-notes=CHANGELOG.md
@@ -108,6 +110,19 @@ jobs:
           SCOOP_TOKEN: ${{ secrets.SCOOP_TOKEN }}
       - name: Add MSI to release
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/v')
         with:
           files: "target/wix/komorebi-*.msi"
+
+  winget:
+    name: Publish to WinGet
+    runs-on: windows-latest
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/v')
+
+    steps:
+      - uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: LGUG2Z.komorebi
+          release-tag: ${{ github.ref }}
+          token: ${{ secrets.WINGET_TOKEN }}

Cargo.lock

@@ -84,9 +84,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.2.17"
+version = "3.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
+checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
 dependencies = [
  "atty",
  "bitflags",
@@ -102,9 +102,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.17"
+version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -800,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22"
+checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
 
 [[package]]
 name = "petgraph"
@@ -1082,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62"
+checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1158,9 +1158,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.25.3"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71eb43e528fdc239f08717ec2a378fdb017dddbc3412de15fff527554591a66c"
+checksum = "4ae2421f3e16b3afd4aa692d23b83d0ba42ee9b0081d5deeb7d21428d7195fb1"
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys",
@@ -1400,13 +1400,13 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "which"
-version = "4.2.5"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 dependencies = [
  "either",
- "lazy_static",
  "libc",
+ "once_cell",
 ]
 
 [[package]]

README.md

@@ -33,6 +33,7 @@ Articles, blog posts, demos, and videos about _komorebi_ can be added to this li
 
 - [Moving to Windows from Linux Pt 1](https://kvwu.io/posts/moving-to-windows/)
 - [Windows 下的现代化平铺窗口管理器 komorebi](https://zhuanlan.zhihu.com/p/455064481)
+- [komorebi を導入してみる](https://zenn.dev/omochice/articles/50f42a3df8f426)
 
 ## GitHub Sponsors Early Access
 
@@ -128,6 +129,14 @@ using [`setx`](https://docs.microsoft.com/en-us/windows-server/administration/wi
 Variables pop up in System Properties Advanced (which can be launched with `SystemPropertiesAdvanced.exe` at a
 PowerShell prompt), and then move the binaries to that directory.
 
+### Winget
+
+You can use the builtin package manager from Windows to install the latest komorebi release:
+
+```powershell
+winget install LGUG2Z.komorebi
+```
+
 ### Scoop
 
 If you use the [Scoop](https://scoop.sh/) command line installer, you can run the following commands to install the

komorebi/Cargo.toml

@@ -33,7 +33,7 @@ schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 strum = { version = "0.24", features = ["derive"] }
-sysinfo = "0.25"
+sysinfo = "0.26"
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

komorebi/src/process_command.rs

@@ -114,10 +114,7 @@ pub fn listen_for_commands_tcp(wm: Arc<Mutex<WindowManager>>, port: usize) {
 
                     tracing::info!("listening for incoming tcp messages from {}", &addr);
 
-                    match read_commands_tcp(&wm, &mut stream, &addr) {
-                        Ok(()) => {}
-                        Err(error) => tracing::error!("{}", error),
-                    }
+                    read_commands_tcp(&wm, &mut stream, &addr);
                 }
                 Err(error) => {
                     tracing::error!("{}", error);
@@ -939,56 +936,56 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, stream: UnixStream) ->
     Ok(())
 }
 
-pub fn read_commands_tcp(
-    wm: &Arc<Mutex<WindowManager>>,
-    stream: &mut TcpStream,
-    addr: &str,
-) -> Result<()> {
-    let mut stream = BufReader::new(stream);
-
-    loop {
-        let mut buf = vec![0; 1024];
-        match stream.read(&mut buf) {
-            Err(..) => {
-                tracing::warn!("removing disconnected tcp client: {addr}");
-                let mut connections = TCP_CONNECTIONS.lock();
-                connections.remove(addr);
-                break;
-            }
-            Ok(size) => {
-                let message = if let Ok(message) =
-                    SocketMessage::from_str(&String::from_utf8_lossy(&buf[..size]))
-                {
-                    message
-                } else {
-                    tracing::warn!("client sent an invalid message, disconnecting: {addr}");
+pub fn read_commands_tcp(wm: &Arc<Mutex<WindowManager>>, stream: &mut TcpStream, addr: &str) {
+    let addr = addr.to_string();
+    let wm = wm.clone();
+    let stream = stream.try_clone().unwrap();
+    std::thread::spawn(move || -> Result<()> {
+        let mut stream = BufReader::new(stream);
+        loop {
+            let mut buf = vec![0; 1024];
+            match stream.read(&mut buf) {
+                Err(..) => {
+                    tracing::warn!("removing disconnected tcp client: {addr}");
                     let mut connections = TCP_CONNECTIONS.lock();
-                    connections.remove(addr);
+                    connections.remove(&addr);
                     break;
-                };
-
-                let mut wm = wm.lock();
-
-                if wm.is_paused {
-                    return match message {
-                        SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
-                            Ok(wm.process_command(message)?)
-                        }
-                        _ => {
-                            tracing::trace!("ignoring while paused");
-                            Ok(())
-                        }
-                    };
                 }
+                Ok(size) => {
+                    let message = if let Ok(message) =
+                        SocketMessage::from_str(&String::from_utf8_lossy(&buf[..size]))
+                    {
+                        message
+                    } else {
+                        tracing::warn!("client sent an invalid message, disconnecting: {addr}");
+                        let mut connections = TCP_CONNECTIONS.lock();
+                        connections.remove(&addr);
+                        break;
+                    };
 
-                wm.process_command(message.clone())?;
-                notify_subscribers(&serde_json::to_string(&Notification {
-                    event: NotificationEvent::Socket(message.clone()),
-                    state: wm.as_ref().into(),
-                })?)?;
+                    let mut wm = wm.lock();
+
+                    if wm.is_paused {
+                        return match message {
+                            SocketMessage::TogglePause
+                            | SocketMessage::State
+                            | SocketMessage::Stop => Ok(wm.process_command(message)?),
+                            _ => {
+                                tracing::trace!("ignoring while paused");
+                                Ok(())
+                            }
+                        };
+                    }
+
+                    wm.process_command(message.clone())?;
+                    notify_subscribers(&serde_json::to_string(&Notification {
+                        event: NotificationEvent::Socket(message.clone()),
+                        state: wm.as_ref().into(),
+                    })?)?;
+                }
             }
         }
-    }
 
-    Ok(())
+        Ok(())
+    });
 }

komorebi/src/process_event.rs

@@ -198,8 +198,14 @@ impl WindowManager {
                         }
                     }
 
-                    self.focused_workspace_mut()?
-                        .focus_container_by_window(window.hwnd)?;
+                    if let Some(monocle) = workspace.monocle_container() {
+                        if let Some(window) = monocle.focused_window() {
+                            window.focus(false)?;
+                        }
+                    } else {
+                        self.focused_workspace_mut()?
+                            .focus_container_by_window(window.hwnd)?;
+                    }
                 }
             }
             WindowManagerEvent::Show(_, window) | WindowManagerEvent::Manage(window) => {

komorebic/Cargo.toml

@@ -25,7 +25,7 @@ powershell_script = "1.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
-sysinfo = "0.25"
+sysinfo = "0.26"
 uds_windows = "1"
 
 [dependencies.windows]

komorebic/src/main.rs

@@ -964,16 +964,13 @@ fn main() -> Result<()> {
                                     "'--await-configuration'".to_string()
                                 },
                                 |port| if arg.ffm {
-                                    format!("'--ffm','--tcp-server={}'", port)
+                                    format!("'--ffm','--tcp-port={}'", port)
                                 } else if arg.await_configuration {
-                                    format!("'--await-configuration','--tcp-server={}'", port)
+                                    format!("'--await-configuration','--tcp-port={}'", port)
                                 } else if arg.ffm && arg.await_configuration {
-                                    format!(
-                                        "'--ffm','--await-configuration','--tcp-server={}'",
-                                        port
-                                    )
+                                    format!("'--ffm','--await-configuration','--tcp-port={}'", port)
                                 } else {
-                                    format!("'--tcp-server={}'", port)
+                                    format!("'--tcp-port={}'", port)
                                 }
                             )
                         )
@@ -995,16 +992,13 @@ fn main() -> Result<()> {
                                     "'--await-configuration'".to_string()
                                 },
                                 |port| if arg.ffm {
-                                    format!("'--ffm','--tcp-server={}'", port)
+                                    format!("'--ffm','--tcp-port={}'", port)
                                 } else if arg.await_configuration {
-                                    format!("'--await-configuration','--tcp-server={}'", port)
+                                    format!("'--await-configuration','--tcp-port={}'", port)
                                 } else if arg.ffm && arg.await_configuration {
-                                    format!(
-                                        "'--ffm','--await-configuration','--tcp-server={}'",
-                                        port
-                                    )
+                                    format!("'--ffm','--await-configuration','--tcp-port={}'", port)
                                 } else {
-                                    format!("'--tcp-server={}'", port)
+                                    format!("'--tcp-port={}'", port)
                                 }
                             )
                         )