ci: only bootstrap the required projects when building desktop app

* clipper: fix duplicate notes created on save

* clipper(web): move singleton checks inside the fn

---------

Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>

.commitlintrc.js

@@ -28,7 +28,9 @@ const SCOPES = [
   "docs",
   "refactor",
   "misc",
-  "global"
+  "common",
+  "global",
+  "docs"
 ];
 
 module.exports = {

.github/actions/setup-node-with-cache/action.yml

@@ -0,0 +1,27 @@
+name: 'Setup node with cache action'
+description: 'Setups node with cache'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16.x
+        cache: "npm"
+        cache-dependency-path: |
+          package-lock.json
+          apps/mobile/package-lock.json
+          apps/desktop/package-lock.json
+          apps/web/package-lock.json
+          extensions/web-clipper/package-lock.json
+          packages/core/package-lock.json
+          packages/crypto/package-lock.json
+          packages/sodium/package-lock.json
+          packages/clipper/package-lock.json
+          packages/crypto-worker/package-lock.json
+          packages/editor-mobile/package-lock.json
+          packages/editor/package-lock.json
+          packages/logger/package-lock.json
+          packages/streamable-fs/package-lock.json
+          packages/theme/package-lock.json

.github/workflows/android.publish.internal.yml

@@ -11,21 +11,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - uses: actions/setup-node@master
-        with:
-          node-version: '16'
-          cache: 'npm'
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Use specific Java version for the builds
         uses: joschi/setup-jdk@v2

.github/workflows/android.publish.yml

@@ -11,21 +11,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - uses: actions/setup-node@master
-        with:
-          node-version: '16'
-          cache: 'npm'
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Use specific Java version for the builds
         uses: joschi/setup-jdk@v2

.github/workflows/core.tests.yml

@@ -24,21 +24,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Prepare environment
         run: |

.github/workflows/desktop.publish.yml

@@ -28,21 +28,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Install packages
         run: |
@@ -64,7 +50,7 @@ jobs:
 
       - name: Collect app metadata
         id: app_metadata
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
         run: |
           echo ::set-output name=app_version::$(cat package.json | jq -r .version)
 
@@ -91,6 +77,9 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
       - name: Setup notarization
         run: |
           mkdir -p ~/private_keys/
@@ -98,7 +87,7 @@ jobs:
 
       - name: Collect app metadata
         id: app_metadata
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
         run: |
           echo ::set-output name=apple_app_id::$(cat package.json | jq -r .appAppleId)
           echo ::set-output name=app_bundle_id::$(cat package.json | jq -r .build.appId)
@@ -115,26 +104,20 @@ jobs:
           private-key-raw: ${{ secrets.api_key }}
           platform: "MAC_OS"
 
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-
       - name: Download build
         uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/web/desktop/build
+          path: ./apps/desktop/build
 
       - name: Install packages
         run: |
-          npm i
-          npm i dmg-license
-        working-directory: ./apps/web/desktop
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --scope=@notesnook/desktop --scope=@notesnook/crypto --scope=@notesnook/sodium -- --prefer-offline --no-audit
       
       - name: Install provisioning profile
         run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
 
       - name: Build app for Mac App Store
         if: inputs.publish-apple && steps.appstore.outputs.app-version-latest != steps.app_metadata.outputs.app_version
@@ -142,9 +125,9 @@ jobs:
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
         run: |
-          npm run build:mas
+          npx nx run release --project @notesnook/desktop -- --variant=mas
           npx electron-builder --mac mas --universal -p never
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
 
       - name: Build zip and dmg
         env:
@@ -155,13 +138,13 @@ jobs:
           APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
           APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }}
         run: |
-          npm run build
+          npx nx run release --project @notesnook/desktop
           if [ ${{ inputs.publish-github }} == true ]; then
             npx electron-builder --mac zip dmg --arm64 --x64 -p always
           else
             npx electron-builder --mac zip dmg --arm64 --x64 -p never
           fi
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
 
       - name: Deploy to Testflight
         if: inputs.publish-apple && steps.appstore.outputs.app-version-latest != steps.app_metadata.outputs.app_version
@@ -169,12 +152,12 @@ jobs:
           API_KEY_ID: ${{ secrets.api_key_id }}
           API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
         run: |       
-          package=$(find ./dist/mas-universal/notesnook*.pkg)
+          package=$(find ./output/mas-universal/notesnook*.pkg)
 
           echo "Uploading ${package} using altool..."
 
           xcrun altool --upload-package $package -t osx --apiKey $API_KEY_ID --apiIssuer $API_KEY_ISSUER_ID --apple-id ${{ steps.app_metadata.outputs.apple_app_id }} --bundle-id ${{ steps.app_metadata.outputs.app_bundle_id }} --bundle-short-version-string ${{ steps.app_metadata.outputs.app_version }} --bundle-version ${{ steps.app_metadata.outputs.bundle_version }}
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
 
   build-linux:
     name: Build for Linux
@@ -185,6 +168,9 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
       - name: Setup Snapcraft Auth
         if: inputs.publish-snap
         run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
@@ -192,31 +178,27 @@ jobs:
       - name: Install Snapcraft
         uses: samuelmeuli/action-snapcraft@v1
         if: inputs.publish-snap
-        
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
 
       - name: Download build
         uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/web/desktop/build
+          path: ./apps/desktop/build
 
       - name: Install packages
-        run: npm i
-        working-directory: ./apps/web/desktop
+        run: |
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --scope=@notesnook/desktop --scope=@notesnook/crypto --scope=@notesnook/sodium -- --prefer-offline --no-audit
 
       - name: Build Electron wrapper
-        run: npm run build
-        working-directory: ./apps/web/desktop
+        run: npx nx run release --project @notesnook/desktop
+        working-directory: ./apps/desktop
 
       - name: Build snap
         if: inputs.publish-snap
         run: |
           npx electron-builder --linux snap:x64 -p never
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
 
       - name: Build AppImage
         env:
@@ -227,13 +209,13 @@ jobs:
           else
             npx electron-builder --linux AppImage:x64 AppImage:arm64 -p never
           fi
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop
 
       - name: Publish on Snapcraft
         if: inputs.publish-snap
         run: |
-          snapcraft upload --release=stable ./dist/notesnook_linux_amd64.snap
-        working-directory: ./apps/web/desktop
+          snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
+        working-directory: ./apps/desktop
 
   build-windows:
     name: Build for Windows
@@ -245,31 +227,29 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Download build
         uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/web/desktop/build
+          path: ./apps/desktop/build
 
       - name: Install packages
-        run: npm i
-        working-directory: ./apps/web/desktop
+        run: |
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --scope=@notesnook/desktop --scope=@notesnook/crypto --scope=@notesnook/sodium -- --prefer-offline --no-audit
 
-      - name: Build Electron wrapper
-        run: npm run build
-        working-directory: ./apps/web/desktop
+      - name: Build
+        run: npx nx run release --project @notesnook/desktop
 
-      - name: Build app
+      - name: Publish
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if ($${{ inputs.publish-github }} -eq $true) {
-            npx electron-builder --win --publish always
+            yarn electron-builder --win --publish always
           } else {
-            npx electron-builder --win --publish never
+            yarn electron-builder --win --publish never
           }
-        working-directory: ./apps/web/desktop
+        working-directory: ./apps/desktop

.github/workflows/editor.tests.yml

@@ -25,21 +25,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Install packages
         run: |

.github/workflows/web.publish.yml

@@ -11,21 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Install packages
         run: |

.github/workflows/web.tests.yml

@@ -25,21 +25,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Install packages
         run: |
@@ -76,21 +62,7 @@ jobs:
           path: ./apps/web/build
 
       - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: "npm"
-          cache-dependency-path: |
-            apps/mobile/package-lock.json
-            apps/web/package-lock.json
-            packages/core/package-lock.json
-            packages/crypto/package-lock.json
-            packages/crypto-worker/package-lock.json
-            packages/editor-mobile/package-lock.json
-            packages/editor/package-lock.json
-            packages/logger/package-lock.json
-            packages/streamable-fs/package-lock.json
-            packages/theme/package-lock.json
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Install packages
         run: |

.gitignore

@@ -7,4 +7,5 @@ nx-cloud.env
 .idea
 .eslintcache
 .env.local
-.nyc_output
+.nyc_output
+site

README.md

@@ -25,25 +25,30 @@ Notesnook is built using the following technologies:
 1. JavaScript/Typescript — this repo is in a hybrid state. A lot of the newer code is being written in Typescript & the old code is slowly being ported over.
 2. React — the whole front-end across all platforms is built using React.
 3. React Native — For mobile apps we are using React Native
-4. NPM — listed here because we **don't** use Yarn or PNPM or XYZ across any of our projects.
-5. Lerna & Nx — maintaining monorepos is hard but Nx makes it easier.
+4. Electron — For desktop app
+5. NPM — listed here because we **don't** use Yarn or PNPM or XYZ across any of our projects.
+6. Lerna & Nx — maintaining monorepos is hard but Nx makes it easier.
 
 > **Note: Each project in the monorepo contains its own architecture details which you can refer to.**
 
 ### Monorepo structure
 
-| Name                       | Path                                               | Description                                                       |
-| -------------------------- | -------------------------------------------------- | ----------------------------------------------------------------- |
-| `@notesnook/web`           | [/apps/web](/apps/web)                             | Web/Desktop clients                                               |
-| `@notesnook/mobile`        | [/apps/mobile](/apps/mobile)                       | Android/iOS clients                                               |
-| `@notesnook/core`          | [/packages/core](/packages/core)                   | Shared core between all platforms                                 |
-| `@notesnook/crypto`        | [/packages/crypto](/packages/crypto)               | Cryptography library wrapper around libsodium                     |
-| `@notesnook/editor`        | [/packages/editor](/packages/editor)               | Notesnook editor + all extensions                                 |
-| `@notesnook/editor-mobile` | [/packages/editor-mobile](/packages/editor-mobile) | A very thin wrapper around `@notesnook/editor` for mobile clients |
-| `@notesnook/logger`        | [/packages/logger](/packages/logger)               | Simple & pluggable logger                                         |
-| `@notesnook/crypto-worker` | [/packages/crypto-worker](/packages/crypto-worker) | Helpers to use `@notesnook/crypto` from a Worker                  |
-| `@notesnook/streamable-fs` | [/packages/streamable-fs](/packages/streamable-fs) | Streaming interface around an IndexedDB based file system         |
-| `@notesnook/theme`         | [/packages/theme](/packages/theme)                 | The core theme used in web & desktop clients                      |
+| Name                       | Path                                               | Description                                                          |
+| -------------------------- | -------------------------------------------------- | -------------------------------------------------------------------- |
+| `@notesnook/web`           | [/apps/web](/apps/web)                             | Web client                                                           |
+| `@notesnook/desktop`       | [/apps/desktop](/apps/desktop)                     | Desktop client                                                       |
+| `@notesnook/mobile`        | [/apps/mobile](/apps/mobile)                       | Android/iOS clients                                                  |
+| `@notesnook/web-clipper`   | [/extensions/web-clipper](/extensions/web-clipper) | Web clipper                                                          |
+| `@notesnook/core`          | [/packages/core](/packages/core)                   | Shared core between all platforms                                    |
+| `@notesnook/crypto`        | [/packages/crypto](/packages/crypto)               | Cryptography library wrapper around libsodium                        |
+| `@notesnook/clipper`       | [/packages/clipper](/packages/clipper)             | Web clipper core handling everything related to actual page clipping |
+| `@notesnook/editor`        | [/packages/editor](/packages/editor)               | Notesnook editor + all extensions                                    |
+| `@notesnook/editor-mobile` | [/packages/editor-mobile](/packages/editor-mobile) | A very thin wrapper around `@notesnook/editor` for mobile clients    |
+| `@notesnook/logger`        | [/packages/logger](/packages/logger)               | Simple & pluggable logger                                            |
+| `@notesnook/sodium`        | [/packages/sodium](/packages/sodium)               | Wrapper around libsodium to support Node.js & Browser                |
+| `@notesnook/crypto-worker` | [/packages/crypto-worker](/packages/crypto-worker) | Helpers to use `@notesnook/crypto` from a Worker                     |
+| `@notesnook/streamable-fs` | [/packages/streamable-fs](/packages/streamable-fs) | Streaming interface around an IndexedDB based file system            |
+| `@notesnook/theme`         | [/packages/theme](/packages/theme)                 | The core theme used in web & desktop clients                         |
 
 ### Contributing guidelines
 

apps/desktop/.gitignore

@@ -0,0 +1,4 @@
+node_modules
+build
+output
+dist

apps/desktop/README.md

