Merge branch 'develop'

Author: marcelklehr

.github/workflows/issues.yml

@@ -28,25 +28,27 @@ jobs:
             
             Thank you for taking the time to open this issue with floccus. I know it's frustrating when software
             causes problems. You have made the right choice to come here and open an issue to make sure your problem gets looked at
-            and if possible solved.
-            I'm Marcel and I created floccus a few years ago, maintaining it ever since. I currently work for Nextcloud
+            and if possible solved. Let me give you a short introduction on what to expect from this issue tracker to avoid misunderstandings.
+            I'm Marcel. I created floccus a few years ago, and have been maintaining it since. I currently work for Nextcloud
             which leaves me with less time for side projects like this one than I used to have.
             I still try to answer all issues and if possible fix all bugs here, but it sometimes takes a while until I get to it.
-            Until then, please be patient. 
-            Note also that GitHub is a place where people meet to make software better *together*. Nobody here is under any obligation
+            Until then, please be patient. It helps when you stick around to answer follow up questions I may have,
+            as very few bugs can be fixed directly from the first bug report, without any interaction. If information is missing in your bug report
+            and the issue cannot be solved without it, I will have to close the issue after a while.
+            Note also that GitHub in general is a place where people meet to make software better *together*. Nobody here is under any obligation
             to help you, solve your problems or deliver on any expectations or demands you may have, but if enough people come together we can
             collaborate to make this software better. For everyone.
             Thus, if you can, you could also have a look at other issues to see whether you can help other people with your knowledge
             and experience. If you have coding experience it would also be awesome if you could step up to dive into the code and
             try to fix the odd bug yourself. Everyone will be thankful for extra helping hands!
-            To continue the development and maintenance of this project in a sustainable way I ask that you donate to the project when opening an issue
-            (or at least once your issue is solved), if you're not a donor already.
+            If you cannot lend a helping hand, to continue the development and maintenance of this project in a sustainable way,
+            I ask that you donate to the project when opening an issue (or at least once your issue is solved), if you're not a donor already.
             You can find donation options at <https://floccus.org/donate/>. Thank you!
             
             One last word: If you feel, at any point, like you need to vent, this is not the place for it; you can go to the Nextcloud forum,
             to twitter or somewhere else. But this is a technical issue tracker, so please make sure to
             focus on the tech and keep your opinions to yourself.
             
-            I look forward to working with you on this issue
+            Thank you for reading through this primer. I look forward to working with you on this issue!
             Cheers :blue_heart:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [5.5.0] - 2025-04-09
+
+### New
+
+* feat(Logger): Use IndexedDB to store logs in order to store more
+* feat(AdditionFailsafe): Extend failsafe mechanism to prevent creation of excessive amounts of bookmarks
+* fix(failsafe): Reduce threshold to 20% OR 1k bookmarks
+
+### Fixed
+
+* fix(Controller): Do not run scheduleSync concurrently for all accounts
+* fix(failsafe): Also apply failsafe on upstream changes
+* fix(NewAccount): Disable git backend on android/ios
+* fix(GoogleDrive): fix "T.includes is not a function" error
+* fix(webdav): Validate filesize via PROPFIND to detect partial downloads
+
 ## [5.4.5] - 2025-03-20
 
 ### Fixed

_locales/en/messages.json

@@ -119,6 +119,15 @@
   "Error040": {
     "message": "E040: Could not search for your file name in your Google Drive"
   },
+  "Error041": {
+    "message": "E041: Remote bookmarks file size differs from the content that was actually downloaded from the server. This might be a temporary network issue. If this error persists please contact the server administrator."
+  },
+  "Error042": {
+    "message": "E042: Remote bookmarks file size could not be retrieved. It is impossible to verify that the bookmarks file was downloaded in full. If this error persists please contact the server administrator."
+  },
+  "Error043": {
+    "message": "E043: Failsafe: The current sync run would increase your bookmarks count by {0}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
+  },
   "LabelWebdavurl": {
     "message": "WebDAV URL"
   },
