Compare commits
16 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c34133ded1 | ||
|
|
0d059cbbd3 | ||
|
|
fc83a1cc65 | ||
|
|
4e81af0599 | ||
|
|
74c3c5c17e | ||
|
|
3632a578e1 | ||
|
|
8a9905fc56 | ||
|
|
1e39cbb0c5 | ||
|
|
40be58f2fc | ||
|
|
3f08b5b54a | ||
|
|
bfec99ae35 | ||
|
|
d9afd3aa81 | ||
|
|
e72113d91d | ||
|
|
7c4ff619c1 | ||
|
|
9c4217f450 | ||
|
|
cc09002171 |
@@ -26,23 +26,22 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cd frontend
|
cd frontend
|
||||||
npm install
|
npm install
|
||||||
# Run Tailwind manually first
|
|
||||||
npx @tailwindcss/cli -i input.css -o public/tailwind.css
|
npx @tailwindcss/cli -i input.css -o public/tailwind.css
|
||||||
|
# Trunk'ın optimizasyonunu kapalı (0) tutuyoruz çünkü Cargo.toml'daki opt-level='z' zaten o işi yapıyor.
|
||||||
trunk build --release
|
trunk build --release
|
||||||
|
|
||||||
- name: Build Backend (MIPS)
|
- name: Build Backend (MIPS)
|
||||||
env:
|
env:
|
||||||
# Ensure we are building a fully static binary
|
# -s ve -w ile binary içindeki gereksiz tüm yükleri siliyoruz.
|
||||||
# -C link-self-contained=no: Let Zig (the linker) handle CRT objects (crt1.o, etc.)
|
RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float -C link-arg=-s -C link-arg=-w"
|
||||||
RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float"
|
|
||||||
CFLAGS_mips_unknown_linux_musl: "-msoft-float"
|
CFLAGS_mips_unknown_linux_musl: "-msoft-float"
|
||||||
run: |
|
run: |
|
||||||
cd backend
|
# Sadece gerekli özellikleri derliyoruz (Boyut tasarrufu için swagger kapalı)
|
||||||
cargo zigbuild --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
|
cargo zigbuild -p backend --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort --no-default-features --features push-notifications
|
||||||
file target/mips-unknown-linux-musl/release/backend
|
|
||||||
|
|
||||||
- name: Rename Binary
|
- name: Create Release Assets
|
||||||
run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
|
run: |
|
||||||
|
mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
|
||||||
|
|
||||||
- name: Generate Release Tag
|
- name: Generate Release Tag
|
||||||
id: tag
|
id: tag
|
||||||
@@ -56,8 +55,10 @@ jobs:
|
|||||||
REPO="admin/vibetorrent"
|
REPO="admin/vibetorrent"
|
||||||
API_URL="${{ gitea.server_url }}/api/v1"
|
API_URL="${{ gitea.server_url }}/api/v1"
|
||||||
|
|
||||||
# Create release
|
RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" \
|
||||||
RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" -H "Authorization: token ${RELEASE_TOKEN}" -H "Content-Type: application/json" -d "{
|
-H "Authorization: token ${RELEASE_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "{
|
||||||
\"tag_name\": \"${TAG}\",
|
\"tag_name\": \"${TAG}\",
|
||||||
\"name\": \"Release ${TAG}\",
|
\"name\": \"Release ${TAG}\",
|
||||||
\"body\": \"Automated build from commit ${{ gitea.sha }}\",
|
\"body\": \"Automated build from commit ${{ gitea.sha }}\",
|
||||||
@@ -66,15 +67,9 @@ jobs:
|
|||||||
}")
|
}")
|
||||||
|
|
||||||
RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
|
RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
|
||||||
echo "Release ID: $RELEASE_ID"
|
if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then exit 1; fi
|
||||||
|
|
||||||
if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
|
curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" \
|
||||||
echo "Failed to create release:"
|
-H "Authorization: token ${RELEASE_TOKEN}" \
|
||||||
echo "$RELEASE_RESPONSE"
|
-H "Content-Type: application/octet-stream" \
|
||||||
exit 1
|
--data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
|
||||||
fi
|
|
||||||
|
|
||||||
# Upload binary as release asset
|
|
||||||
curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" -H "Authorization: token ${RELEASE_TOKEN}" -H "Content-Type: application/octet-stream" --data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
|
|
||||||
|
|
||||||
echo "Release ${TAG} created with binary attached."
|
|
||||||
10
Cargo.toml
10
Cargo.toml
@@ -2,13 +2,19 @@
|
|||||||
members = ["backend", "frontend", "shared"]
|
members = ["backend", "frontend", "shared"]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
# Optimize for size (aggressive)
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
|
# En küçük binary boyutu
|
||||||
opt-level = "z"
|
opt-level = "z"
|
||||||
lto = true
|
# En derin kod temizliği (dead code elimination)
|
||||||
|
lto = "fat"
|
||||||
|
# En iyi optimizasyon için tek birim derleme
|
||||||
codegen-units = 1
|
codegen-units = 1
|
||||||
|
# Hata izleme kodlarını atarak yer kazan
|
||||||
panic = "abort"
|
panic = "abort"
|
||||||
|
# Sembolleri ve hata ayıklama bilgilerini kesin sil
|
||||||
strip = true
|
strip = true
|
||||||
|
# Artık (incremental) build'i kapat ki optimizasyon tam olsun
|
||||||
|
incremental = false
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
coarsetime = { path = "third_party/coarsetime" }
|
coarsetime = { path = "third_party/coarsetime" }
|
||||||
@@ -4,8 +4,9 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["push-notifications"]
|
default = ["push-notifications", "swagger"]
|
||||||
push-notifications = ["web-push", "openssl"]
|
push-notifications = ["web-push", "openssl"]
|
||||||
|
swagger = ["utoipa-swagger-ui"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
axum = { version = "0.8", features = ["macros", "ws"] }
|
axum = { version = "0.8", features = ["macros", "ws"] }
|
||||||
@@ -29,7 +30,7 @@ shared = { path = "../shared" }
|
|||||||
thiserror = "2.0.18"
|
thiserror = "2.0.18"
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
utoipa = { version = "5.4.0", features = ["axum_extras"] }
|
utoipa = { version = "5.4.0", features = ["axum_extras"] }
|
||||||
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
|
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"], optional = true }
|
||||||
web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
|
web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
openssl = { version = "0.10", features = ["vendored"], optional = true }
|
openssl = { version = "0.10", features = ["vendored"], optional = true }
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ use tower_http::{
|
|||||||
cors::CorsLayer,
|
cors::CorsLayer,
|
||||||
trace::TraceLayer,
|
trace::TraceLayer,
|
||||||
};
|
};
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
use utoipa::OpenApi;
|
use utoipa::OpenApi;
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
use utoipa_swagger_ui::SwaggerUi;
|
use utoipa_swagger_ui::SwaggerUi;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@@ -98,6 +100,7 @@ struct Args {
|
|||||||
reset_password: Option<String>,
|
reset_password: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
#[derive(OpenApi)]
|
#[derive(OpenApi)]
|
||||||
#[openapi(
|
#[openapi(
|
||||||
@@ -146,6 +149,7 @@ struct Args {
|
|||||||
)]
|
)]
|
||||||
struct ApiDoc;
|
struct ApiDoc;
|
||||||
|
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
#[cfg(not(feature = "push-notifications"))]
|
#[cfg(not(feature = "push-notifications"))]
|
||||||
#[derive(OpenApi)]
|
#[derive(OpenApi)]
|
||||||
#[openapi(
|
#[openapi(
|
||||||
@@ -462,9 +466,13 @@ async fn main() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let app = Router::new()
|
let app = Router::new();
|
||||||
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
|
let app = app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
|
||||||
|
|
||||||
// Setup & Auth Routes
|
// Setup & Auth Routes
|
||||||
|
let app = app
|
||||||
.route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
|
.route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
|
||||||
.route("/api/setup", post(handlers::setup::setup_handler))
|
.route("/api/setup", post(handlers::setup::setup_handler))
|
||||||
.route(
|
.route(
|
||||||
@@ -516,9 +524,9 @@ async fn main() {
|
|||||||
.layer(TraceLayer::new_for_http())
|
.layer(TraceLayer::new_for_http())
|
||||||
.layer(
|
.layer(
|
||||||
CompressionLayer::new()
|
CompressionLayer::new()
|
||||||
.br(true)
|
.br(false)
|
||||||
.gzip(true)
|
.gzip(true)
|
||||||
.quality(CompressionLevel::Best),
|
.quality(CompressionLevel::Fastest),
|
||||||
)
|
)
|
||||||
.layer(
|
.layer(
|
||||||
ServiceBuilder::new()
|
ServiceBuilder::new()
|
||||||
|
|||||||
@@ -52,15 +52,5 @@ web-sys = { version = "0.3", features = [
|
|||||||
shared = { path = "../shared" }
|
shared = { path = "../shared" }
|
||||||
tailwind_fuse = "0.3.2"
|
tailwind_fuse = "0.3.2"
|
||||||
js-sys = "0.3.85"
|
js-sys = "0.3.85"
|
||||||
|
base64 = "0.22.1"
|
||||||
[profile.release]
|
serde-wasm-bindgen = "0.6.5"
|
||||||
# En yüksek seviyede boyut optimizasyonu
|
|
||||||
opt-level = "z"
|
|
||||||
# Tüm kütüphaneler arasında link-time optimizasyonu yapar (Çok etkilidir)
|
|
||||||
lto = true
|
|
||||||
# Kod üretim birimini 1'e düşürerek daha iyi optimizasyon sağlar
|
|
||||||
codegen-units = 1
|
|
||||||
# Hata durumunda stack unwinding yerine doğrudan durur (Kod boyutunu düşürür)
|
|
||||||
panic = "abort"
|
|
||||||
# Sembolleri ve debug bilgilerini siler
|
|
||||||
strip = true
|
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use wasm_bindgen::closure::Closure;
|
|
||||||
use wasm_bindgen::JsCast;
|
|
||||||
use crate::store::{get_action_messages, show_toast_with_signal};
|
use crate::store::{get_action_messages, show_toast_with_signal};
|
||||||
use shared::NotificationLevel;
|
use shared::NotificationLevel;
|
||||||
|
|
||||||
@@ -423,57 +421,50 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let _t_hash = t.hash.clone();
|
let _t_hash = t.hash.clone();
|
||||||
let t_hash_click = t.hash.clone();
|
let t_hash_click = t.hash.clone();
|
||||||
|
|
||||||
let (timer_id, set_timer_id) = create_signal(Option::<i32>::None);
|
let (timer_handle, set_timer_handle) = create_signal(Option::<leptos::leptos_dom::helpers::TimeoutHandle>::None);
|
||||||
let t_hash_long = t.hash.clone();
|
let t_hash_long = t.hash.clone();
|
||||||
|
|
||||||
let clear_timer = move || {
|
let clear_long_press_timer = move || {
|
||||||
if let Some(id) = timer_id.get_untracked() {
|
if let Some(handle) = timer_handle.get_untracked() {
|
||||||
window().clear_timeout_with_handle(id);
|
handle.clear();
|
||||||
set_timer_id.set(None);
|
set_timer_handle.set(None);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let handle_touchstart = {
|
let handle_touchstart = {
|
||||||
let t_hash = t_hash_long.clone();
|
let t_hash = t_hash_long.clone();
|
||||||
move |e: web_sys::TouchEvent| {
|
move |e: web_sys::TouchEvent| {
|
||||||
clear_timer();
|
clear_long_press_timer();
|
||||||
if let Some(touch) = e.touches().get(0) {
|
if let Some(touch) = e.touches().get(0) {
|
||||||
let x = touch.client_x();
|
let x = touch.client_x();
|
||||||
let y = touch.client_y();
|
let y = touch.client_y();
|
||||||
let hash = t_hash.clone();
|
let hash = t_hash.clone();
|
||||||
|
|
||||||
let closure = Closure::wrap(Box::new(move || {
|
// Use Leptos set_timeout: cleaner, safer, no manual Closure needed
|
||||||
|
let handle = set_timeout_with_handle(move || {
|
||||||
set_menu_position.set((x, y));
|
set_menu_position.set((x, y));
|
||||||
set_selected_hash.set(Some(hash.clone()));
|
set_selected_hash.set(Some(hash.clone()));
|
||||||
set_menu_visible.set(true);
|
set_menu_visible.set(true);
|
||||||
|
|
||||||
// Haptic feedback (iOS Safari doesn't support vibrate)
|
// Haptic feedback
|
||||||
let navigator = window().navigator();
|
let navigator = window().navigator();
|
||||||
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
|
if let Ok(vibrate) = js_sys::Reflect::get(&navigator, &"vibrate".into()) {
|
||||||
|
if vibrate.is_function() {
|
||||||
let _ = navigator.vibrate_with_duration(50);
|
let _ = navigator.vibrate_with_duration(50);
|
||||||
}
|
}
|
||||||
}) as Box<dyn Fn()>);
|
}
|
||||||
|
set_timer_handle.set(None);
|
||||||
|
}, std::time::Duration::from_millis(600));
|
||||||
|
|
||||||
let id = window()
|
if let Ok(h) = handle {
|
||||||
.set_timeout_with_callback_and_timeout_and_arguments_0(
|
set_timer_handle.set(Some(h));
|
||||||
closure.as_ref().unchecked_ref(),
|
}
|
||||||
600
|
|
||||||
)
|
|
||||||
.unwrap_or(0);
|
|
||||||
|
|
||||||
closure.forget();
|
|
||||||
set_timer_id.set(Some(id));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let handle_touchmove = move |_| {
|
let handle_touchmove = move |_| clear_long_press_timer();
|
||||||
clear_timer();
|
let handle_touchend = move |_| clear_long_press_timer();
|
||||||
};
|
|
||||||
|
|
||||||
let handle_touchend = move |_| {
|
|
||||||
clear_timer();
|
|
||||||
};
|
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -328,68 +328,47 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
|
|
||||||
// First, request notification permission if not already granted
|
// First, request notification permission if not already granted
|
||||||
let window = web_sys::window().expect("window should exist");
|
let window = web_sys::window().expect("window should exist");
|
||||||
let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
|
|
||||||
if notification_class.is_undefined() {
|
|
||||||
log::error!("Notification API not available");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check current permission
|
// Notification.permission is a static property, but web_sys exposes it via the Notification class instance or we check it manually.
|
||||||
let current_permission = js_sys::Reflect::get(¬ification_class, &"permission".into())
|
// Actually, Notification::permission() is a static method in web_sys.
|
||||||
.ok()
|
match web_sys::Notification::permission() {
|
||||||
.and_then(|p| p.as_string())
|
web_sys::NotificationPermission::Granted => {
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
if current_permission == "granted" {
|
|
||||||
log::info!("Notification permission already granted");
|
log::info!("Notification permission already granted");
|
||||||
true
|
}
|
||||||
} else if current_permission == "denied" {
|
web_sys::NotificationPermission::Denied => {
|
||||||
log::warn!("Notification permission was denied");
|
log::warn!("Notification permission was denied");
|
||||||
return;
|
return;
|
||||||
} else {
|
|
||||||
// Permission is "default" - need to request
|
|
||||||
log::info!("Requesting notification permission...");
|
|
||||||
if let Ok(request_fn) = js_sys::Reflect::get(¬ification_class, &"requestPermission".into()) {
|
|
||||||
if request_fn.is_function() {
|
|
||||||
let request_fn_typed = js_sys::Function::from(request_fn);
|
|
||||||
match request_fn_typed.call0(¬ification_class) {
|
|
||||||
Ok(promise_val) => {
|
|
||||||
let request_future = wasm_bindgen_futures::JsFuture::from(
|
|
||||||
js_sys::Promise::from(promise_val)
|
|
||||||
);
|
|
||||||
match request_future.await {
|
|
||||||
Ok(result) => {
|
|
||||||
let result_str = result.as_string().unwrap_or_default();
|
|
||||||
log::info!("Permission request result: {}", result_str);
|
|
||||||
result_str == "granted"
|
|
||||||
}
|
}
|
||||||
|
web_sys::NotificationPermission::Default => {
|
||||||
|
log::info!("Requesting notification permission...");
|
||||||
|
let permission_promise = match web_sys::Notification::request_permission() {
|
||||||
|
Ok(p) => p,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to request notification permission: {:?}", e);
|
log::error!("Failed to request notification permission: {:?}", e);
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::error!("Failed to call requestPermission: {:?}", e);
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
log::error!("Cannot access Notification class");
|
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if !permission_granted {
|
match wasm_bindgen_futures::JsFuture::from(permission_promise).await {
|
||||||
log::warn!("Notification permission not granted, cannot subscribe to push");
|
Ok(val) => {
|
||||||
|
let permission = val.as_string().unwrap_or_default();
|
||||||
|
if permission != "granted" {
|
||||||
|
log::warn!("Notification permission denied by user");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
log::info!("Notification permission granted by user");
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Failed to await notification permission: {:?}", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
log::warn!("Unknown notification permission status");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
log::info!("Notification permission granted! Proceeding with push subscription...");
|
log::info!("Notification permission granted! Proceeding with push subscription...");
|
||||||
|
|
||||||
@@ -433,7 +412,6 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Get service worker registration
|
// Get service worker registration
|
||||||
let window = web_sys::window().expect("window should exist");
|
|
||||||
let navigator = window.navigator();
|
let navigator = window.navigator();
|
||||||
let service_worker = navigator.service_worker();
|
let service_worker = navigator.service_worker();
|
||||||
|
|
||||||
@@ -494,12 +472,14 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
.dyn_into::<web_sys::PushSubscription>()
|
.dyn_into::<web_sys::PushSubscription>()
|
||||||
.expect("should be PushSubscription");
|
.expect("should be PushSubscription");
|
||||||
|
|
||||||
// Get subscription JSON using toJSON() method
|
// PushSubscription objects can be serialized directly via JSON.stringify which calls their toJSON method internally.
|
||||||
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
// Or we can use Reflect to call toJSON if we want the object directly.
|
||||||
|
// Let's use the robust way: call toJSON via Reflect but handle it gracefully.
|
||||||
|
let json_val = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
||||||
Ok(func) if func.is_function() => {
|
Ok(func) if func.is_function() => {
|
||||||
let json_func = js_sys::Function::from(func);
|
let json_func = js_sys::Function::from(func);
|
||||||
match json_func.call0(&push_subscription) {
|
match json_func.call0(&push_subscription) {
|
||||||
Ok(result) => result,
|
Ok(res) => res,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to call toJSON: {:?}", e);
|
log::error!("Failed to call toJSON: {:?}", e);
|
||||||
return;
|
return;
|
||||||
@@ -507,25 +487,30 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
log::error!("toJSON method not found on PushSubscription");
|
// Fallback: try to stringify the object directly
|
||||||
return;
|
// log::warn!("toJSON not found, trying JSON.stringify");
|
||||||
}
|
let json_str = match js_sys::JSON::stringify(&push_subscription) {
|
||||||
};
|
Ok(s) => s,
|
||||||
|
|
||||||
let json_value = match js_sys::JSON::stringify(&json_result) {
|
|
||||||
Ok(val) => val,
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to stringify subscription: {:?}", e);
|
log::error!("Failed to stringify subscription: {:?}", e);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// Parse back to object to match our expected flow (slightly inefficient but safe)
|
||||||
|
match js_sys::JSON::parse(&String::from(json_str)) {
|
||||||
|
Ok(v) => v,
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Failed to parse stringified subscription: {:?}", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let subscription_json_str = json_value.as_string().expect("should be string");
|
// Convert JsValue (JSON object) to PushSubscriptionJSON struct via serde
|
||||||
|
// Note: web_sys::PushSubscriptionJSON is not a struct we can directly use with serde_json usually,
|
||||||
log::info!("Push subscription: {}", subscription_json_str);
|
// but we can use serde-wasm-bindgen to convert JsValue -> Rust Struct
|
||||||
|
let subscription_data: PushSubscriptionData = match serde_wasm_bindgen::from_value(json_val) {
|
||||||
// Parse and send to backend
|
|
||||||
let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
|
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to parse subscription JSON: {:?}", e);
|
log::error!("Failed to parse subscription JSON: {:?}", e);
|
||||||
@@ -533,37 +518,9 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Extract endpoint and keys
|
// Send to backend (subscription_data is already the struct we need)
|
||||||
let endpoint = subscription_data
|
|
||||||
.get("endpoint")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.expect("endpoint should exist")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let keys_obj = subscription_data
|
|
||||||
.get("keys")
|
|
||||||
.expect("keys should exist");
|
|
||||||
|
|
||||||
let p256dh = keys_obj
|
|
||||||
.get("p256dh")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.expect("p256dh should exist")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let auth = keys_obj
|
|
||||||
.get("auth")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.expect("auth should exist")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let push_data = PushSubscriptionData {
|
|
||||||
endpoint,
|
|
||||||
keys: PushKeys { p256dh, auth },
|
|
||||||
};
|
|
||||||
|
|
||||||
// Send to backend
|
|
||||||
let response = match Request::post("/api/push/subscribe")
|
let response = match Request::post("/api/push/subscribe")
|
||||||
.json(&push_data)
|
.json(&subscription_data)
|
||||||
.expect("serialization should succeed")
|
.expect("serialization should succeed")
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
@@ -583,34 +540,15 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Helper to convert URL-safe base64 string to Uint8Array
|
/// Helper to convert URL-safe base64 string to Uint8Array
|
||||||
/// Uses JavaScript to properly decode binary data (avoids UTF-8 encoding issues)
|
/// Uses pure Rust base64 crate for better safety and performance
|
||||||
fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
|
fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
|
||||||
// Add padding
|
use base64::{engine::general_purpose, Engine as _};
|
||||||
let padding = (4 - (base64_string.len() % 4)) % 4;
|
|
||||||
let mut padded = base64_string.to_string();
|
|
||||||
padded.push_str(&"=".repeat(padding));
|
|
||||||
|
|
||||||
// Replace URL-safe characters
|
// VAPID keys are URL-safe base64. Try both NO_PAD and padded for robustness.
|
||||||
let standard_base64 = padded.replace('-', "+").replace('_', "/");
|
let bytes = general_purpose::URL_SAFE_NO_PAD
|
||||||
|
.decode(base64_string)
|
||||||
|
.or_else(|_| general_purpose::URL_SAFE.decode(base64_string))
|
||||||
|
.map_err(|e| JsValue::from_str(&format!("Base64 decode error: {}", e)))?;
|
||||||
|
|
||||||
// Decode using JavaScript to avoid UTF-8 encoding issues
|
Ok(js_sys::Uint8Array::from(&bytes[..]))
|
||||||
// Create a JavaScript function to decode the base64 and convert to Uint8Array
|
|
||||||
let js_code = format!(
|
|
||||||
r#"
|
|
||||||
(function() {{
|
|
||||||
const binaryString = atob('{}');
|
|
||||||
const bytes = new Uint8Array(binaryString.length);
|
|
||||||
for (let i = 0; i < binaryString.length; i++) {{
|
|
||||||
bytes[i] = binaryString.charCodeAt(i);
|
|
||||||
}}
|
|
||||||
return bytes;
|
|
||||||
}})()
|
|
||||||
"#,
|
|
||||||
standard_base64
|
|
||||||
);
|
|
||||||
|
|
||||||
let result = js_sys::eval(&js_code)?;
|
|
||||||
let array = result.dyn_into::<js_sys::Uint8Array>()?;
|
|
||||||
|
|
||||||
Ok(array)
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user