Fix CORS for Windows desktop app, improve error logging, and bump to v0.0.9

Author: samdev-7

clients/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@collapse/desktop",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "private": true,
   "type": "module",
   "scripts": {

clients/desktop/src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "collapse-desktop"
-version = "0.0.8"
+version = "0.0.9"
 edition = "2021"
 
 [lib]

clients/desktop/src-tauri/Cargo.toml

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/nicehash/tauri/refs/tags/tauri-v2.3.1/crates/tauri-utils/schema.json",
   "productName": "Collapse",
   "identifier": "com.hackclub.collapse",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "build": {
     "frontendDist": "../dist",
     "devUrl": "http://localhost:1420",

clients/desktop/src-tauri/tauri.conf.json

@@ -10,6 +10,7 @@
 
 import { invoke as tauriInvoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
+import { getVersion } from "@tauri-apps/api/app";
 
 // ---------------------------------------------------------------------------
 // Types
@@ -27,6 +28,8 @@ interface LogEntry {
 
 const MAX_ENTRIES = 200;
 const entries: LogEntry[] = [];
+let appVersion = "unknown";
+getVersion().then((v) => { appVersion = v; }).catch(() => {});
 
 function push(level: LogEntry["level"], message: string) {
   entries.push({ time: Date.now(), level, message });
@@ -184,7 +187,7 @@ export function getReport(): string {
   const platform = navigator.platform || "unknown";
   const ua = navigator.userAgent || "";
 
-  const lines = [`Collapse Desktop | ${platform} | ${now}`, `UA: ${ua}`, "---"];
+  const lines = [`Collapse Desktop v${appVersion} | ${platform} | ${now}`, `UA: ${ua}`, "---"];
 
   // Last 100 entries
   const recent = entries.slice(-100);

clients/desktop/src/logger.ts

@@ -63,7 +63,7 @@ export function useGallery({ apiBaseUrl, tokens }: UseGalleryOptions): UseGaller
       })
       .catch((err) => {
         if (!cancelled) {
-          console.warn("Gallery fetch error:", err);
+          console.warn("Gallery fetch error:", err instanceof Error ? err.message : err);
           setError(err.message);
           // Keep showing whatever sessions we had
         }

clients/react/src/hooks/useGallery.ts

@@ -16,7 +16,8 @@ const app = Fastify({ logger: true });
 await app.register(cors, {
   origin: (origin, cb) => {
     // Allow: no origin (server-to-server), *.hackclub.com, localhost dev, tauri app
-    if (!origin || origin.startsWith("tauri://")) {
+    // Tauri uses tauri:// on macOS/Linux but http://tauri.localhost on Windows
+    if (!origin || origin.startsWith("tauri://") || origin === "http://tauri.localhost") {
       cb(null, true);
       return;
     }
@@ -28,10 +29,12 @@ await app.register(cors, {
       ) {
         cb(null, true);
       } else {
-        cb(new Error("Not allowed by CORS"), false);
+        app.log.warn(`CORS rejected origin: ${origin}`);
+        cb(new Error(`Not allowed by CORS (origin: ${origin})`), false);
       }
     } catch {
-      cb(new Error("Not allowed by CORS"), false);
+      app.log.warn(`CORS rejected origin (malformed): ${origin}`);
+      cb(new Error(`Not allowed by CORS (origin: ${origin})`), false);
     }
   },
 });