mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-16 15:17:21 -05:00
added discord rpc
This commit is contained in:
@@ -10,6 +10,7 @@ fn main() {
|
||||
"crypto-utils.js",
|
||||
"credential-manager.js",
|
||||
"update-client.js",
|
||||
"discord-rpc.js",
|
||||
] {
|
||||
println!("cargo:rerun-if-changed=../{}", f);
|
||||
}
|
||||
@@ -49,6 +50,7 @@ fn main() {
|
||||
"win_close",
|
||||
"win_drag",
|
||||
"open_new_window",
|
||||
"report_location",
|
||||
]),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
"allow-win-close",
|
||||
"allow-win-drag",
|
||||
"allow-open-new-window",
|
||||
"allow-report-location",
|
||||
"core:default",
|
||||
"core:window:allow-start-dragging",
|
||||
"core:window:allow-minimize",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
{"default":{"identifier":"default","description":"Window and opener permissions for local and localhost-served pages","remote":{"urls":["http://localhost:*","http://localhost:*/*","http://127.0.0.1:*","http://127.0.0.1:*/*"]},"local":true,"windows":["*"],"webviews":["*"],"permissions":["allow-win-minimize","allow-win-maximize","allow-win-close","allow-win-drag","allow-open-new-window","core:default","core:window:allow-start-dragging","core:window:allow-minimize","core:window:allow-maximize","core:window:allow-unmaximize","core:window:allow-toggle-maximize","core:window:allow-close","core:window:allow-destroy","core:window:allow-is-maximized","core:window:allow-is-fullscreen","core:window:allow-set-fullscreen","core:window:allow-set-focus","core:window:allow-show","core:window:allow-hide","opener:default"]}}
|
||||
{"default":{"identifier":"default","description":"Window and opener permissions for local and localhost-served pages","remote":{"urls":["http://localhost:*","http://localhost:*/*","http://127.0.0.1:*","http://127.0.0.1:*/*"]},"local":true,"windows":["*"],"webviews":["*"],"permissions":["allow-win-minimize","allow-win-maximize","allow-win-close","allow-win-drag","allow-open-new-window","allow-report-location","core:default","core:window:allow-start-dragging","core:window:allow-minimize","core:window:allow-maximize","core:window:allow-unmaximize","core:window:allow-toggle-maximize","core:window:allow-close","core:window:allow-destroy","core:window:allow-is-maximized","core:window:allow-is-fullscreen","core:window:allow-set-fullscreen","core:window:allow-set-focus","core:window:allow-show","core:window:allow-hide","opener:default"]}}
|
||||
@@ -345,10 +345,10 @@
|
||||
"description": "Permission identifier",
|
||||
"oneOf": [
|
||||
{
|
||||
"description": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`",
|
||||
"description": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`\n- `allow-report-location`",
|
||||
"type": "string",
|
||||
"const": "default",
|
||||
"markdownDescription": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`"
|
||||
"markdownDescription": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`\n- `allow-report-location`"
|
||||
},
|
||||
{
|
||||
"description": "Allows opening a new webview window",
|
||||
@@ -356,6 +356,12 @@
|
||||
"const": "allow-open-new-window",
|
||||
"markdownDescription": "Allows opening a new webview window"
|
||||
},
|
||||
{
|
||||
"description": "Allows reporting the current page to the backend",
|
||||
"type": "string",
|
||||
"const": "allow-report-location",
|
||||
"markdownDescription": "Allows reporting the current page to the backend"
|
||||
},
|
||||
{
|
||||
"description": "Allows closing the window",
|
||||
"type": "string",
|
||||
@@ -386,6 +392,12 @@
|
||||
"const": "deny-open-new-window",
|
||||
"markdownDescription": "Denies the open_new_window command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the report_location command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
"const": "deny-report-location",
|
||||
"markdownDescription": "Denies the report_location command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the win_close command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
|
||||
@@ -345,10 +345,10 @@
|
||||
"description": "Permission identifier",
|
||||
"oneOf": [
|
||||
{
|
||||
"description": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`",
|
||||
"description": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`\n- `allow-report-location`",
|
||||
"type": "string",
|
||||
"const": "default",
|
||||
"markdownDescription": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`"
|
||||
"markdownDescription": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`\n- `allow-report-location`"
|
||||
},
|
||||
{
|
||||
"description": "Allows opening a new webview window",
|
||||
@@ -356,6 +356,12 @@
|
||||
"const": "allow-open-new-window",
|
||||
"markdownDescription": "Allows opening a new webview window"
|
||||
},
|
||||
{
|
||||
"description": "Allows reporting the current page to the backend",
|
||||
"type": "string",
|
||||
"const": "allow-report-location",
|
||||
"markdownDescription": "Allows reporting the current page to the backend"
|
||||
},
|
||||
{
|
||||
"description": "Allows closing the window",
|
||||
"type": "string",
|
||||
@@ -386,6 +392,12 @@
|
||||
"const": "deny-open-new-window",
|
||||
"markdownDescription": "Denies the open_new_window command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the report_location command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
"const": "deny-report-location",
|
||||
"markdownDescription": "Denies the report_location command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the win_close command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
|
||||
11
src-tauri/permissions/autogenerated/report_location.toml
Normal file
11
src-tauri/permissions/autogenerated/report_location.toml
Normal file
@@ -0,0 +1,11 @@
|
||||
# Automatically generated - DO NOT EDIT!
|
||||
|
||||
[[permission]]
|
||||
identifier = "allow-report-location"
|
||||
description = "Enables the report_location command without any pre-configured scope."
|
||||
commands.allow = ["report_location"]
|
||||
|
||||
[[permission]]
|
||||
identifier = "deny-report-location"
|
||||
description = "Denies the report_location command without any pre-configured scope."
|
||||
commands.deny = ["report_location"]
|
||||
@@ -30,6 +30,12 @@ description = "Allows opening a new webview window"
|
||||
[[permission.allow]]
|
||||
cmd = "open_new_window"
|
||||
|
||||
[[permission]]
|
||||
identifier = "allow-report-location"
|
||||
description = "Allows reporting the current page to the backend"
|
||||
[[permission.allow]]
|
||||
cmd = "report_location"
|
||||
|
||||
[[set]]
|
||||
identifier = "default"
|
||||
description = "Default permissions for Vyla Home app commands"
|
||||
@@ -38,5 +44,6 @@ permissions = [
|
||||
"allow-win-maximize",
|
||||
"allow-win-close",
|
||||
"allow-win-drag",
|
||||
"allow-open-new-window"
|
||||
]
|
||||
"allow-open-new-window",
|
||||
"allow-report-location"
|
||||
]
|
||||
@@ -4,7 +4,7 @@ use std::path::PathBuf;
|
||||
use std::process::{Child, Command, Stdio};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use tauri::webview::NewWindowResponse;
|
||||
use tauri::{AppHandle, Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder};
|
||||
use tauri::{AppHandle, Emitter, Listener, Manager, State, WebviewUrl, WebviewWindowBuilder};
|
||||
|
||||
fn debug_log(msg: &str) {
|
||||
let log_dir = if let Ok(app_data) = std::env::var("APPDATA") {
|
||||
@@ -40,6 +40,19 @@ fn debug_log(msg: &str) {
|
||||
|
||||
struct NodeServices(Mutex<Option<Child>>);
|
||||
|
||||
struct NodeStdin(Mutex<Option<std::process::ChildStdin>>);
|
||||
|
||||
fn write_node_line(state: &NodeStdin, line: &str) -> Result<(), String> {
|
||||
use std::io::Write;
|
||||
let mut lock = state.0.lock().map_err(|e| e.to_string())?;
|
||||
if let Some(stdin) = lock.as_mut() {
|
||||
stdin.write_all(line.as_bytes()).map_err(|e| e.to_string())?;
|
||||
stdin.write_all(b"\n").map_err(|e| e.to_string())?;
|
||||
stdin.flush().map_err(|e| e.to_string())?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
static WINDOW_COUNTER: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(1);
|
||||
|
||||
static READY_URL: Mutex<Option<String>> = Mutex::new(None);
|
||||
@@ -485,6 +498,70 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
injectLiquidNavBar();
|
||||
}
|
||||
startNavObserver();
|
||||
|
||||
(function () {
|
||||
let last = '';
|
||||
let timer = null;
|
||||
|
||||
function metaImage() {
|
||||
const m = document.querySelector("meta[property='og:image']");
|
||||
return m && m.content ? m.content : '';
|
||||
}
|
||||
|
||||
function send(attempt) {
|
||||
const n = typeof attempt === 'number' ? attempt : 0;
|
||||
const tauri = window.__TAURI__;
|
||||
if (!tauri || !tauri.core) {
|
||||
if (n < 40) setTimeout(() => send(n + 1), 250);
|
||||
return;
|
||||
}
|
||||
const payload = {
|
||||
label: window.__VYLA_WINDOW_LABEL || 'main',
|
||||
url: location.href,
|
||||
title: document.title || '',
|
||||
image: metaImage(),
|
||||
closed: false
|
||||
};
|
||||
const v = document.querySelector('video');
|
||||
if (v && Number.isFinite(v.duration) && v.duration > 0) {
|
||||
payload.position = v.currentTime;
|
||||
payload.duration = v.duration;
|
||||
payload.paused = v.paused;
|
||||
}
|
||||
if (!tauri.event) {
|
||||
if (n < 40) setTimeout(() => send(n + 1), 250);
|
||||
return;
|
||||
}
|
||||
tauri.event.emit('vyla-presence', payload).catch((e) => console.error('[vyla] presence emit failed', e));
|
||||
}
|
||||
|
||||
function check() {
|
||||
if (location.href === last) return;
|
||||
last = location.href;
|
||||
send();
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(send, 1500);
|
||||
}
|
||||
|
||||
['pushState', 'replaceState'].forEach((fn) => {
|
||||
const orig = history[fn];
|
||||
history[fn] = function () {
|
||||
const r = orig.apply(this, arguments);
|
||||
setTimeout(check, 0);
|
||||
return r;
|
||||
};
|
||||
});
|
||||
|
||||
window.addEventListener('popstate', check);
|
||||
window.addEventListener('hashchange', check);
|
||||
window.addEventListener('focus', () => send());
|
||||
['play', 'pause', 'seeked'].forEach((name) => {
|
||||
document.addEventListener(name, () => send(), true);
|
||||
});
|
||||
setInterval(check, 2000);
|
||||
setInterval(() => { if (document.hasFocus()) send(); }, 5000);
|
||||
check();
|
||||
})();
|
||||
"##;
|
||||
|
||||
#[tauri::command]
|
||||
@@ -515,6 +592,13 @@ fn win_drag(window: tauri::Window) -> Result<(), String> {
|
||||
window.start_dragging().map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
async fn report_location(state: State<'_, NodeStdin>, payload: serde_json::Value) -> Result<(), String> {
|
||||
let line = serde_json::json!({ "type": "presence", "payload": payload }).to_string();
|
||||
debug_log(&format!("[PRESENCE] {}", line));
|
||||
write_node_line(&state, &line)
|
||||
}
|
||||
|
||||
fn normalize_url(url: &str) -> Option<tauri::Url> {
|
||||
let final_url = if url.starts_with("http") || url.starts_with("tauri://") {
|
||||
url.to_string()
|
||||
@@ -647,9 +731,11 @@ fn main() {
|
||||
win_maximize,
|
||||
win_close,
|
||||
win_drag,
|
||||
open_new_window
|
||||
open_new_window,
|
||||
report_location
|
||||
])
|
||||
.manage(NodeServices(Mutex::new(None)))
|
||||
.manage(NodeStdin(Mutex::new(None)))
|
||||
.setup(|app| {
|
||||
debug_log("Tauri setup started");
|
||||
let app_data = app.path().app_data_dir().unwrap_or_default();
|
||||
@@ -895,6 +981,13 @@ fn main() {
|
||||
});
|
||||
}
|
||||
|
||||
if let Some(stdin) = child.stdin.take() {
|
||||
let stdin_state: State<NodeStdin> = app.state();
|
||||
if let Ok(mut lock) = stdin_state.0.lock() {
|
||||
*lock = Some(stdin);
|
||||
};
|
||||
}
|
||||
|
||||
let state: State<NodeServices> = app.state();
|
||||
if let Ok(mut lock) = state.0.lock() {
|
||||
*lock = Some(child);
|
||||
@@ -911,6 +1004,14 @@ fn main() {
|
||||
}
|
||||
}
|
||||
|
||||
let presence_handle = app.handle().clone();
|
||||
app.listen("vyla-presence", move |event| {
|
||||
debug_log(&format!("[PRESENCE] {}", event.payload()));
|
||||
let line = format!("{{\"type\":\"presence\",\"payload\":{}}}", event.payload());
|
||||
let state: State<NodeStdin> = presence_handle.state();
|
||||
let _ = write_node_line(&state, &line);
|
||||
});
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.on_window_event(|window, event| {
|
||||
@@ -924,6 +1025,11 @@ fn main() {
|
||||
}
|
||||
};
|
||||
window.app_handle().exit(0);
|
||||
} else {
|
||||
let label = window.label().to_string();
|
||||
let line = serde_json::json!({ "type": "presence", "payload": { "label": label, "closed": true } }).to_string();
|
||||
let state: State<NodeStdin> = window.state();
|
||||
let _ = write_node_line(&state, &line);
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
"../crypto-utils.js",
|
||||
"../credential-manager.js",
|
||||
"../update-client.js",
|
||||
"../discord-rpc.js",
|
||||
"../config/**/*",
|
||||
"../node_modules/**/*"
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user