fix: fix updater not working correctly

Reviewed-on: #1

.github/workflows/deploy.yml

@@ -1,46 +1,45 @@
 name: Release FanslySync
-
 on:
   workflow_dispatch:
-    inputs:
-      app-slug:
-        type: string
-        description: Slug of the application
-        required: true
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
-  CN_APP_SLUG: ${{ github.event.inputs.app-slug }}
+  CN_APPLICATION: "fansly-creator-bot/fansly-sync"
 
 jobs:
   draft:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
-
       - name: create draft release
-        uses: crabnebula-dev/cloud-release@v0.1.0
+        uses: crabnebula-dev/cloud-release@v0
         with:
-          command: release draft ${{ env.CN_APP_SLUG }} --framework tauri
+          command: release draft ${{ env.CN_APPLICATION }} --framework tauri
           api-key: ${{ secrets.CN_API_KEY }}
 
-  build:
+  build_desktop:
     needs: draft
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - os: ubuntu-22.04
+          - os: windows
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+
       - name: Install stable toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
@@ -48,48 +47,35 @@ jobs:
           cache: true
 
       - name: install Linux dependencies
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-22.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y webkit2gtk-4.1
 
-      - name: Install x86_64-apple-darwin for mac and build FanslySync binaries
+      - name: build Tauri app for Windows, Linux
-        if: matrix.os == 'macos-latest'
-        run: |
-          rustup target add x86_64-apple-darwin
-          npm i
-          npm run tauri build -- --target x86_64-apple-darwin
-          npm run tauri build -- --target aarch64-apple-darwin
-        env:
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-
-      - name: build FanslySync app for Windows, Linux
         if: matrix.os != 'macos-latest'
         run: |
-          npm i
+          npm ci
-          npm run tauri build
+          npm exec tauri build
         env:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
 
       - name: upload assets
-        uses: crabnebula-dev/cloud-release@v0.1.0
+        uses: crabnebula-dev/cloud-release@v0
         with:
-          command: release upload ${{ env.CN_APP_SLUG }} --framework tauri
+          command: release upload ${{ env.CN_APPLICATION }} --framework tauri
           api-key: ${{ secrets.CN_API_KEY }}
-          path: ./src-tauri
 
   publish:
-    needs: build
+    needs: [build_desktop]
-
+    runs-on: ubuntu-22.04
-    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
       - name: publish release
-        uses: crabnebula-dev/cloud-release@v0.1.0
+        uses: crabnebula-dev/cloud-release@v0
         with:
-          command: release publish ${{ env.CN_APP_SLUG }} --framework tauri
+          command: release publish ${{ env.CN_APPLICATION }} --framework tauri
           api-key: ${{ secrets.CN_API_KEY }}

package.json

@@ -10,7 +10,13 @@
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --check . && eslint .",
 		"format": "prettier --write .",
-		"tauri": "tauri"
+		"tauri": "tauri",
+		"build_prod": "tauri build",
+		"publish": "npm run build_prod && npm run publish:makedraft && npm run publish:upload && npm run pubish:publishcn",
+		"publish_nobuild": "npm run publish:makedraft && npm run publish:upload && npm run pubish:publishcn",
+		"publish:makedraft": "cn release draft fansly-creator-bot/fansly-sync --framework tauri",
+		"publish:upload": "cn release upload fansly-creator-bot/fansly-sync --framework tauri",
+		"pubish:publishcn": "cn release publish fansly-creator-bot/fansly-sync --framework tauri"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "^3.2.5",
@@ -44,7 +50,8 @@
 		"@tauri-apps/plugin-log": "^2.0.1",
 		"@tauri-apps/plugin-notification": "^2.0.0",
 		"@tauri-apps/plugin-os": "^2.0.0",
-		"@tauri-apps/plugin-updater": "^2.0.0",
+		"@tauri-apps/plugin-process": "^2.2.1",
+		"@tauri-apps/plugin-updater": "^2.7.1",
 		"svelte-french-toast": "^1.2.0"
 	}
 }

src-tauri/Cargo.lock

