mobile: fix attachments not loading when added from share ext

* core: update showdown library to support single spaced paragraphs

* core: add tests

* core: update showdown library

.github/workflows/android.publish.yml

@@ -40,6 +40,7 @@ jobs:
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Publish to Playstore
         id: deploy
@@ -64,6 +65,7 @@ jobs:
           alias: ${{ secrets.PUBLIC_ALIAS }}
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
           keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Rename apk files
         run: |

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "2.6.11",
+  "version": "2.6.14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "2.6.11",
+      "version": "2.6.14",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
@@ -24,8 +24,8 @@
         "@types/node": "18.16.1",
         "@types/yargs": "^17.0.24",
         "chokidar": "^3.5.3",
-        "electron": "25.9.3",
-        "electron-builder": "^24.6.4",
+        "electron": "25.9.8",
+        "electron-builder": "^24.9.1",
         "electron-builder-notarize": "^1.5.1",
         "esbuild": "^0.17.19",
         "tree-kill": "^1.2.2",
@@ -173,12 +173,11 @@
       }
     },
     "node_modules/@electron/asar": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.4.tgz",
-      "integrity": "sha512-lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g==",
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz",
+      "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==",
       "dev": true,
       "dependencies": {
-        "chromium-pickle-js": "^0.2.0",
         "commander": "^5.0.0",
         "glob": "^7.1.6",
         "minimatch": "^3.0.4"
@@ -869,9 +868,9 @@
       }
     },
     "node_modules/@types/debug": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
-      "integrity": "sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
       "dev": true,
       "dependencies": {
         "@types/ms": "*"
@@ -902,9 +901,9 @@
       }
     },
     "node_modules/@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+      "version": "0.7.34",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
       "dev": true
     },
     "node_modules/@types/node": {
@@ -970,9 +969,9 @@
       }
     },
     "node_modules/7zip-bin": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz",
-      "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
+      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
       "dev": true
     },
     "node_modules/agent-base": {
@@ -1054,9 +1053,9 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "24.6.4",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
-      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.9.1.tgz",
+      "integrity": "sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
@@ -1065,15 +1064,15 @@
         "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
-        "7zip-bin": "~5.1.1",
+        "7zip-bin": "~5.2.0",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.3.4",
         "ejs": "^3.1.8",
-        "electron-publish": "24.5.0",
+        "electron-publish": "24.8.1",
         "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
@@ -1092,6 +1091,19 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1116,9 +1128,9 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
       "dev": true
     },
     "node_modules/async-exit-hook": {
@@ -1280,16 +1292,16 @@
       "dev": true
     },
     "node_modules/builder-util": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.5.0.tgz",
-      "integrity": "sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==",
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.8.1.tgz",
+      "integrity": "sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==",
       "dev": true,
       "dependencies": {
         "@types/debug": "^4.1.6",
-        "7zip-bin": "~5.1.1",
+        "7zip-bin": "~5.2.0",
         "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.2.1",
+        "builder-util-runtime": "9.2.3",
         "chalk": "^4.1.2",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
@@ -1315,6 +1327,19 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/builder-util/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/busboy": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -1413,9 +1438,9 @@
       "dev": true
     },
     "node_modules/ci-info": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
       "funding": [
         {
@@ -1702,14 +1727,14 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "24.6.4",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
-      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.9.1.tgz",
+      "integrity": "sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.6.4",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "app-builder-lib": "24.9.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "fs-extra": "^10.1.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
@@ -1718,6 +1743,19 @@
         "dmg-license": "^1.0.11"
       }
     },
+    "node_modules/dmg-builder/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/dmg-license": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -1774,9 +1812,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "25.9.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.3.tgz",
-      "integrity": "sha512-dacaHg/PuwVcFRgPDCM5j7UDzqGJWOsbBRdS5wPKLNS/ejPeccIjuNUT1cqcrpvCJKAFW8swHWg9kdizNSEDHQ==",
+      "version": "25.9.8",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.8.tgz",
+      "integrity": "sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -1792,16 +1830,16 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "24.6.4",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
-      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.9.1.tgz",
+      "integrity": "sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.6.4",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "app-builder-lib": "24.9.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.6.4",
+        "dmg-builder": "24.9.1",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
@@ -1863,6 +1901,19 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
+    "node_modules/electron-builder/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/electron-notarize": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz",
@@ -1893,20 +1944,33 @@
       }
     },
     "node_modules/electron-publish": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.5.0.tgz",
-      "integrity": "sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==",
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.8.1.tgz",
+      "integrity": "sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==",
       "dev": true,
       "dependencies": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "chalk": "^4.1.2",
         "fs-extra": "^10.1.0",
         "lazy-val": "^1.0.5",
         "mime": "^2.5.2"
       }
     },
+    "node_modules/electron-publish/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/electron-trpc": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/electron-trpc/-/electron-trpc-0.5.2.tgz",

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "2.6.11",
+  "version": "2.6.14",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/index.js",
@@ -25,8 +25,8 @@
     "@types/node": "18.16.1",
     "@types/yargs": "^17.0.24",
     "chokidar": "^3.5.3",
-    "electron": "25.9.3",
-    "electron-builder": "^24.6.4",
+    "electron": "25.9.8",
+    "electron-builder": "^24.9.1",
     "electron-builder-notarize": "^1.5.1",
     "esbuild": "^0.17.19",
     "tree-kill": "^1.2.2",

apps/mobile/app/common/database/logger.js

@@ -16,8 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { MMKVLoader } from "react-native-mmkv-storage";
 import { initalize } from "@notesnook/core/dist/logger";
+import { MMKVLoader } from "react-native-mmkv-storage";
 import { KV } from "./storage";
 
 const LoggerStorage = new MMKVLoader()
@@ -26,4 +26,4 @@ const LoggerStorage = new MMKVLoader()
 
 initalize(new KV(LoggerStorage));
 
-export {};
+export { LoggerStorage };

apps/mobile/app/common/database/storage.js

@@ -90,6 +90,10 @@ export class KV {
     return this.storage.removeItem(key);
   }
 
+  async removeMulti(keys) {
+    return this.storage.removeItems(...keys);
+  }
+
   async clear() {
     return this.storage.clearStore();
   }
