Merge branch 'develop'

Author: marcelklehr

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [5.5.2] - 2025-04-16
+
+### Fixed
+
+* fix(IndexedDB): Delete up to the last hour of logs
+* fix(storage): Add checkStorage method to freeStorage regularly
+* fix(IndexedDB): Don't store more than 50MB of logs
+
 ## [5.5.1] - 2025-04-09
 
 ### Fixed

android/app/build.gradle

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

manifest.chrome.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

manifest.firefox.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "NODE_OPTIONS=--max-old-space-size=5000 gulp",

src/lib/IndexedDB.ts

@@ -20,10 +20,12 @@ db.version(1).stores({
 export { db }
 export { LogMessage }
 
+const MAX_STORAGE_SIZE = 50 * 1024 * 1024 // 50MB
+
 export async function freeStorageIfNecessary() {
   if (navigator.storage && navigator.storage.estimate) {
     let {usage, quota} = await navigator.storage.estimate()
-    if (usage / quota > 0.9) {
+    if (usage / quota > 0.9 || usage > MAX_STORAGE_SIZE) {
       const oneWeekAgo = Date.now() - 60 * 60 * 1000 * 24 * 7
 
       await db.logs
@@ -32,12 +34,21 @@ export async function freeStorageIfNecessary() {
     }
 
     ({usage, quota} = await navigator.storage.estimate())
-    if (usage / quota > 0.6) {
+    if (usage / quota > 0.6 || usage > MAX_STORAGE_SIZE) {
       const oneDayAgo = Date.now() - 60 * 60 * 1000 * 24
 
       await db.logs
         .where('dateTime').below(oneDayAgo)
         .delete()
     }
+
+    ({usage, quota} = await navigator.storage.estimate())
+    if (usage / quota > 0.6 || usage > MAX_STORAGE_SIZE) {
+      const lastHour = Date.now() - 60 * 60 * 1000
+
+      await db.logs
+        .where('dateTime').below(lastHour)
+        .delete()
+    }
   }
 }

src/lib/browser/BrowserController.js

@@ -22,6 +22,10 @@ class AlarmManager {
     this.ctl = ctl
   }
 
+  async checkStorage() {
+    await freeStorageIfNecessary()
+  }
+
   async checkSync() {
     const accounts = await BrowserAccountStorage.getAllAccounts()
     for (let accountId of accounts) {
@@ -105,6 +109,7 @@ export default class BrowserController {
 
     // Set up the alarms
 
+    browser.alarms.create('checkStorage', { periodInMinutes: 15 })
     browser.alarms.create('checkSync', { periodInMinutes: 1 })
     browser.alarms.onAlarm.addListener(async alarm => {
       await this.alarms[alarm.name]()
@@ -129,7 +134,6 @@ export default class BrowserController {
       },
       []
     )
-    freeStorageIfNecessary()
 
     // do some cleaning if this is a new version
 

src/lib/native/NativeController.js

@@ -15,6 +15,7 @@ class AlarmManager {
     this.ctl = ctl
     this.backgroundSyncEnabled = true
     setInterval(() => this.checkSync(), 25 * 1000)
+    setInterval(() => this.checkStorage(), 30 * 1000)
 
     Network.addListener('networkStatusChange', status => {
       if (status.connected) {
@@ -25,6 +26,10 @@ class AlarmManager {
     })
   }
 
+  async checkStorage() {
+    await freeStorageIfNecessary()
+  }
+
   async checkSync() {
     if (!this.backgroundSyncEnabled) {
       return
@@ -93,7 +98,6 @@ export default class NativeController {
       },
       []
     )
-    freeStorageIfNecessary()
 
     // lock accounts when locking is enabled