@@ -108,6 +108,7 @@ dependencies = [
  "tauri-plugin-log",
  "tauri-plugin-notification",
  "tauri-plugin-os",
+ "tauri-plugin-process",
  "tauri-plugin-single-instance",
  "tauri-plugin-updater",
  "thiserror 2.0.12",
@@ -4847,6 +4848,16 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "tauri-plugin-process"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57da5888533e802b6206b9685091f8714aa1f5266dc80051a82388449558b773"
+dependencies = [
+ "tauri",
+ "tauri-plugin",
+]
+
 [[package]]
 name = "tauri-plugin-single-instance"
 version = "2.2.3"

src-tauri/Cargo.toml

@@ -24,13 +24,14 @@ lazy_static = "1.5.0"
 tokio = { version = "1.29.1", features = ["full"] }
 tokio-macros = "2.3.0"
 tauri-plugin-os = { version = "2.2.1" }
-tauri-plugin-dialog = { version = "2.2.1" }
+tauri-plugin-dialog = "2.2.1"
 tauri-plugin-clipboard-manager = { version = "2.2.1" }
 tauri-plugin-notification = { version = "2.2.1" }
-tauri-plugin-updater = { version = "2.2.1" }
+tauri-plugin-updater = "2.2.1"
 tauri-plugin-log = { version = "2.2.1" }
 log = "0.4.27"
 thiserror = "2.0.12"
+tauri-plugin-process = "2"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
@@ -41,3 +42,4 @@ custom-protocol = ["tauri/custom-protocol"]
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-autostart = "2.3.0"
 tauri-plugin-single-instance = "2"
+tauri-plugin-updater = "2"

src-tauri/capabilities/migrated.json

@@ -1,32 +1,37 @@
 {
-	"identifier": "migrated",
+  "identifier": "migrated",
-	"description": "permissions that were migrated from v1",
+  "description": "permissions that were migrated from v1",
-	"local": true,
+  "local": true,
-	"windows": ["main"],
+  "windows": [
-	"permissions": [
+    "main"
-		"core:default",
+  ],
-		"dialog:allow-message",
+  "permissions": [
-		"dialog:allow-ask",
+    "core:default",
-		"dialog:allow-confirm",
+    "dialog:allow-message",
-		"notification:default",
+    "dialog:allow-ask",
-		"os:allow-platform",
+    "dialog:allow-confirm",
-		"os:allow-version",
+    "notification:default",
-		"os:allow-os-type",
+    "os:allow-platform",
-		"os:allow-family",
+    "os:allow-version",
-		"os:allow-arch",
+    "os:allow-os-type",
-		"os:allow-exe-extension",
+    "os:allow-family",
-		"os:allow-locale",
+    "os:allow-arch",
-		"os:allow-hostname",
+    "os:allow-exe-extension",
-		"clipboard-manager:allow-read-text",
+    "os:allow-locale",
-		"clipboard-manager:allow-write-text",
+    "os:allow-hostname",
-		"core:app:allow-app-show",
+    "clipboard-manager:allow-read-text",
-		"core:app:allow-app-hide",
+    "clipboard-manager:allow-write-text",
-		"os:default",
+    "core:app:allow-app-show",
-		"dialog:default",
+    "core:app:allow-app-hide",
-		"clipboard-manager:default",
+    "os:default",
-		"notification:default",
+    "dialog:default",
-		"updater:default",
+    "clipboard-manager:default",
-		"log:default",
+    "notification:default",
-		"autostart:default"
+    "updater:default",
-	]
+    "log:default",
+    "autostart:default",
+    "process:default",
+    "process:allow-restart",
+    "process:default"
+  ]
 }

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default","dialog:allow-message","dialog:allow-ask","dialog:allow-confirm","notification:default","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text","core:app:allow-app-show","core:app:allow-app-hide","os:default","dialog:default","clipboard-manager:default","notification:default","updater:default","log:default","autostart:default"]}}
+{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default","dialog:allow-message","dialog:allow-ask","dialog:allow-confirm","notification:default","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text","core:app:allow-app-show","core:app:allow-app-hide","os:default","dialog:default","clipboard-manager:default","notification:default","updater:default","log:default","autostart:default","process:default","process:allow-restart","process:default"]}}

src-tauri/gen/schemas/desktop-schema.json

@@ -2564,6 +2564,36 @@
           "const": "os:deny-version",
           "markdownDescription": "Denies the version command without any pre-configured scope."
         },
+        {
+          "description": "This permission set configures which\nprocess features are by default exposed.\n\n#### Granted Permissions\n\nThis enables to quit via `allow-exit` and restart via `allow-restart`\nthe application.\n\n#### This default permission set includes:\n\n- `allow-exit`\n- `allow-restart`",
+          "type": "string",
+          "const": "process:default",
+          "markdownDescription": "This permission set configures which\nprocess features are by default exposed.\n\n#### Granted Permissions\n\nThis enables to quit via `allow-exit` and restart via `allow-restart`\nthe application.\n\n#### This default permission set includes:\n\n- `allow-exit`\n- `allow-restart`"
+        },
+        {
+          "description": "Enables the exit command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:allow-exit",
+          "markdownDescription": "Enables the exit command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the restart command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:allow-restart",
+          "markdownDescription": "Enables the restart command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the exit command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:deny-exit",
+          "markdownDescription": "Denies the exit command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the restart command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:deny-restart",
+          "markdownDescription": "Denies the restart command without any pre-configured scope."
+        },
         {
           "description": "This permission set configures which kind of\nupdater functions are exposed to the frontend.\n\n#### Granted Permissions\n\nThe full workflow from checking for updates to installing them\nis enabled.\n\n\n#### This default permission set includes:\n\n- `allow-check`\n- `allow-download`\n- `allow-install`\n- `allow-download-and-install`",
           "type": "string",

src-tauri/gen/schemas/windows-schema.json

@@ -2564,6 +2564,36 @@
           "const": "os:deny-version",
           "markdownDescription": "Denies the version command without any pre-configured scope."
         },
+        {
+          "description": "This permission set configures which\nprocess features are by default exposed.\n\n#### Granted Permissions\n\nThis enables to quit via `allow-exit` and restart via `allow-restart`\nthe application.\n\n#### This default permission set includes:\n\n- `allow-exit`\n- `allow-restart`",
+          "type": "string",
+          "const": "process:default",
+          "markdownDescription": "This permission set configures which\nprocess features are by default exposed.\n\n#### Granted Permissions\n\nThis enables to quit via `allow-exit` and restart via `allow-restart`\nthe application.\n\n#### This default permission set includes:\n\n- `allow-exit`\n- `allow-restart`"
+        },
+        {
+          "description": "Enables the exit command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:allow-exit",
+          "markdownDescription": "Enables the exit command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the restart command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:allow-restart",
+          "markdownDescription": "Enables the restart command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the exit command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:deny-exit",
+          "markdownDescription": "Denies the exit command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the restart command without any pre-configured scope.",
+          "type": "string",
+          "const": "process:deny-restart",
+          "markdownDescription": "Denies the restart command without any pre-configured scope."
+        },
         {
           "description": "This permission set configures which kind of\nupdater functions are exposed to the frontend.\n\n#### Granted Permissions\n\nThe full workflow from checking for updates to installing them\nis enabled.\n\n\n#### This default permission set includes:\n\n- `allow-check`\n- `allow-download`\n- `allow-install`\n- `allow-download-and-install`",
           "type": "string",

src-tauri/src/handlers/fansly/mod.rs

@@ -117,15 +117,19 @@ impl Fansly {
             .await?;
 
         if !response.status().is_success() {
-            eprintln!("[sync::process::get_profile] No successful response from API. Setting error state.");
+            log::error!("[sync::process::get_profile] No successful response from API. Setting error state.");
             return Err(response.error_for_status().unwrap_err());
         } else {
-            println!("[sync::process::get_profile] Got successful response from API.");
+            log::info!("[sync::process::get_profile] Successfully fetched profile data.");
         }
 
         let profile = response
             .json::<FanslyBaseResponse<FanslyAccountResponse>>()
             .await?;
+
+        // Show the profile data
+        log::info!("[sync::process::get_profile] Profile data: {:?}", profile);
+
         Ok(profile)
     }
 
@@ -157,12 +161,12 @@ impl Fansly {
         let response = self.client.get(url).headers(headers).send().await?;
 
         if !response.status().is_success() {
-            eprintln!("[sync::process::fetch_followers] No successful response from API. Setting error state.");
+            log::error!("[sync::process::fetch_followers] No successful response from API. Setting error state.");
             return Err(response.error_for_status().unwrap_err());
         }
 
         let followers: FanslyBaseResponseList<FanslyFollowersResponse> = response.json().await?;
-        println!(
+        log::info!(
             "[sync::process::fetch_followers] Got {} followers from API.",
             followers.response.len()
         );
@@ -423,7 +427,7 @@ impl Fansly {
             .await;
 
             // Every 10 requests, sleep for a bit to avoid rate limiting
-            if total_requests % 10 == 0 {
+            if total_requests % 50 == 0 {
                 tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
             }
 
@@ -463,7 +467,7 @@ impl Fansly {
             .await;
 
             // Every 10 requests, sleep for a bit to avoid rate limiting
-            if total_requests % 10 == 0 {
+            if total_requests % 50 == 0 {
                 tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
             }
 

src-tauri/src/main.rs

@@ -57,6 +57,7 @@ fn handle_menu(app: &tauri::AppHandle, event: &tauri::menu::MenuEvent) {
 #[tokio::main]
 async fn main() {
     tauri::Builder::default()
+        .plugin(tauri_plugin_process::init())
         .setup(|app| {
             // Setup menu items for the tray
             let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;

src-tauri/src/structs/mod.rs

@@ -89,7 +89,7 @@ pub struct Account {
     pub id: String,
     pub email: String,
     pub username: String,
-    pub display_name: String,
+    pub display_name: Option<String>,
     pub flags: i64,
     pub version: i64,
     pub created_at: i64,

src-tauri/tauri.conf.json

@@ -47,9 +47,11 @@
 	"plugins": {
 		"updater": {
 			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDJFODZGRDI4NjBFMDQ1RUMKUldUc1JlQmdLUDJHTGdRdSt6dWFISXE0MThsa0tvUDA2RWdMSStjQ0J6NVBhdmU4ajRMMms4a1cK",
+			"active": true,
 			"endpoints": [
 				"https://cdn.crabnebula.app/update/fansly-creator-bot/fansly-sync/{{target}}-{{arch}}/{{current_version}}"
-			]
+			],
+			"dialog": true
 		}
 	},
 	"app": {

src/lib/types.ts

@@ -53,7 +53,7 @@ export interface AccountInfoResponse {
 export interface AccountInfo {
 	id: string;
 	username: string;
-	displayName: string;
+	displayName: string | null;
 	flags: number;
 	version: number;
 	createdAt: number;
@@ -76,8 +76,6 @@ export interface AccountInfo {
 	banner: Avatar;
 	postLikes: number;
 	streaming: Streaming;
-	subscriptionTiers: SubscriptionTier[];
-	profileAccess: boolean;
 }
 
 export interface SubscriptionTier {

src/routes/home/+page.svelte

@@ -97,9 +97,15 @@
 		);
 		if (uploadErr) {
 			error('[AutoSync] Upload failed');
-			sendNotification({ title: 'Auto Sync Failed', body: `Retry at ${nextTime}` });
+			sendNotification({
+				title: 'Auto Sync Failed',
+				body: `We failed to upload your data. ${uploadErr}. We will try again in ${config.sync_interval} hours.`
+			});
 		} else {
-			sendNotification({ title: 'Auto Sync Successful', body: `Next at ${nextTime}` });
+			sendNotification({
+				title: 'Auto Sync Successful',
+				body: `Your data has been uploaded successfully. Next sync will be at ${nextTime}.`
+			});
 		}
 	}
 
@@ -171,7 +177,13 @@
 
 	async function enableAutoSync() {
 		if (!(await isEnabled())) {
-			const confirm = await ask('Enable auto-start?');
+			const confirm = await ask(
+				"We've detected that auto-start is disabled. It's required for auto-sync to work. Do you want to enable it?",
+				{
+					title: 'Auto Sync Setup',
+					kind: 'info'
+				}
+			);
 			if (!confirm) return;
 			await toast.promise(enable(), {
 				loading: 'Enabling...',
@@ -179,7 +191,11 @@
 				error: 'Failed'
 			});
 		}
-		if (!config?.sync_token) return message('Set a sync token first.', { kind: 'error' });
+		if (!config?.sync_token)
+			return message('Set a sync token first.', {
+				kind: 'error',
+				title: 'Auto Sync Setup | Error'
+			});
 		config!.auto_sync_enabled = !config.auto_sync_enabled;
 		await saveConfig();
 		config.auto_sync_enabled ? scheduleAutoSync() : syncInterval && clearInterval(syncInterval);
@@ -307,8 +323,8 @@
 						</span>
 					</div>
 					<p class="text-zinc-400 mb-4">
-						We'll automatically sync your data {config?.sync_interval}
+						Your data will be automatically synced to your configured Discord server every {config?.sync_interval}
-						{config?.sync_interval === 1 ? 'hour' : 'hours'} to your configured discord server.
+						{config?.sync_interval === 1 ? 'hour' : 'hours'}
 					</p>
 					<div class="flex space-x-4">
 						<button

src/routes/setup/+page.svelte

@@ -54,6 +54,9 @@
 				unknown
 			];
 			if (err || !me?.success) {
+				if (err) {
+					console.error('Error fetching account info:', err);
+				}
 				validationErrors.fanslyToken =
 					'Authentication failed. Please check your token and try again.';
 				step = 1;