Create backup ports for auth (#22)

* Create backup ports for auth

* Add timeout if event cannot be given

* Fix wrong assignment

* Remove stupid timeout

* Use requets instead of emits

* Update workflow

Author: kadiryazici

.github/workflows/type-check.yml

@@ -1,8 +1,6 @@
 name: Type Check
 
-on:
-  pull_request:
-    types: [opened, reopened]
+on: push
 
 jobs:
   release:

src-tauri/Cargo.lock

@@ -23,6 +23,7 @@ ascii = "1.1.0"
 rodio = "0.16.0"
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
+port_scanner = "*"
 
 [features]
 # by default Tauri runs in production mode

src-tauri/Cargo.toml

@@ -3,7 +3,7 @@ use std::{fs::File, io::BufReader, sync::Mutex};
 use rodio::{Decoder, OutputStream, Sink};
 use tauri::{AppHandle, State, Window};
 
-use crate::server::AuthServer;
+use crate::{server::AuthServer, utils::get_available_socket_addr};
 
 #[tauri::command]
 pub fn play_notification_sound(app: AppHandle) {
@@ -38,7 +38,8 @@ pub fn set_icon_template(is_template: bool, app: AppHandle) {
 #[tauri::command]
 pub fn start_server(window: Window, state: State<'_, Mutex<AuthServer>>) {
     let mut server = state.lock().unwrap();
-    server.listen(window);
+    let addr = get_available_socket_addr();
+    server.listen(window, addr);
 }
 
 #[tauri::command]

src-tauri/src/commands.rs

@@ -5,6 +5,7 @@
 
 mod commands;
 mod server;
+mod utils;
 
 use std::sync::Mutex;
 

src-tauri/src/main.rs

@@ -1,6 +1,6 @@
 use tauri::Window;
 
-use std::{io::Cursor, str::FromStr, sync::Arc};
+use std::{io::Cursor, net::SocketAddr, str::FromStr, sync::Arc};
 
 use ::ascii::AsciiString;
 use tiny_http::{Header, HeaderField, Method, Request, Response, Server};
@@ -74,7 +74,11 @@ fn set_content_type_html(response: &mut Response<Cursor<Vec<u8>>>) {
 }
 
 fn handle_code_request(request: Request, window: &Window) {
-    if *request.method() != Method::Get || !request.url().starts_with("/callback?code=") {
+    let url = request.url();
+
+    if *request.method() != Method::Get
+        || (!request.url().starts_with("/callback?code=") && !request.url().starts_with("/ping"))
+    {
         let mut response = Response::from_string(create_html(
             "Not Found - Gitification".to_owned(),
             "NOT FOUND".to_owned(),
@@ -86,7 +90,18 @@ fn handle_code_request(request: Request, window: &Window) {
         return;
     }
 
-    let url = request.url();
+    if url.starts_with("/ping") {
+        let mut response = Response::from_string("{\"pong\": true}");
+
+        response.add_header(Header {
+            field: HeaderField::from_str("Content-Type").unwrap(),
+            value: AsciiString::from_str("application/json").unwrap(),
+        });
+
+        request.respond(response).unwrap();
+        return;
+    }
+
     let code_query = url.split("?code=").collect::<Vec<&str>>()[1];
     let code = code_query.split("&").collect::<Vec<&str>>()[0];
 
@@ -110,12 +125,12 @@ impl AuthServer {
         AuthServer { server: None }
     }
 
-    pub fn listen(&mut self, window: Window) {
+    pub fn listen(&mut self, window: Window, addr: SocketAddr) {
         if self.server.is_some() {
             return;
         }
 
-        let server = Arc::new(Server::http("0.0.0.0:23846").unwrap());
+        let server = Arc::new(Server::http(addr).unwrap());
         std::thread::spawn({
             let server = Arc::clone(&server);
             move || {
@@ -125,7 +140,7 @@ impl AuthServer {
             }
         });
 
-        self.server = Some(server)
+        self.server = Some(server);
     }
 
     pub fn stop(&mut self) {

src-tauri/src/server.rs

@@ -0,0 +1,14 @@
+use port_scanner::local_port_available;
+use std::net::SocketAddr;
+
+pub const SERVER_PORTS: [u16; 3] = [23846, 15830, 12840];
+
+pub fn get_available_socket_addr() -> SocketAddr {
+    for port in SERVER_PORTS {
+        if local_port_available(port) {
+            return SocketAddr::from(([127, 0, 0, 1], port));
+        }
+    }
+
+    panic!("No available port found")
+}

src-tauri/src/utils.rs

@@ -22,7 +22,7 @@
       },
       "http": {
         "request": true,
-        "scope": ["https://github.com/*", "https://api.github.com/*"]
+        "scope": ["https://github.com/*", "https://api.github.com/*", "http://localhost:23846/*", "http://localhost:15830/*", "http://localhost:12840/*"]
       },
       "process": {
         "exit": true

src-tauri/tauri.conf.json

@@ -0,0 +1,19 @@
+import { ResponseType, fetch } from '@tauri-apps/api/http'
+import { SERVER_PORTS } from '../constants'
+
+export async function getServerPort() {
+  for (const port of SERVER_PORTS) {
+    const res = await fetch<{ pong: true }>(`http://localhost:${port}/ping`, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+      responseType: ResponseType.JSON,
+    })
+
+    if (res.ok && res.data.pong) {
+      console.log({ res })
+      return port
+    }
+  }
+
+  return SERVER_PORTS[0]
+}

src/api/app.ts

@@ -1,13 +1,2 @@
-import { SERVER_PORT } from '../constants'
-import { createURL } from '../utils/url'
-
 export const GITHUB_AUTHORIZE_ENDPOINT = 'https://github.com/login/oauth/authorize'
 export const GITHUB_AUTH_SCOPES = ['notifications', 'read:user']
-
-export const GITHUB_AUTH_QUERIES = {
-  client_id: import.meta.env.VITE_CLIENT_ID,
-  scope: GITHUB_AUTH_SCOPES.join(' '),
-  redirect_uri: `http://localhost:${SERVER_PORT}/callback`,
-}
-
-export const GITHUB_AUTH_URL = createURL({ url: GITHUB_AUTHORIZE_ENDPOINT, query: GITHUB_AUTH_QUERIES })