@@ -505,16 +514,16 @@
     "message": "Failsafe"
   },
   "DescriptionFailsafe": {
-    "message": "Sometimes configuration errors or software bugs can cause the unintended removal of data, which is then lost. To prevent that from happening, floccus will not delete more than 50% of your bookmarks in one go unless you disable this failsafe here."
+    "message": "Sometimes configuration errors or software bugs can cause the unintended removal of data, which is then lost, or the unintended duplication of data, which is then hard to sort out. To prevent this from happening, floccus will not delete more than 20% of your bookmarks in one go and will also not add more than 20% to your bookmarks count in one go, unless you disable this failsafe here."
   },
   "LabelFailsafeon": {
-    "message": "Enabled. Don't delete more than 50% of my local bookmarks without asking me first. (Recommended)"
+    "message": "Enabled. Will not delete or add more than 20% from/to your local bookmarks without asking you first. (Recommended)"
   },
   "LabelFailsafeoff": {
-    "message": "Disabled. Allow the removal of more than 50% of my local bookmarks without confirming with me."
+    "message": "Disabled. Will allow removing or adding more than 20% from/to your local bookmarks without confirming with you."
   },
   "StatusFailsafeoff": {
-    "message": "Failsafe disabled. You are at risk for unintended data loss. It is recommended to enable the failsafe in the profile settings."
+    "message": "Failsafe disabled. You are at risk for unintended data loss or duplication. It is recommended to enable the failsafe in the profile settings."
   },
   "LabelAdaptergoogledrive": {
     "message": "Google Drive"
@@ -673,7 +682,7 @@
     "message": "Profile created"
   },
   "DescriptionAccountcreated": {
-    "message": "Your profile has been created. You can close this tab now."
+    "message": "Your profile has been created. You can close this tab now. One more thing: Sync is not a backup. Make sure you have regular backups of your bookmarks."
   },
   "DescriptionNonhttps": {
     "message": "You have entered a server that uses an insecure protocol. It is recommended to only use servers with support for HTTPS."
@@ -718,7 +727,7 @@
     "message": "Git over HTTPS"
   },
   "DescriptionAdaptergit": {
-    "message": "The Git option syncs your bookmarks by storing them in a file in the provided Git repository. There is no accompanying web UI for this option, but you can use it with any Git hosting server, like Github, Gitlab, Gitea, etc. It can sync http, ftp, data, file and javascript bookmarks. You can not make use of end-to-end encryption when using this option."
+    "message": "The Git option syncs your bookmarks by storing them in a file in the provided Git repository. There is no accompanying web UI for this option, but you can use it with any Git hosting server, like Github, Gitlab, Gitea, etc. It can sync http, ftp, data, file and javascript bookmarks. You can not make use of end-to-end encryption when using this option. This option is currently not available in the mobile app."
   },
   "LabelGiturl": {
     "message": "Repository URL using HTTP"

_locales/zh_CN/messages.json

@@ -119,6 +119,15 @@
   "Error040": {
     "message": "E040: 无法在你的 Google 云盘中搜索你的文件名"
   },
+  "Error041": {
+    "message": "E041：远程书签文件大小和从服务器实际下载的内容大小不一致。这可能是由于临时的网络问题。如果这个错误持续，请联系服务器管理员。"
+  },
+  "Error042": {
+    "message": "E042: 无法获取远程书签文件的大小。无法验证书签文件是否完整下载了该文件。如果这个错误持续，请联系服务器管理员。"
+  },
+  "Error043": {
+    "message": "E043：安全保护：当前同步运行会将你的书签数增加 {0}%。应用拒绝执行本操作。如果你仍想继续进行，请在配置文件的设置中停用该安全保护措施。"
+  },
   "LabelWebdavurl": {
     "message": "WebDAV URL"
   },
@@ -505,16 +514,16 @@
     "message": "安全保护"
   },
   "DescriptionFailsafe": {
-    "message": "有时，配置错误或软件Bug可能会在您无意识的情况下自动清除数据，从而导致数据丢失。为阻止这种情况发生，软件将在您一次清除书签达50%以上时自动停止清除操作，除非您关闭以下安全保护开关。"
+    "message": "配置错误或软件故障有时会导致意想不到的数据删除，造成数据丢失，或者导致意想不到的数据重复，使得难以找出重复数据。为了防止以上情形，floccus 不会一次性删除超过 20% 的书签，也不会一次性添加数量超过现有书签 20% 的书签，除非你在此停用这一安全保护措施。"
   },
   "LabelFailsafeon": {
-    "message": "开启。在未提前告知的情况下，本地书签删除达50%以上时将停止删除。（推荐选择此项）"
+    "message": "已启用。应用不会再不首先询问你的情况下一次性删除或添加超过 20% 的书签（推荐）"
   },
   "LabelFailsafeoff": {
-    "message": "关闭。在未提前告知的情况下，允许删除50%以上的本地书签。"
+    "message": "已停用。应用将在不和你确认的情况下一次性添加或删除超过 20% 的书签"
   },
   "StatusFailsafeoff": {
-    "message": "已停用安全保护。你有意外丢失数据的风险。建议在配置文件设置中启用它。"
+    "message": "安全保护已停用。你有意外的数据丢失或重复的风险。建议在配置文件设置种启用安全保护。"
   },
   "LabelAdaptergoogledrive": {
     "message": "Google Drive"
@@ -673,7 +682,7 @@
     "message": "创建了配置"
   },
   "DescriptionAccountcreated": {
-    "message": "您的配置已创建。您现在可以关闭此选项卡。"
+    "message": "你的配置文件已创建。现在你可以关闭这个标签页了。还有一件事：同步不是备份。请确保定期备份书签。"
   },
   "DescriptionNonhttps": {
     "message": "您输入了一个使用不安全协议的服务器。 建议仅使用支持 HTTPS 的服务器。"
@@ -718,7 +727,7 @@
     "message": "HTTPS 连接的 Git"
   },
   "DescriptionAdaptergit": {
-    "message": "Git 选项通过将书签存储在所提供的 Git 仓库中的一个文件内来进行书签同步。此选项没有伴随的 web 用户界面，但你可以通过任意 Git 托管服务器，比如 GitHub、Gitlab、Gitea 等使用它。它可以同步 http、ftp、数据、文件和 javascript 书签。使用此选项时，你无法使用端到端加密。"
+    "message": "Git 选项通过将书签存储在所提供的 Git 仓库中的一个文件内来进行书签同步。此选项没有伴随的 web 用户界面，但你可以通过任意 Git 托管服务器，比如 GitHub、Gitlab、Gitea 等使用它。它可以同步 http、ftp、数据、文件和 javascript 书签。使用此选项时，你无法使用端到端加密。此选项当前在手机应用上不可用。"
   },
   "LabelGiturl": {
     "message": "使用 HTTP 的存储库 URL"

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5004005
-        versionName "5.4.5"
+        versionCode 5005000
+        versionName "5.5.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App.xcodeproj/project.pbxproj

@@ -363,7 +363,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.handmadeideas.floccus.new-bookmark";
@@ -397,7 +397,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4.3;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.handmadeideas.floccus.new-bookmark";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -459,7 +459,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -511,7 +511,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -537,7 +537,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4.3;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = org.handmadeideas.floccus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -567,7 +567,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = org.handmadeideas.floccus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "5.4.5",
+  "version": "5.5.0",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "NODE_OPTIONS=--max-old-space-size=5000 gulp",
@@ -97,6 +97,7 @@
     "buffer": "^6.0.3",
     "cheerio": "^1.0.0-rc.12",
     "core-js": "3.x",
+    "dexie": "^4.0.11",
     "fast-xml-parser": "^4.2.7",
     "humanize-duration": "^3.25.1",
     "intl-messageformat": "^9.9.1",

package.json

@@ -240,14 +240,14 @@ export class InterruptedSyncError extends FloccusError {
 
 // code 28 is unused
 
-export class FailsafeError extends FloccusError {
+export class DeletionFailsafeError extends FloccusError {
   public percent: number
 
   constructor(percent:number) {
     super(`E029: Failsafe: The current sync run would delete ${percent}% of your bookmarks. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
     this.code = 29
     this.percent = percent
-    Object.setPrototypeOf(this, FailsafeError.prototype)
+    Object.setPrototypeOf(this, DeletionFailsafeError.prototype)
   }
 }
 
@@ -341,4 +341,31 @@ export class GoogleDriveSearchError extends FloccusError {
     this.code = 40
     Object.setPrototypeOf(this, GoogleDriveSearchError.prototype)
   }
+}
+
+export class FileSizeMismatch extends FloccusError {
+  constructor() {
+    super('E041: Remote bookmarks file size differs from the content that was actually downloaded from the server. This might be a temporary network issue. If this error persists please contact the server administrator.')
+    this.code = 41
+    Object.setPrototypeOf(this, FileSizeMismatch.prototype)
+  }
+}
+
+export class FileSizeUnknown extends FloccusError {
+  constructor() {
+    super('E042: Remote bookmarks file size could not be retrieved. It is impossible to verify that the bookmarks file was downloaded in full. If this error persists please contact the server administrator.')
+    this.code = 42
+    Object.setPrototypeOf(this, FileSizeUnknown.prototype)
+  }
+}
+
+export class AdditionFailsafeError extends FloccusError {
+  public percent: number
+
+  constructor(percent:number) {
+    super(`E043: Failsafe: The current sync run would increase your bookmarks count by ${percent}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
+    this.code = 43
+    this.percent = percent
+    Object.setPrototypeOf(this, AdditionFailsafeError.prototype)
+  }
 }

src/errors/Error.ts

@@ -198,7 +198,6 @@ export default class Account {
               Logger.log(
                 'Resource is locked, trying again soon'
               )
-              await Logger.persist()
               return
             }
           } else {
@@ -348,7 +347,6 @@ export default class Account {
         await this.init()
       }
     }
-    await Logger.persist()
   }
 
   static async stringifyError(er:any):Promise<string> {