(chore): bumped up to v0.6.0

.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: 'macos-latest'
+          - platform: 'macos-15'
             args: '--target aarch64-apple-darwin'
             arch: 'aarch64-apple-darwin'
-          - platform: 'macos-latest'
+          - platform: 'macos-15'
             args: '--target x86_64-apple-darwin'
             arch: 'x86_64-apple-darwin'
           - platform: 'ubuntu-22.04'
@@ -45,7 +45,7 @@ jobs:
       - name: 🛠️ install Rust stable
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+          targets: ${{ matrix.platform == 'macos-15' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
       - name: 🛠️ Rust cache
         uses: swatinem/rust-cache@v2

README.md

@@ -17,7 +17,7 @@ A Helper App for PytubePP Extension/Addon to Communicate with Pytube Post Proces
 
 ### 📎 Pre-Requirements
 
-- [Python (>3.8)](https://www.python.org/downloads/)
+- [Python](https://www.python.org/downloads/) (>3.8)
 - [FFmpeg](https://www.ffmpeg.org)
 - [PytubePP](https://github.com/neosubhamoy/pytubepp)
 * These requirements can be installed using PytubePP Helper (post installation) if [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget/#install-winget) (for Windows users) / [Homebrew](https://brew.sh) (for MacOS users) is installed in your system
@@ -37,13 +37,12 @@ A Helper App for PytubePP Extension/Addon to Communicate with Pytube Post Proces
 
    2. Now open PytubePP Helper (from system tray not from start menu or shotcut) you will see (blue) 'install' buttons. First click on the install button on the right side of 'Python', a cmd window will popup to install Python. after the installation is finished then close the cmd window and now install 'FFmpeg' by clicking on the next install button. after the installation is finished close the cmd window and restart your Computer.
 
-   3. Again open PytubePP Helper (from system tray not from start menu or shotcut) and install PytubePP at last. after it finishes you can close the cmd window. Now click on the 'Refresh' button and you will see the 'Ready' message. Then close PytubePP Helper
+   3. Again open PytubePP Helper and install PytubePP at the end. after it finishes you can close the cmd window. Now click on the 'Refresh' button and you will see the 'Ready' message. Then close PytubePP Helper
 
    4. You can now add the [PytubePP Extension](https://github.com/neosubhamoy/pytubepp-extension) in your browser and it should work properly with [PytubePP](https://github.com/neosubhamoy/pytubepp)
 
    5. Pro Tips:
    - Make sure PytubePP Helper is always running in the background (system tray) otherwise PytubePP Extension will not work properly.
-   - Always open PytubePP Helper from system tray if it's already running. if you open PytubePP Helper from start menu or shotcut when PytubePP Helper is already running in system tray then two instances of PytubePP Helper will run on the same time which may cause the app to malfunction!
    - PytubePP Helper by default always autostarts itself when Windows starts. Make sure autostart is not disabled for PytubePP Helper in Task Manager (Startup apps tab)
 
 * **>> LINUX:**
@@ -64,7 +63,6 @@ A Helper App for PytubePP Extension/Addon to Communicate with Pytube Post Proces
 
    3. Pro Tips:
    - Make sure PytubePP Helper is always running in the background (Appindicator) otherwise PytubePP Extension will not work properly.
-   - Always open PytubePP Helper from Appindicator if it's already running. if you open PytubePP Helper from programs menu or shotcut when PytubePP Helper is already running in Appindicator then two instances of PytubePP Helper will run on the same time which may cause the app to malfunction!
    - PytubePP Helper by default always autostarts itself when Linux Distro starts. Make sure autostart is not disabled for PytubePP Helper in your distro's Startup Manager / Applications
 
 * **>> MAC OS:**

copyFiles.aarch64-apple-darwin.js

@@ -5,10 +5,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'release', 'pytubepp-helper-msghost');
+const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'aarch64-apple-darwin', 'release', 'pytubepp-helper-msghost');
 const msghostDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost');
-const autostartSrc = path.join(__dirname, 'src-tauri', 'target', 'release', 'pytubepp-helper-autostart');
-const autostartDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart');
 const autostartPlistSrc = path.join(__dirname, 'src-tauri', 'autostart', 'pytubepp-helper-autostart.plist');
 const autostartPlistDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart.plist');
 const msghostManifestMacChromeSrc = path.join(__dirname, 'src-tauri', 'msghost-manifest', 'macos', 'chrome', 'com.neosubhamoy.pytubepp.helper.json');
@@ -17,7 +15,7 @@ const msghostManifestMacFirefoxSrc = path.join(__dirname, 'src-tauri', 'msghost-
 const msghostManifestMacFirefoxDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost-moz.json');
 
 fs.copyFileSync(msghostSrc, msghostDest);
-fs.copyFileSync(autostartSrc, autostartDest);
+// fs.copyFileSync(autostartSrc, autostartDest);
 fs.copyFileSync(autostartPlistSrc, autostartPlistDest);
 fs.copyFileSync(msghostManifestMacChromeSrc, msghostManifestMacChromeDest);
 fs.copyFileSync(msghostManifestMacFirefoxSrc, msghostManifestMacFirefoxDest);

copyFiles.js

@@ -7,15 +7,12 @@ const __dirname = path.dirname(__filename);
 
 const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'release', 'pytubepp-helper-msghost.exe');
 const msghostDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost.exe');
-const autostartSrc = path.join(__dirname, 'src-tauri', 'target', 'release', 'pytubepp-helper-autostart.exe');
-const autostartDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart.exe');
 const msghostManifestWinChromeSrc = path.join(__dirname, 'src-tauri', 'msghost-manifest', 'windows', 'chrome', 'com.neosubhamoy.pytubepp.helper.json');
 const msghostManifestWinChromeDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost.json');
 const msghostManifestWinFirefoxSrc = path.join(__dirname, 'src-tauri', 'msghost-manifest', 'windows', 'firefox', 'com.neosubhamoy.pytubepp.helper.json');
 const msghostManifestWinFirefoxDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost-moz.json');
 
 fs.copyFileSync(msghostSrc, msghostDest);
-fs.copyFileSync(autostartSrc, autostartDest);
 fs.copyFileSync(msghostManifestWinChromeSrc, msghostManifestWinChromeDest);
 fs.copyFileSync(msghostManifestWinFirefoxSrc, msghostManifestWinFirefoxDest);
 console.log('Files copied successfully');

copyFiles.x86_64-apple-darwin.js

@@ -7,8 +7,6 @@ const __dirname = path.dirname(__filename);
 
 const msghostSrc = path.join(__dirname, 'src-tauri', 'target', 'x86_64-apple-darwin', 'release', 'pytubepp-helper-msghost');
 const msghostDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost');
-const autostartSrc = path.join(__dirname, 'src-tauri', 'target', 'x86_64-apple-darwin', 'release', 'pytubepp-helper-autostart');
-const autostartDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart');
 const autostartPlistSrc = path.join(__dirname, 'src-tauri', 'autostart', 'pytubepp-helper-autostart.plist');
 const autostartPlistDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-autostart.plist');
 const msghostManifestMacChromeSrc = path.join(__dirname, 'src-tauri', 'msghost-manifest', 'macos', 'chrome', 'com.neosubhamoy.pytubepp.helper.json');
@@ -17,7 +15,6 @@ const msghostManifestMacFirefoxSrc = path.join(__dirname, 'src-tauri', 'msghost-
 const msghostManifestMacFirefoxDest = path.join(__dirname, 'src-tauri', 'pytubepp-helper-msghost-moz.json');
 
 fs.copyFileSync(msghostSrc, msghostDest);
-fs.copyFileSync(autostartSrc, autostartDest);
 fs.copyFileSync(autostartPlistSrc, autostartPlistDest);
 fs.copyFileSync(msghostManifestMacChromeSrc, msghostManifestMacChromeDest);
 fs.copyFileSync(msghostManifestMacFirefoxSrc, msghostManifestMacFirefoxDest);

index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tauri + React + Typescript</title>
+    <title>PytubePP Helper</title>
   </head>
 
   <body>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pytubepp-helper",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pytubepp-helper",
-      "version": "0.4.0",
+      "version": "0.6.0",
       "dependencies": {
         "@radix-ui/react-icons": "^1.3.0",
         "@radix-ui/react-slot": "^1.1.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pytubepp-helper",
   "private": true,
-  "version": "0.4.0",
+  "version": "0.6.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

public/tauri.svg

@@ -1,6 +0,0 @@
-<svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
-<ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
-</svg>

src-tauri/Cargo.lock

@@ -2473,7 +2473,7 @@ dependencies = [
 
 [[package]]
 name = "pytubepp-helper"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "fix-path-env",
  "futures-util",
@@ -2485,14 +2485,6 @@ dependencies = [
  "tokio-tungstenite",
 ]
 
-[[package]]
-name = "pytubepp-helper-autostart"
-version = "0.1.0"
-dependencies = [
- "serde_json",
- "websocket",
-]
-
 [[package]]
 name = "pytubepp-helper-msghost"
 version = "0.1.0"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pytubepp-helper"
-version = "0.4.0"
+version = "0.6.0"
 description = "PytubePP Helper"
 authors = ["neosubhamoy"]
 edition = "2021"
@@ -26,6 +26,5 @@ custom-protocol = ["tauri/custom-protocol"]
 [workspace]
 members = [
   ".",
-  "msghost",
+  "msghost"
-  "autostart"
 ]

src-tauri/autostart/Cargo.lock

@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "pytubepp-helper-autostart"
-version = "0.1.0"

src-tauri/autostart/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "pytubepp-helper-autostart"
-version = "0.1.0"
-description = "PytubePP Helper (Autostart)"
-authors = ["neosubhamoy <hey@neosubhamoy.com>"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-websocket = "0.27.1"
-serde_json = "1.0"

src-tauri/autostart/pytubepp-helper-autostart.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Name=pytubepp-helper
 Icon=pytubepp-helper
-Comment=pytubepp-helper autostart script
+Comment=pytubepp-helper autostart
-Exec=/usr/bin/pytubepp-helper-autostart
+Exec=/usr/bin/pytubepp-helper --hidden
 StartupNotify=false
 Terminal=false

src-tauri/autostart/pytubepp-helper-autostart.plist

@@ -4,8 +4,11 @@
     <dict>
         <key>Label</key>
         <string>com.neosubhamoy.pytubepp.helper</string>
-        <key>Program</key>
+        <key>ProgramArguments</key>
-        <string>/Applications/pytubepp-helper.app/Contents/MacOS/pytubepp-helper</string>
+        <array>
+            <string>/Applications/pytubepp-helper.app/Contents/MacOS/pytubepp-helper</string>
+            <string>--hidden</string>
+        </array>
         <key>RunAtLoad</key>
         <true/>
     </dict>

src-tauri/autostart/src/main.rs

@@ -1,70 +0,0 @@
-#![windows_subsystem = "windows"]
-
-use std::process::Command;
-use websocket::client::ClientBuilder;
-use websocket::OwnedMessage;
-use std::thread::sleep;
-use std::time::Duration;
-
-fn connect_with_retry(url: &str, max_attempts: u32) -> Result<websocket::sync::Client<std::net::TcpStream>, Box<dyn std::error::Error>> {
-    let mut attempts = 0;
-    loop {
-        match ClientBuilder::new(url).unwrap().connect_insecure() {
-            Ok(client) => {
-                eprintln!("Successfully connected to Tauri app :)");
-                return Ok(client);
-            }
-            Err(e) => {
-                attempts += 1;
-                if attempts >= max_attempts {
-                    return Err(Box::new(e));
-                }
-                let wait_time = Duration::from_secs(2u64.pow(attempts));
-                eprintln!("Connection attempt {} failed. Retrying in {:?}...", attempts, wait_time);
-                sleep(wait_time);
-            }
-        }
-    }
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    #[cfg(target_os = "windows")]
-    {
-        let _ = Command::new("pytubepp-helper.exe").spawn();
-    }
-
-    #[cfg(target_os = "linux")]
-    {
-        let _ = Command::new("pytubepp-helper").spawn();
-    }
-
-    #[cfg(target_os = "macos")]
-    {
-        let _ = Command::new("/Applications/pytubepp-helper.app/Contents/MacOS/pytubepp-helper").spawn();
-    }
-
-    // Launch the main application
-    // let _ = Command::new("pytubepp-helper")
-    //     .spawn();
-
-    // Connect with the Tauri app
-    let websocket_url = "ws://localhost:3030";
-    eprintln!("Attempting to connect to {}", websocket_url);
-
-    let mut client = match connect_with_retry(websocket_url, 2) {
-        Ok(client) => client,
-        Err(e) => {
-            eprintln!("Failed to connect after multiple attempts: {:?}", e);
-            return Err(e);
-        }
-    };
-
-    // Send message to Tauri app
-    client.send_message(&OwnedMessage::Text(serde_json::json!({
-        "url": "",
-        "command": "autostart",
-        "argument": ""
-    }).to_string()))?;
-
-    Ok(())
-}

src-tauri/installer/windows/nsis-template.nsi

@@ -18,8 +18,8 @@ ${StrLoc}
 
 !define MANUFACTURER "neosubhamoy"
 !define PRODUCTNAME "pytubepp-helper"
-!define VERSION "0.4.0"
+!define VERSION "0.6.0"
-!define VERSIONWITHBUILD "0.4.0.0"
+!define VERSIONWITHBUILD "0.6.0.0"
 !define SHORTDESCRIPTION "PytubePP Helper"
 !define INSTALLMODE "currentUser"
 !define LICENSE "..\..\..\..\..\LICENSE"
@@ -43,7 +43,7 @@ ${StrLoc}
 !define MANUPRODUCTKEY "Software\${MANUFACTURER}\${PRODUCTNAME}"
 !define UNINSTALLERSIGNCOMMAND ""
 !define ESTIMATEDSIZE "0x002311"
-!define AUTOSTART_EXEC "pytubepp-helper-autostart.exe"
+!define AUTOSTART_EXEC "pytubepp-helper.exe"
 !define CHROME_REG_PATH "Software\Google\Chrome\NativeMessagingHosts\com.neosubhamoy.pytubepp.helper"
 !define FIREFOX_REG_PATH "Software\Mozilla\NativeMessagingHosts\com.neosubhamoy.pytubepp.helper"
 !define RUN_REG_PATH "Software\Microsoft\Windows\CurrentVersion\Run"
@@ -548,7 +548,7 @@ Section Install
 
   ; Copy resources
     CreateDirectory "$INSTDIR\"
-    File /a "/oname=pytubepp-helper-autostart.exe" "..\..\..\..\pytubepp-helper-autostart.exe"
+    ; File /a "/oname=pytubepp-helper-autostart.exe" "..\..\..\..\pytubepp-helper-autostart.exe"
     File /a "/oname=pytubepp-helper-msghost-moz.json" "..\..\..\..\pytubepp-helper-msghost-moz.json"
     File /a "/oname=pytubepp-helper-msghost.exe" "..\..\..\..\pytubepp-helper-msghost.exe"
     File /a "/oname=pytubepp-helper-msghost.json" "..\..\..\..\pytubepp-helper-msghost.json"
@@ -585,7 +585,7 @@ Section Install
   WriteRegStr HKCU "${FIREFOX_REG_PATH}" "" "$INSTDIR\pytubepp-helper-msghost-moz.json"
 
   ; Add entry for automatic startup with Windows
-  WriteRegStr HKCU "${RUN_REG_PATH}" "${PRODUCTNAME}" "$\"$INSTDIR\${AUTOSTART_EXEC}$\""
+  WriteRegStr HKCU "${RUN_REG_PATH}" "${PRODUCTNAME}" "$\"$INSTDIR\${AUTOSTART_EXEC}$\" --hidden"
 
   ; Create start menu shortcut (GUI)
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -670,7 +670,7 @@ Section Uninstall
   Delete "$INSTDIR\${MAINBINARYNAME}.exe"
 
   ; Delete resources
-    Delete "$INSTDIR\pytubepp-helper-autostart.exe"
+    ; Delete "$INSTDIR\pytubepp-helper-autostart.exe"
     Delete "$INSTDIR\pytubepp-helper-msghost-moz.json"
     Delete "$INSTDIR\pytubepp-helper-msghost.exe"
     Delete "$INSTDIR\pytubepp-helper-msghost.json"

src-tauri/installer/windows/wix-fragment-registry.wxs

@@ -10,7 +10,7 @@
           <RegistryValue Type="string" Value="[INSTALLDIR]pytubepp-helper-msghost-moz.json" KeyPath="no" />
         </RegistryKey>
         <RegistryKey Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\Run">
-          <RegistryValue Name="pytubepp-helper" Type="string" Value="[INSTALLDIR]pytubepp-helper-autostart.exe" KeyPath="no" />
+          <RegistryValue Name="pytubepp-helper" Type="string" Value="&quot;[INSTALLDIR]pytubepp-helper.exe&quot; --hidden" KeyPath="no" />
         </RegistryKey>
       </Component>
     </DirectoryRef>

src-tauri/src/main.rs

@@ -1,11 +1,11 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use std::{process::Command, sync::Arc, env};
+use std::{process::Command, sync::Arc, env, time::Duration};
 use serde_json::Value;
 use tauri::{CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
-use tokio::{net::{TcpListener, TcpStream}, sync::{Mutex, oneshot}};
+use tokio::{net::{TcpListener, TcpStream}, sync::{Mutex, oneshot}, time::sleep};
-use tokio_tungstenite::accept_async;
+use tokio_tungstenite::{accept_async, connect_async};
 use futures_util::{SinkExt, StreamExt};
 
 struct ResponseChannel {
@@ -17,6 +17,20 @@ struct WebSocketState {
     response_channel: ResponseChannel,
 }
 
+async fn is_another_instance_running() -> bool {
+    match connect_async("ws://127.0.0.1:3030").await {
+        Ok(_) => true,
+        Err(_) => false
+    }
+}
+
+async fn try_bind_ws_port() -> Option<TcpListener> {
+    match TcpListener::bind("127.0.0.1:3030").await {
+        Ok(listener) => Some(listener),
+        Err(_) => None
+    }
+}
+
 #[tauri::command]
 async fn send_to_extension(
     message: String,
@@ -170,10 +184,40 @@ fn download_stream(url: String, stream: String) {
 #[tokio::main]
 async fn main() {
     let _ = fix_path_env::fix();
+    
+    // Check if another instance is running
+    if is_another_instance_running().await {
+        println!("Another instance is already running. Exiting...");
+        std::process::exit(0);
+    }
+
+    // Try to bind to the WebSocket port with a few retries
+    let mut listener = None;
+    for _ in 0..3 {
+        if let Some(l) = try_bind_ws_port().await {
+            listener = Some(l);
+            break;
+        }
+        sleep(Duration::from_millis(100)).await;
+    }
+
+    // If we couldn't bind to the port after retries, assume another instance is running
+    let listener = match listener {
+        Some(l) => l,
+        None => {
+            println!("Could not bind to WebSocket port. Another instance might be running. Exiting...");
+            std::process::exit(0);
+        }
+    };
+    
+    let args: Vec<String> = env::args().collect();
+    let start_hidden = args.contains(&"--hidden".to_string());
+
     let websocket_state = Arc::new(Mutex::new(WebSocketState { 
         sender: None,
         response_channel: ResponseChannel { sender: None },
     }));
+    
     let tray_menu = SystemTrayMenu::new()
         .add_item(CustomMenuItem::new("show".to_string(), "Show"))
         .add_item(CustomMenuItem::new("quit".to_string(), "Quit"));
@@ -207,10 +251,16 @@ async fn main() {
         })
         .manage(websocket_state.clone())
         .setup(move |app| {
+            let window = app.get_window("main").unwrap();
+            
+            if start_hidden {
+                window.hide().unwrap();
+            }
+
             let app_handle = app.handle();
             let ws_state = websocket_state.clone();
+            
             tokio::spawn(async move {
-                let listener = TcpListener::bind("127.0.0.1:3030").await.unwrap();
                 println!("WebSocket server listening on ws://127.0.0.1:3030");
                 while let Ok((stream, _)) = listener.accept().await {
                     let app_handle = app_handle.clone();

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "pytubepp-helper",
-    "version": "0.4.0"
+    "version": "0.6.0"
   },
   "tauri": {
     "allowlist": {

src-tauri/tauri.linux.conf.json

@@ -1,7 +1,7 @@
 {
   "build": {
-    "beforeDevCommand": "npm run dev && cargo build --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --manifest-path=./src-tauri/autostart/Cargo.toml",
+    "beforeDevCommand": "npm run dev && cargo build --manifest-path=./src-tauri/msghost/Cargo.toml",
-    "beforeBuildCommand": "npm run build && cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --manifest-path=./src-tauri/autostart/Cargo.toml",
+    "beforeBuildCommand": "npm run build && cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml",
     "devPath": "http://localhost:1422",
     "distDir": "../dist"
   },
@@ -32,6 +32,11 @@
             "cmd": "grep",
             "args": ["^ID=", "/etc/os-release"]
           },
+          {
+            "name": "detect-pkgmngr",
+            "cmd": "sh",
+            "args": ["-c", "command -v apt || command -v dnf || command -v pacman"]
+          },
           {
             "name": "is-apt-installed",
             "cmd": "apt",
@@ -128,13 +133,12 @@
         "icons/icon.ico"
       ],
       "deb": {
-        "depends": ["python3-pip", "ffmpeg"],
+        "depends": ["python3-pip", "ffmpeg", "gnome-terminal"],
         "files": {
           "/etc/opt/chrome/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/linux/chrome/com.neosubhamoy.pytubepp.helper.json",
           "/etc/chromium/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/linux/chrome/com.neosubhamoy.pytubepp.helper.json",
           "/usr/lib/mozilla/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/linux/firefox/com.neosubhamoy.pytubepp.helper.json",
           "/usr/bin/pytubepp-helper-msghost": "./target/release/pytubepp-helper-msghost",
-          "/usr/bin/pytubepp-helper-autostart": "./target/release/pytubepp-helper-autostart",
           "/etc/xdg/autostart/pytubepp-helper-autostart.desktop": "./autostart/pytubepp-helper-autostart.desktop"
         }
       },
@@ -142,13 +146,12 @@
         "epoch": 0,
         "release": "1",
         "license": "MIT",
-        "depends": ["python3-pip", "ffmpeg-free"],
+        "depends": ["python3-pip", "ffmpeg-free", "gnome-terminal"],
         "files": {
           "/etc/opt/chrome/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/linux/chrome/com.neosubhamoy.pytubepp.helper.json",
           "/etc/chromium/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/linux/chrome/com.neosubhamoy.pytubepp.helper.json",
           "/usr/lib/mozilla/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/linux/firefox/com.neosubhamoy.pytubepp.helper.json",
           "/usr/bin/pytubepp-helper-msghost": "./target/release/pytubepp-helper-msghost",
-          "/usr/bin/pytubepp-helper-autostart": "./target/release/pytubepp-helper-autostart",
           "/etc/xdg/autostart/pytubepp-helper-autostart.desktop": "./autostart/pytubepp-helper-autostart.desktop"
         }
       }

src-tauri/tauri.macos.conf.json

@@ -1,7 +1,7 @@
 {
   "build": {
-    "beforeDevCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && [[ \"$ARCH\" == \"aarch64-apple-darwin\" ]] && cargo build --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --manifest-path=./src-tauri/autostart/Cargo.toml || cargo build --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --target=$ARCH --manifest-path=./src-tauri/autostart/Cargo.toml && npm run dev",
+    "beforeDevCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && cargo build --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && npm run dev",
-    "beforeBuildCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && [[ \"$ARCH\" == \"aarch64-apple-darwin\" ]] && cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --manifest-path=./src-tauri/autostart/Cargo.toml && node copyFiles.${ARCH}.js && npm run build || cargo build --release --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --target=$ARCH --manifest-path=./src-tauri/autostart/Cargo.toml && node copyFiles.${ARCH}.js && npm run build",
+    "beforeBuildCommand": "[[ -n \"$TARGET_ARCH\" ]] && ARCH=\"$TARGET_ARCH\" || ARCH=\"$(uname -m | sed 's/^arm64$/aarch64/')-apple-darwin\" && cargo build --release --target=$ARCH --manifest-path=./src-tauri/msghost/Cargo.toml && node copyFiles.${ARCH}.js && npm run build",
     "devPath": "http://localhost:1422",
     "distDir": "../dist"
   },
@@ -32,6 +32,11 @@
             "cmd": "grep",
             "args": ["^ID=", "/etc/os-release"]
           },
+          {
+            "name": "detect-pkgmngr",
+            "cmd": "sh",
+            "args": ["-c", "command -v apt || command -v dnf || command -v pacman"]
+          },
           {
             "name": "is-apt-installed",
             "cmd": "apt",
@@ -102,7 +107,6 @@
           "$RESOURCE/pytubepp-helper-msghost.json",
           "$RESOURCE/pytubepp-helper-msghost-moz.json",
           "$RESOURCE/pytubepp-helper-msghost",
-          "$RESOURCE/pytubepp-helper-autostart",
           "$RESOURCE/pytubepp-helper-autostart.plist"
         ]
       },
@@ -156,7 +160,6 @@
         "pytubepp-helper-msghost.json",
         "pytubepp-helper-msghost-moz.json",
         "pytubepp-helper-msghost",
-        "pytubepp-helper-autostart",
         "pytubepp-helper-autostart.plist"
       ]
     },

src-tauri/tauri.windows.conf.json

@@ -1,7 +1,7 @@
 {
   "build": {
-    "beforeDevCommand": "cargo build --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --manifest-path=./src-tauri/autostart/Cargo.toml && npm run dev",
+    "beforeDevCommand": "cargo build --manifest-path=./src-tauri/msghost/Cargo.toml && npm run dev",
-    "beforeBuildCommand": "cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --manifest-path=./src-tauri/autostart/Cargo.toml && node copyFiles.js && npm run build",
+    "beforeBuildCommand": "cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && node copyFiles.js && npm run build",
     "devPath": "http://localhost:1422",
     "distDir": "../dist"
   },
@@ -32,6 +32,11 @@
             "cmd": "grep",
             "args": ["^ID=", "/etc/os-release"]
           },
+          {
+            "name": "detect-pkgmngr",
+            "cmd": "sh",
+            "args": ["-c", "command -v apt || command -v dnf || command -v pacman"]
+          },
           {
             "name": "is-apt-installed",
             "cmd": "apt",
@@ -93,8 +98,7 @@
         "scope": [
           "$RESOURCE/pytubepp-helper-msghost.json",
           "$RESOURCE/pytubepp-helper-msghost-moz.json",
-          "$RESOURCE/pytubepp-helper-msghost.exe",
+          "$RESOURCE/pytubepp-helper-msghost.exe"
-          "$RESOURCE/pytubepp-helper-autostart.exe"
         ]
       },
       "window": {
@@ -148,8 +152,7 @@
       "resources": [
         "pytubepp-helper-msghost.json",
         "pytubepp-helper-msghost-moz.json",
-        "pytubepp-helper-msghost.exe",
+        "pytubepp-helper-msghost.exe"
-        "pytubepp-helper-autostart.exe"
       ]
     },
     "systemTray": {

src/App.tsx

@@ -9,7 +9,7 @@ import { ThemeProvider } from "@/components/theme-provider";
 import { Button } from "@/components/ui/button";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
 import { InstalledPrograms, WebSocketMessage, } from "./types";
-import { compareVersions, extractVersion, isInstalled, sendStreamInfo, detectWindows, detectDistro, extractDistroId, detectDistroBase, detectMacOs, registerMacFiles } from "./lib/utils";
+import { compareVersions, extractVersion, isInstalled, sendStreamInfo, detectWindows, detectDistro, extractDistroId, detectMacOs, registerMacFiles, detectPackageManager, extractPkgMngrName } from "./lib/utils";
 import { CircleCheck, TriangleAlert, CircleAlert } from 'lucide-react';
 
 function App() {
@@ -27,7 +27,7 @@ function App() {
   const [isMacOs, setIsMacOs] = useState<boolean>(false)
   const [macOsVersion, setMacOsVersion] = useState<string | null>(null)
   const [distroId, setDistroId] = useState<string | null>(null)
-  const [distroBase, setDistroBase] = useState<string | null>(null)
+  const [distroPkgMngr, setDistroPkgMngr] = useState<string | null>(null)
   const [installedPrograms, setInstalledPrograms] = useState<InstalledPrograms>({
     winget: {
       installed: false,
@@ -218,7 +218,10 @@ function App() {
           const distroResult = await detectDistro();
           if (distroResult) {
             setDistroId(extractDistroId(distroResult));
-            setDistroBase(detectDistroBase(extractDistroId(distroResult)));
+            const distroPkgMngrResult = await detectPackageManager();
+            if (distroPkgMngrResult) {
+              setDistroPkgMngr(extractPkgMngrName(distroPkgMngrResult));
+            }
           }
           break;
 
@@ -243,7 +246,7 @@ function App() {
             <Button className="ml-3" size="sm" onClick={checkAllPrograms}>Refresh</Button>
           </div>
         </div>
-        { distroId && distroBase && distroBase === 'debian' ? /* Section for Debian */
+        { distroId && distroPkgMngr && distroPkgMngr === 'apt' ? /* Section for Debian */
         <div className="programstats mt-5 mx-3">
           <div className="programitem flex items-center justify-between">
             <p><b>Python:</b> {installedPrograms.python3.installed ? 'installed' : 'not installed'} {installedPrograms.python3.version ? `(${installedPrograms.python3.version})` : ''}</p>
@@ -285,7 +288,7 @@ function App() {
             </Alert>
           : null}
         </div>
-        : distroId && distroBase && distroBase === 'rhel' ? /* Section for RHEL */
+        : distroId && distroPkgMngr && distroPkgMngr === 'dnf' ? /* Section for RHEL */
         <div className="programstats mt-5 mx-3">
           <div className="programitem flex items-center justify-between">
             <p><b>Python:</b> {installedPrograms.python3.installed ? 'installed' : 'not installed'} {installedPrograms.python3.version ? `(${installedPrograms.python3.version})` : ''}</p>

src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

src/lib/utils.ts

@@ -65,20 +65,27 @@ export async function detectDistro(): Promise<string | null> {
   }
 }
 
-export function detectDistroBase(distro: string | null): string | null{
+export async function detectPackageManager(): Promise<string | null> {
-  if(distro) {
+  try{
-    if(['debian', 'ubuntu', 'pop', 'kali'].includes(distro)) {
+    const output = await new Command('detect-pkgmngr', ['-c', 'command -v apt || command -v dnf || command -v pacman']).execute();
-      return 'debian';
+    if (output.code === 0) {
-    } else if (['rhel', 'fedora', 'centos', 'rocky'].includes(distro)) {
+      return output.stdout;
-      return 'rhel';
     } else {
-      return 'other';
+      return output.stdout;
     }
-  } else {
+  } catch (error) {
+    console.error(error);
     return null;
   }
 }
 
+export function extractPkgMngrName(path: string): string | null {
+  const pattern = /^\s*(.*\/)?([^\/\s]+)\s*$/;
+  const match = path.trim().match(pattern);
+  if (!match) return null;
+  return match[2];
+}
+
 export function extractDistroId(input: string): string | null {
   const regex = /ID=([a-zA-Z]+)/;
   const match = input.match(regex);