@@ -0,0 +1,58 @@
+<p align="center">
+<img style="align:center;" src="/resources/screenshots/web.jpg" alt="Notesnook desktop screenshot" width="600" />
+</p>
+
+<h1 align="center">Notesnook Desktop</h1>
+<h3 align="center">The desktop app is built using Electron & Typescript.</h3>
+<p align="center">
+<a href="https://notesnook.com/downloads">Downloads</a> | <a href="#developer-guide">Developer guide</a> | <a href="#build-instructions">How to build?</a>
+</p>
+
+## Getting started
+
+## Build instructions
+
+> **Before you start, it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
+
+### Setting up the development environment
+
+Requirements:
+
+1. [Node.js](https://nodejs.org/en/download/)
+2. [git](https://git-scm.com/downloads)
+3. NPM (not yarn or pnpm)
+
+Before you can do anything, you'll need to [install Node.js](https://nodejs.org/en/download/) v16 or later on your system.
+
+Once you have completed the setup, the first step is to `clone` the monorepo:
+
+```bash
+git clone https://github.com/streetwriters/notesnook.git
+
+# change directory
+cd notesnook
+```
+
+Once you are inside the `./notesnook` directory, run the preparation step:
+
+```bash
+# this might take a while to complete
+npm install
+```
+
+Now you can finally start the desktop app:
+
+```bash
+npm run start:desktop
+```
+
+## Developer guide
+
+### The tech stack
+
+We try to keep the stack as lean as possible:
+
+1. Electron
+2. tRPC: for cross-communication between the web & desktop parts
+3. zod: for runtime typechecking
+4. yargs: for CLI argument parsing

apps/desktop/global.d.ts

@@ -16,10 +16,12 @@ 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-var */
 
 import { BrowserWindow } from "electron";
 
 declare global {
-  // eslint-disable-next-line no-var
-  var window: BrowserWindow;
+  var window: BrowserWindow | null;
+  var RELEASE: boolean;
+  var MAC_APP_STORE: boolean;
 }

apps/desktop/package.json

@@ -2,32 +2,46 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "2.5.1",
+  "version": "2.5.4",
   "appAppleId": "1544027013",
   "private": true,
-  "main": "./build/electron.js",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "homepage": "https://notesnook.com/",
   "repository": "https://github.com/streetwriters/notesnook",
+  "license": "GPL-3.0-or-later",
   "dependencies": {
+    "@notesnook/crypto": "*",
+    "@trpc/client": "^10.29.1",
+    "@trpc/server": "^10.29.1",
     "diary": "^0.3.1",
+    "electron-trpc": "^0.5.2",
     "electron-updater": "^5.3.0",
     "icojs": "^0.17.1",
-    "isomorphic-fetch": "^3.0.0",
-    "yargs": "^17.6.2"
+    "typed-emitter": "^2.1.0",
+    "yargs": "^17.6.2",
+    "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@types/node-fetch": "^2.6.2",
-    "electron": "^21.1.1",
+    "@electron/rebuild": "^3.2.13",
+    "@types/node": "^18.15.0",
+    "electron": "^24.4.0",
     "electron-builder": "^23.6.0",
-    "electron-builder-notarize": "^1.5.0",
+    "electron-builder-notarize": "^1.5.1",
     "electron-reloader": "^1.2.3",
-    "esbuild": "^0.15.11",
-    "patch-package": "^6.5.1"
+    "esbuild": "^0.17.19",
+    "node-fetch": "^3.3.1"
+  },
+  "optionalDependencies": {
+    "dmg-license": "^1.0.11"
   },
   "scripts": {
-    "build": "esbuild ./electron.js ./preload.js --external:electron --external:fsevents --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
-    "build:mas": "esbuild ./electron.js ./preload.js --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "pack": "rm -rf ./build && cp -r ../build ./ && npm run build && yarn electron-builder --linux AppImage:x64 AppImage:arm64",
+    "start": "turbowatch scripts/dev.ts",
+    "staging": "zx scripts/build.mjs --run",
+    "release": "zx scripts/build.mjs",
+    "build": "tsc",
+    "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
+    "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
     "postinstall": "patch-package"
   },
   "author": {
@@ -40,12 +54,13 @@
     "productName": "Notesnook",
     "copyright": "Copyright © 2023 Streetwriters (Private) Limited",
     "artifactName": "notesnook_${os}_${arch}.${ext}",
+    "npmRebuild": false,
     "files": [
       "!*.chunk.js.map",
       "!*.chunk.js.LICENSE.txt",
       "build/",
-      "!build/screenshots",
-      "!node_modules"
+      "!build/screenshots${/*}",
+      "!node_modules${/*}"
     ],
     "afterSign": "electron-builder-notarize",
     "afterPack": "./scripts/removeLocales.js",
@@ -174,9 +189,12 @@
     "extraResources": [
       "./assets/**"
     ],
+    "extraMetadata": {
+      "main": "./build/electron.js"
+    },
     "directories": {
       "buildResources": "assets",
-      "output": "./dist/"
+      "output": "./output/"
     },
     "publish": [
       {

apps/desktop/patches/electron-trpc+0.5.2.patch

@@ -0,0 +1,23 @@
+diff --git a/node_modules/electron-trpc/dist/main.mjs b/node_modules/electron-trpc/dist/main.mjs
+index 379cf3b..2644e5d 100644
+--- a/node_modules/electron-trpc/dist/main.mjs
++++ b/node_modules/electron-trpc/dist/main.mjs
+@@ -221,9 +221,16 @@ class G {
+     i(this, c).includes(r) || (i(this, c).push(r), I(this, T, W).call(this, r));
+   }
+   detachWindow(r) {
++    
+     y(this, c, i(this, c).filter((n) => n !== r));
+-    for (const [n, t] of i(this, u).entries())
+-      n.startsWith(`${r.webContents.id}-`) && (t.unsubscribe(), i(this, u).delete(n));
++    for (const [n, t] of i(this, u).entries()) {
++      try {
++        n.startsWith(`${r.webContents.id}-`) && (t.unsubscribe(), i(this, u).delete(n));
++      } catch(e) {
++        console.error(e);
++        // ignore
++      }
++    }
+   }
+ }
+ c = new WeakMap(), u = new WeakMap(), T = new WeakSet(), W = function(r) {

apps/desktop/scripts/build.mjs

@@ -0,0 +1,110 @@
+/*
+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 path from "path";
+import fs from "fs/promises";
+import { existsSync } from "fs";
+import { argv, os } from "zx";
+import * as childProcess from "child_process";
+
+const sodiumNativePrebuildPath = (arch) =>
+  path.join(
+    `node_modules`,
+    `@notesnook`,
+    `crypto`,
+    `node_modules`,
+    `@notesnook`,
+    `sodium`,
+    `node_modules`,
+    `sodium-native`,
+    `prebuilds`,
+    `${os.platform()}-${arch}`
+  );
+const webAppPath = path.resolve(path.join(__dirname, "..", "..", "web"));
+if (argv.rebuild) {
+  await fs.rm("./build/", { force: true, recursive: true });
+
+  await exec(`cd ${webAppPath} && npm run build:desktop`);
+
+  await fs.cp(path.join(webAppPath, "build"), "build", {
+    recursive: true,
+    force: true
+  });
+}
+
+if (argv.variant === "mas") {
+  await exec(`npm run bundle:mas`);
+} else {
+  await exec(`npm run bundle`);
+}
+
+await exec(`npx tsc`);
+
+if (existsSync(sodiumNativePrebuildPath("x64"))) {
+  console.log("copying sodium-native-x64");
+  await fs.cp(
+    sodiumNativePrebuildPath("x64"),
+    path.join("build", "prebuilds", `${process.platform}-x64`),
+    {
+      recursive: true,
+      force: true
+    }
+  );
+}
+
+if (existsSync(sodiumNativePrebuildPath("ia32"))) {
+  console.log("copying sodium-native-ia32");
+  await fs.cp(
+    sodiumNativePrebuildPath("ia32"),
+    path.join("build", "prebuilds", `${process.platform}-ia32`),
+    {
+      recursive: true,
+      force: true
+    }
+  );
+}
+
+if (existsSync(sodiumNativePrebuildPath("arm64"))) {
+  console.log("copying sodium-native-arm64");
+  await fs.cp(
+    sodiumNativePrebuildPath("arm64"),
+    path.join("build", "prebuilds", `${process.platform}-arm64`),
+    {
+      recursive: true,
+      force: true
+    }
+  );
+}
+
+if (argv.run) {
+  if (process.platform === "win32") {
+    await exec(`npx electron-builder --win --x64`);
+    // await exec(`.\\output\\notesnook_win_x64_portable.exe`);
+  } else {
+    await exec(`npx electron-builder --linux AppImage:x64`);
+    await exec(`./output/notesnook_linux_x86_64.AppImage`);
+  }
+}
+
+async function exec(cmd) {
+  return childProcess.execSync(cmd, {
+    env: process.env,
+    stdio: "inherit"
+  });
+}

apps/desktop/scripts/dev.ts

@@ -0,0 +1,116 @@
+/*
+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 path from "path";
+import fs from "fs/promises";
+import { watch } from "turbowatch";
+import { $, within } from "zx";
+
+const sodiumNativePrebuildPath = path.join(
+  `node_modules`,
+  `@notesnook`,
+  `crypto`,
+  `node_modules`,
+  `@notesnook`,
+  `sodium`,
+  `node_modules`,
+  `sodium-native`,
+  `prebuilds`
+);
+let isServerRunning = false;
+
+async function main() {
+  const { shutdown } = await watch({
+    project: path.join(__dirname, ".."),
+    cwd: path.join(__dirname, ".."),
+    triggers: [
+      {
+        expression: [
+          "allof",
+          ["not", ["dirname", "node_modules"]],
+          ["match", "*.ts", "basename"]
+        ],
+        name: "dev",
+        // retry: { retries: 0 },
+        onTeardown: async () => {
+          await fs.rm("./build/", { force: true, recursive: true });
+        },
+        onChange: async ({ spawn: $, first, log }) => {
+          if (first) {
+            await fs.rm("./build/", { force: true, recursive: true });
+          }
+
+          await $`npm run bundle`;
+          await $`npx tsc`;
+
+          if (first) {
+            await fs.cp(sodiumNativePrebuildPath, "build/prebuilds", {
+              recursive: true,
+              force: true
+            });
+          }
+
+          if (!isServerRunning) {
+            await spawnAndWaitUntil(
+              path.join(__dirname, "..", "..", "web"),
+              "npm run start:desktop",
+              (data) => data.includes("Network: use --host to expose")
+            );
+            isServerRunning = true;
+          }
+
+          await $`npx electron ${path.join("build", "electron.js")}`;
+        }
+      }
+    ]
+  });
+
+  // SIGINT is the signal sent when we press Ctrl+C
+  process.once("SIGINT", () => {
+    void shutdown();
+  });
+}
+
+main();
+
+function spawnAndWaitUntil(
+  cwd: string,
+  cmd: string,
+  predicate: (data: string) => boolean
+) {
+  return new Promise((resolve) => {
+    within(async () => {
+      $.env = process.env;
+      $.env.NO_COLOR = "true";
+      $.quote = (c) => c;
+
+      try {
+        const s = $`cd ${cwd} && ${cmd}`;
+        s.stdout.on("data", (data) => {
+          if (predicate(data)) resolve(undefined); //
+        });
+        await s;
+      } catch (e) {
+        //ignore
+      } finally {
+        isServerRunning = false;
+      }
+    });
+  });
+}

apps/desktop/src/api/bridge.ts

@@ -0,0 +1,58 @@
+/*
+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 { initTRPC } from "@trpc/server";
+import { observable } from "@trpc/server/observable";
+import { EventEmitter } from "events";
+import TypedEventEmitter from "typed-emitter";
+
+export type AppEvents = {
+  onCreateItem(name: "note" | "notebook" | "reminder"): void;
+};
+
+const emitter = new EventEmitter();
+const typedEmitter = emitter as TypedEventEmitter<AppEvents>;
+const t = initTRPC.create();
+
+export const bridgeRouter = t.router({
+  onCreateItem: createSubscription("onCreateItem")
+});
+
+export const bridge: AppEvents = new Proxy({} as AppEvents, {
+  get(_t, name) {
+    if (typeof name === "symbol") return;
+    return (...args: unknown[]) => {
+      emitter.emit(name, ...args);
+    };
+  }
+});
+
+function createSubscription<TName extends keyof AppEvents>(eventName: TName) {
+  return t.procedure.subscription(() => {
+    return observable<Parameters<AppEvents[TName]>[0]>((emit) => {
+      const listener: AppEvents[TName] = (...args: any[]) => {
+        emit.next(args[0]);
+      };
+      typedEmitter.addListener(eventName, listener);
+      return () => {
+        typedEmitter.removeListener(eventName, listener);
+      };
+    });
+  });
+}

apps/desktop/src/api/compression.ts

@@ -18,16 +18,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import zlib from "node:zlib";
 import utils from "node:util";
+import { initTRPC } from "@trpc/server";
+import { z } from "zod";
+
+const t = initTRPC.create();
 
 const gzipAsync = utils.promisify(zlib.gzip);
 const gunzipAsync = utils.promisify(zlib.gunzip);
 
-export async function gzip(args) {
-  const { data, level } = args;
-  return (await gzipAsync(data, { level })).toString("base64");
-}
-
-export async function gunzip(args) {
-  const { data } = args;
-  return (await gunzipAsync(Buffer.from(data, "base64"))).toString("utf-8");
-}
+export const compressionRouter = t.router({
+  gzip: t.procedure
+    .input(z.object({ data: z.string(), level: z.number() }))
+    .query(async ({ input }) => {
+      const { data, level } = input;
+      return (await gzipAsync(data, { level })).toString("base64");
+    }),
+  gunzip: t.procedure.input(z.string()).query(async ({ input }) => {
+    return (await gunzipAsync(Buffer.from(input, "base64"))).toString("utf-8");
+  })
+});

apps/desktop/src/api/index.ts

@@ -17,25 +17,25 @@ 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 { ipcMain } from "electron";
-import { logger } from "../logger";
-import { getAction } from "./actions";
-import { getCall } from "./calls";
+import { initTRPC } from "@trpc/server";
+import { compressionRouter } from "./compression";
+import { osIntegrationRouter } from "./os-integration";
+import { spellCheckerRouter } from "./spell-checker";
+import { updaterRouter } from "./updater";
+import { bridgeRouter } from "./bridge";
 
-ipcMain.on("fromRenderer", async (event, args) => {
-  logger.info("Action requested by renderer", args);
+const t = initTRPC.create();
 
-  const { type } = args;
-  const action = getAction(type);
-  if (!action) return;
-  await action(args);
+export const router = t.router({
+  compress: compressionRouter,
+  integration: osIntegrationRouter,
+  spellChecker: spellCheckerRouter,
+  updater: updaterRouter,
+  bridge: bridgeRouter
 });
 
-ipcMain.handle("fromRenderer", async (event, args) => {
-  const { type } = args;
-  logger.info("Call requested by renderer", type);
-  const call = getCall(type);
-  if (!call) return;
+export const api = router.createCaller({});
 
-  return await call(args, globalThis.window);
-});
+// Export type router type signature,
+// NOT the router itself.
+export type AppRouter = typeof router;

apps/desktop/src/api/os-integration.ts

@@ -0,0 +1,160 @@
+/*
+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 { initTRPC } from "@trpc/server";
+import { z } from "zod";
+import { dialog, nativeTheme, Notification, shell } from "electron";
+import { AutoLaunch } from "../utils/autolaunch";
+import { config, DesktopIntegration } from "../utils/config";
+import { bringToFront } from "../utils/bring-to-front";
+import { getTheme, setTheme, Theme } from "../utils/theme";
+import { mkdirSync, writeFileSync } from "fs";
+import { dirname, join } from "path";
+import { platform } from "os";
+import { resolvePath } from "../utils/resolve-path";
+import { observable } from "@trpc/server/observable";
+
+const t = initTRPC.create();
+
+const NotificationOptions = z.object({
+  title: z.string().optional(),
+  body: z.string().optional(),
+  silent: z.boolean().optional(),
+  timeoutType: z.union([z.literal("default"), z.literal("never")]).optional(),
+  urgency: z
+    .union([z.literal("normal"), z.literal("critical"), z.literal("low")])
+    .optional(),
+  tag: z.string()
+});
+
+export const osIntegrationRouter = t.router({
+  zoomFactor: t.procedure.query(() => config.zoomFactor),
+  setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
+    globalThis.window?.webContents.setZoomFactor(factor);
+    config.zoomFactor = factor;
+  }),
+
+  privacyMode: t.procedure.query(() => config.privacyMode),
+  setPrivacyMode: t.procedure
+    .input(z.boolean().optional())
+    .mutation(({ input: privacyMode }) => {
+      if (!globalThis.window || !["win32", "darwin"].includes(process.platform))
+        return;
+
+      globalThis.window.setContentProtection(!!privacyMode);
+
+      if (process.platform === "win32") {
+        globalThis.window.setThumbnailClip(
+          privacyMode
+            ? { x: 0, y: 0, width: 1, height: 1 }
+            : { x: 0, y: 0, width: 0, height: 0 }
+        );
+      }
+      config.privacyMode = !!privacyMode;
+    }),
+
+  desktopIntegration: t.procedure.query(() => config.desktopSettings),
+  setDesktopIntegration: t.procedure
+    .input(DesktopIntegration)
+    .mutation(({ input: settings }) => {
+      if (settings.autoStart) {
+        AutoLaunch.enable(!!settings.startMinimized);
+      } else {
+        AutoLaunch.disable();
+      }
+      config.desktopSettings = settings;
+    }),
+
+  selectDirectory: t.procedure
+    .input(
+      z.object({
+        title: z.string().optional(),
+        buttonLabel: z.string().optional(),
+        defaultPath: z.string().optional()
+      })
+    )
+    .query(async ({ input }) => {
+      if (!globalThis.window) return undefined;
+
+      const { title, buttonLabel, defaultPath } = input;
+
+      const result = await dialog.showOpenDialog(globalThis.window, {
+        title,
+        buttonLabel,
+        properties: ["openDirectory"],
+        defaultPath: defaultPath && resolvePath(defaultPath)
+      });
+      if (result.canceled) return undefined;
+
+      return result.filePaths[0];
+    }),
+
+  saveFile: t.procedure
+    .input(z.object({ data: z.string(), filePath: z.string() }))
+    .query(({ input }) => {
+      const { data, filePath } = input;
+      if (!data || !filePath) return;
+
+      const resolvedPath = resolvePath(filePath);
+
+      mkdirSync(dirname(resolvedPath), { recursive: true });
+      writeFileSync(resolvedPath, data);
+    }),
+
+  showNotification: t.procedure
+    .input(NotificationOptions)
+    .query(({ input }) => {
+      const notification = new Notification({
+        ...input,
+        icon: join(
+          __dirname,
+          platform() === "win32" ? "app.ico" : "favicon-72x72.png"
+        )
+      });
+      notification.show();
+      if (input.urgency === "critical") {
+        shell.beep();
+      }
+
+      return new Promise((resolve) => {
+        notification.once("close", () => resolve(undefined));
+        notification.once("click", () => resolve(input.tag));
+      });
+    }),
+  openPath: t.procedure
+    .input(z.object({ type: z.literal("path"), link: z.string() }))
+    .query(({ input }) => {
+      const { type, link } = input;
+      if (type === "path") return shell.openPath(resolvePath(link));
+    }),
+  bringToFront: t.procedure.query(() => bringToFront()),
+  changeTheme: t.procedure
+    .input(Theme)
+    .mutation(({ input }) => setTheme(input)),
+
+  onThemeChanged: t.procedure.subscription(() =>
+    observable<"dark" | "light">((emit) => {
+      nativeTheme.on("updated", () => {
+        if (getTheme() === "system") {
+          emit.next(nativeTheme.shouldUseDarkColors ? "dark" : "light");
+        }
+      });
+    })
+  )
+});

apps/desktop/src/api/spell-checker.ts

@@ -17,9 +17,13 @@ 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 { getIsSpellCheckerEnabled } from "../../config/spellChecker";
+import { initTRPC } from "@trpc/server";
+import { z } from "zod";
+import { config } from "../utils/config";
 
-const LANGUAGES = {
+const t = initTRPC.create();
+
+const LANGUAGES: Record<string, string> = {
   af: "Afrikaans",
   bg: "Bulgarian",
   ca: "Catalan",
@@ -78,28 +82,41 @@ const LANGUAGES = {
   vi: "Vietnamese"
 };
 
-/**
- *
- * @param {*} args
- * @param {import("electron").BrowserWindow} win
- * @returns
- */
-export default function (_args, win) {
-  if (!win) return;
+type Language = { code: string; name: string };
 
-  return {
-    enabled: getIsSpellCheckerEnabled(),
-    languages: win.webContents.session.availableSpellCheckerLanguages.map(
-      (code) => ({
-        code,
-        name: LANGUAGES[code]
-      })
+export const spellCheckerRouter = t.router({
+  isEnabled: t.procedure.query(() => config.isSpellCheckerEnabled),
+  languages: t.procedure.query(
+    () =>
+      <Language[]>(
+        globalThis.window?.webContents.session.availableSpellCheckerLanguages.map(
+          (code) => ({
+            code,
+            name: LANGUAGES[code]
+          })
+        )
+      )
+  ),
+  enabledLanguages: t.procedure.query(
+    () =>
+      <Language[]>(
+        globalThis.window?.webContents.session
+          .getSpellCheckerLanguages()
+          .map((code) => ({
+            code,
+            name: LANGUAGES[code]
+          }))
+      )
+  ),
+  setLanguages: t.procedure
+    .input(z.array(z.string()))
+    .mutation(({ input: languages }) =>
+      globalThis.window?.webContents.session.setSpellCheckerLanguages(languages)
     ),
-    enabledLanguages: win.webContents.session
-      .getSpellCheckerLanguages()
-      .map((code) => ({
-        code,
-        name: LANGUAGES[code]
-      }))
-  };
-}
+  toggle: t.procedure
+    .input(z.boolean().optional())
+    .mutation(({ input: enabled }) => {
+      globalThis.window?.webContents.session.setSpellCheckerEnabled(!!enabled);
+      config.isSpellCheckerEnabled = !!enabled;
+    })
+});

apps/desktop/src/api/updater.ts

@@ -0,0 +1,71 @@
+/*
+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 { initTRPC } from "@trpc/server";
+import { observable } from "@trpc/server/observable";
+import { CancellationToken, autoUpdater } from "electron-updater";
+import type { AppUpdaterEvents } from "electron-updater/out/AppUpdater";
+
+type UpdateInfo = { version: string };
+type Progress = { percent: number };
+
+const t = initTRPC.create();
+
+export const updaterRouter = t.router({
+  install: t.procedure.query(() => autoUpdater.quitAndInstall()),
+  download: t.procedure.query(async () => {
+    const cancellationToken = new CancellationToken();
+    await autoUpdater.downloadUpdate(cancellationToken);
+  }),
+  check: t.procedure.query(async () => {
+    await autoUpdater.checkForUpdates();
+  }),
+
+  onChecking: createSubscription("checking-for-update"),
+  onDownloaded: createSubscription<"update-downloaded", UpdateInfo>(
+    "update-downloaded"
+  ),
+  onDownloadProgress: createSubscription<"download-progress", Progress>(
+    "download-progress"
+  ),
+  onNotAvailable: createSubscription<"update-not-available", UpdateInfo>(
+    "update-not-available"
+  ),
+  onAvailable: createSubscription<"update-available", UpdateInfo>(
+    "update-available"
+  ),
+  onError: createSubscription("error")
+});
+
+function createSubscription<
+  TName extends keyof AppUpdaterEvents,
+  TReturnType = Parameters<AppUpdaterEvents[TName]>[0]
+>(eventName: TName) {
+  return t.procedure.subscription(() => {
+    return observable<TReturnType>((emit) => {
+      const listener: AppUpdaterEvents[TName] = (...args: any[]) => {
+        emit.next(args[0]);
+      };
+      autoUpdater.addListener(eventName, listener);
+      return () => {
+        autoUpdater.removeListener(eventName, listener);
+      };
+    });
+  });
+}

apps/desktop/src/cli.ts

@@ -21,10 +21,10 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 export type CLIOptions = {
-  note?: boolean | string;
-  notebook?: boolean | string;
-  reminder?: boolean | string;
-  hidden?: boolean;
+  note: boolean | string;
+  notebook: boolean | string;
+  reminder: boolean | string;
+  hidden: boolean;
 };
 
 export async function parseArguments(): Promise<CLIOptions> {
@@ -55,7 +55,7 @@ export async function parseArguments(): Promise<CLIOptions> {
           "Open a note",
           { id: { string: true, description: "Id of the note" } },
           (args) => {
-            result.note = args.id;
+            result.note = args.id || false;
           }
         )
         .command(
@@ -63,7 +63,7 @@ export async function parseArguments(): Promise<CLIOptions> {
           "Open a notebook",
           { id: { string: true, description: "Id of the notebook" } },
           (args) => {
-            result.notebook = args.id;
+            result.notebook = args.id || false;
           }
         )
         .command(
@@ -79,6 +79,6 @@ export async function parseArguments(): Promise<CLIOptions> {
         );
     })
     .parse();
-  result.hidden = hidden;
+  result.hidden = hidden || false;
   return result;
 }

apps/desktop/src/index.ts

@@ -17,8 +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 { getPrivacyMode } from "../../config/privacyMode";
-
-export default function () {
-  return getPrivacyMode();
-}
+export * from "./constants";
+export type { AppRouter } from "./api";
+export { type UpdateInfo } from "builder-util-runtime";

apps/desktop/src/main.ts

@@ -18,33 +18,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* global MAC_APP_STORE, RELEASE */
 
-import "isomorphic-fetch";
 import { app, BrowserWindow, nativeTheme, shell } from "electron";
 import { isDevelopment } from "./utils";
-import { registerProtocol, PROTOCOL_URL } from "./protocol";
-import { configureAutoUpdater } from "./autoupdate";
-import { getBackgroundColor, getTheme, setTheme } from "./config/theme";
-import getZoomFactor from "./ipc/calls/getZoomFactor";
-import { logger } from "./logger";
-import { setupMenu } from "./menu";
-import { WindowState } from "./config/window-state";
-import { sendMessageToRenderer } from "./ipc/utils";
-import { EVENTS } from "./events";
-import "./ipc/index.js";
-import getPrivacyMode from "./ipc/calls/getPrivacyMode";
-import setPrivacyMode from "./ipc/actions/setPrivacyMode";
-import { getIsSpellCheckerEnabled } from "./config/spellChecker";
-import { getDesktopIntegration } from "./config/desktopIntegration";
-import { AutoLaunch } from "./autolaunch";
-import { setupJumplist } from "./jumplist";
-import { setupTray } from "./tray";
-import { parseArguments } from "./cli";
-import { AssetManager } from "./asset-manager";
+import { registerProtocol, PROTOCOL_URL } from "./utils/protocol";
+import { configureAutoUpdater } from "./utils/autoupdater";
+import { getBackgroundColor, getTheme, setTheme } from "./utils/theme";
+import { setupMenu } from "./utils/menu";
+import { WindowState } from "./utils/window-state";
+import { AutoLaunch } from "./utils/autolaunch";
+import { setupJumplist } from "./utils/jumplist";
+import { setupTray } from "./utils/tray";
+import { CLIOptions, parseArguments } from "./cli";
+import { AssetManager } from "./utils/asset-manager";
+import { createIPCHandler } from "electron-trpc/main";
+import { router, api } from "./api";
+import { config } from "./utils/config";
+import path from "path";
 
 if (!RELEASE) {
   require("electron-reloader")(module);
 }
 
+if (process.platform == "win32" && process.env.PORTABLE_EXECUTABLE_DIR) {
+  console.log("Portable app: true");
+  const root = path.join(process.env.PORTABLE_EXECUTABLE_DIR, "Notesnook");
+  app.setPath("appData", path.join(root, "AppData"));
+  app.setPath("documents", path.join(root, "Documents"));
+  app.setPath("userData", path.join(root, "UserData"));
+}
 // only run a single instance
 
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
@@ -55,12 +56,11 @@ if (process.platform === "win32") {
   app.setAppUserModelId(app.name);
 }
 
-var mainWindowState;
 async function createWindow() {
   await AssetManager.loadIcons();
   const cliOptions = await parseArguments();
 
-  mainWindowState = new WindowState({});
+  const mainWindowState = new WindowState({});
   setTheme(getTheme());
 
   const mainWindow = new BrowserWindow({
@@ -78,19 +78,18 @@ async function createWindow() {
       format: process.platform === "win32" ? "ico" : "png"
     }),
     webPreferences: {
-      zoomFactor: getZoomFactor(),
+      zoomFactor: config.zoomFactor,
       devTools: true, // isDev,
-      nodeIntegration: false, //true,
-      contextIsolation: true,
-      nativeWindowOpen: true,
-      spellcheck: getIsSpellCheckerEnabled(),
+      nodeIntegration: true, //true,
+      contextIsolation: false,
+      spellcheck: config.isSpellCheckerEnabled,
       preload: __dirname + "/preload.js"
     }
   });
 
-  mainWindow.on("show", () => {
-    if (getPrivacyMode()) {
-      setPrivacyMode({ privacyMode: getPrivacyMode() });
+  mainWindow.on("show", async () => {
+    if (config.privacyMode) {
+      await api.integration.setPrivacyMode(config.privacyMode);
     }
   });
 
@@ -99,6 +98,7 @@ async function createWindow() {
   setupMenu();
   setupJumplist();
   setupDesktopIntegration(cliOptions.hidden);
+  createIPCHandler({ router, windows: [mainWindow] });
 
   mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
     "http://dictionaries.notesnook.com/"
@@ -110,7 +110,7 @@ async function createWindow() {
   try {
     await mainWindow.loadURL(`${createURL(cliOptions)}`);
   } catch (e) {
-    logger.error(e);
+    if (e instanceof Error) console.error(e);
   }
 
   mainWindow.on("closed", () => {
@@ -125,20 +125,14 @@ async function createWindow() {
   nativeTheme.on("updated", () => {
     setupTray();
     setupJumplist();
-
-    if (getTheme() === "system") {
-      sendMessageToRenderer(EVENTS.themeChanged, {
-        theme: nativeTheme.shouldUseDarkColors ? "dark" : "light"
-      });
-    }
   });
 }
 
 app.commandLine.appendSwitch("lang", "en-US");
 app.on("ready", async () => {
-  logger.info("App ready. Opening window.");
+  console.info("App ready. Opening window.");
 
-  registerProtocol();
+  if (!isDevelopment()) registerProtocol();
   await createWindow();
   configureAutoUpdater();
 });
@@ -155,10 +149,7 @@ app.on("activate", () => {
   }
 });
 
-/**
- * @param {import("./cli").CLIOptions} options
- */
-function createURL(options) {
+function createURL(options: CLIOptions) {
   const url = new URL(isDevelopment() ? "http://localhost:3000" : PROTOCOL_URL);
 
   if (options.note === true) url.hash = "/notes/create/1";
@@ -172,8 +163,8 @@ function createURL(options) {
   return url;
 }
 
-function setupDesktopIntegration(hidden) {
-  const desktopIntegration = getDesktopIntegration();
+function setupDesktopIntegration(hidden: boolean) {
+  const desktopIntegration = config.desktopSettings;
 
   if (
     desktopIntegration.closeToSystemTray ||
@@ -182,14 +173,14 @@ function setupDesktopIntegration(hidden) {
     setupTray();
   }
 
-  globalThis.window.on("ready-to-show", () => {
+  globalThis.window?.on("ready-to-show", () => {
     if (!hidden) {
-      globalThis.window.show();
+      globalThis.window?.show();
     }
 
     if (hidden && !desktopIntegration.minimizeToSystemTray) {
-      globalThis.window.show();
-      globalThis.window.minimize();
+      globalThis.window?.show();
+      globalThis.window?.minimize();
     }
   });
 
@@ -199,32 +190,32 @@ function setupDesktopIntegration(hidden) {
     app.on("before-quit", () => app.exit(0));
   }
 
-  globalThis.window.on("close", (e) => {
-    if (getDesktopIntegration().closeToSystemTray) {
+  globalThis.window?.on("close", (e) => {
+    if (config.desktopSettings.closeToSystemTray) {
       e.preventDefault();
       if (process.platform == "darwin") {
         // on macOS window cannot be minimized/hidden if it is already fullscreen
         // so we just close it.
-        if (globalThis.window.isFullScreen()) app.exit(0);
+        if (globalThis.window?.isFullScreen()) app.exit(0);
         else app.hide();
       } else {
-        globalThis.window.minimize();
-        globalThis.window.hide();
+        globalThis.window?.minimize();
+        globalThis.window?.hide();
       }
     }
   });
 
-  globalThis.window.on("minimize", () => {
-    if (getDesktopIntegration().minimizeToSystemTray) {
+  globalThis.window?.on("minimize", () => {
+    if (config.desktopSettings.minimizeToSystemTray) {
       if (process.platform == "darwin") {
         app.hide();
       } else {
-        globalThis.window.hide();
+        globalThis.window?.hide();
       }
     }
   });
 
   if (desktopIntegration.autoStart) {
-    AutoLaunch.enable(desktopIntegration.startMinimized);
+    AutoLaunch.enable(!!desktopIntegration.startMinimized);
   }
 }

apps/desktop/src/preload.ts

@@ -0,0 +1,51 @@
+/*
+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-var */
+
+import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
+import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
+import type { NNCrypto } from "@notesnook/crypto";
+import { ipcRenderer } from "electron";
+import { platform } from "os";
+
+declare global {
+  var os: () => "mas" | ReturnType<typeof platform>;
+  var electronTRPC: RendererGlobalElectronTRPC;
+  var NativeNNCrypto: (new () => NNCrypto) | undefined;
+}
+
+process.once("loaded", async () => {
+  console.log("HELLO!");
+  const electronTRPC: RendererGlobalElectronTRPC = {
+    sendMessage: (operation) =>
+      ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
+    onMessage: (callback) =>
+      ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
+  };
+  globalThis.electronTRPC = electronTRPC;
+});
+
+globalThis.NativeNNCrypto =
+  process.platform === "win32" &&
+  process.arch !== "x64" &&
+  process.arch !== "ia32"
+    ? undefined
+    : require("@notesnook/crypto").NNCrypto;
+
+globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());

apps/desktop/src/utils/asset-manager.ts

@@ -19,10 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { NativeImage, nativeImage } from "electron";
 import path from "path";
-import { isDevelopment } from "./utils";
+import { isDevelopment } from "./index";
 import { parse, ParsedImage } from "icojs";
 import { readFileSync } from "fs";
-import { getSystemTheme } from "./config/theme";
+import { getSystemTheme } from "./theme";
 
 type Formats = "ico" | "png" | "icns";
 type IconOptions<TFormat extends Formats> = {
@@ -30,8 +30,8 @@ type IconOptions<TFormat extends Formats> = {
   format?: TFormat;
 };
 
-type IconNames = typeof icons[number];
-type Prefixes = typeof prefixes[number];
+type IconNames = (typeof icons)[number];
+type Prefixes = (typeof prefixes)[number];
 
 type FlexibleIcon<TFormat extends Formats> = TFormat extends "ico"
   ? string

apps/desktop/src/utils/autoupdater.ts

@@ -17,13 +17,19 @@ 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 { CancellationToken } from "builder-util-runtime";
 import { autoUpdater } from "electron-updater";
-import { EVENTS } from "../../events";
-import { sendMessageToRenderer } from "../utils";
 
-export default () => {
-  sendMessageToRenderer(EVENTS.updateDownloadProgress, { progress: 0 });
-  autoUpdater.cancellationToken = new CancellationToken();
-  autoUpdater.downloadUpdate(autoUpdater.cancellationToken);
-};
+async function configureAutoUpdater() {
+  autoUpdater.setFeedURL({
+    provider: "generic",
+    url: `https://notesnook.com/releases/${process.platform}/`,
+    useMultipleRangeRequest: false
+  });
+
+  autoUpdater.autoDownload = false;
+  autoUpdater.allowDowngrade = false;
+  autoUpdater.allowPrerelease = false;
+  autoUpdater.autoInstallOnAppQuit = true;
+}
+
+export { configureAutoUpdater };

apps/desktop/src/utils/bring-to-front.ts

@@ -17,9 +17,9 @@ 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 { WindowState } from "../../config/window-state";
+import { WindowState } from "./window-state";
 
-export default () => {
+export function bringToFront() {
   if (!globalThis.window) return;
 
   if (globalThis.window.isMinimized()) {
@@ -31,4 +31,4 @@ export default () => {
   globalThis.window.focus();
   globalThis.window.moveTop();
   globalThis.window.webContents.focus();
-};
+}

apps/desktop/src/utils/config.ts

@@ -0,0 +1,55 @@
+/*
+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 { nativeTheme } from "electron";
+import { JSONStorage } from "./json-storage";
+import { z } from "zod";
+
+export const DesktopIntegration = z.object({
+  autoStart: z.boolean().optional(),
+  startMinimized: z.boolean().optional(),
+  minimizeToSystemTray: z.boolean().optional(),
+  closeToSystemTray: z.boolean().optional()
+});
+
+export type DesktopIntegration = z.infer<typeof DesktopIntegration>;
+
+export const config = {
+  desktopSettings: <DesktopIntegration>{
+    autoStart: false,
+    startMinimized: false,
+    minimizeToSystemTray: false,
+    closeToSystemTray: false
+  },
+  privacyMode: false,
+  isSpellCheckerEnabled: false,
+  zoomFactor: 0,
+  theme: nativeTheme.themeSource
+};
+
+type ConfigKey = keyof typeof config;
+for (const key in config) {
+  const defaultValue = config[<ConfigKey>key];
+  if (Object.hasOwn(config, key)) {
+    Object.defineProperty(config, key, {
+      get: () => JSONStorage.get(key, defaultValue),
+      set: (value) => JSONStorage.set(key, value)
+    });
+  }
+}

apps/desktop/src/utils/index.ts

@@ -17,15 +17,21 @@ 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 { JSONStorage } from "../jsonstorage";
+import { app } from "electron";
+import { join } from "path";
+import { existsSync } from "fs";
 
-function getZoomFactor() {
-  let factor = parseFloat(JSONStorage.get("zoomFactor"));
-  return isNaN(factor) ? 1.0 : factor;
+export const APP_ICON_PATH = join(
+  __dirname,
+  process.platform === "win32" ? "app.ico" : "favicon-72x72.png"
+);
+
+export function isDevelopment() {
+  return process.env.ELECTRON_IS_DEV
+    ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1
+    : !app.isPackaged;
 }
 
-function setZoomFactor(factor) {
-  return JSONStorage.set("zoomFactor", factor.toString());
+export function isFlatpak() {
+  return existsSync("/.flatpak-info");
 }
-
-export { setZoomFactor, getZoomFactor };

apps/desktop/src/utils/jumplist.ts

@@ -19,9 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { app, Menu } from "electron";
 import { AssetManager } from "./asset-manager";
-import { EVENTS } from "./events";
-import bringToFront from "./ipc/actions/bringToFront";
-import { sendMessageToRenderer } from "./ipc/utils";
+import { bringToFront } from "./bring-to-front";
+import { bridge } from "../api/bridge";
 
 export function setupJumplist() {
   if (process.platform === "win32") {
@@ -76,7 +75,7 @@ function setDockMenuOnMacOs() {
       type: "normal",
       click: () => {
         bringToFront();
-        sendMessageToRenderer(EVENTS.createItem, { itemType: "note" });
+        bridge.onCreateItem("note");
       }
     },
     {
@@ -84,7 +83,7 @@ function setDockMenuOnMacOs() {
       type: "normal",
       click: () => {
         bringToFront();
-        sendMessageToRenderer(EVENTS.createItem, { itemType: "notebook" });
+        bridge.onCreateItem("notebook");
       }
     },
     {
@@ -92,7 +91,7 @@ function setDockMenuOnMacOs() {
       type: "normal",
       click: () => {
         bringToFront();
-        sendMessageToRenderer(EVENTS.createItem, { itemType: "reminder" });
+        bridge.onCreateItem("reminder");
       }
     }
   ]);

apps/desktop/src/utils/menu.ts

@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Menu, MenuItem, clipboard, shell } from "electron";
 
 function setupMenu() {
+  if (!globalThis.window) return;
+
   globalThis.window.webContents.on("context-menu", (_event, params) => {
     const menu = new Menu();
 
@@ -29,7 +31,7 @@ function setupMenu() {
         new MenuItem({
           label: suggestion,
           click: () =>
-            globalThis.window.webContents.replaceMisspelling(suggestion)
+            globalThis.window?.webContents.replaceMisspelling(suggestion)
         })
       );
     }
@@ -40,7 +42,7 @@ function setupMenu() {
         new MenuItem({
           label: "Add to dictionary",
           click: () =>
-            globalThis.window.webContents.session.addWordToSpellCheckerDictionary(
+            globalThis.window?.webContents.session.addWordToSpellCheckerDictionary(
               params.misspelledWord
             )
         })

apps/desktop/src/utils/protocol.ts

@@ -17,19 +17,18 @@ 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 { protocol } from "electron";
-import { isDevelopment, getPath } from "./utils";
-import { createReadStream } from "fs";
-import { extname, normalize } from "path";
-import { logger } from "./logger";
+import { protocol, ProtocolRequest } from "electron";
+import { isDevelopment } from "./index";
+import { createReadStream, statSync } from "fs";
+import { extname, join, normalize } from "path";
 import { URL } from "url";
-import { Blob } from "buffer";
+import fetch, { Response } from "node-fetch";
 
-const FILE_NOT_FOUND = -6;
 const BASE_PATH = isDevelopment() ? "../public" : "";
 const HOSTNAME = `app.notesnook.com`;
-const PROTOCOL = "https";
-const extensionToMimeType = {
+const FILE_NOT_FOUND = -6;
+const SCHEME = "https";
+const extensionToMimeType: Record<string, string> = {
   html: "text/html",
   json: "application/json",
   js: "application/javascript",
@@ -40,11 +39,11 @@ const extensionToMimeType = {
 
 function registerProtocol() {
   const protocolInterceptionResult = protocol.interceptStreamProtocol(
-    PROTOCOL,
+    SCHEME,
     async (request, callback) => {
       const url = new URL(request.url);
       if (shouldInterceptRequest(url)) {
-        logger.info("Intercepting request:", request);
+        console.info("Intercepting request:", request.url);
 
         const loadIndex = !extname(url.pathname);
         const absoluteFilePath = normalize(
@@ -56,7 +55,7 @@ function registerProtocol() {
         );
         const filePath = getPath(absoluteFilePath);
         if (!filePath) {
-          logger.error("Local asset file not found at", filePath);
+          console.error("Local asset file not found at", filePath);
           callback({ error: FILE_NOT_FOUND });
           return;
         }
@@ -68,7 +67,7 @@ function registerProtocol() {
           mimeType: extensionToMimeType[fileExtension]
         });
       } else {
-        var response;
+        let response: Response;
         try {
           const body = await getBody(request);
           response = await fetch(request.url, {
@@ -83,56 +82,95 @@ function registerProtocol() {
           });
         } catch (e) {
           console.error(e);
-          logger.error(`Error sending request to `, request.url, "Error: ", e);
+          console.error(`Error sending request to `, request.url, "Error: ", e);
           callback({ statusCode: 400 });
           return;
         }
         callback({
           statusCode: response.status,
-          data: response.body,
+          data: response.body || undefined,
           headers: Object.fromEntries(response.headers.entries()),
-          mimeType: response.headers.get("Content-Type")
+          mimeType: response.headers.get("Content-Type") || undefined
         });
       }
     }
   );
 
-  logger.info(
-    `${PROTOCOL} protocol inteception ${
+  console.info(
+    `${SCHEME} protocol inteception ${
       protocolInterceptionResult ? "successful" : "failed"
     }.`
   );
+
+  // protocol.handle(SCHEME, (request) => {
+  //   const url = new URL(request.url);
+  //   if (shouldInterceptRequest(url)) {
+  //     console.info("Intercepting request:", request.url);
+  //     const loadIndex = !extname(url.pathname);
+  //     const absoluteFilePath = normalize(
+  //       `${__dirname}${
+  //         loadIndex ? `${BASE_PATH}/index.html` : `${BASE_PATH}/${url.pathname}`
+  //       }`
+  //     );
+  //     const filePath = getPath(absoluteFilePath);
+  //     if (!filePath) {
+  //       console.error("Local asset file not found at", filePath);
+  //       return new Response(undefined, {
+  //         status: 404,
+  //         statusText: "FILE_NOT_FOUND"
+  //       });
+  //     }
+  //     const fileExtension = extname(filePath).replace(".", "");
+  //     const data = createReadStream(filePath);
+  //     return new Response(data, {
+  //       headers: { "Content-Type": extensionToMimeType[fileExtension] }
+  //     });
+  //   } else {
+  //     return net.fetch(request);
+  //   }
+  // });
+  // console.info(`${SCHEME} protocol inteception "successful"`);
 }
 
-const bypassedRoutes = [];
-function shouldInterceptRequest(url) {
-  let shouldIntercept = url.hostname === HOSTNAME;
+const bypassedRoutes: string[] = [];
+function shouldInterceptRequest(url: URL) {
+  const shouldIntercept = url.hostname === HOSTNAME;
   return shouldIntercept && !bypassedRoutes.includes(url.pathname);
 }
 
-/**
- *
- * @param {Electron.ProtocolRequest} request
- */
-async function getBody(request) {
-  /**
-   * @type {Electron.Session}
-   */
+const PROTOCOL_URL = `${SCHEME}://${HOSTNAME}/`;
+export { registerProtocol, PROTOCOL_URL };
+
+async function getBody(request: ProtocolRequest) {
   const session = globalThis?.window?.webContents?.session;
 
   const blobParts = [];
   if (!request.uploadData || !request.uploadData.length) return null;
-  for (let data of request.uploadData) {
-    if (data.type === "rawData") {
+  for (const data of request.uploadData) {
+    if (data.bytes) {
       blobParts.push(new Uint8Array(data.bytes));
-    } else if (session && data.type === "blob") {
+    } else if (session && data.blobUUID) {
       const buffer = await session.getBlobData(data.blobUUID);
+      if (!buffer) continue;
       blobParts.push(new Uint8Array(buffer));
     }
   }
   const blob = new Blob(blobParts);
-  return await blob.arrayBuffer();
+  return blob;
 }
 
-const PROTOCOL_URL = `${PROTOCOL}://${HOSTNAME}/`;
-export { registerProtocol, PROTOCOL_URL };
+function getPath(filePath: string): string | undefined {
+  try {
+    const result = statSync(filePath);
+
+    if (result.isFile()) {
+      return filePath;
+    }
+
+    if (result.isDirectory()) {
+      return getPath(join(filePath, "index.html"));
+    }
+  } catch (_) {
+    // ignore
+  }
+}

apps/desktop/src/utils/resolve-path.ts

@@ -17,25 +17,17 @@ 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 { app } from "electron";
 import { isAbsolute, join } from "path";
 
-function sendMessageToRenderer(type, payload = {}) {
-  const message = { type, ...payload };
-  logger.info("Sending message to renderer", message);
-  if (globalThis.window)
-    globalThis.window.webContents.send("fromMain", message);
-}
-
-function resolvePath(_path) {
+export function resolvePath(_path: string) {
   if (isAbsolute(_path)) return _path;
 
   return join(
     ..._path.split("/").map((segment) => {
       let resolved = segment;
       try {
-        resolved = app.getPath(resolved);
+        resolved = app.getPath(resolved as any);
       } catch (e) {
         // ignore
       }
@@ -43,5 +35,3 @@ function resolvePath(_path) {
     })
   );
 }
-
-export { resolvePath, sendMessageToRenderer };

apps/desktop/src/utils/theme.ts

@@ -17,19 +17,27 @@ 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 { JSONStorage } from "../jsonstorage";
 import { nativeTheme } from "electron";
+import { config } from "./config";
+import { z } from "zod";
 
-type Theme = typeof nativeTheme.themeSource;
-function getTheme(): Theme {
-  return JSONStorage.get("theme", nativeTheme.themeSource);
+export const Theme = z.union([
+  z.literal("system"),
+  z.literal("light"),
+  z.literal("dark")
+]);
+
+export type Theme = z.infer<typeof Theme>;
+
+function getTheme() {
+  return config.theme;
 }
 
 function setTheme(theme: Theme) {
   changeTheme(theme);
   if (globalThis.window)
     globalThis.window.setBackgroundColor(getBackgroundColor());
-  return JSONStorage.set("theme", theme);
+  config.theme = theme;
 }
 
 function getBackgroundColor() {

apps/desktop/src/utils/tray.ts

@@ -19,10 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { app, Menu, Tray } from "electron";
 import { AssetManager } from "./asset-manager";
-import { EVENTS } from "./events";
-import bringToFront from "./ipc/actions/bringToFront";
-import { sendMessageToRenderer } from "./ipc/utils";
-import { isFlatpak } from "./utils";
+import { isFlatpak } from "./index";
+import { bringToFront } from "./bring-to-front";
+import { bridge } from "../api/bridge";
 
 let tray: Tray | undefined = undefined;
 export function destroyTray() {
@@ -59,7 +58,7 @@ export function setupTray() {
         : AssetManager.icon("note-add", { size: trayIconSize }),
       click: () => {
         bringToFront();
-        sendMessageToRenderer(EVENTS.createItem, { itemType: "note" });
+        bridge.onCreateItem("note");
       }
     },
     {
@@ -70,7 +69,7 @@ export function setupTray() {
         : AssetManager.icon("notebook-add", { size: trayIconSize }),
       click: () => {
         bringToFront();
-        sendMessageToRenderer(EVENTS.createItem, { itemType: "notebook" });
+        bridge.onCreateItem("notebook");
       }
     },
     { type: "separator" },

apps/desktop/src/utils/window-state.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 { JSONStorage } from "../jsonstorage";
+import { JSONStorage } from "./json-storage";
 import { screen as _screen, BrowserWindow } from "electron";
 const screen = _screen;
 

apps/desktop/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig",
+  "compilerOptions": {
+    "outDir": "./dist/",
+    "lib": ["ESNext"]
+  },
+  "include": ["src", "global.d.ts"]
+}

apps/mobile/.github/workflows/android-public-release.yml

@@ -17,15 +17,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Setup npmrc
-        run: |
-          echo "registry=https://npm.pkg.github.com" > .npmrc
-          echo "@streetwriters:registry=https://npm.pkg.github.com" >> .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{secrets.PACKAGES_TOKEN}}" >> .npmrc
-
-      - name: Setup yarnrc
-        run: echo "\"@streetwriters:registry\" \"https://npm.pkg.github.com\"" > .yarnrc
-
       - uses: actions/setup-node@master
         with:
           node-version: "16"

apps/mobile/.github/workflows/android-release.yml

@@ -17,15 +17,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Setup npmrc
-        run: |
-          echo "registry=https://npm.pkg.github.com" > .npmrc
-          echo "@streetwriters:registry=https://npm.pkg.github.com" >> .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{secrets.PACKAGES_TOKEN}}" >> .npmrc
-
-      - name: Setup yarnrc
-        run: echo "\"@streetwriters:registry\" \"https://npm.pkg.github.com\"" > .yarnrc
-
       - uses: actions/setup-node@master
         with:
           node-version: "16"

apps/mobile/app/app.js

@@ -16,34 +16,31 @@ 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 "react-native-gesture-handler";
 import React, { useEffect } from "react";
+import { View } from "react-native";
+import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
+import AppLockedOverlay from "./components/app-lock-overlay";
 import { withErrorBoundry } from "./components/exception-handler";
 import GlobalSafeAreaProvider from "./components/globalsafearea";
-import Launcher from "./components/launcher";
 import { useAppEvents } from "./hooks/use-app-events";
 import { ApplicationHolder } from "./navigation";
 import Notifications from "./services/notifications";
 import SettingsService from "./services/settings";
 import { TipManager } from "./services/tip-manager";
 import { useUserStore } from "./stores/use-user-store";
-import { View } from "react-native";
-import { useState } from "react";
 
 SettingsService.init();
 SettingsService.checkOrientation();
 const App = () => {
-  useAppEvents();
-  const [init, setInit] = useState(false);
+  const init = useAppEvents();
   useEffect(() => {
     let { appLockMode } = SettingsService.get();
     if (appLockMode && appLockMode !== "none") {
-      useUserStore.getState().setVerifyUser(true);
+      useUserStore.getState().lockApp(true);
     }
-    //BackgroundSync.start();
-    setInit(true);
+    init();
     setTimeout(async () => {
       SettingsService.onFirstLaunch();
       await Notifications.get();
@@ -52,7 +49,10 @@ const App = () => {
       }
       TipManager.init();
     }, 100);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
   return (
     <View
       style={{
@@ -81,8 +81,8 @@ const App = () => {
         }}
       >
         <ApplicationHolder />
-        {init && <Launcher />}
       </GestureHandlerRootView>
+      <AppLockedOverlay />
     </View>
   );
 };

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

@@ -16,8 +16,7 @@ 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 Database from "@notesnook/core/api/index";
+import { database } from "@notesnook/common";
 import { initalize, logger as dbLogger } from "@notesnook/core/logger";
 import { Platform } from "react-native";
 import { MMKVLoader } from "react-native-mmkv-storage";
@@ -30,13 +29,8 @@ import * as Gzip from "react-native-gzip";
 const LoggerStorage = new MMKVLoader()
   .withInstanceID("notesnook_logs")
   .initialize();
-initalize(new KV(LoggerStorage), true);
-export const DatabaseLogger = dbLogger;
 
-/**
- * @type {import("@notesnook/core/api/index").default}
- */
-export var db = new Database(
+database.setup(
   Storage,
   Platform.OS === "ios" ? EventSource : AndroidEventSource,
   filesystem,
@@ -46,7 +40,7 @@ export var db = new Database(
   }
 );
 
-db.host(
+database.host(
   __DEV__
     ? {
         API_HOST: "https://api.notesnook.com",
@@ -68,3 +62,8 @@ db.host(
         ISSUES_HOST: "https://issues.streetwriters.co"
       }
 );
+
+initalize(new KV(LoggerStorage), true);
+
+export const db = database;
+export const DatabaseLogger = dbLogger;

apps/mobile/app/components/app-lock-overlay/index.js

@@ -0,0 +1,215 @@
+/*
+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 React, { useCallback, useEffect, useRef } from "react";
+import { Platform, View } from "react-native";
+import { enabled } from "react-native-privacy-snapshot";
+import { db } from "../../common/database";
+import { useAppState } from "../../hooks/use-app-state";
+import BiometricService from "../../services/biometrics";
+import { useSettingStore } from "../../stores/use-setting-store";
+import { useThemeStore } from "../../stores/use-theme-store";
+import { useUserStore } from "../../stores/use-user-store";
+import { NotesnookModule } from "../../utils/notesnook-module";
+import { SIZE } from "../../utils/size";
+import { Button } from "../ui/button";
+import { IconButton } from "../ui/icon-button";
+import Input from "../ui/input";
+import Seperator from "../ui/seperator";
+import Heading from "../ui/typography/heading";
+import Paragraph from "../ui/typography/paragraph";
+
+const AppLockedOverlay = () => {
+  const colors = useThemeStore((state) => state.colors);
+  const user = useUserStore((state) => state.user);
+  const appLocked = useUserStore((state) => state.appLocked);
+  const lockApp = useUserStore((state) => state.lockApp);
+  const deviceMode = useSettingStore((state) => state.deviceMode);
+  const passwordInputRef = useRef();
+  const password = useRef();
+  const appState = useAppState();
+
+  const biometricUnlockAwaitingUserInput = useRef(false);
+
+  const onUnlockAppRequested = useCallback(async () => {
+    if (!(await BiometricService.isBiometryAvailable())) return;
+    if (Platform.OS === "android") {
+      const activityName = await NotesnookModule.getActivityName();
+      if (activityName !== "MainActivity") return;
+    }
+    useSettingStore.getState().setRequestBiometrics(true);
+
+    let unlocked = await BiometricService.validateUser(
+      "Unlock to access your notes",
+      ""
+    );
+    if (unlocked) {
+      lockApp(false);
+      enabled(false);
+      password.current = null;
+    }
+    setTimeout(() => {
+      biometricUnlockAwaitingUserInput.current = false;
+      useSettingStore.getState().setRequestBiometrics(false);
+    }, 1);
+  }, [lockApp]);
+
+  const onSubmit = async () => {
+    if (!password.current) return;
+    try {
+      let unlocked = await db.user.verifyPassword(password.current);
+      if (unlocked) {
+        lockApp(false);
+        enabled(false);
+        password.current = null;
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  };
+
+  useEffect(() => {
+    if (
+      biometricUnlockAwaitingUserInput.current ||
+      useUserStore.getState().disableAppLockRequests
+    )
+      return;
+    if (appLocked && appState === "active") {
+      biometricUnlockAwaitingUserInput.current = true;
+      onUnlockAppRequested();
+    }
+  }, [appState, onUnlockAppRequested, appLocked]);
+
+  return (
+    appLocked && (
+      <View
+        style={{
+          backgroundColor: colors.bg,
+          width: "100%",
+          height: "100%",
+          position: "absolute",
+          zIndex: 999,
+          justifyContent: "center"
+        }}
+      >
+        <View
+          style={{
+            flex: 1,
+            justifyContent: "center",
+            width:
+              deviceMode !== "mobile"
+                ? "50%"
+                : Platform.OS == "ios"
+                ? "95%"
+                : "100%",
+            paddingHorizontal: 12,
+            marginBottom: 30,
+            marginTop: 15,
+            alignSelf: "center"
+          }}
+        >
+          <IconButton
+            name="fingerprint"
+            size={100}
+            customStyle={{
+              width: 100,
+              height: 100,
+              marginBottom: 20,
+              marginTop: user ? 0 : 50
+            }}
+            onPress={onUnlockAppRequested}
+            color={colors.border}
+          />
+          <Heading
+            color={colors.heading}
+            style={{
+              alignSelf: "center",
+              textAlign: "center"
+            }}
+          >
+            Unlock your notes
+          </Heading>
+
+          <Paragraph
+            style={{
+              alignSelf: "center",
+              textAlign: "center",
+              maxWidth: "90%"
+            }}
+          >
+            {"Please verify it's you"}
+          </Paragraph>
+          <Seperator />
+          <View
+            style={{
+              width: "100%",
+              padding: 12,
+              backgroundColor: colors.bg
+            }}
+          >
+            {user ? (
+              <>
+                <Input
+                  fwdRef={passwordInputRef}
+                  secureTextEntry
+                  placeholder="Enter account password"
+                  onChangeText={(v) => (password.current = v)}
+                  onSubmit={onSubmit}
+                />
+              </>
+            ) : null}
+
+            <View
+              style={{
+                marginTop: user ? 25 : 25
+              }}
+            >
+              {user ? (
+                <>
+                  <Button
+                    title="Continue"
+                    type="accent"
+                    onPress={onSubmit}
+                    width={250}
+                    height={45}
+                    style={{
+                      borderRadius: 150,
+                      marginBottom: 10
+                    }}
+                    fontSize={SIZE.md}
+                  />
+                </>
+              ) : null}
+
+              <Button
+                title="Unlock with Biometrics"
+                width={250}
+                onPress={onUnlockAppRequested}
+                icon={"fingerprint"}
+                type={user ? "grayAccent" : "accent"}
+              />
+            </View>
+          </View>
+        </View>
+      </View>
+    )
+  );
+};
+
+export default AppLockedOverlay;

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

@@ -34,7 +34,6 @@ import {
 import PremiumService from "../../services/premium";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { formatBytes } from "../../utils";
 import { eCloseAttachmentDialog, eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
@@ -47,6 +46,7 @@ import { Notice } from "../ui/notice";
 import { PressableButton } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { formatBytes } from "@notesnook/common";
 
 const Actions = ({ attachment, setAttachments, fwdRef }) => {
   const colors = useThemeStore((state) => state.colors);

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

@@ -23,7 +23,7 @@ import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { formatBytes } from "../../utils";
+import { formatBytes } from "@notesnook/common";
 import { SIZE } from "../../utils/size";
 import SheetProvider from "../sheet-provider";
 import { IconButton } from "../ui/icon-button";

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

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useEffect, useRef, useState } from "react";
-import { View } from "react-native";
+import { Platform, View } from "react-native";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import {
   eSubscribeEvent,
@@ -34,6 +34,7 @@ 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,
@@ -75,7 +76,7 @@ const AuthModal = () => {
   return !visible ? null : (
     <BaseDialog
       overlayOpacity={0}
-      statusBarTranslucent={true}
+      statusBarTranslucent={false}
       onRequestClose={currentAuthMode !== AuthMode.welcomeSignup && close}
       visible={true}
       onClose={close}
@@ -85,64 +86,82 @@ const AuthModal = () => {
       transparent={false}
       animated={false}
     >
-      {currentAuthMode !== AuthMode.login ? (
-        <Signup
-          changeMode={(mode) => setCurrentAuthMode(mode)}
-          trial={AuthMode.trialSignup === currentAuthMode}
-          welcome={initialAuthMode.current === AuthMode.welcomeSignup}
-        />
-      ) : (
-        <Login
-          welcome={initialAuthMode.current === AuthMode.welcomeSignup}
-          changeMode={(mode) => setCurrentAuthMode(mode)}
-        />
-      )}
+      <KeyboardAwareScrollView
+        style={{
+          width: "100%"
+        }}
+        contentContainerStyle={{
+          height: Platform.OS === "android" ? "100%" : "100%"
+        }}
+        bounces={false}
+      >
+        {currentAuthMode !== AuthMode.login ? (
+          <Signup
+            changeMode={(mode) => setCurrentAuthMode(mode)}
+            trial={AuthMode.trialSignup === currentAuthMode}
+            welcome={initialAuthMode.current === AuthMode.welcomeSignup}
+          />
+        ) : (
+          <Login
+            welcome={initialAuthMode.current === AuthMode.welcomeSignup}
+            changeMode={(mode) => setCurrentAuthMode(mode)}
+          />
+        )}
+      </KeyboardAwareScrollView>
 
       <View
         style={{
           position: "absolute",
-          top: insets.top,
+          paddingTop: Platform.OS === "android" ? 0 : insets.top,
+          top: 0,
           zIndex: 999,
-          flexDirection: "row",
-          alignItems: "center",
-          paddingHorizontal: 12,
-          width: "100%",
-          height: 50,
-          justifyContent:
-            initialAuthMode.current !== AuthMode.welcomeSignup
-              ? "space-between"
-              : "flex-end"
+          backgroundColor: colors.nav,
+          width: "100%"
         }}
       >
-        {initialAuthMode.current === AuthMode.welcomeSignup ? null : (
-          <IconButton
-            name="arrow-left"
-            onPress={() => {
-              hideAuth();
-            }}
-            color={colors.pri}
-          />
-        )}
+        <View
+          style={{
+            flexDirection: "row",
+            alignItems: "center",
+            paddingHorizontal: 12,
+            width: "100%",
+            height: 50,
+            justifyContent:
+              initialAuthMode.current !== AuthMode.welcomeSignup
+                ? "space-between"
+                : "flex-end"
+          }}
+        >
+          {initialAuthMode.current === AuthMode.welcomeSignup ? null : (
+            <IconButton
+              name="arrow-left"
+              onPress={() => {
+                hideAuth();
+              }}
+              color={colors.pri}
+            />
+          )}
 
-        {initialAuthMode.current !== AuthMode.welcomeSignup ? null : (
-          <Button
-            title="Skip"
-            onPress={() => {
-              hideAuth();
-            }}
-            iconSize={16}
-            type="gray"
-            iconPosition="right"
-            icon="chevron-right"
-            height={25}
-            iconStyle={{
-              marginTop: 2
-            }}
-            style={{
-              paddingHorizontal: 6
-            }}
-          />
-        )}
+          {initialAuthMode.current !== AuthMode.welcomeSignup ? null : (
+            <Button
+              title="Skip"
+              onPress={() => {
+                hideAuth();
+              }}
+              iconSize={16}
+              type="gray"
+              iconPosition="right"
+              icon="chevron-right"
+              height={25}
+              iconStyle={{
+                marginTop: 2
+              }}
+              style={{
+                paddingHorizontal: 6
+              }}
+            />
+          )}
+        </View>
       </View>
 
       <Toast context="local" />

apps/mobile/app/components/auth/login.js

@@ -35,6 +35,9 @@ import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
 import { useSettingStore } from "../../stores/use-setting-store";
+import { eUserLoggedIn } from "../../utils/events";
+import { useUserStore } from "../../stores/use-user-store";
+import Sync from "../../services/sync";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -58,9 +61,14 @@ export const Login = ({ changeMode }) => {
     login
   } = useLogin(async () => {
     hideAuth();
-    eSendEvent("userLoggedIn", true);
+    eSendEvent(eUserLoggedIn, true);
     await sleep(500);
     Progress.present();
+    setTimeout(() => {
+      if (!useUserStore.getState().syncing) {
+        Sync.run("global", false, true);
+      }
+    }, 5000);
   });
   const deviceMode = useSettingStore((state) => state.deviceMode);
 
@@ -94,12 +102,12 @@ export const Login = ({ changeMode }) => {
       >
         <View
           style={{
-            flex: 0.45,
+            flexGrow: 0.8,
             justifyContent: "flex-end",
             paddingHorizontal: 20,
             backgroundColor: colors.nav,
-            marginBottom: 20,
             borderBottomWidth: 1,
+            marginBottom: 12,
             borderBottomColor: colors.border,
             alignSelf: deviceMode !== "mobile" ? "center" : undefined,
             borderWidth: deviceMode !== "mobile" ? 1 : null,
@@ -156,7 +164,8 @@ export const Login = ({ changeMode }) => {
               : "99.9%",
             backgroundColor: colors.bg,
             alignSelf: "center",
-            paddingHorizontal: 20
+            paddingHorizontal: 20,
+            flexGrow: 1
           }}
         >
           <Input

apps/mobile/app/components/auth/session-expired.js

@@ -22,14 +22,14 @@ import { Modal, View } from "react-native";
 import { db } from "../../common/database";
 import BiometricService from "../../services/biometrics";
 import {
+  ToastEvent,
   eSendEvent,
-  eSubscribeEvent,
-  eUnSubscribeEvent,
-  ToastEvent
+  eSubscribeEvent
 } from "../../services/event-manager";
 import SettingsService from "../../services/settings";
 import Sync from "../../services/sync";
 import { useThemeStore } from "../../stores/use-theme-store";
+import { eLoginSessionExpired, eUserLoggedIn } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { Dialog } from "../dialog";
@@ -61,7 +61,7 @@ export const SessionExpired = () => {
   const [focused, setFocused] = useState(false);
   const { step, password, email, passwordInputRef, loading, login } = useLogin(
     () => {
-      eSendEvent("userLoggedIn", true);
+      eSendEvent(eUserLoggedIn, true);
       setVisible(false);
     }
   );
@@ -84,9 +84,9 @@ export const SessionExpired = () => {
   };
 
   useEffect(() => {
-    eSubscribeEvent("session_expired", open);
+    const sub = eSubscribeEvent(eLoginSessionExpired, open);
     return () => {
-      eUnSubscribeEvent("session_expired", open);
+      sub.unsubscribe?.();
       setFocused(false);
     };
   }, [visible, open]);

apps/mobile/app/components/auth/signup.js

@@ -102,13 +102,12 @@ export const Signup = ({ changeMode, trial }) => {
           zIndex: 10,
           width: "100%",
           alignSelf: "center",
-          height: "100%",
-          minHeight: "100%"
+          height: "100%"
         }}
       >
         <View
           style={{
-            flex: 0.35,
+            flexGrow: 1,
             justifyContent: "flex-end",
             paddingHorizontal: 20,
             backgroundColor: colors.nav,
@@ -165,7 +164,7 @@ export const Signup = ({ changeMode, trial }) => {
             paddingHorizontal: 20,
             backgroundColor: colors.bg,
             alignSelf: "center",
-            flex: 0.6
+            flexGrow: 0.5
           }}
         >
           <Input

apps/mobile/app/components/container/floating-button.js

@@ -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 React, { useEffect } from "react";
+import React, { useCallback, useEffect } from "react";
 import { Keyboard, Platform, View } from "react-native";
 import Animated, {
   Easing,
@@ -30,10 +30,10 @@ import { notesnook } from "../../../e2e/test.ids";
 import { editorState } from "../../screens/editor/tiptap/utils";
 import { useSelectionStore } from "../../stores/use-selection-store";
 import { useSettingStore } from "../../stores/use-setting-store";
-import { getElevation, showTooltip, TOOLTIP_POSITIONS } from "../../utils";
-import { normalize, SIZE } from "../../utils/size";
+import { getElevationStyle } from "../../utils/elevation";
+import { SIZE, normalize } from "../../utils/size";
+import NativeTooltip from "../../utils/tooltip";
 import { PressableButton } from "../ui/pressable";
-import { useCallback } from "react";
 
 export const FloatingButton = ({
   title,
@@ -116,11 +116,11 @@ export const FloatingButton = ({
         accentColor={color || "accent"}
         accentText="light"
         customStyle={{
-          ...getElevation(5),
+          ...getElevationStyle(5),
           borderRadius: 100
         }}
         onLongPress={(event) => {
-          showTooltip(event, title, TOOLTIP_POSITIONS.LEFT);
+          NativeTooltip.show(event, title, NativeTooltip.POSITIONS.LEFT);
         }}
         onPress={onPress}
       >

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

@@ -46,7 +46,8 @@ const BaseDialog = ({
   animated = true,
   bounce = true,
   closeOnTouch = true,
-  useSafeArea = true
+  useSafeArea = true,
+  avoidKeyboardResize = false
 }) => {
   const floating = useIsFloatingKeyboard();
 
@@ -94,7 +95,7 @@ const BaseDialog = ({
         }}
       >
         <KeyboardAvoidingView
-          enabled={!floating && Platform.OS === "ios"}
+          enabled={!floating && Platform.OS === "ios" && !avoidKeyboardResize}
           behavior="padding"
         >
           <BouncingView

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

@@ -21,7 +21,7 @@ import React from "react";
 import { View } from "react-native";
 import { DDS } from "../../services/device-detection";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { getElevation } from "../../utils";
+import { getElevationStyle } from "../../utils/elevation";
 
 const DialogContainer = ({ width, height, ...restProps }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -30,7 +30,7 @@ const DialogContainer = ({ width, height, ...restProps }) => {
     <View
       {...restProps}
       style={{
-        ...getElevation(5),
+        ...getElevationStyle(5),
         width: width || DDS.isTab ? 500 : "85%",
         maxHeight: height || 450,
         borderRadius: 10,

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

@@ -25,7 +25,7 @@ import {
   eUnSubscribeEvent
 } from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { getElevation } from "../../utils";
+import { getElevationStyle } from "../../utils/elevation";
 import { eCloseSimpleDialog, eOpenSimpleDialog } from "../../utils/events";
 import { sleep } from "../../utils/time";
 import { Toast } from "../toast";
@@ -111,7 +111,7 @@ export const Dialog = ({ context = "global" }) => {
   };
 
   const style = {
-    ...getElevation(5),
+    ...getElevationStyle(5),
     width: DDS.isTab ? 400 : "85%",
     maxHeight: 450,
     borderRadius: 5,

apps/mobile/app/components/dialogs/jump-to-section/index.js

@@ -26,7 +26,7 @@ import {
 } from "../../../services/event-manager";
 import { useMessageStore } from "../../../stores/use-message-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
-import { getElevation } from "../../../utils";
+import { getElevationStyle } from "../../../utils/elevation";
 import {
   eCloseJumpToDialog,
   eOpenJumpToDialog,
@@ -124,7 +124,7 @@ const JumpToSectionDialog = ({ scrollRef, data, type }) => {
     >
       <View
         style={{
-          ...getElevation(5),
+          ...getElevationStyle(5),
           width: DDS.isTab ? 500 : "85%",
           backgroundColor: colors.bg,
           zIndex: 100,

apps/mobile/app/components/dialogs/result/index.js

@@ -25,7 +25,7 @@ import {
   eUnSubscribeEvent
 } from "../../../services/event-manager";
 import { useThemeStore } from "../../../stores/use-theme-store";
-import { getElevation } from "../../../utils";
+import { getElevationStyle } from "../../../utils/elevation";
 import { eCloseResultDialog, eOpenResultDialog } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
 import BaseDialog from "../../dialog/base-dialog";
@@ -68,7 +68,7 @@ const ResultDialog = () => {
     <BaseDialog visible={true} onRequestClose={close}>
       <View
         style={{
-          ...getElevation(5),
+          ...getElevationStyle(5),
           width: DDS.isTab ? 350 : "85%",
           maxHeight: 500,
           borderRadius: 10,

apps/mobile/app/components/dialogs/vault/index.js

@@ -34,7 +34,8 @@ import {
 } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import SearchService from "../../../services/search";
-import { getElevation, toTXT } from "../../../utils";
+import { convertNoteToText } from "../../../utils/note-to-text";
+import { getElevationStyle } from "../../../utils/elevation";
 import {
   eClearEditor,
   eCloseActionSheet,
@@ -564,7 +565,7 @@ export class VaultDialog extends Component {
   }
 
   async _copyNote(note) {
-    Clipboard.setString(await toTXT(note));
+    Clipboard.setString(await convertNoteToText(note));
     ToastEvent.show({
       heading: "Note copied",
       type: "success",
@@ -580,7 +581,7 @@ export class VaultDialog extends Component {
       await Share.open({
         heading: "Share note",
         failOnCancel: false,
-        message: await toTXT(note)
+        message: await convertNoteToText(note)
       });
     } catch (e) {
       console.error(e);
@@ -678,7 +679,7 @@ export class VaultDialog extends Component {
       >
         <View
           style={{
-            ...getElevation(5),
+            ...getElevationStyle(5),
             width: DDS.isTab ? 350 : "85%",
             borderRadius: 10,
             backgroundColor: colors.bg,

apps/mobile/app/components/header/right-menus.js

@@ -92,7 +92,7 @@ export const RightMenus = () => {
           onRequestClose={() => {
             menuRef.current?.hide();
           }}
-          anchor={
+          button={
             <IconButton
               onPress={() => {
                 menuRef.current?.show();

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

@@ -29,7 +29,7 @@ import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import SettingsService from "../../services/settings";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { getElevation } from "../../utils";
+import { getElevationStyle } from "../../utils/elevation";
 import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import Heading from "../ui/typography/heading";
@@ -198,7 +198,7 @@ const Intro = ({ navigation }) => {
           style={{
             paddingHorizontal: 24,
             alignSelf: "center",
-            ...getElevation(5),
+            ...getElevationStyle(5),
             borderRadius: 100
           }}
           fontSize={SIZE.md}

apps/mobile/app/components/intro/welcome.js

@@ -24,7 +24,7 @@ import { eSendEvent } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import SettingsService from "../../services/settings";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { getElevation } from "../../utils";
+import { getElevationStyle } from "../../utils/elevation";
 import {
   eCloseLoading,
   eOpenLoading,
@@ -91,7 +91,7 @@ export const WelcomeNotice = () => {
           paddingHorizontal: 24,
           alignSelf: "center",
           borderRadius: 100,
-          ...getElevation(5),
+          ...getElevationStyle(5),
           marginTop: 30
         }}
         type="accent"

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

@@ -1,339 +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 notifee from "@notifee/react-native";
-import React, { useCallback, useEffect, useRef } from "react";
-import { Platform, View } from "react-native";
-import RNBootSplash from "react-native-bootsplash";
-import { checkVersion } from "react-native-check-version";
-import Config from "react-native-config";
-import { enabled } from "react-native-privacy-snapshot";
-import { DatabaseLogger, db } from "../../common/database";
-import { useAppState } from "../../hooks/use-app-state";
-import BiometricService from "../../services/biometrics";
-import { eSendEvent, presentSheet } from "../../services/event-manager";
-import { setRateAppMessage } from "../../services/message";
-import PremiumService from "../../services/premium";
-import SettingsService from "../../services/settings";
-import { initialize } from "../../stores";
-import { useMessageStore } from "../../stores/use-message-store";
-import { useNoteStore } from "../../stores/use-notes-store";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { useThemeStore } from "../../stores/use-theme-store";
-import { useUserStore } from "../../stores/use-user-store";
-import { AndroidModule } from "../../utils";
-import { eOpenAnnouncementDialog } from "../../utils/events";
-import { getGithubVersion } from "../../utils/github-version";
-import { SIZE } from "../../utils/size";
-import { sleep } from "../../utils/time";
-import Migrate from "../sheets/migrate";
-import NewFeature from "../sheets/new-feature/index";
-import { Update } from "../sheets/update";
-import { Button } from "../ui/button";
-import { IconButton } from "../ui/icon-button";
-import Input from "../ui/input";
-import Seperator from "../ui/seperator";
-import Heading from "../ui/typography/heading";
-import Paragraph from "../ui/typography/paragraph";
-import { Walkthrough } from "../walkthroughs";
-
-const Launcher = React.memo(
-  function Launcher() {
-    const colors = useThemeStore((state) => state.colors);
-    const setLoading = useNoteStore((state) => state.setLoading);
-    const loading = useNoteStore((state) => state.loading);
-    const user = useUserStore((state) => state.user);
-    const verifyUser = useUserStore((state) => state.verifyUser);
-    const setVerifyUser = useUserStore((state) => state.setVerifyUser);
-    const deviceMode = useSettingStore((state) => state.deviceMode);
-    const appState = useAppState();
-    const passwordInputRef = useRef();
-    const password = useRef();
-    const introCompleted = useSettingStore(
-      (state) => state.settings.introCompleted
-    );
-    const verifying = useRef(false);
-
-    const loadNotes = useCallback(async () => {
-      if (verifyUser) {
-        return;
-      }
-      setImmediate(() => {
-        db.notes.init().then(() => {
-          Walkthrough.init();
-          initialize();
-          setImmediate(() => {
-            setLoading(false);
-          });
-        });
-      });
-    }, [setLoading, verifyUser]);
-
-    const init = useCallback(async () => {
-      if (!db.isInitialized) {
-        RNBootSplash.hide({ fade: true });
-        DatabaseLogger.info("Initializing database");
-        await db.init();
-      }
-
-      if (db.migrations.required() && !verifyUser) {
-        presentSheet({
-          component: <Migrate />,
-          onClose: async () => {
-            if (!db.isInitialized) {
-              await db.init();
-            }
-            loadNotes();
-          },
-          disableClosing: true
-        });
-        return;
-      }
-
-      if (!verifyUser) {
-        loadNotes();
-      } else {
-        useUserStore.getState().setUser(await db.user?.getUser());
-      }
-    }, [loadNotes, verifyUser]);
-
-    useEffect(() => {
-      if (!loading) {
-        doAppLoadActions();
-      }
-    }, [doAppLoadActions, loading]);
-
-    const doAppLoadActions = useCallback(async () => {
-      await sleep(500);
-      if (SettingsService.get().sessionExpired) {
-        eSendEvent("session_expired");
-        return;
-      }
-      notifee.setBadgeCount(0);
-      await useMessageStore.getState().setAnnouncement();
-      if (NewFeature.present()) return;
-      if (await checkAppUpdateAvailable()) return;
-      if (await checkForRateAppRequest()) return;
-      if (await PremiumService.getRemainingTrialDaysStatus()) return;
-
-      if (introCompleted) {
-        useMessageStore.subscribe((state) => {
-          let dialogs = state.dialogs;
-          if (dialogs.length > 0) {
-            eSendEvent(eOpenAnnouncementDialog, dialogs[0]);
-          }
-        });
-      }
-    }, [introCompleted]);
-
-    const checkAppUpdateAvailable = async () => {
-      if (__DEV__ || Config.isTesting === "true") return;
-      try {
-        const version =
-          Config.GITHUB_RELEASE === "true"
-            ? await getGithubVersion()
-            : await checkVersion();
-        if (!version || !version?.needsUpdate) return false;
-        presentSheet({
-          component: (ref) => <Update version={version} fwdRef={ref} />
-        });
-        return true;
-      } catch (e) {
-        return false;
-      }
-    };
-
-    const checkForRateAppRequest = async () => {
-      let rateApp = SettingsService.get().rateApp;
-      if (
-        rateApp &&
-        rateApp < Date.now() &&
-        !useMessageStore.getState().message?.visible
-      ) {
-        setRateAppMessage();
-        return false;
-      }
-      return false;
-    };
-
-    const onUnlockBiometrics = useCallback(async () => {
-      if (!(await BiometricService.isBiometryAvailable())) return;
-      if (Platform.OS === "android") {
-        const activityName = await AndroidModule.getActivityName();
-        if (activityName !== "MainActivity") return;
-      }
-
-      let verified = await BiometricService.validateUser(
-        "Unlock to access your notes",
-        ""
-      );
-      if (verified) {
-        setVerifyUser(false);
-        enabled(false);
-        password.current = null;
-        setTimeout(() => {
-          verifying.current = false;
-        }, 1);
-      }
-    }, [setVerifyUser]);
-
-    useEffect(() => {
-      init();
-    }, [init, verifyUser]);
-
-    useEffect(() => {
-      if (verifying.current || useUserStore.getState().shouldBlockVerifyUser)
-        return;
-      if (verifyUser && appState === "active") {
-        verifying.current = true;
-        onUnlockBiometrics();
-      }
-    }, [appState, onUnlockBiometrics, verifyUser]);
-
-    const onSubmit = async () => {
-      if (!password.current) return;
-      try {
-        let verified = await db.user.verifyPassword(password.current);
-        if (verified) {
-          setVerifyUser(false);
-          enabled(false);
-          password.current = null;
-        }
-      } catch (e) {
-        console.error(e);
-      }
-    };
-
-    return verifyUser ? (
-      <View
-        style={{
-          backgroundColor: colors.bg,
-          width: "100%",
-          height: "100%",
-          position: "absolute",
-          zIndex: 999,
-          justifyContent: "center"
-        }}
-      >
-        <View
-          style={{
-            flex: 1,
-            justifyContent: "center",
-            width:
-              deviceMode !== "mobile"
-                ? "50%"
-                : Platform.OS == "ios"
-                ? "95%"
-                : "100%",
-            paddingHorizontal: 12,
-            marginBottom: 30,
-            marginTop: 15,
-            alignSelf: "center"
-          }}
-        >
-          <IconButton
-            name="fingerprint"
-            size={100}
-            customStyle={{
-              width: 100,
-              height: 100,
-              marginBottom: 20,
-              marginTop: user ? 0 : 50
-            }}
-            onPress={onUnlockBiometrics}
-            color={colors.border}
-          />
-          <Heading
-            color={colors.heading}
-            style={{
-              alignSelf: "center",
-              textAlign: "center"
-            }}
-          >
-            Unlock your notes
-          </Heading>
-
-          <Paragraph
-            style={{
-              alignSelf: "center",
-              textAlign: "center",
-              maxWidth: "90%"
-            }}
-          >
-            {"Please verify it's you"}
-          </Paragraph>
-          <Seperator />
-          <View
-            style={{
-              width: "100%",
-              padding: 12,
-              backgroundColor: colors.bg
-            }}
-          >
-            {user ? (
-              <>
-                <Input
-                  fwdRef={passwordInputRef}
-                  secureTextEntry
-                  placeholder="Enter account password"
-                  onChangeText={(v) => (password.current = v)}
-                  onSubmit={onSubmit}
-                />
-              </>
-            ) : null}
-
-            <View
-              style={{
-                marginTop: user ? 25 : 25
-              }}
-            >
-              {user ? (
-                <>
-                  <Button
-                    title="Continue"
-                    type="accent"
-                    onPress={onSubmit}
-                    width={250}
-                    height={45}
-                    style={{
-                      borderRadius: 150,
-                      marginBottom: 10
-                    }}
-                    fontSize={SIZE.md}
-                  />
-                </>
-              ) : null}
-
-              <Button
-                title="Unlock with Biometrics"
-                width={250}
-                onPress={onUnlockBiometrics}
-                icon={"fingerprint"}
-                type={user ? "grayAccent" : "accent"}
-              />
-            </View>
-          </View>
-        </View>
-      </View>
-    ) : null;
-  },
-  () => true
-);
-
-export default Launcher;

apps/mobile/app/components/list-items/headers/notebook-header.js

@@ -23,7 +23,7 @@ import { View } from "react-native";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { useMenuStore } from "../../../stores/use-menu-store";
 import { ToastEvent } from "../../../services/event-manager";
-import { getTotalNotes } from "../../../utils";
+import { getTotalNotes } from "@notesnook/common";
 import { db } from "../../../common/database";
 import { SIZE } from "../../../utils/size";
 import { IconButton } from "../../ui/icon-button";

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

@@ -178,16 +178,29 @@ const NoteItem = ({
           </View>
         ) : null}
 
-        <Heading
-          numberOfLines={1}
-          color={COLORS_NOTE[item.color?.toLowerCase()] || colors.heading}
-          style={{
-            flexWrap: "wrap"
-          }}
-          size={SIZE.md}
-        >
-          {item.title}
-        </Heading>
+        {compactMode ? (
+          <Paragraph
+            numberOfLines={1}
+            color={COLORS_NOTE[item.color?.toLowerCase()] || colors.heading}
+            style={{
+              flexWrap: "wrap"
+            }}
+            size={SIZE.sm}
+          >
+            {item.title}
+          </Paragraph>
+        ) : (
+          <Heading
+            numberOfLines={1}
+            color={COLORS_NOTE[item.color?.toLowerCase()] || colors.heading}
+            style={{
+              flexWrap: "wrap"
+            }}
+            size={SIZE.md}
+          >
+            {item.title}
+          </Heading>
+        )}
 
         {item.headline && !compactMode ? (
           <Paragraph
@@ -202,161 +215,223 @@ const NoteItem = ({
           </Paragraph>
         ) : null}
 
-        <View
-          style={{
-            flexDirection: "row",
-            justifyContent: "flex-start",
-            alignItems: "center",
-            width: "100%",
-            marginTop: 5,
-            height: SIZE.md + 2
-          }}
-        >
-          {!isTrash ? (
-            <>
-              {item.conflicted ? (
-                <Icon
-                  name="alert-circle"
+        {compactMode ? null : (
+          <View
+            style={{
+              flexDirection: "row",
+              justifyContent: "flex-start",
+              alignItems: "center",
+              width: "100%",
+              marginTop: 5,
+              height: SIZE.md + 2
+            }}
+          >
+            {!isTrash ? (
+              <>
+                {item.conflicted ? (
+                  <Icon
+                    name="alert-circle"
+                    style={{
+                      marginRight: 6
+                    }}
+                    size={SIZE.sm}
+                    color={colors.red}
+                  />
+                ) : null}
+                <TimeSince
                   style={{
+                    fontSize: SIZE.xs,
+                    color: colors.icon,
                     marginRight: 6
                   }}
-                  size={SIZE.sm}
-                  color={colors.red}
+                  time={item[dateBy]}
+                  updateFrequency={
+                    Date.now() - item[dateBy] < 60000 ? 2000 : 60000
+                  }
                 />
-              ) : null}
-              <TimeSince
-                style={{
-                  fontSize: SIZE.xs,
-                  color: colors.icon,
-                  marginRight: 6
-                }}
-                time={item[dateBy]}
-                updateFrequency={
-                  Date.now() - item[dateBy] < 60000 ? 2000 : 60000
-                }
-              />
 
-              {attachmentCount > 0 ? (
-                <View
+                {attachmentCount > 0 ? (
+                  <View
+                    style={{
+                      flexDirection: "row",
+                      alignItems: "center",
+                      marginRight: 6
+                    }}
+                  >
+                    <Icon
+                      name="attachment"
+                      size={SIZE.md}
+                      color={colors.icon}
+                    />
+                    <Paragraph color={colors.icon} size={SIZE.xs}>
+                      {attachmentCount}
+                    </Paragraph>
+                  </View>
+                ) : null}
+
+                {item.pinned ? (
+                  <Icon
+                    testID="icon-pinned"
+                    name="pin-outline"
+                    size={SIZE.sm}
+                    style={{
+                      marginRight: 6
+                    }}
+                    color={
+                      COLORS_NOTE[item.color?.toLowerCase()] || colors.accent
+                    }
+                  />
+                ) : null}
+
+                {item.locked ? (
+                  <Icon
+                    name="lock"
+                    testID="note-locked-icon"
+                    size={SIZE.sm}
+                    style={{
+                      marginRight: 6
+                    }}
+                    color={colors.icon}
+                  />
+                ) : null}
+
+                {item.favorite ? (
+                  <Icon
+                    testID="icon-star"
+                    name="star-outline"
+                    size={SIZE.md}
+                    style={{
+                      marginRight: 6
+                    }}
+                    color="orange"
+                  />
+                ) : null}
+
+                {!isTrash && !compactMode && tags
+                  ? tags.map((item) =>
+                      item.id ? (
+                        <Button
+                          title={"#" + item.alias}
+                          key={item.id}
+                          height={23}
+                          type="gray"
+                          textStyle={{
+                            textDecorationLine: "underline"
+                          }}
+                          hitSlop={{ top: 8, bottom: 12, left: 0, right: 0 }}
+                          fontSize={SIZE.xs}
+                          style={{
+                            borderRadius: 5,
+                            paddingHorizontal: 6,
+                            marginRight: 4,
+                            zIndex: 10,
+                            maxWidth: tags.length > 1 ? 130 : null
+                          }}
+                          onPress={() => navigateToTag(item)}
+                        />
+                      ) : null
+                    )
+                  : null}
+              </>
+            ) : (
+              <>
+                <Paragraph
+                  color={colors.icon}
+                  size={SIZE.xs}
                   style={{
-                    flexDirection: "row",
-                    alignItems: "center",
                     marginRight: 6
                   }}
                 >
-                  <Icon name="attachment" size={SIZE.md} color={colors.icon} />
-                  <Paragraph color={colors.icon} size={SIZE.xs}>
-                    {attachmentCount}
-                  </Paragraph>
-                </View>
-              ) : null}
+                  Deleted on{" "}
+                  {item && item.dateDeleted
+                    ? new Date(item.dateDeleted).toISOString().slice(0, 10)
+                    : null}
+                </Paragraph>
 
-              {item.pinned ? (
-                <Icon
-                  testID="icon-pinned"
-                  name="pin-outline"
-                  size={SIZE.sm}
+                <Paragraph
+                  color={colors.accent}
+                  size={SIZE.xs}
                   style={{
                     marginRight: 6
                   }}
-                  color={
-                    COLORS_NOTE[item.color?.toLowerCase()] || colors.accent
-                  }
-                />
-              ) : null}
-
-              {item.locked ? (
-                <Icon
-                  name="lock"
-                  testID="note-locked-icon"
-                  size={SIZE.sm}
-                  style={{
-                    marginRight: 6
-                  }}
-                  color={colors.icon}
-                />
-              ) : null}
-
-              {item.favorite ? (
-                <Icon
-                  testID="icon-star"
-                  name="star"
-                  size={SIZE.md}
-                  style={{
-                    marginRight: 6
-                  }}
-                  color="orange"
-                />
-              ) : null}
-
-              {!isTrash && !compactMode && tags
-                ? tags.map((item) =>
-                    item.id ? (
-                      <Button
-                        title={"#" + item.alias}
-                        key={item.id}
-                        height={23}
-                        type="gray"
-                        textStyle={{
-                          textDecorationLine: "underline"
-                        }}
-                        hitSlop={{ top: 8, bottom: 12, left: 0, right: 0 }}
-                        fontSize={SIZE.xs}
-                        style={{
-                          borderRadius: 5,
-                          paddingHorizontal: 6,
-                          marginRight: 4,
-                          zIndex: 10,
-                          maxWidth: tags.length > 1 ? 130 : null
-                        }}
-                        onPress={() => navigateToTag(item)}
-                      />
-                    ) : null
-                  )
-                : null}
-            </>
-          ) : (
-            <>
-              <Paragraph
-                color={colors.icon}
-                size={SIZE.xs}
-                style={{
-                  marginRight: 6
-                }}
-              >
-                Deleted on{" "}
-                {item && item.dateDeleted
-                  ? new Date(item.dateDeleted).toISOString().slice(0, 10)
-                  : null}
-              </Paragraph>
-
-              <Paragraph
-                color={colors.accent}
-                size={SIZE.xs}
-                style={{
-                  marginRight: 6
-                }}
-              >
-                {item.itemType[0].toUpperCase() + item.itemType.slice(1)}
-              </Paragraph>
-            </>
-          )}
-        </View>
+                >
+                  {item.itemType[0].toUpperCase() + item.itemType.slice(1)}
+                </Paragraph>
+              </>
+            )}
+          </View>
+        )}
       </View>
-      <IconButton
-        testID={notesnook.listitem.menu}
-        color={colors.pri}
-        name="dots-horizontal"
-        size={SIZE.xl}
-        onPress={() => !noOpen && showActionSheet(item, isTrash)}
-        customStyle={{
-          justifyContent: "center",
-          height: 35,
-          width: 35,
-          borderRadius: 100,
+      <View
+        style={{
+          flexDirection: "row",
           alignItems: "center"
         }}
-      />
+      >
+        {compactMode ? (
+          <>
+            {item.conflicted ? (
+              <Icon
+                name="alert-circle"
+                style={{
+                  marginRight: 6
+                }}
+                size={SIZE.sm}
+                color={colors.red}
+              />
+            ) : null}
+
+            {item.locked ? (
+              <Icon
+                name="lock"
+                testID="note-locked-icon"
+                size={SIZE.sm}
+                style={{
+                  marginRight: 6
+                }}
+                color={colors.icon}
+              />
+            ) : null}
+
+            {item.favorite ? (
+              <Icon
+                testID="icon-star"
+                name="star-outline"
+                size={SIZE.md}
+                style={{
+                  marginRight: 6
+                }}
+                color="orange"
+              />
+            ) : null}
+
+            <TimeSince
+              style={{
+                fontSize: SIZE.xs,
+                color: colors.icon,
+                marginRight: 6
+              }}
+              time={item[dateBy]}
+              updateFrequency={Date.now() - item[dateBy] < 60000 ? 2000 : 60000}
+            />
+          </>
+        ) : null}
+
+        <IconButton
+          testID={notesnook.listitem.menu}
+          color={colors.pri}
+          name="dots-horizontal"
+          size={SIZE.xl}
+          onPress={() => !noOpen && showActionSheet(item, isTrash)}
+          customStyle={{
+            justifyContent: "center",
+            height: 35,
+            width: 35,
+            borderRadius: 100,
+            alignItems: "center"
+          }}
+        />
+      </View>
     </>
   );
 };

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

@@ -30,7 +30,6 @@ import {
 } from "../../../services/event-manager";
 import { useEditorStore } from "../../../stores/use-editor-store";
 import { useSelectionStore } from "../../../stores/use-selection-store";
-import { history } from "../../../utils";
 import { eOnLoadNote, eShowMergeDialog } from "../../../utils/events";
 import { tabBarRef } from "../../../utils/global-refs";
 import { presentDialog } from "../../dialog/functions";
@@ -59,12 +58,14 @@ export const openNote = async (item, isTrash, setSelectedItem, isSheet) => {
       return;
     }
   }
+  const { selectedItemsList, selectionMode, clearSelection } =
+    useSelectionStore.getState();
 
-  if (history.selectedItemsList.length > 0 && history.selectionMode) {
+  if (selectedItemsList.length > 0 && selectionMode) {
     setSelectedItem && setSelectedItem(_note);
     return;
   } else {
-    history.selectedItemsList = [];
+    clearSelection();
   }
 
   if (_note.conflicted) {

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

@@ -22,23 +22,23 @@ import { View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { notesnook } from "../../../../e2e/test.ids";
 import { TopicNotes } from "../../../screens/notes/topic-notes";
+import { useSelectionStore } from "../../../stores/use-selection-store";
 import { useSettingStore } from "../../../stores/use-setting-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
-import { history } from "../../../utils";
 import { SIZE } from "../../../utils/size";
 import { Properties } from "../../properties";
 import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
-import { getFormattedDate } from "../../../utils/time";
+import { getFormattedDate } from "@notesnook/common";
 
 const showActionSheet = (item) => {
   Properties.present(item);
 };
 
 const navigateToTopic = (topic) => {
-  if (history.selectedItemsList.length > 0) return;
+  if (useSelectionStore.getState().selectedItemsList.length > 0) return;
   TopicNotes.navigate(topic, true);
 };
 
@@ -64,15 +64,28 @@ export const NotebookItem = ({
           flexShrink: 1
         }}
       >
-        <Heading
-          size={SIZE.md}
-          numberOfLines={1}
-          style={{
-            flexWrap: "wrap"
-          }}
-        >
-          {item.title}
-        </Heading>
+        {compactMode ? (
+          <Paragraph
+            size={SIZE.sm}
+            numberOfLines={1}
+            style={{
+              flexWrap: "wrap"
+            }}
+          >
+            {item.title}
+          </Paragraph>
+        ) : (
+          <Heading
+            size={SIZE.md}
+            numberOfLines={1}
+            style={{
+              flexWrap: "wrap"
+            }}
+          >
+            {item.title}
+          </Heading>
+        )}
+
         {isTopic || !item.description || compactMode ? null : (
           <Paragraph
             size={SIZE.sm}
@@ -123,40 +136,51 @@ export const NotebookItem = ({
           </View>
         )}
 
-        <View
-          style={{
-            flexDirection: "row",
-            justifyContent: "flex-start",
-            alignItems: "center",
-            marginTop: 5,
-            height: SIZE.md + 2
-          }}
-        >
-          {isTrash ? (
-            <>
+        {!compactMode ? (
+          <View
+            style={{
+              flexDirection: "row",
+              justifyContent: "flex-start",
+              alignItems: "center",
+              marginTop: 5,
+              height: SIZE.md + 2
+            }}
+          >
+            {isTrash ? (
+              <>
+                <Paragraph
+                  color={colors.icon}
+                  size={SIZE.xs}
+                  style={{
+                    textAlignVertical: "center",
+                    marginRight: 6
+                  }}
+                >
+                  {"Deleted on " +
+                    new Date(item.dateDeleted).toISOString().slice(0, 10)}
+                </Paragraph>
+                <Paragraph
+                  color={colors.accent}
+                  size={SIZE.xs}
+                  style={{
+                    textAlignVertical: "center",
+                    marginRight: 6
+                  }}
+                >
+                  {item.itemType[0].toUpperCase() + item.itemType.slice(1)}
+                </Paragraph>
+              </>
+            ) : (
               <Paragraph
                 color={colors.icon}
                 size={SIZE.xs}
                 style={{
-                  textAlignVertical: "center",
                   marginRight: 6
                 }}
               >
-                {"Deleted on " +
-                  new Date(item.dateDeleted).toISOString().slice(0, 10)}
+                {getFormattedDate(item[dateBy], "date")}
               </Paragraph>
-              <Paragraph
-                color={colors.accent}
-                size={SIZE.xs}
-                style={{
-                  textAlignVertical: "center",
-                  marginRight: 6
-                }}
-              >
-                {item.itemType[0].toUpperCase() + item.itemType.slice(1)}
-              </Paragraph>
-            </>
-          ) : (
+            )}
             <Paragraph
               color={colors.icon}
               size={SIZE.xs}
@@ -164,50 +188,66 @@ export const NotebookItem = ({
                 marginRight: 6
               }}
             >
-              {getFormattedDate(item[dateBy], "date")}
+              {item && totalNotes > 1
+                ? totalNotes + " notes"
+                : totalNotes === 1
+                ? totalNotes + " note"
+                : "0 notes"}
             </Paragraph>
-          )}
-          <Paragraph
-            color={colors.icon}
-            size={SIZE.xs}
-            style={{
-              marginRight: 6
-            }}
-          >
-            {item && totalNotes > 1
-              ? totalNotes + " notes"
-              : totalNotes === 1
-              ? totalNotes + " note"
-              : "0 notes"}
-          </Paragraph>
 
-          {item.pinned ? (
-            <Icon
-              name="pin-outline"
-              size={SIZE.sm}
-              style={{
-                marginRight: 10,
-                marginTop: 2
-              }}
-              color={colors.accent}
-            />
-          ) : null}
-        </View>
+            {item.pinned ? (
+              <Icon
+                name="pin-outline"
+                size={SIZE.sm}
+                style={{
+                  marginRight: 10,
+                  marginTop: 2
+                }}
+                color={colors.accent}
+              />
+            ) : null}
+          </View>
+        ) : null}
       </View>
-      <IconButton
-        color={colors.heading}
-        name="dots-horizontal"
-        testID={notesnook.ids.notebook.menu}
-        size={SIZE.xl}
-        onPress={() => showActionSheet(item)}
-        customStyle={{
-          justifyContent: "center",
-          height: 35,
-          width: 35,
-          borderRadius: 100,
+      <View
+        style={{
+          flexDirection: "row",
           alignItems: "center"
         }}
-      />
+      >
+        {compactMode ? (
+          <>
+            <Paragraph
+              color={colors.icon}
+              size={SIZE.xs}
+              style={{
+                marginRight: 6
+              }}
+            >
+              {item && totalNotes > 1
+                ? totalNotes + " notes"
+                : totalNotes === 1
+                ? totalNotes + " note"
+                : "0 notes"}
+            </Paragraph>
+          </>
+        ) : null}
+
+        <IconButton
+          color={colors.heading}
+          name="dots-horizontal"
+          testID={notesnook.ids.notebook.menu}
+          size={SIZE.xl}
+          onPress={() => showActionSheet(item)}
+          customStyle={{
+            justifyContent: "center",
+            height: 35,
+            width: 35,
+            borderRadius: 100,
+            alignItems: "center"
+          }}
+        />
+      </View>
     </>
   );
 };