@@ -145,6 +149,7 @@ export default {
   clear: () => DefaultStorage.clear(),
   getAllKeys: () => DefaultStorage.getAllKeys(),
   writeMulti: (items) => DefaultStorage.writeMulti(items),
+  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
   encrypt,
   decrypt,
   decryptMulti,

apps/mobile/app/common/filesystem/download-attachment.js

@@ -34,7 +34,8 @@ import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";
 import Storage from "../database/storage";
 import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
-import { createCacheDir } from "./io";
+import { createCacheDir, exists } from "./io";
+import { IOS_APPGROUPID } from "../../utils/constants";
 
 export const FileDownloadStatus = {
   Success: 1,
@@ -181,7 +182,8 @@ export default async function downloadAttachment(
     silent: false,
     cache: false,
     throwError: false,
-    groupId: undefined
+    groupId: undefined,
+    base64: false
   }
 ) {
   await createCacheDir();
@@ -212,10 +214,14 @@ export default async function downloadAttachment(
       options.groupId || attachment.metadata.hash,
       attachment.metadata.hash
     );
-    if (
-      !(await RNFetchBlob.fs.exists(`${cacheDir}/${attachment.metadata.hash}`))
-    )
+
+    if (!(await exists(attachment.metadata.hash))) {
       return;
+    }
+
+    if (options.base64) {
+      return await db.attachments.read(attachment.metadata.hash, "base64");
+    }
 
     let filename = getFileNameWithExtension(
       attachment.metadata.filename,
@@ -233,7 +239,8 @@ export default async function downloadAttachment(
       mime: attachment.metadata.type,
       fileName: options.cache ? undefined : filename,
       uri: options.cache ? undefined : folder.uri,
-      chunkSize: attachment.chunkSize
+      chunkSize: attachment.chunkSize,
+      appGroupId: IOS_APPGROUPID
     };
 
     let fileUri = await Sodium.decryptFile(

apps/mobile/app/common/filesystem/io.js

@@ -36,9 +36,13 @@ export async function readEncrypted(filename, key, cipherData) {
     }
 
     const attachment = db.attachments.attachment(filename);
-    const isPng = /(png)/g.test(attachment?.metadata.type);
-    const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
-    console.log("decrypting....");
+    const isPng = !attachment.metadata.type
+      ? false
+      : /(png)/g.test(attachment?.metadata.type);
+    const isJpeg = !attachment.metadata.type
+      ? false
+      : /(jpeg|jpg)/g.test(attachment?.metadata.type);
+
     let output = await Sodium.decryptFile(
       key,
       {

apps/mobile/app/components/attachments/actions.js

@@ -48,7 +48,7 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { formatBytes } from "@notesnook/common";
 
-const Actions = ({ attachment, setAttachments, fwdRef }) => {
+const Actions = ({ attachment, setAttachments, fwdRef, close }) => {
   const { colors } = useThemeColors();
   const contextId = attachment.metadata.hash;
   const [filename, setFilename] = useState(attachment.metadata.filename);
@@ -64,7 +64,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
       name: "Download",
       onPress: async () => {
         if (currentProgress) {
-          await db.fs.cancel(attachment.metadata.hash, "download");
+          await db.fs.cancel(attachment.metadata.hash);
           useAttachmentStore.getState().remove(attachment.metadata.hash);
         }
         downloadAttachment(attachment.metadata.hash, false);
@@ -117,7 +117,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
           });
         }
 
-        setAttachments([...db.attachments.all]);
+        setAttachments();
         setLoading({
           name: null
         });
@@ -140,7 +140,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 filename: value
               });
               setFilename(value);
-              setAttachments([...db.attachments.all]);
+              setAttachments();
             }
           },
           positiveText: "Rename"
@@ -152,8 +152,8 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
       name: "Delete",
       onPress: async () => {
         await db.attachments.remove(attachment.metadata.hash, false);
-        setAttachments([...db.attachments.all]);
-        eSendEvent(eCloseSheet, contextId);
+        setAttachments();
+        close();
       },
       icon: "delete-outline"
     }
@@ -362,8 +362,13 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
 Actions.present = (attachment, set, context) => {
   presentSheet({
     context: context,
-    component: (ref) => (
-      <Actions fwdRef={ref} setAttachments={set} attachment={attachment} />
+    component: (ref, close) => (
+      <Actions
+        fwdRef={ref}
+        setAttachments={set}
+        close={close}
+        attachment={attachment}
+      />
     )
   });
 };

apps/mobile/app/components/attachments/attachment-item.js

@@ -132,7 +132,7 @@ export const AttachmentItem = ({
           activeOpacity={0.9}
           onPress={() => {
             if (encryption || !pressable) return;
-            db.fs.cancel(attachment.metadata.hash, currentProgress.type);
+            db.fs.cancel(attachment.metadata.hash);
             setCurrentProgress(null);
           }}
           style={{

apps/mobile/app/components/attachments/index.js

@@ -68,7 +68,7 @@ export const AttachmentDialog = ({ note }) => {
       !attachmentSearchValue.current ||
       attachmentSearchValue.current === ""
     ) {
-      setAttachments([...attachments]);
+      setAttachments(filterAttachments(currentFilter));
     }
     clearTimeout(searchTimer.current);
     searchTimer.current = setTimeout(() => {
@@ -77,13 +77,16 @@ export const AttachmentDialog = ({ note }) => {
         attachmentSearchValue.current
       );
       if (results.length === 0) return;
-      setAttachments(results);
+
+      setAttachments(filterAttachments(currentFilter, results));
     }, 300);
   };
 
   const renderItem = ({ item }) => (
     <AttachmentItem
-      setAttachments={setAttachments}
+      setAttachments={() => {
+        setAttachments(filterAttachments(currentFilter));
+      }}
       attachment={item}
       context="attachments-list"
     />
@@ -133,11 +136,12 @@ export const AttachmentDialog = ({ note }) => {
     }
   ];
 
-  const filterAttachments = (type) => {
-    const attachments = note
-      ? db.attachments.ofNote(note.id, "all")
-      : [...(db.attachments.all || [])];
-    isDocument;
+  const filterAttachments = (type, _attachments) => {
+    const attachments =
+      _attachments || note
+        ? db.attachments.ofNote(note.id, "all")
+        : [...(db.attachments.all || [])];
+
     switch (type) {
       case "all":
         return attachments;

apps/mobile/app/components/auth/auth-modal.js

@@ -17,14 +17,16 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { Platform, View } from "react-native";
+import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
-import { useThemeColors } from "@notesnook/theme";
+import { useUserStore } from "../../stores/use-user-store";
 import { eCloseLoginDialog, eOpenLoginDialog } from "../../utils/events";
 import { sleep } from "../../utils/time";
 import BaseDialog from "../dialog/base-dialog";
@@ -34,7 +36,6 @@ import { IconButton } from "../ui/icon-button";
 import { hideAuth, initialAuthMode } from "./common";
 import { Login } from "./login";
 import { Signup } from "./signup";
-import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 
 export const AuthMode = {
   login: 0,
@@ -68,6 +69,9 @@ const AuthModal = () => {
   }
 
   const close = () => {
+    useUserStore.setState({
+      disableAppLockRequests: false
+    });
     actionSheetRef.current?.hide();
     setCurrentAuthMode(AuthMode.login);
     setVisible(false);
@@ -77,6 +81,11 @@ const AuthModal = () => {
     <BaseDialog
       overlayOpacity={0}
       statusBarTranslucent={false}
+      onShow={() => {
+        useUserStore.setState({
+          disableAppLockRequests: true
+        });
+      }}
       onRequestClose={currentAuthMode !== AuthMode.welcomeSignup && close}
       visible={true}
       onClose={close}
@@ -86,6 +95,7 @@ const AuthModal = () => {
       transparent={false}
       animated={false}
       centered={false}
+      enableSheetKeyboardHandler
     >
       <KeyboardAwareScrollView
         style={{

apps/mobile/app/components/dialog/base-dialog.js

@@ -66,6 +66,7 @@ const BaseDialog = ({
   }, []);
 
   useEffect(() => {
+    if (useUserStore.getState().disableAppLockRequests) return;
     if (SettingsService.get().appLockMode === "background") {
       if (appState === "background") {
         setIntervalVisible(false);

apps/mobile/app/components/list-items/note/index.js

@@ -99,8 +99,8 @@ const NoteItem = ({
   dateBy = "dateCreated",
   noOpen = false
 }) => {
-  const currentEditingNote = useEditorStore(
-    (state) => state.currentEditingNote
+  const isEditingNote = useEditorStore(
+    (state) => state.currentEditingNote === item.id
   );
   const { colors } = useThemeColors();
   const compactMode = useIsCompactModeEnabled(item);
@@ -112,8 +112,7 @@ const NoteItem = ({
   const reminder = getUpcomingReminder(reminders);
   const noteColor = ColorValues[item.color?.toLowerCase()];
   const tags = getTags(item);
-  const primaryColors =
-    currentEditingNote === item.id ? colors.selected : colors.primary;
+  const primaryColors = isEditingNote ? colors.selected : colors.primary;
 
   return (
     <>

apps/mobile/app/components/list-items/selection-wrapper/back-fill.js

@@ -25,13 +25,13 @@ import { useEditorStore } from "../../../stores/use-editor-store";
 
 export const Filler = ({ item }) => {
   const { colors } = useThemeColors();
-  const currentEditingNote = useEditorStore(
-    (state) => state.currentEditingNote
+  const isEditingNote = useEditorStore(
+    (state) => state.currentEditingNote === item.id
   );
 
   const [selected] = useIsSelected(item);
 
-  return currentEditingNote === item.id || selected ? (
+  return isEditingNote || selected ? (
     <View
       style={{
         position: "absolute",
@@ -39,12 +39,11 @@ export const Filler = ({ item }) => {
         height: "150%",
         backgroundColor: colors.selected.background,
         borderLeftWidth: 5,
-        borderLeftColor:
-          currentEditingNote === item.id
-            ? item.color
-              ? colors.static[item.color]
-              : colors.selected.accent
-            : "transparent"
+        borderLeftColor: isEditingNote
+          ? item.color
+            ? colors.static[item.color]
+            : colors.selected.accent
+          : "transparent"
       }}
       collapsable={false}
     />

apps/mobile/app/components/sheets/export-notes/index.js

@@ -97,6 +97,16 @@ const ExportNotesSheet = ({ notes, update }) => {
       id: notesnook.ids.dialogs.export.md,
       pro: premium
     },
+    {
+      title: "Markdown + Frontmatter",
+      func: async () => {
+        await save("md-frontmatter");
+      },
+      icon: "language-markdown",
+      desc: "View in any text or markdown editor",
+      id: notesnook.ids.dialogs.export.md,
+      pro: premium
+    },
     {
       title: "Plain Text",
       func: async () => {
@@ -178,7 +188,9 @@ const ExportNotesSheet = ({ notes, update }) => {
                 >
                   <Icon
                     name={item.icon}
-                    color={item.pro ? colors.primary.accent : colors.primary.icon}
+                    color={
+                      item.pro ? colors.primary.accent : colors.primary.icon
+                    }
                     size={SIZE.xxxl + 10}
                   />
                 </View>

apps/mobile/app/components/ui/sheet/index.js

@@ -85,6 +85,7 @@ const SheetWrapper = ({
   };
 
   useEffect(() => {
+    if (useUserStore.getState().disableAppLockRequests) return;
     if (SettingsService.get().appLockMode === "background") {
       if (appState === "background") {
         const ref = fwdRef || localRef;

apps/mobile/app/hooks/use-editor-tags.ts

@@ -1,82 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { useEffect, useState } from "react";
-import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
-import { useEditorStore } from "../stores/use-editor-store";
-import { useTagStore } from "../stores/use-tag-store";
-import { db } from "../common/database";
-import { NoteType } from "app/utils/types";
-import { useCallback } from "react";
-
-/**
- * A hook that injects/removes tags from tags bar in editor
- */
-const useEditorTags = () => {
-  const currentEditingNote = useEditorStore(
-    (state) => state.currentEditingNote
-  );
-  const tags = useTagStore((state) => state.tags);
-  const [note, setNote] = useState<NoteType | null>(null);
-  const [noteTags, setNoteTags] = useState<string[]>([]);
-
-  const refreshNote = useCallback(() => {
-    const current = useEditorStore.getState().currentEditingNote;
-    if (!current) {
-      setNote(null);
-      setNoteTags([]);
-      return;
-    }
-    const note = db.notes?.note(current)?.data as NoteType;
-    setNote(note ? { ...note } : null);
-    getTags(note);
-  }, []);
-
-  useEffect(() => {
-    refreshNote();
-  }, [currentEditingNote, refreshNote, tags]);
-
-  const load = useCallback(() => {
-    if (!note) return;
-    //  tiny.call(EditorWebView, renderTags(noteTags));
-  }, [note]);
-
-  useEffect(() => {
-    eSubscribeEvent("updateTags", load);
-    return () => {
-      eUnSubscribeEvent("updateTags", load);
-    };
-  }, [load, noteTags]);
-
-  function getTags(note: NoteType) {
-    if (!note || !note.tags) return [];
-    const tags = note.tags
-      .map((t) => (db.tags?.tag(t) ? { ...db.tags.tag(t) } : null))
-      .filter((t) => t !== null);
-    setNoteTags(tags);
-  }
-
-  useEffect(() => {
-    load();
-  }, [load, noteTags]);
-
-  return [];
-};
-
-export default useEditorTags;

apps/mobile/app/screens/editor/index.tsx

@@ -45,6 +45,7 @@ import { EditorProps, useEditorType } from "./tiptap/types";
 import { useEditor } from "./tiptap/use-editor";
 import { useEditorEvents } from "./tiptap/use-editor-events";
 import { editorController } from "./tiptap/utils";
+import { useThemeColors } from "@notesnook/theme";
 
 const style: ViewStyle = {
   height: "100%",
@@ -93,35 +94,6 @@ const Editor = React.memo(
         get: () => editor
       }));
 
-      const onMediaDownloaded = useCallback(
-        ({
-          hash,
-          groupId,
-          src,
-          attachmentType
-        }: {
-          hash: string;
-          groupId: string;
-          src: string;
-          attachmentType: string;
-        }) => {
-          if (groupId !== editor.note.current?.id) return;
-          editorController.current.markImageLoaded(hash);
-          if (attachmentType === "webclip") {
-            editor.commands.updateWebclip({
-              hash: hash,
-              src: src
-            });
-          } else {
-            editor.commands.updateImage({
-              hash: hash,
-              dataurl: src
-            });
-          }
-        },
-        [editor.commands, editor.note]
-      );
-
       const onError = useCallback(() => {
         renderKey.current =
           renderKey.current === `editor-0` ? `editor-1` : `editor-0`;
@@ -130,16 +102,11 @@ const Editor = React.memo(
       }, [editor]);
 
       useEffect(() => {
-        const sub = [
-          eSubscribeEvent("webview_reset", onError),
-          EV.subscribe(EVENTS.mediaAttachmentDownloaded, onMediaDownloaded)
-        ];
-
+        const sub = [eSubscribeEvent("webview_reset", onError)];
         return () => {
           sub.forEach((s) => s.unsubscribe());
-          EV.unsubscribe(EVENTS.mediaAttachmentDownloaded, onMediaDownloaded);
         };
-      }, [onError, onMediaDownloaded]);
+      }, [onError]);
 
       useLayoutEffect(() => {
         setImmediate(() => {
@@ -210,6 +177,7 @@ export default Editor;
 const ReadonlyButton = ({ editor }: { editor: useEditorType }) => {
   const readonly = useEditorStore((state) => state.readonly);
   const keyboard = useKeyboard();
+  const { colors } = useThemeColors();
 
   const onPress = async () => {
     if (editor.note.current) {
@@ -225,7 +193,7 @@ const ReadonlyButton = ({ editor }: { editor: useEditorType }) => {
       name="pencil-lock"
       type="grayBg"
       onPress={onPress}
-      color="accent"
+      color={colors.primary.accent}
       customStyle={{
         position: "absolute",
         bottom: 60,

apps/mobile/app/screens/editor/source.ts

@@ -28,5 +28,5 @@ const EditorMobileSourceUrl =
  * The url should be something like this: http://192.168.100.126:3000/index.html
  */
 export const EDITOR_URI = __DEV__
-  ? EditorMobileSourceUrl
+  ? "http://192.168.8.107:3000/index.html"
   : EditorMobileSourceUrl;

apps/mobile/app/screens/editor/tiptap/commands.ts

@@ -17,10 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import type {
-  Attachment,
-  AttachmentProgress
-} from "@notesnook/editor/dist/extensions/attachment/index";
+import type { Attachment } from "@notesnook/editor/dist/extensions/attachment/index";
 import type { ImageAttributes } from "@notesnook/editor/dist/extensions/image/index";
 import { createRef, RefObject } from "react";
 import { Platform } from "react-native";
@@ -203,11 +200,16 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
     );
   };
 
-  setAttachmentProgress = async (attachmentProgress: AttachmentProgress) => {
+  setAttachmentProgress = async (attachmentProgress: Partial<Attachment>) => {
     await this.doAsync(
-      `editor && editor.commands.setAttachmentProgress(${JSON.stringify(
+      `editor && editor.commands.updateAttachment(${JSON.stringify(
         attachmentProgress
-      )})`
+      )}, {
+        preventUpdate: true,
+        query: (attachment) => {
+          return attachment.hash === "${attachmentProgress.hash}";
+        }
+      })`
     );
   };
 

apps/mobile/app/screens/editor/tiptap/editor-events.ts

@@ -36,5 +36,6 @@ export const EventTypes = {
   contentchange: "editor-event:content-change",
   reminders: "editor-event:reminders",
   previewAttachment: "editor-event:preview-attachment",
-  copyToClipboard: "editor-events:copy-to-clipboard"
+  copyToClipboard: "editor-events:copy-to-clipboard",
+  getAttachmentData: "editor-events:get-attachment-data"
 };

apps/mobile/app/screens/editor/tiptap/use-editor-events.ts

@@ -66,6 +66,7 @@ import { EditorMessage, EditorProps, useEditorType } from "./types";
 import { EditorEvents, editorState } from "./utils";
 import { useNoteStore } from "../../../stores/use-notes-store";
 import SettingsService from "../../../services/settings";
+import downloadAttachment from "../../../common/filesystem/download-attachment";
 
 const publishNote = async (editor: useEditorType) => {
   const user = useUserStore.getState().user;
@@ -189,7 +190,7 @@ export const useEditorEvents = (
       readonly: readonly || editorPropReadonly,
       tools: tools || getDefaultPresets().default,
       noHeader: noHeader,
-      noToolbar: readonly || editorPropReadonly || noToolbar,
+      noToolbar: noToolbar,
       doubleSpacedLines: doubleSpacedLines,
       corsProxy: corsProxy,
       fontSize:
@@ -416,6 +417,43 @@ export const useEditorEvents = (
           break;
         }
 
+        case EventTypes.getAttachmentData: {
+          const attachment = (editorMessage.value as any)
+            .attachment as Attachment;
+
+          console.log(
+            "Getting attachment data:",
+            attachment.hash,
+            attachment.type
+          );
+          downloadAttachment(attachment.hash, true, {
+            base64: true,
+            silent: true,
+            groupId: editor.note.current?.id,
+            cache: true
+          } as any)
+            .then((data: any) => {
+              console.log(
+                "Got attachment data:",
+                !!data,
+                (editorMessage.value as any).resolverId
+              );
+              editor.postMessage(EditorEvents.attachmentData, {
+                resolverId: (editorMessage.value as any).resolverId,
+                data
+              });
+            })
+            .catch(() => {
+              console.log("Error downloading attachment data");
+              editor.postMessage(EditorEvents.attachmentData, {
+                resolverId: (editorMessage.value as any).resolverId,
+                data: undefined
+              });
+            });
+
+          break;
+        }
+
         case EventTypes.pro:
           if (editor.state.current?.isFocused) {
             editor.state.current.isFocused = true;

apps/mobile/app/screens/editor/tiptap/use-editor.ts

@@ -78,7 +78,6 @@ export const useEditor = (
   const saveCount = useRef(0);
   const lastContentChangeTime = useRef<number>(0);
   const lock = useRef(false);
-  const loadedImages = useRef<{ [name: string]: boolean }>({});
   const lockedSessionId = useRef<string>();
   const loadingState = useRef<string>();
 
@@ -129,12 +128,9 @@ export const useEditor = (
 
   const reset = useCallback(
     async (resetState = true, resetContent = true) => {
-      currentNote.current?.id &&
-        db.fs?.cancel(currentNote.current.id, "download");
+      currentNote.current?.id && db.fs?.cancel(currentNote.current.id);
       currentNote.current = null;
-      loadedImages.current = {};
       currentContent.current = null;
-      clearTimeout(timers.current["loading-images"]);
       sessionHistoryId.current = undefined;
       saveCount.current = 0;
       loadingState.current = undefined;
@@ -287,58 +283,6 @@ export const useEditor = (
     }
   }, []);
 
-  const getMediaToLoad = (previousContent?: string) => {
-    if (!currentNote.current?.id) return [];
-
-    const previousAttachments =
-      previousContent?.matchAll(/data-hash="(.+?)"/gm) || [];
-    const attachments =
-      currentContent.current?.data?.matchAll(/data-hash="(.+?)"/gm) || [];
-
-    const media: string[] = [];
-
-    const oldMatches = Array.from(previousAttachments).map((match) => match[1]);
-    const matches = Array.from(attachments).map((match) => match[1]);
-
-    for (let i = 0; i < matches.length; i++) {
-      const currentHash = matches[i];
-      const oldHash = oldMatches[i];
-      if (currentHash !== oldHash) {
-        media.push(currentHash);
-        loadedImages.current[currentHash] = false;
-      }
-    }
-    return media;
-  };
-
-  const markImageLoaded = (hash: string) => {
-    const attachment = loadedImages.current[hash];
-    if (typeof attachment === "boolean") {
-      loadedImages.current[hash] = true;
-    }
-  };
-
-  const loadImages = useCallback((previousContent?: string) => {
-    if (!currentNote.current?.id) return;
-    const timerId = "loading-images";
-    clearTimeout(timers.current[timerId]);
-    timers.current[timerId] = setTimeout(() => {
-      if (!currentNote.current?.id) return;
-      if (currentNote.current?.content?.isPreview) {
-        db.content?.downloadMedia(
-          currentNote.current?.id,
-          currentNote.current.content,
-          true
-        );
-      } else {
-        const media = getMediaToLoad(previousContent);
-        if (media.length > 0) {
-          db.attachments?.downloadMedia(currentNote.current?.id, media);
-        }
-      }
-    }, 1000);
-  }, []);
-
   const loadNote = useCallback(
     async (
       item: Omit<NoteType, "type"> & {
@@ -408,13 +352,13 @@ export const useEditor = (
         await commands.setStatus(getFormattedDate(item.dateEdited), "Saved");
         await postMessage(EditorEvents.title, item.title);
         loadingState.current = currentContent.current?.data;
-        if (currentContent.current?.data) {
-          await postMessage(
-            EditorEvents.html,
-            currentContent.current?.data,
-            10000
-          );
-        }
+
+        await postMessage(
+          EditorEvents.html,
+          currentContent.current?.data || "",
+          10000
+        );
+
         loadingState.current = undefined;
         useEditorStore.getState().setReadonly(item.readonly);
         await commands.setTags(currentNote.current);
@@ -425,18 +369,9 @@ export const useEditor = (
           }
         }, 300);
         overlay(false);
-        loadImages();
       }
     },
-    [
-      commands,
-      isDefaultEditor,
-      loadContent,
-      loadImages,
-      overlay,
-      postMessage,
-      reset
-    ]
+    [commands, isDefaultEditor, loadContent, overlay, postMessage, reset]
   );
 
   const lockNoteWithVault = useCallback((note: NoteType) => {
@@ -466,8 +401,6 @@ export const useEditor = (
 
       lock.current = true;
 
-      const previousContent = currentContent.current?.data;
-
       if (data.type === "tiptap") {
         if (!currentNote.current.locked && isContentEncrypted) {
           lockNoteWithVault(note);
@@ -500,18 +433,8 @@ export const useEditor = (
       }
 
       lock.current = false;
-      if (data.type === "tiptap") {
-        loadImages(previousContent);
-        db.eventManager.subscribe(
-          EVENTS.syncCompleted,
-          () => {
-            loadImages(previousContent);
-          },
-          true
-        );
-      }
     },
-    [loadImages, lockNoteWithVault, postMessage, commands]
+    [lockNoteWithVault, postMessage, commands]
   );
 
   useEffect(() => {
@@ -689,7 +612,6 @@ export const useEditor = (
     saveContent,
     onContentChanged,
     editorId: editorId,
-    markImageLoaded,
     overlay,
     postMessage
   };

apps/mobile/app/screens/editor/tiptap/utils.ts

@@ -50,7 +50,8 @@ export const EditorEvents: { [name: string]: string } = {
   titleplaceholder: "native:titleplaceholder",
   logger: "native:logger",
   status: "native:status",
-  keyboardShown: "native:keyboardShown"
+  keyboardShown: "native:keyboardShown",
+  attachmentData: "native:attachment-data"
 };
 
 export function randId(prefix: string) {

apps/mobile/app/screens/settings/picker/pickers.jsx

@@ -69,10 +69,10 @@ export const TrashIntervalPicker = createSettingsPicker({
     db.settings.setTrashCleanupInterval(item);
   },
   formatValue: (item) => {
-    return item === -1 ? "Never" : item + " days";
+    return item === -1 ? "Never" : item === 1 ? "Daily" : item + " days";
   },
   getItemKey: (item) => item.toString(),
-  options: [-1, 7, 30, 365],
+  options: [-1, 1, 7, 30, 365],
   compareValue: (current, item) => current === item,
   premium: true
 });

apps/mobile/app/screens/trash/index.tsx

@@ -65,7 +65,11 @@ const PLACEHOLDER_DATA = (trashCleanupInterval = 7) => ({
   paragraph:
     trashCleanupInterval === -1
       ? "Set automatic trash cleanup interval from Settings > Behaviour > Clean trash interval."
-      : `Items in the trash will be permanently deleted after after ${trashCleanupInterval} days.`,
+      : `Trash gets automatically cleaned up ${
+          trashCleanupInterval === 1
+            ? "daily."
+            : `after ${trashCleanupInterval} days.`
+        }`,
   button: null,
   loading: "Loading trash items"
 });

apps/mobile/app/services/exporter.js

@@ -109,7 +109,7 @@ async function makeHtml(note) {
 
 /**
  *
- * @param {"txt" | "pdf" | "md" | "html"} type
+ * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
  */
 async function exportAs(type, note, bulk) {
   let data;
@@ -122,6 +122,9 @@ async function exportAs(type, note, bulk) {
     case "md":
       data = await db.notes.note(note.id).export("md");
       break;
+    case "md-frontmatter":
+      data = await db.notes.note(note.id).export("md-frontmatter");
+      break;
     case "pdf":
       {
         let html = await makeHtml(note);
@@ -159,7 +162,7 @@ async function exportAs(type, note, bulk) {
 
 /**
  *
- * @param {"txt" | "pdf" | "md" | "html"} type
+ * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
  */
 async function exportNote(note, type) {
   let path = await getPath(FolderNames[type]);
@@ -180,7 +183,7 @@ async function exportNote(note, type) {
     filePath: path,
     type: "text/plain",
     name: "Text",
-    fileName: fileName + `.${type}`
+    fileName: fileName + `.${type === "md-frontmatter" ? "md" : type}`
   };
 }
 
@@ -212,7 +215,7 @@ function getUniqueFileName(fileName, results) {
 
 /**
  *
- * @param {"txt" | "pdf" | "md" | "html"} type
+ * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
  */
 async function bulkExport(notes, type, callback) {
   let path = await getPath(FolderNames[type]);

apps/mobile/app/services/premium.js

@@ -303,7 +303,9 @@ const subscriptions = {
         console.log("Subscription.verify", requestData);
         try {
           let result = await fetch(
-            "http://192.168.43.5:4264/apple/verify",
+            __DEV__
+              ? "http://192.168.43.5:4264/apple/verify"
+              : "https://payments.streetwriters.co/apple/verify",
             requestData
           );
           console.log("Subscribed", result);

apps/mobile/app/stores/use-attachment-store.ts

@@ -68,8 +68,7 @@ export const useAttachmentStore = create<AttachmentStore>((set, get) => ({
     if (!progress) return;
     editorController.current?.commands.setAttachmentProgress({
       hash: hash,
-      progress: 100,
-      type: progress[hash]?.type || "download"
+      progress: 100
     });
     progress[hash] = null;
     set({ progress: { ...progress } });
@@ -80,10 +79,11 @@ export const useAttachmentStore = create<AttachmentStore>((set, get) => ({
     progress[hash] = { sent, total, hash, recieved, type };
     const progressPercentage =
       type === "upload" ? sent / total : recieved / total;
+
     editorController.current?.commands.setAttachmentProgress({
       hash: hash,
-      progress: Math.round(Math.max(progressPercentage * 100, 0)),
-      type: type
+      //@ts-ignore
+      progress: Math.round(Math.max(progressPercentage * 100, 0))
     });
     set({ progress: { ...progress } });
   },

apps/mobile/app/utils/note-bundle.js

@@ -21,7 +21,7 @@ import Sodium from "@ammarahmed/react-native-sodium";
 import { isImage } from "@notesnook/core/dist/utils/filename";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import { db } from "../common/database";
+import { DatabaseLogger, db } from "../common/database";
 import { IOS_APPGROUPID } from "./constants";
 
 const santizeUri = (uri) => {
@@ -57,6 +57,7 @@ export async function attachFile(uri, hash, type, filename, options) {
     return true;
   } catch (e) {
     if (Platform.OS === "ios") RNFetchBlob.fs.unlink(uri).catch(console.log);
+    DatabaseLogger.error(e, "Attach file error");
     console.log("attach file error: ", e);
     return false;
   }
@@ -107,26 +108,31 @@ async function createNotes(bundle) {
       uri: uri,
       type: "cache"
     });
-    await attachFile(uri, hash, file.type, file.name, {
+    const attached = await attachFile(uri, hash, file.type, file.name, {
       type: "cache",
       id: id,
       appGroupId: IOS_APPGROUPID
     });
     let content = ``;
-    if (isImage(file.type)) {
-      content = `<img data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" />`;
-    } else {
-      content = `<p><span data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" data-size="${file.size}" /></p>`;
+
+    if (attached) {
+      if (isImage(file.type)) {
+        content = `<img data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" />`;
+      } else {
+        content = `<p><span data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" data-size="${file.size}" /></p>`;
+      }
+      const rawContent = await db.content.raw(
+        db.notes.note(id).data?.contentId
+      );
+      await db.notes.add({
+        id: id,
+        content: {
+          type: "tiptap",
+          data: rawContent?.data ? rawContent?.data + content : content
+        },
+        sessionId: sessionId
+      });
     }
-    const rawContent = await db.content.raw(db.notes.note(id).data?.contentId);
-    await db.notes.add({
-      id: id,
-      content: {
-        type: "tiptap",
-        data: rawContent?.data ? rawContent?.data + content : content
-      },
-      sessionId: sessionId
-    });
   }
 }
 

apps/mobile/native/android/app/build.gradle

@@ -111,7 +111,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 2071
+        versionCode 2074
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -997,7 +997,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2062;
+				CURRENT_PROJECT_VERSION = 2066;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1071,7 +1071,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.11;
+				MARKETING_VERSION = 2.6.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1102,7 +1102,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2062;
+				CURRENT_PROJECT_VERSION = 2066;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1176,7 +1176,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.11;
+				MARKETING_VERSION = 2.6.15;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1186,7 +1186,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook;
 				PRODUCT_NAME = Notesnook;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Distribution 2023";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook App Distribution 2024";
 				SWIFT_OBJC_BRIDGING_HEADER = "Notesnook-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1335,7 +1335,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2062;
+				CURRENT_PROJECT_VERSION = 2066;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1347,7 +1347,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.11;
+				MARKETING_VERSION = 2.6.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1378,7 +1378,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2062;
+				CURRENT_PROJECT_VERSION = 2066;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1391,12 +1391,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.11;
+				MARKETING_VERSION = 2.6.15;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Widget Distribution 2023";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Widget Distribution 2024";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -1421,7 +1421,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2062;
+				CURRENT_PROJECT_VERSION = 2066;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1495,7 +1495,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.11;
+				MARKETING_VERSION = 2.6.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1526,7 +1526,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2062;
+				CURRENT_PROJECT_VERSION = 2066;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1601,12 +1601,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.11;
+				MARKETING_VERSION = 2.6.15;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share Distrubution 2023";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share Distribution 2024";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Make Note/Make Note-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

apps/mobile/native/ios/Podfile.lock

@@ -327,7 +327,7 @@ PODS:
     - React-Core
   - react-native-keep-awake (1.2.0):
     - React-Core
-  - react-native-mmkv-storage (0.10.0-alpha.9):
+  - react-native-mmkv-storage (0.10.0-alpha.11):
     - MMKV (~> 1.3.1)
     - React
     - React-Core
@@ -875,7 +875,7 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa
   react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
   react-native-keep-awake: caee3ff89eaa21dfe29010f0d143566874a04441
-  react-native-mmkv-storage: d4ad55ab411b7f0d4e6269d801b31821ef48970b
+  react-native-mmkv-storage: e798639f91601896f1c84f4eb3d6f19af2f4a160
   react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
   react-native-notification-sounds: da78c828fe1bcbb92d8b505d5261890ed315ff39
   react-native-orientation: f1caf84d65f1a4fd4511a18f2b924e634ad7a628
@@ -931,4 +931,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b0cadd188aa428b98d1eaa0b84b3b6208e714119
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.2

apps/mobile/native/package.json

@@ -44,7 +44,7 @@
     "react-native-image-picker": "4.1.2",
     "react-native-in-app-review": "4.3.3",
     "react-native-keychain": "4.0.5",
-    "react-native-mmkv-storage": "^0.10.0-alpha.9",
+    "react-native-mmkv-storage": "^0.10.0-alpha.11",
     "react-native-modal-datetime-picker": "14.0.0",
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",

apps/mobile/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.9",
+  "version": "2.6.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "2.6.9",
+      "version": "2.6.14",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "workspaces": [
@@ -62,7 +62,7 @@
         "@microsoft/signalr": "^7.0.10",
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@streetwriters/showdown": "^3.0.2-alpha",
         "async-mutex": "^0.3.2",
         "dayjs": "1.11.9",
         "entities": "^4.3.1",
@@ -133,6 +133,7 @@
         "@tiptap/extension-underline": "2.1.12",
         "@tiptap/pm": "2.1.12",
         "@tiptap/starter-kit": "2.1.12",
+        "async-mutex": "^0.4.0",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
         "entities": "^4.5.0",
@@ -319,7 +320,7 @@
         "react-native-image-picker": "4.1.2",
         "react-native-in-app-review": "4.3.3",
         "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.9",
+        "react-native-mmkv-storage": "^0.10.0-alpha.11",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
@@ -18479,9 +18480,9 @@
       "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
     },
     "node_modules/react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.9",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
-      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw==",
+      "version": "0.10.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",
+      "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw==",
       "bin": {
         "mmkv-link": "autolink/postlink/run.js"
       },
@@ -26830,7 +26831,7 @@
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/crypto": "file:../crypto",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@streetwriters/showdown": "^3.0.2-alpha",
         "@types/html-to-text": "^9.0.0",
         "@types/katex": "^0.16.1",
         "@types/prismjs": "^1.26.0",
@@ -26904,6 +26905,7 @@
         "@types/react-dom": "17.0.2",
         "@types/react-modal": "3.13.1",
         "@types/tinycolor2": "^1.4.3",
+        "async-mutex": "^0.4.0",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
         "entities": "^4.5.0",
@@ -27076,7 +27078,7 @@
         "react-native-image-picker": "4.1.2",
         "react-native-in-app-review": "4.3.3",
         "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.9",
+        "react-native-mmkv-storage": "^0.10.0-alpha.11",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
@@ -36184,9 +36186,9 @@
       "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
     },
     "react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.9",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
-      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw=="
+      "version": "0.10.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",
+      "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw=="
     },
     "react-native-modal-datetime-picker": {
       "version": "14.0.0",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.11",
+  "version": "2.6.15",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [

apps/theme-builder/package-lock.json

@@ -1377,7 +1377,7 @@
     },
     "../web": {
       "name": "@notesnook/web",
-      "version": "2.6.8",
+      "version": "2.6.14",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@aws-sdk/util-base64-browser": "^3.208.0",
@@ -1388,7 +1388,7 @@
         "@emotion/react": "11.11.1",
         "@mdi/js": "^7.2.96",
         "@mdi/react": "^1.6.1",
-        "@notesnook-importer/core": "^1.7.1",
+        "@notesnook-importer/core": "^2.0.0",
         "@notesnook/common": "file:../../packages/common",
         "@notesnook/core": "file:../../packages/core",
         "@notesnook/crypto": "file:../../packages/crypto",
@@ -1408,6 +1408,7 @@
         "@theme-ui/core": "^0.14.7",
         "@trpc/client": "10.38.3",
         "@trpc/react-query": "10.38.3",
+        "@zip.js/zip.js": "^2.7.32",
         "allotment": "^1.19.0",
         "axios": "^1.3.4",
         "clipboard-polyfill": "4.0.0",

apps/web/__e2e__/models/editor.model.ts

@@ -171,7 +171,7 @@ export class EditorModel {
       await this.tagInput.fill(tag);
       await this.tagInput.press("Enter");
       await this.tags
-        .locator(":scope", { hasText: new RegExp(`^${tag}$`) })
+        .locator("span", { hasText: new RegExp(`^${tag}$`) })
         .waitFor();
     }
   }
@@ -181,7 +181,7 @@ export class EditorModel {
     const count = await this.tags.count();
     for (let i = 0; i < count; ++i) {
       const item = this.tags.nth(i);
-      const tag = await item.textContent();
+      const tag = await item.locator("span").textContent();
       if (tag) tags.push(tag);
     }
     return tags;

apps/web/__e2e__/notes.test.ts-snapshots/export-html-Chromium-win32.txt

@@ -8,8 +8,11 @@
       content="This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1"
     />
     <title>Test 1 - Notesnook</title>
-    <meta name="created-on" content="xxx" />
-    <meta name="last-edited-on" content="xxx" />
+    <meta name="created-at" content="22-12-2023 11:33 AM" />
+    <meta name="updated-at" content="22-12-2023 11:33 AM" />
+    
+    
+    
     
     <link rel="stylesheet" href="https://app.notesnook.com/assets/editor-styles.css?d=0">
 
@@ -25,6 +28,11 @@
       color: #202124;
       font-family: "Open Sans", "Noto Sans", Frutiger, Calibri, Myriad, Arial, Ubuntu, Helvetica, -apple-system, BlinkMacSystemFont, sans-serif;
     }
+
+    .math-block {
+      padding-top: 20px;
+      padding-bottom: 20px;
+    }
     
     h1,
     h2,

apps/web/__e2e__/notes.test.ts-snapshots/export-md-Chromium-win32.txt

@@ -2,6 +2,3 @@
 
 This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1
 
-
----
-

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "2.6.11",
+  "version": "2.6.14",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",
@@ -16,7 +16,7 @@
     "@emotion/react": "11.11.1",
     "@mdi/js": "^7.2.96",
     "@mdi/react": "^1.6.1",
-    "@notesnook-importer/core": "^1.7.1",
+    "@notesnook-importer/core": "^2.0.0",
     "@notesnook/common": "file:../../packages/common",
     "@notesnook/core": "file:../../packages/core",
     "@notesnook/crypto": "file:../../packages/crypto",
@@ -36,6 +36,7 @@
     "@theme-ui/core": "^0.14.7",
     "@trpc/client": "10.38.3",
     "@trpc/react-query": "10.38.3",
+    "@zip.js/zip.js": "^2.7.32",
     "allotment": "^1.19.0",
     "axios": "^1.3.4",
     "clipboard-polyfill": "4.0.0",

apps/web/src/common/attachments.ts

@@ -20,11 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { lazify } from "../utils/lazify";
 import { db } from "./db";
 
-async function download(hash: string) {
+async function download(hash: string, groupId?: string) {
   const attachment = db.attachments?.attachment(hash);
   if (!attachment) return;
   const downloadResult = await db.fs?.downloadFile(
-    attachment.metadata.hash,
+    groupId || attachment.metadata.hash,
     attachment.metadata.hash,
     attachment.chunkSize,
     attachment.metadata
@@ -61,8 +61,12 @@ type OutputTypeToReturnType = {
 export async function downloadAttachment<
   TType extends "blob" | "base64" | "text",
   TOutputType = OutputTypeToReturnType[TType]
->(hash: string, type: TType): Promise<TOutputType | undefined> {
-  const response = await download(hash);
+>(
+  hash: string,
+  type: TType,
+  groupId?: string
+): Promise<TOutputType | undefined> {
+  const response = await download(hash, groupId);
   if (!response) return;
   const { attachment, key } = response;
 

apps/web/src/common/export.ts

@@ -17,13 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { db } from "./db";
 import { TaskManager } from "./task-manager";
-import { zip } from "../utils/zip";
-import { saveAs } from "file-saver";
-import { showToast } from "../utils/toast";
-import { sanitizeFilename } from "@notesnook/common";
-import Vault from "./vault";
+import { ExportStream } from "../utils/streams/export-stream";
+import { createZipStream } from "../utils/streams/zip-stream";
+import { createWriteStream } from "../utils/stream-saver";
 
 export async function exportToPDF(
   title: string,
@@ -69,7 +66,7 @@ export async function exportToPDF(
 }
 
 export async function exportNotes(
-  format: "pdf" | "md" | "txt" | "html",
+  format: "pdf" | "md" | "txt" | "html" | "md-frontmatter",
   noteIds: string[]
 ): Promise<boolean> {
   return await TaskManager.startTask({
@@ -77,75 +74,11 @@ export async function exportNotes(
     title: "Exporting notes",
     subtitle: "Please wait while your notes are exported.",
     action: async (report) => {
-      let vaultUnlocked = false;
-
-      if (noteIds.length === 1 && db.notes?.note(noteIds[0])?.data.locked) {
-        vaultUnlocked = await Vault.unlockVault();
-        if (!vaultUnlocked) return false;
-      } else if (noteIds.length > 1 && (await db.vault?.exists())) {
-        vaultUnlocked = await Vault.unlockVault();
-        if (!vaultUnlocked)
-          showToast(
-            "error",
-            "Failed to unlock vault. Locked notes will be skipped."
-          );
-      }
-
-      const files = [];
-      let index = 0;
-      for (const noteId of noteIds) {
-        const note = db.notes?.note(noteId);
-        if (!note) continue;
-        if (!vaultUnlocked && note.data.locked) continue;
-
-        report({
-          current: ++index,
-          total: noteIds.length,
-          text: `Exporting "${note.title}"...`
-        });
-
-        const rawContent = await db.content?.raw(note.data.contentId);
-        const content = note.data.locked
-          ? await db.vault?.decryptContent(rawContent)
-          : rawContent;
-
-        const exported = await note
-          .export(format === "pdf" ? "html" : format, content)
-          .catch((e: Error) => {
-            console.error(note.data, e);
-            showToast(
-              "error",
-              `Failed to export note "${note.title}": ${e.message}`
-            );
-          });
-
-        if (typeof exported !== "string") {
-          showToast("error", `Failed to export note "${note.title}"`);
-          continue;
-        }
-
-        if (format === "pdf") {
-          return await exportToPDF(note.title, exported);
-        }
-
-        files.push({
-          filename: note.title,
-          content: exported,
-          date: note.dateEdited
-        });
-      }
-
-      if (!files.length) return false;
-      if (files.length === 1) {
-        saveAs(
-          new Blob([Buffer.from(files[0].content, "utf-8")]),
-          `${sanitizeFilename(files[0].filename)}.${format}`
-        );
-      } else {
-        const zipped = await zip(files, format);
-        saveAs(new Blob([zipped.buffer]), "notes.zip");
-      }
-
+      await new ExportStream(noteIds, format, undefined, (c, text) =>
+        report({ total: noteIds.length, current: c, text })
+      )
+        .pipeThrough(createZipStream())
+        .pipeTo(await createWriteStream("notes.zip"));
       return true;
     }
   });

apps/web/src/common/index.ts

@@ -36,9 +36,9 @@ import { TaskManager } from "./task-manager";
 import { EVENTS } from "@notesnook/core/dist/common";
 import { getFormattedDate } from "@notesnook/common";
 import { createWritableStream } from "./desktop-bridge";
-import { ZipStream } from "../utils/streams/zip-stream";
+import { createZipStream } from "../utils/streams/zip-stream";
 import { FeatureKeys } from "../dialogs/feature-dialog";
-import { Entry, Reader } from "../utils/zip-reader";
+import { ZipEntry, createUnzipIterator } from "../utils/streams/unzip-stream";
 
 export const CREATE_BUTTON_MAP = {
   notes: {
@@ -113,7 +113,7 @@ export async function createBackup() {
           controller.close();
         }
       })
-        .pipeThrough(new ZipStream())
+        .pipeThrough(createZipStream())
         .pipeTo(writeStream);
     }
   });
@@ -138,8 +138,9 @@ export async function selectBackupFile() {
 
 export async function importBackup() {
   const backupFile = await selectBackupFile();
-  if (!backupFile) return;
+  if (!backupFile) return false;
   await restoreBackupFile(backupFile);
+  return true;
 }
 
 export async function restoreBackupFile(backupFile: File) {
@@ -165,12 +166,12 @@ export async function restoreBackupFile(backupFile: File) {
       type: "modal",
       action: async (report) => {
         let cachedPassword: string | undefined = undefined;
-        const { read, totalFiles } = await Reader(backupFile);
-        const entries: Entry[] = [];
+        // const { read, totalFiles } = await Reader(backupFile);
+        const entries: ZipEntry[] = [];
         let filesProcessed = 0;
 
         let isValid = false;
-        for await (const entry of read()) {
+        for await (const entry of createUnzipIterator(backupFile)) {
           if (entry.name === ".nnbackup") {
             isValid = true;
             continue;
@@ -199,7 +200,6 @@ export async function restoreBackupFile(backupFile: File) {
           }
 
           report({
-            total: totalFiles,
             text: `Processed ${entry.name}`,
             current: filesProcessed++
           });

apps/web/src/common/multi-select.ts

@@ -35,20 +35,11 @@ type Item = {
 };
 
 async function moveNotesToTrash(notes: Item[], confirm = true) {
-  const item = notes[0];
   if (confirm && !(await showMultiDeleteConfirmation(notes.length))) return;
-
-  if (notes.length === 1) {
-    if (
-      item.locked &&
-      !(await Vault.unlockNote(item.id, "unlock_and_delete_note"))
-    )
-      return;
-    item.locked = false;
-  }
+  if (notes.some((n) => n.locked) && !(await Vault.unlockVault())) return;
 
   const items = notes.map((item) => {
-    if (item.locked || db.monographs?.isPublished(item.id)) return 0;
+    if (db.monographs?.isPublished(item.id)) return 0;
     return item.id;
   });
 

apps/web/src/components/attachment/index.tsx

@@ -164,7 +164,11 @@ export function Attachment({
             <AttachmentError
               color={"icon-error"}
               size={16}
-              title={attachment.failed}
+              title={
+                typeof attachment.failed === "object"
+                  ? attachment.failed.toString()
+                  : attachment.failed
+              }
             />
           ) : attachment.working ? (
             <Loading size={16} />

apps/web/src/components/auth-container/index.jsx

@@ -171,8 +171,10 @@ function AuthContainer(props) {
             {testimonial.text} —{" "}
             <Link
               sx={{ fontStyle: "italic", color: "paragraph-secondary" }}
-              href={testimonial.link}
-            >
+              href={testimonial.link}  
+              target="_blank"
+              rel="noopener noreferrer"
+              >
               source
             </Link>
           </Text>

apps/web/src/components/editor/index.tsx

@@ -135,26 +135,7 @@ export default function EditorManager({
             if (result) item.data = result.data;
             else EV.publish(EVENTS.vaultLocked);
           }
-          const oldHashes = editorInstance.current.getMediaHashes();
-
           editorInstance.current.updateContent(item.data as string);
-
-          const newHashes = editorInstance.current.getMediaHashes();
-          const hashesToLoad = newHashes.filter(
-            (hash, index) => hash !== oldHashes[index]
-          );
-
-          if (appstore.get().isSyncing()) {
-            db.eventManager.subscribe(
-              EVENTS.syncCompleted,
-              async () => {
-                await db.attachments?.downloadMedia(id, hashesToLoad);
-              },
-              true
-            );
-          } else {
-            await db.attachments?.downloadMedia(id, hashesToLoad);
-          }
         } else if (isNote) {
           if (!locked && item.locked) return EV.publish(EVENTS.vaultLocked);
 
@@ -180,18 +161,6 @@ export default function EditorManager({
     setTimestamp(Date.now());
   }, []);
 
-  const loadMedia = useCallback(async () => {
-    if (previewSession.current) {
-      await db.content?.downloadMedia(
-        noteId,
-        previewSession.current.content,
-        true
-      );
-    } else if (noteId && editorstore.get().session.content) {
-      await db.attachments?.downloadMedia(noteId);
-    }
-  }, [noteId]);
-
   useEffect(() => {
     if (!isNewSession) return;
 
@@ -237,6 +206,7 @@ export default function EditorManager({
               />
             )}
             <Editor
+              id={noteId}
               nonce={timestamp}
               content={() =>
                 previewSession.current?.content?.data ||
@@ -247,7 +217,6 @@ export default function EditorManager({
               options={{
                 readonly: isReadonly || isPreviewSession,
                 onRequestFocus: () => toggleProperties(false),
-                onLoadMedia: loadMedia,
                 focusMode: isFocusMode,
                 isMobile: isMobile || isTablet
               }}
@@ -351,9 +320,9 @@ type EditorOptions = {
   readonly?: boolean;
   focusMode?: boolean;
   onRequestFocus?: () => void;
-  onLoadMedia?: () => void;
 };
 type EditorProps = {
+  id: string | number;
   content: () => string | undefined;
   nonce?: number;
   options?: EditorOptions;
@@ -361,8 +330,9 @@ type EditorProps = {
   onPreviewDocument?: (preview: DocumentPreview) => void;
 };
 export function Editor(props: EditorProps) {
-  const { content, nonce, options, onContentChange, onPreviewDocument } = props;
-  const { readonly, headless, onLoadMedia, isMobile } = options || {
+  const { id, content, nonce, options, onContentChange, onPreviewDocument } =
+    props;
+  const { readonly, headless, isMobile } = options || {
     headless: false,
     readonly: false,
     focusMode: false,
@@ -375,40 +345,16 @@ export function Editor(props: EditorProps) {
   useEffect(() => {
     const event = AppEventManager.subscribe(
       AppEvents.UPDATE_ATTACHMENT_PROGRESS,
-      ({ hash, loaded, total, type }: AttachmentProgress) => {
+      ({ hash, loaded, total }: AttachmentProgress) => {
         editor.current?.sendAttachmentProgress(
           hash,
-          type,
           Math.round((loaded / total) * 100)
         );
       }
     );
 
-    const mediaAttachmentDownloadedEvent = EV.subscribe(
-      EVENTS.mediaAttachmentDownloaded,
-      ({
-        groupId,
-        hash,
-        attachmentType,
-        src
-      }: {
-        groupId?: string;
-        attachmentType: "image" | "webclip" | "generic";
-        hash: string;
-        src: string;
-      }) => {
-        if (groupId?.startsWith("monograph")) return;
-        if (attachmentType === "image") {
-          editor.current?.loadImage(hash, src);
-        } else if (attachmentType === "webclip") {
-          editor.current?.loadWebClip(hash, src);
-        }
-      }
-    );
-
     return () => {
       event.unsubscribe();
-      mediaAttachmentDownloadedEvent.unsubscribe();
     };
   }, [editor]);
 
@@ -424,7 +370,6 @@ export function Editor(props: EditorProps) {
           corsHost: Config.get("corsProxy", "https://cors.notesnook.com")
         }}
         onLoad={() => {
-          if (onLoadMedia) onLoadMedia();
           if (nonce && nonce > 0) setIsLoading(false);
         }}
         onContentChange={onContentChange}
@@ -437,8 +382,11 @@ export function Editor(props: EditorProps) {
             const container = document.getElementById("dialogContainer");
             if (!(container instanceof HTMLElement)) return;
 
-            const dataurl =
-              data.bloburl || (await downloadAttachment(hash, "base64"));
+            const dataurl = await downloadAttachment(
+              hash,
+              "base64",
+              id.toString()
+            );
             if (!dataurl)
               return showToast("error", "This image cannot be previewed.");
 
@@ -455,7 +403,7 @@ export function Editor(props: EditorProps) {
             );
           } else if (attachment && onPreviewDocument) {
             onPreviewDocument({ hash });
-            const blob = await downloadAttachment(hash, "blob");
+            const blob = await downloadAttachment(hash, "blob", id.toString());
             if (!blob) return;
             onPreviewDocument({ url: URL.createObjectURL(blob), hash });
           }
@@ -467,6 +415,13 @@ export function Editor(props: EditorProps) {
             editor.current?.attachFile(file);
           });
         }}
+        onGetAttachmentData={(attachment) => {
+          return downloadAttachment(
+            attachment.hash,
+            attachment.type === "web-clip" ? "text" : "base64",
+            id.toString()
+          );
+        }}
         onAttachFile={async (file) => {
           const result = await attachFile(file);
           if (!result) return;
@@ -557,7 +512,7 @@ function EditorChrome(
         <Box
           id="editorToolbar"
           sx={{
-            display: readonly ? "none" : "flex",
+            display: "flex",
             bg: "background",
             position: "sticky",
             top: 0,

apps/web/src/components/editor/picker.ts

@@ -25,6 +25,7 @@ import { TaskManager } from "../../common/task-manager";
 import { isUserPremium } from "../../hooks/use-is-user-premium";
 import { showToast } from "../../utils/toast";
 import { showFilePicker } from "../../utils/file-picker";
+import { Attachment } from "@notesnook/editor";
 
 const FILE_SIZE_LIMIT = 500 * 1024 * 1024;
 const IMAGE_SIZE_LIMIT = 50 * 1024 * 1024;
@@ -80,33 +81,54 @@ export async function reuploadAttachment(
 }
 
 /**
- * @param {File} selectedFile
+ * @param {File} file
  * @returns
  */
-async function pickFile(selectedFile: File, options?: AddAttachmentOptions) {
+async function pickFile(
+  file: File,
+  options?: AddAttachmentOptions
+): Promise<Attachment | undefined> {
   try {
-    if (selectedFile.size > FILE_SIZE_LIMIT)
+    if (file.size > FILE_SIZE_LIMIT)
       throw new Error("File too big. You cannot add files over 500 MB.");
-    if (!selectedFile) return;
+    if (!file) return;
 
-    return await addAttachment(selectedFile, undefined, options);
+    const hash = await addAttachment(file, options);
+    return {
+      type: "file",
+      filename: file.name,
+      hash,
+      mime: file.type,
+      size: file.size
+    };
   } catch (e) {
     showToast("error", `${(e as Error).message}`);
   }
 }
 
 /**
- * @param {File} selectedImage
+ * @param {File} file
  * @returns
  */
-async function pickImage(selectedImage: File, options?: AddAttachmentOptions) {
+async function pickImage(
+  file: File,
+  options?: AddAttachmentOptions
+): Promise<Attachment | undefined> {
   try {
-    if (selectedImage.size > IMAGE_SIZE_LIMIT)
+    if (file.size > IMAGE_SIZE_LIMIT)
       throw new Error("Image too big. You cannot add images over 50 MB.");
-    if (!selectedImage) return;
+    if (!file) return;
 
-    const dataurl = await toDataURL(selectedImage);
-    return await addAttachment(selectedImage, dataurl, options);
+    const hash = await addAttachment(file, options);
+    const dimensions = await getImageDimensions(file);
+    return {
+      type: "image",
+      filename: file.name,
+      hash,
+      mime: file.type,
+      size: file.size,
+      ...dimensions
+    };
   } catch (e) {
     showToast("error", (e as Error).message);
   }
@@ -118,12 +140,6 @@ async function getEncryptionKey(): Promise<SerializedKey> {
   return key;
 }
 
-async function toDataURL(file: File): Promise<string> {
-  const buffer = await file.arrayBuffer();
-  const base64 = Buffer.from(buffer).toString("base64");
-  return `data:${file.type};base64,${base64}`;
-}
-
 export type AttachmentProgress = {
   hash: string;
   type: "encrypt" | "download" | "upload";
@@ -131,15 +147,6 @@ export type AttachmentProgress = {
   loaded: number;
 };
 
-export type Attachment = {
-  hash: string;
-  filename: string;
-  mime: string;
-  size: number;
-  dataurl?: string;
-  bloburl?: string;
-};
-
 type AddAttachmentOptions = {
   expectedFileHash?: string;
   showProgress?: boolean;
@@ -148,9 +155,8 @@ type AddAttachmentOptions = {
 
 async function addAttachment(
   file: File,
-  dataurl: string | undefined,
   options: AddAttachmentOptions = {}
-): Promise<Attachment> {
+): Promise<string> {
   const { default: FS } = await import("../../interfaces/fs");
   const { expectedFileHash, showProgress = true } = options;
   let forceWrite = options.forceWrite;
@@ -165,7 +171,7 @@ async function addAttachment(
         `Please select the same file for reuploading. Expected hash ${expectedFileHash} but got ${hash}.`
       );
 
-    const exists = db.attachments?.exists(hash);
+    const exists = db.attachments?.attachment(hash);
     if (!forceWrite && exists) {
       forceWrite = (await FS.getUploadedFileSize(hash)) <= 0;
     }
@@ -181,19 +187,13 @@ async function addAttachment(
         ...output,
         hash,
         hashType,
-        filename: file.name,
-        type: file.type,
+        filename: exists?.metadata.filename || file.name,
+        type: exists?.metadata.type || file.type,
         key
       });
     }
 
-    return {
-      hash: hash,
-      filename: file.name,
-      mime: file.type,
-      size: file.size,
-      dataurl
-    };
+    return hash;
   };
 
   const result = showProgress
@@ -204,7 +204,10 @@ async function addAttachment(
   return result;
 }
 
-function withProgress<T>(file: File, action: () => Promise<T>): Promise<T> {
+function withProgress<T>(
+  file: File,
+  action: () => Promise<T>
+): Promise<T | Error> {
   return TaskManager.startTask({
     type: "modal",
     title: "Encrypting attachment",
@@ -226,3 +229,19 @@ function withProgress<T>(file: File, action: () => Promise<T>): Promise<T> {
     }
   });
 }
+
+function getImageDimensions(file: File) {
+  return new Promise<{ width: number; height: number } | undefined>(
+    (resolve) => {
+      const img = new Image();
+      img.onload = () => {
+        const { naturalWidth: width, naturalHeight: height } = img;
+        resolve({ width, height });
+      };
+      img.onerror = () => {
+        resolve(undefined);
+      };
+      img.src = URL.createObjectURL(file);
+    }
+  );
+}

apps/web/src/components/editor/tiptap.tsx

@@ -34,11 +34,11 @@ import {
   getTotalWords,
   countWords,
   getFontById,
-  TiptapOptions
+  TiptapOptions,
+  Attachment
 } from "@notesnook/editor";
 import { Box, Flex } from "@theme-ui/components";
 import { PropsWithChildren, useEffect, useMemo, useRef, useState } from "react";
-import { Attachment } from "./picker";
 import { IEditor } from "./types";
 import {
   useConfigureEditor,
@@ -57,7 +57,6 @@ import { store as editorstore } from "../../stores/editor-store";
 import { ScopedThemeProvider } from "../theme-provider";
 import { writeText } from "clipboard-polyfill";
 import { useStore as useThemeStore } from "../../stores/theme-store";
-import { toBlobURL } from "@notesnook/editor/dist/utils/downloader";
 
 type OnChangeHandler = (
   id: string | undefined,
@@ -72,6 +71,7 @@ type TipTapProps = {
   onInsertAttachment?: (type: AttachmentType) => void;
   onDownloadAttachment?: (attachment: Attachment) => void;
   onPreviewAttachment?: (attachment: Attachment) => void;
+  onGetAttachmentData?: (attachment: Attachment) => Promise<string | undefined>;
   onAttachFile?: (file: File) => void;
   onFocus?: () => void;
   content?: () => string | undefined;
@@ -117,6 +117,7 @@ function TipTap(props: TipTapProps) {
     onInsertAttachment,
     onDownloadAttachment,
     onPreviewAttachment,
+    onGetAttachmentData,
     onAttachFile,
     onContentChange,
     onFocus = () => {},
@@ -282,7 +283,8 @@ function TipTap(props: TipTapProps) {
       onOpenLink: (url) => {
         window.open(url, "_blank");
         return true;
-      }
+      },
+      getAttachmentData: onGetAttachmentData
     };
   }, [readonly, nonce, doubleSpacedLines, dateFormat, timeFormat]);
 
@@ -420,14 +422,6 @@ function toIEditor(editor: Editor): IEditor {
       }),
     undo: () => editor.current?.commands.undo(),
     redo: () => editor.current?.commands.redo(),
-    getMediaHashes: () => {
-      if (!editor.current) return [];
-      const hashes: string[] = [];
-      editor.current.state.doc.descendants((n) => {
-        if (typeof n.attrs.hash === "string") hashes.push(n.attrs.hash);
-      });
-      return hashes;
-    },
     updateContent: (content) => {
       const { from, to } = editor.state.selection;
       editor.current
@@ -443,27 +437,17 @@ function toIEditor(editor: Editor): IEditor {
         })
         .run();
     },
-    attachFile: (file: Attachment) => {
-      if (file.dataurl) {
-        editor.current?.commands.insertImage({
-          ...file,
-          bloburl: toBlobURL(file.dataurl, file.hash)
-        });
-      } else editor.current?.commands.insertAttachment(file);
-    },
-    loadWebClip: (hash, src) =>
-      editor.current?.commands.updateWebClip({ hash }, { src }),
-    loadImage: (hash, dataurl) =>
-      editor.current?.commands.updateImage(
-        { hash },
-        { hash, bloburl: toBlobURL(dataurl, hash), preventUpdate: true }
-      ),
-    sendAttachmentProgress: (hash, type, progress) =>
-      editor.current?.commands.setAttachmentProgress({
-        hash,
-        type,
-        progress
-      })
+    attachFile: (file: Attachment) =>
+      file.type === "image"
+        ? editor.current?.commands.insertImage(file)
+        : editor.current?.commands.insertAttachment(file),
+    sendAttachmentProgress: (hash, progress) =>
+      editor.current?.commands.updateAttachment(
+        {
+          progress
+        },
+        { query: (a) => a.hash === hash, preventUpdate: true }
+      )
   };
 }
 

apps/web/src/components/editor/toolbar.jsx

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { Button, Flex, Text } from "@theme-ui/components";
 import {
   Published,
@@ -51,6 +51,7 @@ function Toolbar() {
   const sessionId = useStore((store) => store.session.id);
   const isDeleted = useStore((store) => store.session.isDeleted);
   const isLocked = useStore((store) => store.session.locked);
+  const readonly = useStore((store) => store.session.readonly);
   const [isFullscreen, setIsFullscreen] = useState(false);
   const isFocusMode = useAppStore((store) => store.isFocusMode);
   const toggleFocusMode = useAppStore((store) => store.toggleFocusMode);
@@ -62,6 +63,7 @@ function Toolbar() {
   const theme = useThemeStore((store) => store.colorScheme);
   const toggleNightMode = useThemeStore((store) => store.toggleColorScheme);
   const [isTitleVisible, setIsTitleVisible] = useState(false);
+  const onScrollTitleRef = useRef(null);
 
   const monographs = useMonographStore((store) => store.monographs);
   const { canRedo, canUndo, redo, undo } = useHistory();
@@ -91,6 +93,11 @@ function Toolbar() {
     };
   }, [isTitleVisible]);
 
+  useEffect(() => {
+    if (onScrollTitleRef.current)
+        onScrollTitleRef.current.defaultValue = title;
+  }, [title]);
+
   const tools = useMemo(
     () => [
       {
@@ -215,6 +222,7 @@ function Toolbar() {
           }}
         />
         <AnimatedInput
+          ref={onScrollTitleRef}
           variant="clean"
           ml={[2, 2, 0]}
           initial={{
@@ -227,6 +235,7 @@ function Toolbar() {
           }}
           transition={{ duration: 0.5 }}
           defaultValue={title}
+          readOnly={readonly}
           onChange={(e) => {
             AppEventManager.publish(AppEvents.changeNoteTitle, {
               title: e.target.value,

apps/web/src/components/editor/types.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Attachment } from "./picker";
+import { Attachment } from "@notesnook/editor";
 
 export type NoteStatistics = {
   words: {
@@ -33,14 +33,7 @@ export interface IEditor {
   }) => void;
   undo: () => void;
   redo: () => void;
-  getMediaHashes: () => string[];
   updateContent: (content: string) => void;
   attachFile: (file: Attachment) => void;
-  loadWebClip: (hash: string, html: string) => void;
-  loadImage: (hash: string, src: string) => void;
-  sendAttachmentProgress: (
-    hash: string,
-    type: "download" | "upload" | "encrypt",
-    progress: number
-  ) => void;
+  sendAttachmentProgress: (hash: string, progress: number) => void;
 }

apps/web/src/components/group-header/index.tsx

@@ -111,7 +111,8 @@ const sortByMenu: (options: GroupingMenuOptions) => MenuItem = (options) => ({
       {
         key: "dateCreated",
         title: "Date created",
-        isHidden: options.groupingKey === "trash"
+        isHidden:
+          options.groupingKey === "trash" || options.groupingKey === "tags"
       },
       {
         key: "dateEdited",

apps/web/src/components/note/index.tsx

@@ -305,6 +305,12 @@ const formats = [
     icon: Markdown,
     subtitle: "Can be opened in any plain-text or markdown editor."
   },
+  {
+    type: "md-frontmatter",
+    title: "Markdown + Frontmatter",
+    icon: Markdown,
+    subtitle: "Can be opened in any plain-text or markdown editor."
+  },
   {
     type: "html",
     title: "HTML",
@@ -466,7 +472,7 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
           {
             type: "button",
             key: "copy-as-text",
-            tooltip: `Export as Text`,
+            tooltip: `Copy as Text`,
             title: "Text",
             icon: Plaintext.path,
             onClick: () => copyNote(note.id, "txt")
@@ -474,7 +480,7 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
           {
             type: "button",
             key: "copy-as-markdown",
-            tooltip: `Export as Markdown`,
+            tooltip: `Copy as Markdown`,
             title: "Markdown",
             icon: Markdown.path,
             onClick: () => copyNote(note.id, "md")
@@ -533,7 +539,7 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
       icon: Trash.path,
       isDisabled:
         items.length === 1
-          ? db.monographs?.isPublished(note.id) || note.locked
+          ? db.monographs?.isPublished(note.id)
           : items.some((item) => !db.notes?.note(item.id).synced()),
       onClick: () => Multiselect.moveNotesToTrash(items, items.length > 1),
       multiSelect: true

apps/web/src/components/search/index.jsx

@@ -29,7 +29,7 @@ function SearchBox({ onSearch }) {
       id="search"
       name="search"
       type="text"
-      sx={{ m: 0, mx: 2, mt: 1 }}
+      sx={{ m: 0, mx: 2, mt: 1, mb: 1 }}
       placeholder="Type your query here"
       onChange={debounce((e) => onSearch(e.target.value), 250)}
       action={{

apps/web/src/components/status-bar/index.tsx

@@ -34,7 +34,7 @@ import {
 import { useStore as useUserStore } from "../../stores/user-store";
 import { useStore as useAppStore } from "../../stores/app-store";
 import TimeAgo from "../time-ago";
-import { hardNavigate, hashNavigate, navigate } from "../../navigation";
+import { hardNavigate, hashNavigate } from "../../navigation";
 import { useAutoUpdater, UpdateStatus } from "../../hooks/use-auto-updater";
 import {
   showIssueDialog,
@@ -67,39 +67,33 @@ function StatusBar() {
       {isFocusMode ? (
         <Flex />
       ) : (
-        <Flex>
+        <Flex sx={{ gap: 1 }}>
           {isLoggedIn ? (
             <>
-              <Button
-                onClick={() =>
-                  user?.isEmailConfirmed
-                    ? navigate("/settings")
-                    : hashNavigate("/email/verify")
-                }
-                variant="statusitem"
-                sx={{
-                  alignItems: "center",
-                  justifyContent: "center",
-                  display: "flex"
-                }}
-              >
-                <Circle
-                  size={7}
-                  color={
-                    user?.isEmailConfirmed
-                      ? "var(--icon-success)"
-                      : "var(--icon-error)"
-                  }
-                />
-                <Text
-                  className="selectable"
-                  variant="subBody"
-                  ml={1}
-                  sx={{ color: "paragraph" }}
+              {user?.isEmailConfirmed ? (
+                <Circle size={7} color={"var(--icon-success)"} />
+              ) : (
+                <Button
+                  onClick={() => hashNavigate("/email/verify")}
+                  variant="statusitem"
+                  sx={{
+                    alignItems: "center",
+                    justifyContent: "center",
+                    display: "flex",
+                    height: "100%"
+                  }}
                 >
-                  {user?.isEmailConfirmed ? "" : "Email not confirmed"}
-                </Text>
-              </Button>
+                  <Circle size={7} color={"var(--icon-error)"} />
+                  <Text
+                    className="selectable"
+                    variant="subBody"
+                    ml={1}
+                    sx={{ color: "paragraph" }}
+                  >
+                    Email not confirmed
+                  </Text>
+                </Button>
+              )}
 
               <SyncStatus />
             </>

apps/web/src/components/trash-item/index.tsx

@@ -59,7 +59,9 @@ function TrashItem(props: TrashItemProps) {
       menuItems={menuItems}
       onClick={() => {
         if (item.itemType === "note")
-          hashNavigate(`/notes/${item.id}/edit`, { replace: true });
+          !item.locked
+            ? hashNavigate(`/notes/${item.id}/edit`, { replace: true })
+            : showToast("error", "Locked notes cannot be previewed in trash.");
       }}
     />
   );

apps/web/src/dialogs/feature-dialog.tsx

@@ -89,17 +89,7 @@ const features: Record<FeatureKeys, Feature> = {
             )
           }
         ]
-      : [
-          {
-            title: "Date time shortcuts in note title",
-            subtitle:
-              "You can now use date time shortcuts (/now, /date & /time) in note & task list titles."
-          },
-          {
-            title: "Restore backups without an account",
-            subtitle: "You can now restore backups without logging in."
-          }
-        ],
+      : [],
     cta: {
       title: "Got it",
       icon: Checkmark,

apps/web/src/dialogs/onboarding-dialog.jsx

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Text, Flex, Button, Image, Box } from "@theme-ui/components";
+import { Text, Flex, Button, Image, Box, Link } from "@theme-ui/components";
 import Dialog from "../components/dialog";
 import {
   Pro,
@@ -417,9 +417,21 @@ function CrossPlatform() {
   return (
     <Flex my={4} sx={{ alignItems: "center" }}>
       {isMacStoreApp() ? null : (
-        <Image src={GooglePlay} sx={{ flexShrink: 0, width: 135 }} />
+        <Link
+          href="https://play.google.com/store/apps/details?id=com.streetwriters.notesnook"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <Image src={GooglePlay} sx={{ flexShrink: 0, width: 135 }} />
+        </Link>
       )}
-      <Image src={AppleStore} sx={{ flexShrink: 0, width: 110 }} />
+      <Link
+        href="https://apps.apple.com/us/app/notesnook-take-private-notes/id1544027013"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <Image src={AppleStore} sx={{ flexShrink: 0, width: 110 }} />
+      </Link>
     </Flex>
   );
 }

apps/web/src/dialogs/password-dialog.jsx

@@ -108,7 +108,8 @@ function PasswordDialog(props) {
               sx={{
                 fontSize: "body",
                 fontFamily: "body",
-                alignItems: "center"
+                alignItems: "center",
+                color: "paragraph"
               }}
             >
               <Checkbox id={check.key} name={check.key} />

apps/web/src/dialogs/settings/backup-export-settings.ts

@@ -67,8 +67,9 @@ export const BackupExportSettings: SettingsGroup[] = [
             type: "button",
             title: "Restore",
             action: async () => {
-              await importBackup();
-              await useAppStore.getState().refresh();
+              if (await importBackup()) {
+                await useAppStore.getState().refresh();
+              }
             },
             variant: "secondary"
           }
@@ -179,6 +180,11 @@ export const BackupExportSettings: SettingsGroup[] = [
               { value: "-", title: "Select format" },
               { value: "txt", title: "Text" },
               { value: "md", title: "Markdown", premium: true },
+              {
+                value: "md-frontmatter",
+                title: "Markdown + Frontmatter",
+                premium: true
+              },
               { value: "html", title: "HTML", premium: true }
             ],
             selectedOption: () => "-",
@@ -186,7 +192,7 @@ export const BackupExportSettings: SettingsGroup[] = [
               if (!db.notes || value === "-") return;
               if (await verifyAccount())
                 await exportNotes(
-                  value as "txt" | "md" | "html",
+                  value as "txt" | "md" | "html" | "md-frontmatter",
                   db.notes.all.map((n) => n.id)
                 );
             }

apps/web/src/dialogs/settings/behaviour-settings.ts

@@ -125,6 +125,7 @@ export const BehaviourSettings: SettingsGroup[] = [
             selectedOption: () =>
               useSettingStore.getState().trashCleanupInterval.toString(),
             options: [
+              { value: "1", title: "Daily" },
               { value: "7", title: "Weekly" },
               { value: "30", title: "Monthly" },
               { value: "365", title: "Yearly" },

apps/web/src/dialogs/settings/components/importer.tsx

@@ -75,7 +75,7 @@ export function Importer() {
         <>
           <CheckCircleOutline color="accent" sx={{ mt: 150 }} />
           <Text variant="body" my={2} sx={{ textAlign: "center" }}>
-            Import successful. {errors.length} errors occured.
+            Import completed. {errors.length} errors occured.
           </Text>
           <Button
             variant="secondary"
@@ -127,6 +127,8 @@ export function Importer() {
                 <Link
                   href="https://help.notesnook.com/importing-notes/import-notes-from-evernote"
                   target="_blank"
+                  rel="noopener noreferrer"
+                  sx={{ color: "accent" }}
                 >
                   import guide
                 </Link>{" "}
@@ -134,23 +136,25 @@ export function Importer() {
               </Text>
             </Flex>
             <Button
+              variant="accent"
               onClick={async () => {
                 setIsDone(false);
                 setIsImporting(true);
 
                 await db.syncer?.acquireLock(async () => {
                   try {
-                    for await (const {
-                      count,
-                      filesRead,
-                      totalFiles
-                    } of importFiles(files)) {
-                      if (notesCounter.current)
-                        notesCounter.current.innerText = `${count}`;
-                      if (importProgress.current)
-                        importProgress.current.style.width = `${
-                          (filesRead / totalFiles) * 100
-                        }%`;
+                    for await (const message of importFiles(files)) {
+                      switch (message.type) {
+                        case "error":
+                          setErrors((errors) => [...errors, message.error]);
+                          break;
+                        case "progress": {
+                          const { count } = message;
+                          if (notesCounter.current)
+                            notesCounter.current.innerText = `${count}`;
+                          break;
+                        }
+                      }
                     }
                   } catch (e) {
                     console.error(e);

apps/web/src/dialogs/settings/components/subscription-status.tsx

@@ -196,40 +196,27 @@ export function SubscriptionStatus() {
                 Request a refund
               </Button>
             </>
-          ) : isBasic ? (
-            <>
-              <Button
-                variant="accent"
-                onClick={async () => {
-                  showBuyDialog();
-                }}
-              >
-                Upgrade to Pro
-              </Button>
-              <Button
-                variant="secondary"
-                onClick={activateTrial}
-                sx={{ bg: "background" }}
-              >
-                {isActivatingTrial ? (
-                  <Loading size={16} />
-                ) : (
-                  "Try free for 14 days"
-                )}
-              </Button>
-            </>
-          ) : isTrial ? (
-            <>
-              <Button
-                variant="accent"
-                onClick={async () => {
-                  showBuyDialog();
-                }}
-              >
-                Upgrade to Pro
-              </Button>
-            </>
           ) : null}
+          {!isPro && (
+            <>
+              <Button variant="accent" onClick={() => showBuyDialog()}>
+                {isProCancelled ? "Resubscribe" : "Upgrade to Pro"}
+              </Button>
+              {isBasic && (
+                <Button
+                  variant="secondary"
+                  onClick={activateTrial}
+                  sx={{ bg: "background" }}
+                >
+                  {isActivatingTrial ? (
+                    <Loading size={16} />
+                  ) : (
+                    "Try free for 14 days"
+                  )}
+                </Button>
+              )}
+            </>
+          )}
         </Flex>
       </Flex>
       {isBasic ? <Features /> : null}

apps/web/src/dialogs/settings/other-settings.ts

@@ -75,16 +75,17 @@ export const AboutSettings: SettingsGroup[] = [
       {
         key: "source-code",
         title: "Source code",
-        description: "All the source code for Notesnook is available & open for everyone on GitHub.",
+        description:
+          "All the source code for Notesnook is available & open for everyone on GitHub.",
         components: [
           {
             type: "button",
             action: () => {
-                window.open(
-                  "https://github.com/streetwriters/notesnook",
-                  "_blank"
-                );
-              },
+              window.open(
+                "https://github.com/streetwriters/notesnook",
+                "_blank"
+              );
+            },
             title: "View source code",
             variant: "secondary"
           }
@@ -234,6 +235,23 @@ export const LegalSettings: SettingsGroup[] = [
             variant: "secondary"
           }
         ]
+      },
+      {
+        key: "license",
+        title: "License",
+        description: "GNU GENERAL PUBLIC LICENSE Version 3",
+        components: [
+          {
+            type: "button",
+            action: () =>
+              void window.open(
+                "https://github.com/streetwriters/notesnook/blob/master/LICENSE",
+                "_blank"
+              ),
+            title: "Read License",
+            variant: "secondary"
+          }
+        ]
       }
     ]
   }

apps/web/src/hooks/use-keyboard-list-navigation.ts

@@ -128,7 +128,7 @@ export function useKeyboardListNavigation(
           focusItemAt(nextIndex);
           return true;
         },
-        "Ctrl-a": () => {
+        "Mod-a": () => {
           resetSelection();
           for (let i = 0; i < length; ++i) select(i);
           return true;

apps/web/src/interfaces/storage.ts

@@ -70,6 +70,10 @@ export class NNStorage {
     return this.database.delete(key);
   }
 
+  removeMulti(keys: string[]) {
+    return this.database.deleteMany(keys);
+  }
+
   clear() {
     return this.database.clear();
   }

apps/web/src/navigation/hash-routes.tsx

@@ -150,5 +150,6 @@ export default hashroutes;
 export type HashRoute = keyof typeof hashroutes;
 
 function afterAction() {
-  window.location.hash = "";
+  hashNavigate("/", { replace: true, notify: false });
+  if (!history.state.replace) history.back();
 }

apps/web/src/navigation/index.ts

@@ -65,8 +65,8 @@ export function hashNavigate<TPath extends HashRoute>(
   let url: string = path;
   if (addNonce) url += `/${++lastNonce}`;
 
-  if (replace) window.history.replaceState(null, "", `#${url}`);
-  else window.history.pushState(null, "", `#${url}`);
+  if (replace) window.history.replaceState({ replace }, "", `#${url}`);
+  else window.history.pushState({ replace }, "", `#${url}`);
 
   const event = new HashChangeEvent("hashchange");
   (event as any).notify = notify;

apps/web/src/stores/app-store.js

@@ -184,7 +184,7 @@ class AppStore extends BaseStore {
 
   toggleRealtimeSync = () => {
     const { isRealtimeSyncEnabled } = this.get();
-    Config.set("realtimeSyncEnabled", !isRealtimeSyncEnabled);
+    Config.set("isRealtimeSyncEnabled", !isRealtimeSyncEnabled);
     this.set(
       (state) => (state.isRealtimeSyncEnabled = !state.isRealtimeSyncEnabled)
     );

apps/web/src/stores/attachment-store.js

@@ -24,7 +24,7 @@ import { store as editorStore } from "./editor-store";
 import { checkAttachment } from "../common/attachments";
 import { showToast } from "../utils/toast";
 import { AttachmentStream } from "../utils/streams/attachment-stream";
-import { ZipStream } from "../utils/streams/zip-stream";
+import { createZipStream } from "../utils/streams/zip-stream";
 import { createWriteStream } from "../utils/stream-saver";
 
 let abortController = undefined;
@@ -67,7 +67,7 @@ class AttachmentStore extends BaseStore {
       }
     );
     await attachmentStream
-      .pipeThrough(new ZipStream())
+      .pipeThrough(createZipStream(abortController.signal))
       .pipeTo(
         await createWriteStream("attachments.zip", {
           signal: abortController.signal

apps/web/src/utils/file-picker.ts

@@ -30,6 +30,9 @@ export function showFilePicker({
     input.setAttribute("type", "file");
     input.setAttribute("accept", acceptedFileTypes);
     input.dispatchEvent(new MouseEvent("click"));
+    input.oncancel = async function () {
+      resolve(undefined);
+    };
     input.onchange = async function () {
       if (!input.files) return resolve(undefined);
       const file = input.files[0];

apps/web/src/utils/importer.ts

@@ -18,28 +18,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { db } from "../common/db";
-import type { Note, Notebook } from "@notesnook-importer/core";
+import {
+  Note,
+  Notebook,
+  ContentType
+} from "@notesnook-importer/core/dist/src/models";
 import {
   ATTACHMENTS_DIRECTORY_NAME,
   NOTE_DATA_FILENAME
 } from "@notesnook-importer/core/dist/src/utils/note-stream";
-import { Cipher } from "@notesnook/crypto/dist/src/types";
-import { Reader, Entry } from "./zip-reader";
 import { path } from "@notesnook-importer/core/dist/src/utils/path";
+import { ZipEntry, createUnzipIterator } from "./streams/unzip-stream";
 
 export async function* importFiles(zipFiles: File[]) {
-  const { default: FS } = await import("../interfaces/fs");
   for (const zip of zipFiles) {
     let count = 0;
     let filesRead = 0;
 
-    const attachments: Record<
-      string,
-      Omit<Cipher, "cipher" | "format"> & { key: any; chunkSize: number }
-    > = {};
-    const { read, totalFiles } = await Reader(zip);
+    const attachments: Record<string, any> = {};
 
-    for await (const entry of read()) {
+    for await (const entry of createUnzipIterator(zip)) {
       ++filesRead;
 
       const isAttachment = entry.name.includes(
@@ -47,52 +45,70 @@ export async function* importFiles(zipFiles: File[]) {
       );
       const isNote = !isAttachment && entry.name.endsWith(NOTE_DATA_FILENAME);
 
-      if (isAttachment) {
-        const name = path.basename(entry.name);
-        if (!name || attachments[name] || db.attachments?.exists(name))
-          continue;
-
-        const data = await entry.arrayBuffer();
-        const { hash } = await FS.hashBuffer(new Uint8Array(data));
-        if (hash !== name) {
-          throw new Error(`integrity check failed: ${name} !== ${hash}`);
+      try {
+        if (isAttachment) {
+          await processAttachment(entry, attachments);
+        } else if (isNote) {
+          await processNote(entry, attachments);
+          ++count;
         }
-
-        const file = new File([data], name, {
-          type: "application/octet-stream"
-        });
-        const key = await db.attachments?.generateKey();
-        const cipherData = await FS.writeEncryptedFile(file, key, name);
-        attachments[name] = { ...cipherData, key };
-      } else if (isNote) {
-        const note = await fileToJson<Note>(entry);
-        for (const attachment of note.attachments || []) {
-          const cipherData = attachments[attachment.hash];
-          if (!cipherData || db.attachments?.exists(attachment.hash)) continue;
-
-          await db.attachments?.add({
-            ...cipherData,
-            hash: attachment.hash,
-            hashType: attachment.hashType,
-            filename: attachment.filename,
-            type: attachment.mime
-          });
-        }
-        await importNote(note);
-
-        ++count;
+      } catch (e) {
+        if (e instanceof Error) yield { type: "error" as const, error: e };
       }
 
       yield {
+        type: "progress" as const,
         count,
-        totalFiles,
         filesRead
       };
     }
   }
 }
 
-async function importNote(note: Note) {
+async function processAttachment(
+  entry: ZipEntry,
+  attachments: Record<string, any>
+) {
+  const name = path.basename(entry.name);
+  if (!name || attachments[name] || db.attachments?.exists(name)) return;
+
+  const { default: FS } = await import("../interfaces/fs");
+
+  const data = await entry.arrayBuffer();
+  const { hash } = await FS.hashBuffer(new Uint8Array(data));
+  if (hash !== name) {
+    throw new Error(`integrity check failed: ${name} !== ${hash}`);
+  }
+
+  const file = new File([data], name, {
+    type: "application/octet-stream"
+  });
+  const key = await db.attachments?.generateKey();
+  const cipherData = await FS.writeEncryptedFile(file, key, name);
+  attachments[name] = { ...cipherData, key };
+}
+
+async function processNote(entry: ZipEntry, attachments: Record<string, any>) {
+  const note = await fileToJson<Note>(entry);
+  for (const attachment of note.attachments || []) {
+    const cipherData = attachments[attachment.hash];
+    if (!cipherData || db.attachments?.exists(attachment.hash)) continue;
+
+    await db.attachments?.add({
+      ...cipherData,
+      hash: attachment.hash,
+      hashType: attachment.hashType,
+      filename: attachment.filename,
+      type: attachment.mime
+    });
+  }
+
+  if (!note.content)
+    note.content = {
+      data: "<p></p>",
+      type: ContentType.HTML
+    };
+
   if (note.content?.type === "html") (note.content.type as string) = "tiptap";
   else throw new Error("Invalid content type: " + note.content?.type);
 
@@ -101,7 +117,7 @@ async function importNote(note: Note) {
   const noteId = await db.notes?.add(note);
 
   for (const nb of notebooks) {
-    const notebook = await importNotebook(nb);
+    const notebook = await importNotebook(nb).catch(() => ({ id: undefined }));
     if (!notebook.id) continue;
     await db.notes?.addToNotebook(
       { id: notebook.id, topic: notebook.topic },
@@ -110,7 +126,7 @@ async function importNote(note: Note) {
   }
 }
 
-async function fileToJson<T>(file: Entry) {
+async function fileToJson<T>(file: ZipEntry) {
   const text = await file.text();
   return JSON.parse(text) as T;
 }
@@ -126,9 +142,10 @@ async function importNotebook(
       title: notebook.notebook,
       topics: notebook.topic ? [notebook.topic] : []
     });
-    nb = db.notebooks?.notebook(nbId).data;
+    nb = db.notebooks?.notebook(nbId)?.data;
+    if (!nb) return {};
   }
-  const topic = nb?.topics.find((t: any) => t.title === notebook.topic);
 
+  const topic = nb.topics.find((t: any) => t.title === notebook.topic);
   return { id: nb ? nb.id : undefined, topic: topic ? topic.id : undefined };
 }

apps/web/src/utils/logger.ts

@@ -23,27 +23,36 @@ import {
   logManager
 } from "@notesnook/core/dist/logger";
 import { LogMessage } from "@notesnook/logger";
-import FileSaver from "file-saver";
 import { DatabasePersistence, NNStorage } from "../interfaces/storage";
-import { zip } from "./zip";
+import { ZipFile, createZipStream } from "./streams/zip-stream";
+import { createWriteStream } from "./stream-saver";
 
 let logger: typeof _logger;
 async function initalizeLogger(persistence: DatabasePersistence = "db") {
-  initalize(await NNStorage.createInstance("Logs", persistence));
+  initalize(await NNStorage.createInstance("Logs", persistence), false);
   logger = _logger.scope("notesnook-web");
 }
 
 async function downloadLogs() {
   if (!logManager) return;
   const allLogs = await logManager.get();
-  const files = allLogs.map((log) => ({
-    filename: log.key,
-    content: (log.logs as LogMessage[])
-      .map((line) => JSON.stringify(line))
-      .join("\n")
-  }));
-  const archive = await zip(files, "log");
-  FileSaver.saveAs(new Blob([archive.buffer]), "notesnook-logs.zip");
+  const textEncoder = new TextEncoder();
+  await new ReadableStream<ZipFile>({
+    pull(controller) {
+      for (const log of allLogs) {
+        controller.enqueue({
+          path: log.key,
+          data: textEncoder.encode(
+            (log.logs as LogMessage[])
+              .map((line) => JSON.stringify(line))
+              .join("\n")
+          )
+        });
+      }
+    }
+  })
+    .pipeThrough(createZipStream())
+    .pipeTo(await createWriteStream("notesnook-logs.zip"));
 }
 
 async function clearLogs() {

apps/web/src/utils/streams/attachment-stream.ts

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { db } from "../../common/db";
 import { lazify } from "../lazify";
+import { makeUniqueFilename } from "./utils";
 import { ZipFile } from "./zip-stream";
 
 export const METADATA_FILENAME = "metadata.json";
@@ -84,17 +85,3 @@ export class AttachmentStream extends ReadableStream<ZipFile> {
     });
   }
 }
-
-function makeUniqueFilename(
-  filePath: string,
-  counters: Record<string, number>
-) {
-  filePath = filePath.toLowerCase();
-  counters[filePath] = (counters[filePath] || 0) + 1;
-  if (counters[filePath] === 1) return filePath;
-
-  const parts = filePath.split(".");
-  return `${parts.slice(0, -1).join(".")}-${counters[filePath]}.${
-    parts[parts.length - 1]
-  }`;
-}

apps/web/src/utils/streams/export-stream.ts

@@ -0,0 +1,115 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { sanitizeFilename } from "@notesnook/common";
+import { db } from "../../common/db";
+import { exportToPDF } from "../../common/export";
+import Vault from "../../common/vault";
+import { showToast } from "../toast";
+import { makeUniqueFilename } from "./utils";
+import { ZipFile } from "./zip-stream";
+
+const FORMAT_TO_EXT = {
+  pdf: "pdf",
+  md: "md",
+  txt: "txt",
+  html: "html",
+  "md-frontmatter": "md"
+} as const;
+
+export class ExportStream extends ReadableStream<ZipFile> {
+  constructor(
+    noteIds: string[],
+    format: "pdf" | "md" | "txt" | "html" | "md-frontmatter",
+    signal?: AbortSignal,
+    onProgress?: (current: number, text: string) => void
+  ) {
+    const textEncoder = new TextEncoder();
+    let index = 0;
+    const counters: Record<string, number> = {};
+    let vaultUnlocked = false;
+
+    super({
+      async start() {
+        if (noteIds.length === 1 && db.notes?.note(noteIds[0])?.data.locked) {
+          vaultUnlocked = await Vault.unlockVault();
+          if (!vaultUnlocked) return false;
+        } else if (noteIds.length > 1 && (await db.vault?.exists())) {
+          vaultUnlocked = await Vault.unlockVault();
+          if (!vaultUnlocked)
+            showToast(
+              "error",
+              "Failed to unlock vault. Locked notes will be skipped."
+            );
+        }
+      },
+      async pull(controller) {
+        if (signal?.aborted) {
+          controller.close();
+          return;
+        }
+
+        const note = db.notes?.note(noteIds[index++]);
+        if (!note) return;
+        if (!vaultUnlocked && note.data.locked) return;
+
+        onProgress && onProgress(index, `Exporting "${note.title}"...`);
+
+        const rawContent = await db.content?.raw(note.data.contentId);
+        const content = note.data.locked
+          ? await db.vault?.decryptContent(rawContent)
+          : rawContent;
+
+        const exported = await note
+          .export(format === "pdf" ? "html" : format, content)
+          .catch((e: Error) => {
+            console.error(note.data, e);
+            showToast(
+              "error",
+              `Failed to export note "${note.title}": ${e.message}`
+            );
+          });
+
+        if (typeof exported !== "string") {
+          showToast("error", `Failed to export note "${note.title}"`);
+          return;
+        }
+
+        if (format === "pdf") {
+          await exportToPDF(note.title, exported);
+          controller.close();
+          return;
+        }
+
+        const filename = sanitizeFilename(note.title, { replacement: "-" });
+        const ext = FORMAT_TO_EXT[format];
+        controller.enqueue({
+          path: makeUniqueFilename([filename, ext].join("."), counters),
+          data: textEncoder.encode(exported),
+          mtime: new Date(note.data.dateEdited),
+          ctime: new Date(note.data.dateCreated)
+        });
+
+        if (index === noteIds.length) {
+          controller.close();
+        }
+      }
+    });
+  }
+}

apps/web/src/utils/streams/fflate-shim.js

@@ -0,0 +1,101 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { Deflate as FflateDeflate, Inflate as FflateInflate } from "fflate";
+
+function initShimAsyncCodec(library, options = {}, registerDataHandler) {
+  return {
+    Deflate: createCodecClass(
+      library.Deflate,
+      options.deflate,
+      registerDataHandler
+    ),
+    Inflate: createCodecClass(
+      library.Inflate,
+      options.inflate,
+      registerDataHandler
+    )
+  };
+}
+
+function objectHasOwn(object, propertyName) {
+  // eslint-disable-next-line no-prototype-builtins
+  return typeof Object.hasOwn === "function"
+    ? Object.hasOwn(object, propertyName)
+    : // eslint-disable-next-line no-prototype-builtins
+      object.hasOwnProperty(propertyName);
+}
+
+function createCodecClass(
+  constructor,
+  constructorOptions,
+  registerDataHandler
+) {
+  return class {
+    constructor(options) {
+      // eslint-disable-next-line @typescript-eslint/no-this-alias
+      const codecAdapter = this;
+      const onData = (data) => {
+        if (codecAdapter.pendingData) {
+          const previousPendingData = codecAdapter.pendingData;
+          codecAdapter.pendingData = new Uint8Array(
+            previousPendingData.length + data.length
+          );
+          const { pendingData } = codecAdapter;
+          pendingData.set(previousPendingData, 0);
+          pendingData.set(data, previousPendingData.length);
+        } else {
+          codecAdapter.pendingData = new Uint8Array(data);
+        }
+      };
+      if (objectHasOwn(options, "level") && options.level === undefined) {
+        delete options.level;
+      }
+      codecAdapter.codec = new constructor(
+        Object.assign({}, constructorOptions, options)
+      );
+      registerDataHandler(codecAdapter.codec, onData);
+    }
+    append(data) {
+      this.codec.push(data);
+      return getResponse(this);
+    }
+    flush() {
+      this.codec.push(new Uint8Array(), true);
+      return getResponse(this);
+    }
+  };
+
+  function getResponse(codec) {
+    if (codec.pendingData) {
+      const output = codec.pendingData;
+      codec.pendingData = null;
+      return output;
+    } else {
+      return new Uint8Array();
+    }
+  }
+}
+
+const { Deflate, Inflate } = initShimAsyncCodec(
+  { Deflate: FflateDeflate, Inflate: FflateInflate },
+  undefined,
+  (codec, onData) => (codec.ondata = onData)
+);
+export { Deflate, Inflate };

apps/web/src/utils/streams/unzip-stream.ts

@@ -0,0 +1,77 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { Deflate, Inflate } from "./fflate-shim";
+import {
+  Entry,
+  TextWriter,
+  Uint8ArrayWriter,
+  ZipReader,
+  configure
+} from "@zip.js/zip.js";
+
+configure({ Deflate, Inflate });
+
+export async function* createUnzipIterator(file: File) {
+  const reader = new ZipReader(file.stream());
+  for await (const entry of reader.getEntriesGenerator()) {
+    yield new ZipEntry(entry);
+  }
+  await reader.close();
+}
+
+export class ZipEntry extends Blob {
+  private ts = new TransformStream();
+  constructor(public readonly entry: Entry) {
+    super();
+  }
+
+  stream(): ReadableStream<Uint8Array> {
+    this.entry.getData?.(this.ts.writable);
+    return this.ts.readable;
+  }
+
+  async text(): Promise<string> {
+    const writer = new TextWriter("utf-8");
+    await this.entry.getData?.(writer);
+    return await writer.getData();
+  }
+
+  get size() {
+    return this.entry.uncompressedSize;
+  }
+
+  get name() {
+    return this.entry.filename;
+  }
+
+  async arrayBuffer(): Promise<ArrayBuffer> {
+    const writer = new Uint8ArrayWriter();
+    await this.entry.getData?.(writer);
+    return (await writer.getData()).buffer;
+  }
+
+  slice(
+    _start?: number | undefined,
+    _end?: number | undefined,
+    _contentType?: string | undefined
+  ): Blob {
+    throw new Error("Slice is not supported.");
+  }
+}

apps/web/src/utils/streams/utils.ts

@@ -0,0 +1,32 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+export function makeUniqueFilename(
+  filePath: string,
+  counters: Record<string, number>
+) {
+  filePath = filePath.toLowerCase();
+  counters[filePath] = (counters[filePath] || 0) + 1;
+  if (counters[filePath] === 1) return filePath;
+
+  const parts = filePath.split(".");
+  return `${parts.slice(0, -1).join(".")}-${counters[filePath]}.${
+    parts[parts.length - 1]
+  }`;
+}

apps/web/src/utils/streams/zip-stream.ts

@@ -17,32 +17,51 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Zip, ZipDeflate } from "fflate";
+import { Deflate, Inflate } from "./fflate-shim";
+import { Uint8ArrayReader, ZipWriter, configure } from "@zip.js/zip.js";
 
-export type ZipFile = { path: string; data: Uint8Array };
-export class ZipStream extends TransformStream<ZipFile, Uint8Array> {
-  constructor() {
-    const zipper = new Zip();
-    super({
-      start(controller) {
-        zipper.ondata = (err, data) => {
-          if (err) {
-            controller.error(err);
-          } else controller.enqueue(data);
-        };
-      },
-      transform(chunk) {
-        const fileStream = new ZipDeflate(chunk.path, {
-          level: 5,
-          mem: 8
+configure({ Deflate, Inflate });
+
+export type ZipFile = {
+  path: string;
+  data: Uint8Array;
+  mtime?: Date;
+  ctime?: Date;
+};
+
+export function createZipStream(signal?: AbortSignal) {
+  const written = new Set<string>();
+  const ts = new TransformStream<Uint8Array, Uint8Array>();
+  const writer = new ZipWriter<Uint8Array>(ts.writable, {
+    zip64: true,
+    signal
+  });
+  const entryWriter = new WritableStream<ZipFile>({
+    start() {},
+    async write(chunk, c) {
+      // zip.js doesn't support overwriting files.
+      if (written.has(chunk.path)) return;
+
+      await writer
+        .add(chunk.path, new Uint8ArrayReader(chunk.data), {
+          creationDate: chunk.ctime,
+          lastModDate: chunk.mtime
+        })
+        .catch(async (e) => {
+          await ts.writable.abort(e);
+          await ts.readable.cancel(e);
+          c.error(e);
         });
-        zipper.add(fileStream);
-        fileStream.push(chunk.data, true);
-      },
-      flush() {
-        zipper.end();
-        zipper.terminate();
-      }
-    });
-  }
+      written.add(chunk.path);
+    },
+    async close() {
+      await writer.close();
+      await ts.writable.close();
+    },
+    async abort(reason) {
+      await ts.writable.abort(reason);
+      await ts.readable.cancel(reason);
+    }
+  });
+  return { writable: entryWriter, readable: ts.readable };
 }

apps/web/src/utils/zip-reader.ts

@@ -1,418 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/* eslint-disable no-underscore-dangle */
-/**
- * Conflux
- * Read (and build) zip files with whatwg streams in the browser.
- *
- * @author Transcend Inc. <https://transcend.io>
- * @license MIT
- */
-
-import { Inflate } from "fflate";
-
-const ERR_BAD_FORMAT = "File format is not recognized.";
-const ZIP_COMMENT_MAX = 65536;
-const EOCDR_MIN = 22;
-const EOCDR_MAX = EOCDR_MIN + ZIP_COMMENT_MAX;
-const MAX_VALUE_32BITS = 0xffffffff;
-
-const decoder = new TextDecoder();
-const uint16e = (b: Uint8Array, n: number) => b[n] | (b[n + 1] << 8);
-
-export class Entry {
-  private dataView: DataView;
-  private _fileLike: File;
-  private _extraFields: Record<string, DataView>;
-  constructor(dataView: DataView, fileLike: File) {
-    if (dataView.getUint32(0) !== 0x504b0102) {
-      throw new Error("ERR_BAD_FORMAT");
-    }
-
-    const dv = dataView;
-
-    this.dataView = dv;
-    this._fileLike = fileLike;
-    this._extraFields = {};
-
-    for (let i = 46 + this.filenameLength; i < dv.byteLength; ) {
-      const id = dv.getUint16(i, true);
-      const len = dv.getUint16(i + 2, true);
-      const start = dv.byteOffset + i + 4;
-      this._extraFields[id] = new DataView(dv.buffer.slice(start, start + len));
-      i += len + 4;
-    }
-  }
-  get webkitRelativePath(): string {
-    return this.name;
-  }
-
-  get type(): string {
-    return "application/octet-stream";
-  }
-
-  get versionMadeBy() {
-    return this.dataView.getUint16(4, true);
-  }
-
-  get versionNeeded() {
-    return this.dataView.getUint16(6, true);
-  }
-
-  get bitFlag() {
-    return this.dataView.getUint16(8, true);
-  }
-
-  get encrypted() {
-    return (this.bitFlag & 0x0001) === 0x0001;
-  }
-
-  get compressionMethod() {
-    return this.dataView.getUint16(10, true);
-  }
-
-  get crc32() {
-    return this.dataView.getUint32(16, true);
-  }
-
-  get compressedSize() {
-    return this.dataView.getUint32(20, true);
-  }
-
-  get filenameLength() {
-    return this.dataView.getUint16(28, true);
-  }
-
-  get extraFieldLength() {
-    return this.dataView.getUint16(30, true);
-  }
-
-  get commentLength() {
-    return this.dataView.getUint16(32, true);
-  }
-
-  get diskNumberStart() {
-    return this.dataView.getUint16(34, true);
-  }
-
-  get internalFileAttributes() {
-    return this.dataView.getUint16(36, true);
-  }
-
-  get externalFileAttributes() {
-    return this.dataView.getUint32(38, true);
-  }
-
-  get directory() {
-    return !!(this.dataView.getUint8(38) & 16);
-  }
-
-  get offset() {
-    return this.dataView.getUint32(42, true);
-  }
-
-  get zip64() {
-    return this.dataView.getUint32(24, true) === MAX_VALUE_32BITS;
-  }
-
-  get comment() {
-    const dv = this.dataView;
-    const uint8 = new Uint8Array(
-      dv.buffer,
-      dv.byteOffset + this.filenameLength + this.extraFieldLength + 46,
-      this.commentLength
-    );
-    return decoder.decode(uint8);
-  }
-
-  // File like IDL methods
-  get lastModifiedDate() {
-    const t = this.dataView.getUint32(12, true);
-
-    return new Date(
-      // Date.UTC(
-      ((t >> 25) & 0x7f) + 1980, // year
-      ((t >> 21) & 0x0f) - 1, // month
-      (t >> 16) & 0x1f, // day
-      (t >> 11) & 0x1f, // hour
-      (t >> 5) & 0x3f, // minute
-      (t & 0x1f) << 1
-      // ),
-    );
-  }
-
-  get lastModified() {
-    return +this.lastModifiedDate;
-  }
-
-  get name() {
-    if (!this.bitFlag && this._extraFields && this._extraFields[0x7075]) {
-      return decoder.decode(this._extraFields[0x7075].buffer.slice(5));
-    }
-
-    const dv = this.dataView;
-    const uint8 = new Uint8Array(
-      dv.buffer,
-      dv.byteOffset + 46,
-      this.filenameLength
-    );
-    return decoder.decode(uint8);
-  }
-
-  get size() {
-    const size = this.dataView.getUint32(24, true);
-    return size === MAX_VALUE_32BITS ? this._extraFields[1].getUint8(0) : size;
-  }
-
-  stream() {
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const self = this;
-
-    const crc = new Crc32();
-    let inflator: Inflate | undefined;
-    const onEnd = (ctrl: ReadableStreamController<Uint8Array>) =>
-      crc.get() === self.crc32
-        ? ctrl.close()
-        : ctrl.error(new Error("The crc32 checksum don't match"));
-
-    return new ReadableStream<Uint8Array>({
-      async start(ctrl) {
-        // Need to read local header to get fileName + extraField length
-        // Since they are not always the same length as in central dir...
-        const ab = await self._fileLike
-          .slice(self.offset + 26, self.offset + 30)
-          .arrayBuffer();
-
-        const bytes = new Uint8Array(ab);
-        const localFileOffset = uint16e(bytes, 0) + uint16e(bytes, 2) + 30;
-        const start = self.offset + localFileOffset;
-        const end = start + self.compressedSize;
-        (this as any).reader = self._fileLike
-          .slice(start, end)
-          .stream()
-          .getReader();
-
-        if (self.compressionMethod) {
-          inflator = new Inflate();
-          inflator.ondata = (chunk, final) => {
-            crc.append(chunk);
-            ctrl.enqueue(chunk);
-            if (final) onEnd(ctrl);
-          };
-        }
-      },
-      async pull(ctrl) {
-        const v = await (this as any).reader.read();
-        if (inflator && !v.done) {
-          inflator.push(v.value);
-        } else if (v.done) {
-          onEnd(ctrl);
-        } else {
-          ctrl.enqueue(v.value);
-          crc.append(v.value);
-        }
-      }
-    });
-  }
-
-  arrayBuffer() {
-    return new Response(this.stream()).arrayBuffer().catch((e) => {
-      throw new Error(`Failed to read Entry\n${e}`);
-    });
-  }
-
-  text() {
-    return new Response(this.stream()).text().catch((e) => {
-      throw new Error(`Failed to read Entry\n${e}`);
-    });
-  }
-
-  file() {
-    return new Response(this.stream())
-      .blob()
-      .then(
-        (blob) =>
-          new File([blob], this.name, { lastModified: this.lastModified })
-      )
-      .catch((e) => {
-        throw new Error(`Failed to read Entry\n${e}`);
-      });
-  }
-}
-
-/**
- * Get a BigInt 64 from a DataView
- *
- * @param {DataView} view a dataview
- * @param {number} position the position
- * @param {boolean} littleEndian whether this uses littleEndian encoding
- * @returns BigInt
- */
-function getBigInt64(view: DataView, position: number, littleEndian = false) {
-  if ("getBigInt64" in DataView.prototype) {
-    return view.getBigInt64(position, littleEndian);
-  }
-
-  let value = BigInt(0);
-  const isNegative =
-    (view.getUint8(position + (littleEndian ? 7 : 0)) & 0x80) > 0;
-  let carrying = true;
-
-  for (let i = 0; i < 8; i++) {
-    let byte = view.getUint8(position + (littleEndian ? i : 7 - i));
-
-    if (isNegative) {
-      if (carrying) {
-        if (byte !== 0x00) {
-          byte = ~(byte - 1) & 0xff;
-          carrying = false;
-        }
-      } else {
-        byte = ~byte & 0xff;
-      }
-    }
-
-    value = value + BigInt(byte) + BigInt(256) ** BigInt(i);
-  }
-
-  if (isNegative) {
-    value = -value;
-  }
-
-  return value;
-}
-
-export async function Reader(file: File) {
-  // Seek EOCDR - "End of central directory record" is the last part of a zip archive, and is at least 22 bytes long.
-  // Zip file comment is the last part of EOCDR and has max length of 64KB,
-  // so we only have to search the last 64K + 22 bytes of a archive for EOCDR signature (0x06054b50).
-  if (file.size < EOCDR_MIN) throw new Error(ERR_BAD_FORMAT);
-
-  // seek last length bytes of file for EOCDR
-  async function doSeek(length: number) {
-    const ab = await file.slice(file.size - length).arrayBuffer();
-    const bytes = new Uint8Array(ab);
-    for (let i = bytes.length - EOCDR_MIN; i >= 0; i--) {
-      if (
-        bytes[i] === 0x50 &&
-        bytes[i + 1] === 0x4b &&
-        bytes[i + 2] === 0x05 &&
-        bytes[i + 3] === 0x06
-      ) {
-        return new DataView(bytes.buffer, i, EOCDR_MIN);
-      }
-    }
-
-    return null;
-  }
-
-  // In most cases, the EOCDR is EOCDR_MIN bytes long
-  let dv =
-    (await doSeek(EOCDR_MIN)) || (await doSeek(Math.min(EOCDR_MAX, file.size)));
-
-  if (!dv) throw new Error(ERR_BAD_FORMAT);
-
-  let fileslength = dv.getUint16(8, true);
-  let centralDirSize = dv.getUint32(12, true);
-  let centralDirOffset = dv.getUint32(16, true);
-  // const fileCommentLength = dv.getUint16(20, true);
-
-  const isZip64 = centralDirOffset === MAX_VALUE_32BITS;
-
-  if (isZip64) {
-    const l = -dv.byteLength - 20;
-    dv = new DataView(await file.slice(l, -dv.byteLength).arrayBuffer());
-
-    // const signature = dv.getUint32(0, true) // 4 bytes
-    // const diskWithZip64CentralDirStart = dv.getUint32(4, true) // 4 bytes
-    const relativeOffsetEndOfZip64CentralDir = Number(getBigInt64(dv, 8, true)); // 8 bytes
-    // const numberOfDisks = dv.getUint32(16, true) // 4 bytes
-
-    const zip64centralBlob = file.slice(relativeOffsetEndOfZip64CentralDir, l);
-    dv = new DataView(await zip64centralBlob.arrayBuffer());
-    // const zip64EndOfCentralSize = dv.getBigInt64(4, true)
-    // const diskNumber = dv.getUint32(16, true)
-    // const diskWithCentralDirStart = dv.getUint32(20, true)
-    // const centralDirRecordsOnThisDisk = dv.getBigInt64(24, true)
-    fileslength = Number(getBigInt64(dv, 32, true));
-    centralDirSize = Number(getBigInt64(dv, 40, true));
-    centralDirOffset = Number(getBigInt64(dv, 48, true));
-  }
-
-  if (centralDirOffset < 0 || centralDirOffset >= file.size) {
-    throw new Error(ERR_BAD_FORMAT);
-  }
-
-  const start = centralDirOffset;
-  const end = centralDirOffset + centralDirSize;
-  const blob = file.slice(start, end);
-  const bytes = new Uint8Array(await blob.arrayBuffer());
-
-  async function* read() {
-    for (let i = 0, index = 0; i < fileslength; i++) {
-      const size =
-        uint16e(bytes, index + 28) + // filenameLength
-        uint16e(bytes, index + 30) + // extraFieldLength
-        uint16e(bytes, index + 32) + // commentLength
-        46;
-
-      if (index + size > bytes.length) {
-        throw new Error("Invalid ZIP file.");
-      }
-
-      yield new Entry(new DataView(bytes.buffer, index, size), file);
-
-      index += size;
-    }
-  }
-
-  return { read, totalFiles: fileslength };
-}
-
-/* eslint-disable no-param-reassign */
-class Crc32 {
-  crc: number;
-  constructor() {
-    this.crc = -1;
-  }
-
-  append(data: Uint8Array) {
-    let crc = this.crc | 0;
-    const { table } = this;
-    for (let offset = 0, len = data.length | 0; offset < len; offset++) {
-      crc = (crc >>> 8) ^ table[(crc ^ data[offset]) & 0xff];
-    }
-    this.crc = crc;
-  }
-
-  get() {
-    return (this.crc ^ -1) >>> 0;
-  }
-
-  private table = ((table: number[], i: number, j: number, t: number) => {
-    for (i = 0; i < 256; i++) {
-      t = i;
-      for (j = 0; j < 8; j++) {
-        t = t & 1 ? (t >>> 1) ^ 0xedb88320 : t >>> 1;
-      }
-      table[i] = t;
-    }
-    return table;
-  })([], 0, 0, 0);
-}

apps/web/src/utils/zip.ts

@@ -1,48 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { AsyncZippable, zip as zipAsync } from "fflate";
-import { sanitizeFilename } from "@notesnook/common";
-
-const textEncoder = new TextEncoder();
-type File = { filename: string; content: string; date: number };
-async function zip(files: File[], format: string): Promise<Uint8Array> {
-  const obj: AsyncZippable = Object.create(null);
-  files.forEach((file) => {
-    const name = sanitizeFilename(file.filename, { replacement: "-" });
-    let counter = 0;
-    while (obj[makeFilename(name, format, counter)]) ++counter;
-
-    obj[makeFilename(name, format, counter)] = [
-      textEncoder.encode(file.content),
-      { mtime: file.date }
-    ];
-  });
-  return new Promise((resolve, reject) =>
-    zipAsync(obj, (err, data) => (err ? reject(err) : resolve(data)))
-  );
-}
-export { zip };
-
-function makeFilename(filename: string, extension: string, counter: number) {
-  let final = filename;
-  if (counter) final += `-${counter}`;
-  final += `.${extension}`;
-  return final;
-}

docs/help/contents/organizing-notes/organize-notes-using-notebooks.md

@@ -210,7 +210,7 @@ In Notesnook, one note can belong to multiple notebooks & topics. This allows fo
 
 1. Go to `Notebooks`
 2. Press the ![Three dot button](/three-dot-button.png) button.
-3. Press `Move to trash` to delete the topic.
+3. Press `Move to trash` to delete the notebook.
 4. Select whether you also want to delete the notes inside this notebook.
 
 ---

fastlane/metadata/android/en-US/changelogs/10364.txt

@@ -0,0 +1,5 @@
+- Added support for markdown with frontmatter in exports
+- Fixed a bug that would randomly cause the app to freeze on launch after using the app for some days.
+- Bug fixes and performance improvements
+
+Thank you for using Notesnook!

fastlane/metadata/android/en-US/changelogs/10369.txt

@@ -0,0 +1,6 @@
+- Added support to check/uncheck all items in a checklist
+- Now you can open pdfs/images in readonly mode
+- Fixed a bug where users are unable to login when app lock is enabled
+- Bug fixes and performance improvements
+
+Thank you for using Notesnook!

fastlane/metadata/android/en-US/changelogs/10374.txt

@@ -0,0 +1,3 @@
+- Bug fixes and performance improvements
+
+Thank you for using Notesnook!

packages/common/package-lock.json

@@ -31,7 +31,7 @@
         "@microsoft/signalr": "^7.0.10",
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@streetwriters/showdown": "^3.0.2-alpha",
         "async-mutex": "^0.3.2",
         "dayjs": "1.11.9",
         "entities": "^4.3.1",
@@ -147,7 +147,7 @@
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/crypto": "file:../crypto",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@streetwriters/showdown": "^3.0.2-alpha",
         "@types/html-to-text": "^9.0.0",
         "@types/katex": "^0.16.1",
         "@types/prismjs": "^1.26.0",

packages/core/package-lock.json

@@ -12,7 +12,8 @@
         "@microsoft/signalr": "^7.0.10",
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@readme/data-urls": "^3.0.0",
+        "@streetwriters/showdown": "^3.0.4-alpha",
         "async-mutex": "^0.3.2",
         "dayjs": "1.11.9",
         "entities": "^4.3.1",
@@ -31,7 +32,7 @@
         "@types/html-to-text": "^9.0.0",
         "@types/katex": "^0.16.1",
         "@types/prismjs": "^1.26.0",
-        "@types/showdown": "^2.0.0",
+        "@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6",
         "@vitest/coverage-v8": "^0.34.1",
         "abortcontroller-polyfill": "^1.7.3",
         "cross-env": "^7.0.3",
@@ -576,6 +577,14 @@
         "@otplib/plugin-thirty-two": "^12.0.1"
       }
     },
+    "node_modules/@readme/data-urls": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@readme/data-urls/-/data-urls-3.0.0.tgz",
+      "integrity": "sha512-b0L7VWqbLZqOSSAFUrxS5ZwUfec35WDsAwwCH481vYnhk0dWO3nvmNVNCbP8CY4cXqwL1W4uCAnhDz+CUmXM3g==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@selderee/plugin-htmlparser2": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz",
@@ -589,9 +598,9 @@
       }
     },
     "node_modules/@streetwriters/showdown": {
-      "version": "3.0.1-alpha.2",
-      "resolved": "https://registry.npmjs.org/@streetwriters/showdown/-/showdown-3.0.1-alpha.2.tgz",
-      "integrity": "sha512-GkIDQlcvJVVMgp1J5H5upiRr2hZQJAJK6gnDzOjvJAflKO4gV96xCq4RFakwahLLhL7uQ8Yx10qtmrtBuJMsEw==",
+      "version": "3.0.4-alpha",
+      "resolved": "https://registry.npmjs.org/@streetwriters/showdown/-/showdown-3.0.4-alpha.tgz",
+      "integrity": "sha512-R2UJzMXyJz312RxekXGQIQvLsdZ0eSa4Z7dRXzf/fL2XsPPtyEzkZce0RoZn/mmKfDym5XKnjcVxnF3hXgjVaw==",
       "bin": {
         "showdown": "bin/showdown.js"
       },
@@ -663,10 +672,11 @@
       "integrity": "sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==",
       "dev": true
     },
-    "node_modules/@types/showdown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/showdown/-/showdown-2.0.0.tgz",
-      "integrity": "sha512-70xBJoLv+oXjB5PhtA8vo7erjLDp9/qqI63SRHm4REKrwuPOLs8HhXwlZJBJaB4kC18cCZ1UUZ6Fb/PLFW4TCA==",
+    "node_modules/@types/streetwriters__showdown": {
+      "name": "@types/showdown",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/showdown/-/showdown-2.0.6.tgz",
+      "integrity": "sha512-pTvD/0CIeqe4x23+YJWlX2gArHa8G0J0Oh6GKaVXV7TAeickpkkZiNOgFcFcmLQ5lB/K0qBJL1FtRYltBfbGCQ==",
       "dev": true
     },
     "node_modules/@types/unist": {
@@ -1176,20 +1186,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/data-urls": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/dayjs": {
       "version": "1.11.9",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
@@ -1788,6 +1784,20 @@
         }
       }
     },
+    "node_modules/jsdom/node_modules/data-urls": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
+      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^12.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/jsdom/node_modules/ws": {
       "version": "8.13.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
@@ -2269,9 +2279,9 @@
       "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "engines": {
         "node": ">=6"
       }
@@ -3253,6 +3263,11 @@
         "@otplib/plugin-thirty-two": "^12.0.1"
       }
     },
+    "@readme/data-urls": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@readme/data-urls/-/data-urls-3.0.0.tgz",
+      "integrity": "sha512-b0L7VWqbLZqOSSAFUrxS5ZwUfec35WDsAwwCH481vYnhk0dWO3nvmNVNCbP8CY4cXqwL1W4uCAnhDz+CUmXM3g=="
+    },
     "@selderee/plugin-htmlparser2": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz",
@@ -3263,9 +3278,9 @@
       }
     },
     "@streetwriters/showdown": {
-      "version": "3.0.1-alpha.2",
-      "resolved": "https://registry.npmjs.org/@streetwriters/showdown/-/showdown-3.0.1-alpha.2.tgz",
-      "integrity": "sha512-GkIDQlcvJVVMgp1J5H5upiRr2hZQJAJK6gnDzOjvJAflKO4gV96xCq4RFakwahLLhL7uQ8Yx10qtmrtBuJMsEw=="
+      "version": "3.0.4-alpha",
+      "resolved": "https://registry.npmjs.org/@streetwriters/showdown/-/showdown-3.0.4-alpha.tgz",
+      "integrity": "sha512-R2UJzMXyJz312RxekXGQIQvLsdZ0eSa4Z7dRXzf/fL2XsPPtyEzkZce0RoZn/mmKfDym5XKnjcVxnF3hXgjVaw=="
     },
     "@tootallnate/once": {
       "version": "2.0.0",
@@ -3327,10 +3342,10 @@
       "integrity": "sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==",
       "dev": true
     },
-    "@types/showdown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/showdown/-/showdown-2.0.0.tgz",
-      "integrity": "sha512-70xBJoLv+oXjB5PhtA8vo7erjLDp9/qqI63SRHm4REKrwuPOLs8HhXwlZJBJaB4kC18cCZ1UUZ6Fb/PLFW4TCA==",
+    "@types/streetwriters__showdown": {
+      "version": "npm:@types/showdown@2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/showdown/-/showdown-2.0.6.tgz",
+      "integrity": "sha512-pTvD/0CIeqe4x23+YJWlX2gArHa8G0J0Oh6GKaVXV7TAeickpkkZiNOgFcFcmLQ5lB/K0qBJL1FtRYltBfbGCQ==",
       "dev": true
     },
     "@types/unist": {
@@ -3716,17 +3731,6 @@
         "rrweb-cssom": "^0.6.0"
       }
     },
-    "data-urls": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.0"
-      }
-    },
     "dayjs": {
       "version": "1.11.9",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
@@ -4170,11 +4174,23 @@
         "xml-name-validator": "^4.0.0"
       },
       "dependencies": {
+        "data-urls": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
+          "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
+          "dev": true,
+          "requires": {
+            "abab": "^2.0.6",
+            "whatwg-mimetype": "^3.0.0",
+            "whatwg-url": "^12.0.0"
+          }
+        },
         "ws": {
           "version": "8.13.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
           "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -4521,9 +4537,9 @@
       "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
     },
     "qclone": {
       "version": "1.2.0",
@@ -4959,7 +4975,8 @@
     "ws": {
       "version": "7.5.9",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "4.0.0",

packages/core/package.json

@@ -12,7 +12,7 @@
     "@types/html-to-text": "^9.0.0",
     "@types/katex": "^0.16.1",
     "@types/prismjs": "^1.26.0",
-    "@types/showdown": "^2.0.0",
+    "@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6",
     "@vitest/coverage-v8": "^0.34.1",
     "abortcontroller-polyfill": "^1.7.3",
     "cross-env": "^7.0.3",
@@ -41,7 +41,8 @@
     "@microsoft/signalr": "^7.0.10",
     "@microsoft/signalr-protocol-msgpack": "^7.0.10",
     "@notesnook/logger": "file:../logger",
-    "@streetwriters/showdown": "^3.0.1-alpha.2",
+    "@readme/data-urls": "^3.0.0",
+    "@streetwriters/showdown": "^3.0.4-alpha",
     "async-mutex": "^0.3.2",
     "dayjs": "1.11.9",
     "entities": "^4.3.1",

packages/core/src/api/index.js

@@ -160,7 +160,6 @@ class Database {
     this.notes = await Notes.new(this, "notes");
 
     await this.trash.init();
-    await this.relations.cleanup();
 
     this.monographs.init().catch(console.error);
   }

packages/core/src/api/settings.js

@@ -136,7 +136,7 @@ class Settings {
   }
   /**
    * Setting to -1 means never clear trash.
-   * @param {7 | 30 | 365 | -1} time
+   * @param {1 | 7 | 30 | 365 | -1} time
    */
   async setTrashCleanupInterval(time) {
     this._settings.trashCleanupInterval = time;

packages/core/src/api/sync/collector.js

@@ -136,19 +136,20 @@ function filterSyncableItems(items, lastSyncedTimestamp, isForceSync) {
     // synced is a local only property
     delete item.synced;
 
-    if (item.localOnly) {
+    if (isUnsynced && isSyncable) {
       ids.push(item.id);
       syncableItems.push(
-        JSON.stringify({
-          id: item.id,
-          deleted: true,
-          dateModified: item.dateModified,
-          deleteReason: "localOnly"
-        })
+        JSON.stringify(
+          item.localOnly
+            ? {
+                id: item.id,
+                deleted: true,
+                dateModified: item.dateModified,
+                deleteReason: "localOnly"
+              }
+            : item
+        )
       );
-    } else if (isUnsynced && isSyncable) {
-      ids.push(item.id);
-      syncableItems.push(JSON.stringify(item));
     }
   }
   return { items: syncableItems, ids };

packages/core/src/api/vault.js

@@ -210,7 +210,7 @@ export default class Vault {
     return await this._lockNote(note, this._password);
   }
 
-  async exists(vaultKey) {
+  async exists(vaultKey = undefined) {
     if (!vaultKey) vaultKey = await this._getKey();
     return vaultKey && vaultKey.cipher && vaultKey.iv;
   }

packages/core/src/collections/attachments.js

@@ -296,7 +296,7 @@ export default class Attachments extends Collection {
     if (!data) return;
 
     return outputType === "base64"
-      ? dataurl.fromObject({ type: attachment.metadata.type, data })
+      ? dataurl.fromObject({ type: "application/octet-stream", data })
       : data;
   }
 

packages/core/src/collections/relations.js

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { logger } from "../logger";
 import { makeId } from "../utils/id";
 import Collection from "./collection";
 
@@ -189,39 +188,6 @@ export default class Relations extends Collection {
     }
     return items;
   }
-
-  async cleanup() {
-    const relationsLogger = logger.scope("Relations");
-    const relations = this._collection.getItems();
-    for (const relation of relations) {
-      const references = [relation.to, relation.from];
-      for (let reference of references) {
-        let exists = false;
-        switch (reference.type) {
-          case "reminder":
-            exists = this._db.reminders.exists(reference.id);
-            break;
-          case "note":
-            exists =
-              this._db.notes.exists(reference.id) ||
-              this._db.trash.exists(reference.id);
-            break;
-          case "notebook":
-            exists =
-              this._db.notebooks.exists(reference.id) ||
-              this._db.trash.exists(reference.id);
-            break;
-        }
-        if (!exists) {
-          relationsLogger.debug(
-            `Removing relation during cleanup`,
-            relation.id
-          );
-          await this.remove(relation.id);
-        }
-      }
-    }
-  }
 }
 
 /**

packages/core/src/content-types/__tests__/__snapshots__/tiptap.test.js.snap

@@ -148,6 +148,12 @@ exports[`convert HTML to markdown with outlinelists > html-to-md-outlinelists.md
 "
 `;
 
+exports[`convert HTML to markdown with singleSpacedParagraphs > html-to-md-singleSpacedParagraphs.md 1`] = `
+"hello world
+hello world 2
+"
+`;
+
 exports[`convert HTML to markdown with tables > html-to-md-tables.md 1`] = `
 "| Goal                                                                                                          | To introduce various features of the app to the user and to convert a user on trial or basic plan to upgrade. |
 | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
@@ -394,6 +400,11 @@ exports[`convert HTML to text with outlinelists > html-to-txt-outlinelists.txt 1
  * Yes it doesn't!"
 `;
 
+exports[`convert HTML to text with singleSpacedParagraphs > html-to-txt-singleSpacedParagraphs.txt 1`] = `
+"hello world
+hello world 2"
+`;
+
 exports[`convert HTML to text with tables > html-to-txt-tables.txt 1`] = `
 "Goal        To introduce various features of the app to the user and to
             convert a user on trial or basic plan to upgrade.

packages/core/src/database/backup.js

@@ -24,6 +24,7 @@ import { toChunks } from "../utils/array.js";
 import { migrateItem } from "../migrations.js";
 import Indexer from "./indexer.js";
 import setManipulator from "../utils/set.js";
+import { logger } from "../logger.js";
 
 const COLORS = [
   "red",
@@ -87,6 +88,7 @@ export default class Backup {
   constructor(db) {
     this._db = db;
     this._migrator = new Migrator();
+    this.logger = logger.scope("Backup");
   }
 
   lastBackupTime() {
@@ -267,15 +269,28 @@ export default class Backup {
           ? "color"
           : item.itemType || item.type;
 
-      // items should sync immediately after getting restored
-      item.dateModified = Date.now();
-      item.synced = false;
-
       if (itemType === "attachment" && item.metadata && item.metadata.hash) {
         const attachment = this._db.attachments.attachment(item.metadata.hash);
         if (attachment) {
+          const isNewGeneric =
+            item.metadata.type === "application/octet-stream";
+          const isOldGeneric =
+            attachment.metadata.type === "application/octet-stream";
           item = {
             ...attachment,
+            metadata: {
+              ...attachment.metadata,
+              type:
+                // we keep whichever mime type is more specific
+                isNewGeneric && !isOldGeneric
+                  ? attachment.metadata.type
+                  : item.metadata.type,
+              filename:
+                // we keep the filename based on which item's mime type we kept
+                isNewGeneric && !isOldGeneric
+                  ? attachment.metadata.filename
+                  : item.metadata.filename
+            },
             noteIds: setManipulator.union(attachment.noteIds, item.noteIds)
           };
         } else {
@@ -284,6 +299,10 @@ export default class Backup {
         }
       }
 
+      // items should sync immediately after getting restored
+      item.dateModified = Date.now();
+      item.synced = false;
+
       const collectionKey = itemTypeToCollectionKey[itemType];
       if (collectionKey) {
         toAdd[collectionKey] = toAdd[collectionKey] || [];