Merge branch 'main' into fix/fix-build-pipeline

Author: devbyray

src-tauri/.cargo/config.toml

@@ -0,0 +1,15 @@
+[build]
+rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.aarch64-apple-darwin]
+rustflags = [
+    "-C", "link-arg=-undefined",
+    "-C", "link-arg=dynamic_lookup",
+]
+
+[profile.release]
+panic = "abort"
+codegen-units = 1
+lto = true
+opt-level = "s"
+strip = true

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "circle-camera"
-version = "0.2.0"
+version = "0.3.0"
 description = "A minimal webcam app that displays in a circle"
 authors = ["Dev By RayRay"]
 license = "EUPL"
@@ -9,6 +9,10 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+# Configure specific target optimizations
+[target.aarch64-apple-darwin]
+rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]
+
 [lib]
 name = "circle_camera_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]

src-tauri/Cargo.toml

@@ -8,5 +8,11 @@
     <string>This app needs access to your microphone for video recording.</string>
     <key>NSCameraUseContinuityCameraDeviceType</key>
     <true/>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.15</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
 </dict>
 </plist>

src-tauri/Info.plist

@@ -1,3 +1,9 @@
 fn main() {
+    // Add specific configuration for Mac builds
+    #[cfg(target_os = "macos")]
+    {
+        println!("cargo:rustc-link-lib=framework=WebKit");
+    }
+    
     tauri_build::build()
 }

src-tauri/build.rs

@@ -58,14 +58,15 @@
       "exceptionDomain": "",
       "frameworks": [],
       "providerShortName": null,
-      "signingIdentity": null
+      "signingIdentity": null,
+      "minimumSystemVersion": "10.15"
     }
   },
   "plugins": {
     "updater": {
       "active": true,
       "endpoints": [
-        "http://localhost:8080/latest.json"
+        "https://github.com/devbyray/circle-camera/releases/latest/download/latest.json"
       ],
       "dialog": true,
       "pubkey": ""

src-tauri/tauri.conf.json

@@ -2,7 +2,7 @@
 import { onMounted, ref } from 'vue';
 import { version as appVersion } from '../../package.json';
 
-// Define TypeScript interface for Update object
+// Update the interface to match Tauri's Update type structure
 interface UpdateInfo {
   version: string;
   notes?: string;
@@ -114,19 +114,35 @@ onMounted(async () => {
     console.log('Current app version:', currentVersion);
     
     // Check for updates
-    const update = await check() as UpdateInfo;
-    updateObject.value = update;
+    const updateResult = await check();
     
-    if (update) {
-      console.log('Update available:', update.version);
+    if (updateResult) {
+      // Create a wrapper that adapts the Tauri Update type to our UpdateInfo interface
+      updateObject.value = {
+        version: updateResult.version,
+        notes: updateResult.body || '',  // Change 'notes' to 'body' which is the correct property
+        date: updateResult.date || '',
+        downloadAndInstall: (progressCallback?: (progress: number) => void) => {
+          return updateResult.downloadAndInstall((event) => {
+            // Convert the DownloadEvent to a simple number progress
+            if (event.event === 'Progress' && progressCallback && 'data' in event) {
+              // Use the chunkLength as a proxy for progress percentage
+              // or implement a custom progress calculation
+              progressCallback(event.data.chunkLength);
+            }
+          });
+        }
+      };
+      
+      console.log('Update available:', updateObject.value.version);
       updateAvailable.value = true;
-      updateVersion.value = update.version;
+      updateVersion.value = updateObject.value.version;
       
       // Emit event for parent components to handle
       emit('update-available', {
-        version: update.version,
-        notes: update.notes || 'No release notes available',
-        releaseUrl: `https://github.com/devbyray/circle-camera/releases/tag/${update.version}`
+        version: updateObject.value.version,
+        notes: updateObject.value.notes || 'No release notes available',
+        releaseUrl: `https://github.com/devbyray/circle-camera/releases/tag/${updateObject.value.version}`
       });
     } else {
       console.log('No update available');

src/components/UpdateChecker.vue

@@ -30,7 +30,10 @@ const updateInfo = ref({ version: '', notes: '', releaseUrl: '' });
 const updateProgress = ref(0);
 const updateInProgress = ref(false);
 const updateError = ref('');
-const updateCheckerRef = ref(null);
+const updateCheckerRef = ref<InstanceType<typeof UpdateChecker> | null>(null);
+
+// Store unsubscribe functions to properly clean them up when component is unmounted
+const unsubscribeFunctions = ref<Array<() => void>>([]);
 
 // Initialize cameras
 async function initializeCameras() {
@@ -81,18 +84,18 @@ function toggleUpdateOverlay() {
 }
 
 // Update handlers
-function handleUpdateAvailable(info) {
+function handleUpdateAvailable(info: { version: string; notes: string; releaseUrl: string }) {
   updateAvailable.value = true;
   updateInfo.value = info;
   console.log('Update available:', info);
 }
 
-function handleUpdateProgress(progress) {
+function handleUpdateProgress(progress: number) {
   updateProgress.value = progress;
   updateInProgress.value = true;
 }
 
-function handleUpdateError(error) {
+function handleUpdateError(error: Error | string) {
   updateError.value = error instanceof Error ? error.message : String(error);
   updateInProgress.value = false;
 }
@@ -155,6 +158,7 @@ async function setupEventListeners() {
         console.log('Received border radius event:', event);
         borderRadius.value = event.payload as number;
       });
+      unsubscribeFunctions.value.push(unlistenRadius);
       console.log('Border radius listener setup complete');
     } catch (e) {
       console.error('Error setting up border-radius listener:', e);
@@ -166,6 +170,7 @@ async function setupEventListeners() {
         console.log('Received border width event:', event);
         borderWidth.value = event.payload as number;
       });
+      unsubscribeFunctions.value.push(unlistenWidth);
       console.log('Border width listener setup complete');
     } catch (e) {
       console.error('Error setting up border-width listener:', e);
@@ -177,6 +182,7 @@ async function setupEventListeners() {
         console.log('Received border color event:', event);
         borderColor.value = event.payload as string;
       });
+      unsubscribeFunctions.value.push(unlistenColor);
       console.log('Border color listener setup complete');
     } catch (e) {
       console.error('Error setting up border-color listener:', e);
@@ -222,6 +228,15 @@ onMounted(async () => {
 onUnmounted(() => {
   // Remove keyboard event listener
   window.removeEventListener('keydown', handleKeyboardShortcuts);
+  
+  // Unsubscribe from all event listeners
+  unsubscribeFunctions.value.forEach(unsubscribe => {
+    try {
+      unsubscribe();
+    } catch (e) {
+      console.error('Error unsubscribing from event:', e);
+    }
+  });
 });
 </script>