change the way frontend detects content change which works even if no…

… new blob is created, fixes #4434

package.json

@@ -41,7 +41,7 @@
     "@excalidraw/excalidraw": "0.16.1",
     "archiver": "6.0.1",
     "async-mutex": "0.4.0",
-    "axios": "1.6.0",
+    "axios": "1.6.1",
     "better-sqlite3": "8.4.0",
     "chokidar": "3.5.3",
     "cls-hooked": "4.2.2",
@@ -61,7 +61,7 @@
     "express-rate-limit": "7.1.4",
     "express-session": "1.17.3",
     "fs-extra": "11.1.1",
-    "helmet": "7.0.0",
+    "helmet": "7.1.0",
     "html": "1.0.0",
     "html2plaintext": "2.1.4",
     "http-proxy-agent": "7.0.0",
@@ -73,8 +73,8 @@
     "jimp": "0.22.10",
     "joplin-turndown-plugin-gfm": "1.0.12",
     "jsdom": "22.1.0",
-    "katex": "^0.16.9",
-    "marked": "9.1.5",
+    "katex": "0.16.9",
+    "marked": "9.1.6",
     "mime-types": "2.1.35",
     "multer": "1.4.5-lts.1",
     "node-abi": "3.51.0",
@@ -104,7 +104,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "25.9.3",
+    "electron": "25.9.4",
     "electron-builder": "24.6.4",
     "electron-packager": "17.1.2",
     "electron-rebuild": "3.2.9",
@@ -119,11 +119,11 @@
     "jasmine": "5.1.0",
     "jsdoc": "4.0.2",
     "jsonc-eslint-parser": "2.4.0",
-    "lint-staged": "15.0.2",
+    "lint-staged": "15.1.0",
     "lorem-ipsum": "2.0.8",
     "nodemon": "3.0.1",
-    "prettier": "3.0.3",
-    "rcedit": "4.0.0",
+    "prettier": "3.1.0",
+    "rcedit": "4.0.1",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4"
   },

src/becca/entities/abstract_becca_entity.js

@@ -180,7 +180,7 @@ class AbstractBeccaEntity {
 
         sql.execute("DELETE FROM blobs WHERE blobId = ?", [oldBlobId]);
         // blobs are not marked as erased in entity_changes, they are just purged completely
-        // this is because technically every keystroke can create a new blob and there would be just too many
+        // this is because technically every keystroke can create a new blob, and there would be just too many
         sql.execute("DELETE FROM entity_changes WHERE entityName = 'blobs' AND entityId = ?", [oldBlobId]);
     }
 
@@ -230,7 +230,7 @@ class AbstractBeccaEntity {
             isErased: false,
             utcDateChanged: pojo.utcDateModified,
             isSynced: true,
-            // overriding componentId will cause frontend to think the change is coming from a different component
+            // overriding componentId will cause the frontend to think the change is coming from a different component
             // and thus reload
             componentId: opts.forceFrontendReload ? utils.randomString(10) : null
         });

src/public/app/entities/fnote.js

@@ -93,6 +93,9 @@ class FNote {
          * @type {string}
          */
         this.mime = row.mime;
+
+        // the main use case to keep this is to detect content change which should trigger refresh
+        this.blobId = row.blobId;
     }
 
     addParent(parentNoteId, branchId, sort = true) {

src/public/app/services/froca.js

@@ -369,12 +369,15 @@ class Froca {
 
     /** @returns {Promise<FBlob>} */
     async getBlob(entityType, entityId) {
+        // I'm not sure why we're not using blobIds directly, it would save us this composite key ...
+        // perhaps one benefit is that we're always requesting the latest blob, not relying on perhaps faulty/slow
+        // websocket update?
         const key = `${entityType}-${entityId}`;
 
         if (!this.blobPromises[key]) {
             this.blobPromises[key] = server.get(`${entityType}/${entityId}/blob`)
                 .then(row => new FBlob(row))
-                .catch(e => console.error(`Cannot get blob for ${entityType} '${entityId}'`));
+                .catch(e => console.error(`Cannot get blob for ${entityType} '${entityId}'`, e));
 
             // we don't want to keep large payloads forever in memory, so we clean that up quite quickly
             // this cache is more meant to share the data between different components within one business transaction (e.g. loading of the note into the tab context and all the components)