diff --git a/.gitignore b/.gitignore index 11e0b6f..1c74d19 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,8 @@ dist .fleet .idea .vscode -release \ No newline at end of file +release +src-tauri/easytier-cli.exe +src-tauri/easytier-core.exe +src-tauri/Packet.dll +src-tauri/wintun.dll diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1162430 --- /dev/null +++ b/LICENSE @@ -0,0 +1,73 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright 2023 sunsijie + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/composables/log.ts b/composables/log.ts new file mode 100644 index 0000000..6e8e607 --- /dev/null +++ b/composables/log.ts @@ -0,0 +1,8 @@ +// const infoDialog = new WebviewWindow("log", { +// title: "日志", +// resizable: false, +// width: 600, +// height: 400, +// parent: appWindow, +// url: "/log" +// }); \ No newline at end of file diff --git a/composables/tray.ts b/composables/tray.ts index 0c52177..6e12c1a 100644 --- a/composables/tray.ts +++ b/composables/tray.ts @@ -15,7 +15,7 @@ async function toggleVisibility() { } } -export async function useTray(init: boolean = false) { +export async function useTray(init: boolean = false, beforExit) { let tray try { tray = await TrayIcon.getById(DEFAULT_TRAY_NAME) @@ -26,9 +26,9 @@ export async function useTray(init: boolean = false) { id: DEFAULT_TRAY_NAME, menu: await Menu.new({ id: 'main', - items: await generateMenuItem(), + items: await generateMenuItem(beforExit), }), - action: async () => { + action: async (e) => { toggleVisibility() }, }) @@ -44,25 +44,31 @@ export async function useTray(init: boolean = false) { tray.setMenuOnLeftClick(false) tray.setMenu(await Menu.new({ id: 'main', - items: await generateMenuItem(), + items: await generateMenuItem(beforExit), })) } return tray } -export async function generateMenuItem() { +export async function generateMenuItem(beforExit: Function) { return [ - await MenuItemExit('Exit'), + await MenuItemExit('退出', beforExit), await PredefinedMenuItem.new({ item: 'Separator' }), - await MenuItemShow('Show / Hide'), + await MenuItemShow('显示 / 隐藏'), ] } -export async function MenuItemExit(text: string) { - return await PredefinedMenuItem.new({ +export async function MenuItemExit(text: string, beforExit: Function) { + return await MenuItem.new({ + id: "quit", text, - item: 'Quit', + action: async () => { + if (beforExit) { + await beforExit(); + } + await getCurrentWindow().close(); + } }) } @@ -76,30 +82,30 @@ export async function MenuItemShow(text: string) { }) } -export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) { - const tray = await useTray() - if (!tray) - return - const menu = await Menu.new({ - id: 'main', - items: items || await generateMenuItem(), - }) - tray.setMenu(menu) -} +// export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) { +// const tray = await useTray() +// if (!tray) +// return +// const menu = await Menu.new({ +// id: 'main', +// items: items || await generateMenuItem(), +// }) +// tray.setMenu(menu) +// } -export async function setTrayRunState(isRunning: boolean = false) { - const tray = await useTray() - if (!tray) - return - tray.setIcon(isRunning ? 'icons/icon-inactive.ico' : 'icons/icon.ico') -} +// export async function setTrayRunState(isRunning: boolean = false) { +// const tray = await useTray() +// if (!tray) +// return +// tray.setIcon(isRunning ? 'icons/icon-inactive.ico' : 'icons/icon.ico') +// } -export async function setTrayTooltip(tooltip: string) { - if (tooltip) { - const tray = await useTray() - if (!tray) - return - tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`) - tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`) - } -} \ No newline at end of file +// export async function setTrayTooltip(tooltip: string) { +// if (tooltip) { +// const tray = await useTray() +// if (!tray) +// return +// tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`) +// tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`) +// } +// } \ No newline at end of file diff --git a/layouts/default.vue b/layouts/default.vue index 4762e83..69ddb17 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -3,23 +3,8 @@ diff --git a/package.json b/package.json index 798da2e..1392ab1 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "easytier-game", "private": true, - "author": "luoleixin@digisky.com", + "author": "leizi97", "description": "A simple network initiator based on Easytier", - "version": "1.0.3", + "version": "1.0.4", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod" diff --git a/pages/index.vue b/pages/index.vue index 0df9ae7..908d515 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -2,37 +2,43 @@ + :model="config" + > + prop="serverUrl" + > + @change="handleServerUrlChange" + > @@ -61,15 +70,18 @@ v-for="item in mainStore.basePeers" :key="item" :label="item" - :value="item"> + :value="item" + >
{{ item }}
+ type="danger" + > + +
@@ -86,7 +98,8 @@ + v-model="config.networkName" + >
@@ -104,7 +117,8 @@ maxlength="100" placeholder="请输入网络密码" v-model="config.networkPassword" - type="password"> + type="password" + >
@@ -121,11 +135,13 @@ + v-model="config.hostname" + > + label="局域网IP" + > + v-model="config.ipv4" + >
-
+
- {{ !data.isStart ? "开始联机" : "停止联机" }} + size="default" + > + {{ !data.isStart ? "启动联机" : "停止联机" }}
- - 日志信息 - + + + + + +
+ size="small" + > 禁用p2p + size="small" + > 禁用ipv6 + size="small" + > 禁用端口监听 + @click="open('https://github.com/EasyTier/EasyTier/releases')" + > easytier发布页
@@ -196,52 +237,62 @@ class="!text-[11px]" type="danger" :underline="false" - @click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')"> - 找不到房间？建议安装WinIPBroadcast + @click="open('https://github.com/dechamps/WinIPBroadcast/releases/tag/winipbroadcast-1.6')" + > + 找不到房间？安装WinIPBroadcast
- - - diff --git a/pages/log.vue b/pages/log.vue new file mode 100644 index 0000000..02b482d --- /dev/null +++ b/pages/log.vue @@ -0,0 +1,33 @@ + + diff --git a/pages/member.vue b/pages/member.vue new file mode 100644 index 0000000..bb00b21 --- /dev/null +++ b/pages/member.vue @@ -0,0 +1,172 @@ + + diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 0b0b79d..6d83d74 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1059,7 +1059,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easytier-game" -version = "1.0.3" +version = "1.0.4" dependencies = [ "log", "reqwest", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 9e23f8c..668ea15 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "easytier-game" -version = "1.0.3" +version = "1.0.4" +homepage = "https://github.com/EasyTier/EasyTier" +repository = "https://github.com/EasyTier/EasytierGame" description = "A simple network initiator based on Easytier" -authors = ["you"] -license = "" -repository = "" +authors = ["leizi97"] +license = "LICENSE" + edition = "2021" rust-version = "1.77.2" @@ -16,6 +18,7 @@ crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] tauri-build = { version = "2.0.1", features = [] } +# prost-build = "0.13.2" [dependencies] serde_json = "1.0" @@ -30,6 +33,8 @@ tauri-plugin-log = "2.0.0-rc" tauri-plugin-shell = "2" reqwest = { version = "0.12", features = ["json"] } zip = "2.2.0" +# prost = "0.13" +# prost-types = "0.13" [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] tauri-plugin-single-instance = "2" diff --git a/src-tauri/LICENSE b/src-tauri/LICENSE new file mode 100644 index 0000000..ea5b606 --- /dev/null +++ b/src-tauri/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index b50fe1d..c32b543 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -3,13 +3,25 @@ "identifier": "default", "description": "enables the default permissions", "windows": [ - "main" + "main", + "log" ], "permissions": [ "core:default", "core:window:allow-minimize", "core:window:allow-hide", "core:window:allow-close", - "shell:allow-open" + "shell:allow-open", + "core:window:allow-show", + "core:window:allow-create", + "core:window:allow-set-position", + "core:window:allow-destroy", + "core:webview:allow-create-webview-window", + "core:webview:allow-set-webview-size", + "core:webview:allow-set-webview-position", + "core:webview:allow-create-webview", + "core:webview:allow-webview-show", + "core:webview:allow-webview-hide", + "core:webview:allow-webview-close" ] } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 8ef6aab..eb7ac0b 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,5 +1,6 @@ use reqwest::{Client, Error}; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; use std::fs::{self, File}; use std::io::{BufRead, BufReader, Write}; use std::os::windows::process::CommandExt; @@ -11,8 +12,7 @@ use std::sync::{ use std::{path, thread}; use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}; use tauri::Emitter; -use tauri::{Manager, WindowEvent}; - +use tauri::Manager; // 定义GitHub Release的结构体 #[derive(Debug, Deserialize)] pub struct Release { @@ -47,26 +47,6 @@ pub async fn fetch_releases() -> Result, Error> { response.json::>().await } -static mut IS_CLOSE: bool = false; - -#[tauri::command(rename_all = "snake_case")] -fn my_commit_output(commit_msg: String, window: tauri::Window) -> Result { - println!("{}", commit_msg); - unsafe { - IS_CLOSE = true; - } - window.close().unwrap(); - return Ok(true); -} - -#[tauri::command(rename_all = "snake_case")] -fn force_close(window: tauri::Window) { - unsafe { - IS_CLOSE = true; - } - window.close().unwrap(); -} - #[tauri::command(rename_all = "snake_case")] fn get_core_version() -> String { match Command::new("easytier-core.exe") @@ -82,9 +62,74 @@ fn get_core_version() -> String { } } +#[tauri::command(rename_all = "snake_case")] +fn get_cli_version() -> String { + match Command::new("easytier-cli.exe") + .arg("--version") + .creation_flags(0x08000000) + .output() + { + Ok(output) => { + let output_str = String::from_utf8_lossy(&output.stdout); + return output_str.trim().to_string(); + } + Err(_e) => return "".to_string(), + } +} + +#[derive(Serialize, Deserialize, Debug)] +struct RoutePeerInfo { + peer_id: u64, + cost: u64, + hostname: Option, + udp_stun_info: String, + easytier_version: String, + network_length: u64, +} + +#[derive(Serialize, Deserialize, Debug)] +struct RouteTable { + peer_infos: HashMap, + ipv4_peer_id_map: HashMap, +} + +#[derive(Serialize, Deserialize, Debug)] +struct PeerRouteServiceImpl { + route_table_with_cost: RouteTable, +} + +#[derive(Serialize, Deserialize, Debug)] +struct PeerRoute { + my_peer_id: u64, + service_impl: PeerRouteServiceImpl, +} + +#[derive(Serialize, Deserialize, Debug)] +struct MyResponse { + response: PeerRoute +} + + + +#[tauri::command(rename_all = "snake_case")] +fn get_members_by_cli() -> String { + match Command::new("easytier-cli.exe") + .arg("peer") + .arg("list") + .creation_flags(0x08000000) + .output() + { + Ok(output) => { + let output_str = String::from_utf8_lossy(&output.stdout); + return output_str.trim().to_string(); + } + Err(_e) => return _e.to_string(), + } +} + #[tauri::command(rename_all = "snake_case")] async fn download_easytier_zip(download_url: String, file_name: String) { - let target = format!("https://ghp.ci/?q={}",download_url); + let target = format!("https://ghp.ci/{}", download_url); let response = reqwest::get(target) .await .expect("error to download easytier url"); @@ -269,16 +314,17 @@ pub fn run() { let context = tauri::generate_context!(); tauri::Builder::default() .plugin(tauri_plugin_shell::init()) - .on_window_event(move |window, event| { - if let WindowEvent::CloseRequested { api, .. } = event { - unsafe { - if !IS_CLOSE { - api.prevent_close(); - window.emit("window-close-event", "").unwrap(); - } - } - } - }) + // .on_window_event(move |window, event| { + // if let WindowEvent::CloseRequested { api, .. } = event { + // println!("close window"); + // unsafe { + // if !IS_CLOSE && window.label() == "main" { + // api.prevent_close(); + // window.emit("window-close-event", "").unwrap(); + // } + // } + // } + // }) .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| { let _ = app .get_webview_window("main") @@ -316,13 +362,13 @@ pub fn run() { }) .manage(stop_signal_clone) .invoke_handler(tauri::generate_handler![ - my_commit_output, - force_close, run_command, stop_command, get_core_version, fetch_easytier_list, - download_easytier_zip + download_easytier_zip, + get_cli_version, + get_members_by_cli ]) .run(context) .expect("error while running tauri application"); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 400271e..0be37eb 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "easytier-game", - "version": "1.0.3", + "version": "1.0.4", "identifier": "com.tauri.easytier-game", "build": {