web: refactor theme builder

& copy link text

.commitlintrc.js

@@ -19,8 +19,10 @@ const SCOPES = [
   "editor",
   "logger",
   "theme",
+  "server",
   "core",
   "fs",
+  "ui",
   "clipper",
   "config",
   "ci",
@@ -28,7 +30,9 @@ const SCOPES = [
   "docs",
   "refactor",
   "misc",
-  "global"
+  "common",
+  "global",
+  "docs"
 ];
 
 module.exports = {

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.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/dco.yml

@@ -1,4 +0,0 @@
-allowRemediationCommits:
-  individual: true
-require:
-  members: false

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

@@ -11,31 +11,20 @@ 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
         with:
-          java-version: '11'
-          architecture: 'x64'
+          java-version: "11"
+          architecture: "x64"
 
       - name: Install node modules
         run: |
-          npm ci
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+          
       - name: Make Gradlew Executable
         run: cd apps/mobile/native/android && chmod +x ./gradlew
 
@@ -50,7 +39,7 @@ jobs:
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}   
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Publish to Playstore
         id: deploy
@@ -61,4 +50,4 @@ jobs:
           releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
           track: internal
           status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/             
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/

.github/workflows/android.publish.yml

@@ -11,31 +11,20 @@ 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
         with:
-          java-version: '11'
-          architecture: 'x64'
+          java-version: "11"
+          architecture: "x64"
 
       - name: Install node modules
         run: |
-          npm ci
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
       - name: Make Gradlew Executable
         run: cd apps/mobile/native/android && chmod +x ./gradlew
 
@@ -50,7 +39,7 @@ jobs:
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}  
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Publish to Playstore
         id: deploy
@@ -61,7 +50,7 @@ jobs:
           releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
           track: production
           status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/      
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -74,7 +63,7 @@ jobs:
           signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
           alias: ${{ secrets.PUBLIC_ALIAS }}
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
-          keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}    
+          keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
 
       - name: Rename apk files
         run: |
@@ -102,4 +91,4 @@ jobs:
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk           
+            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk

.github/workflows/core.tests.yml

@@ -8,7 +8,7 @@ on:
     paths:
       - "packages/core/**"
       # re-run workflow if workflow file changes
-      - ".github/workflows/core.tests.yml" 
+      - ".github/workflows/core.tests.yml"
   pull_request:
     types:
       - "ready_for_review"
@@ -24,25 +24,12 @@ 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: |
-          npm ci --prefer-offline --no-audit
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=core
       - name: Add environment variables
         run: |
           echo "USER_EMAIL=${{ secrets.USER_EMAIL }}" >> $GITHUB_ENV

.github/workflows/desktop.publish.yml

@@ -28,26 +28,12 @@ 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: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
 
       - name: Setup environment
         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,13 +87,13 @@ 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)
           echo ::set-output name=app_version::$(cat package.json | jq -r .version)
           echo ::set-output name=bundle_version::$(cat package.json | jq -r .build.mac.bundleVersion)
-        
+
       - name: Get App Store Version
         id: appstore
         uses: streetwriters/appstore-connect-app-version@develop
@@ -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/web/build
 
       - name: Install packages
         run: |
-          npm i
-          npm i dmg-license
-        working-directory: ./apps/web/desktop
-      
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
+
       - 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,26 +138,26 @@ 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
         env:
           API_KEY_ID: ${{ secrets.api_key_id }}
           API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
-        run: |       
-          package=$(find ./dist/mas-universal/notesnook*.pkg)
+        run: |
+          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/web/build
 
       - name: Install packages
-        run: npm i
-        working-directory: ./apps/web/desktop
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
 
       - 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/web/build
 
       - name: Install packages
-        run: npm i
-        working-directory: ./apps/web/desktop
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
 
-      - 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,26 +25,12 @@ 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: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=editor
 
       - name: Setup environment
         run: |

.github/workflows/help.publish.yml

@@ -0,0 +1,35 @@
+name: Publish Notesnook Help
+
+on: 
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+    paths:
+      - "docs/help/**"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install docgen
+        run: cargo install --git https://github.com/thecodrr/docgen
+
+      - name: Build site
+        run: docgen build --release
+        working-directory: docs/help
+
+      - name: Setup environment
+        run: |
+          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Publish on Cloudflare Pages
+        run: npx --yes wrangler pages deploy --project-name notesnook-help ./docs/help/site/ --branch main

.github/workflows/nscurl.test.yml

@@ -11,4 +11,4 @@ jobs:
 
     steps:
       - name: Run ats-diagnostics
-        run: nscurl --ats-diagnostics https://payments.streetwriters.co
+        run: nscurl --ats-diagnostics https://payments.streetwriters.co

.github/workflows/web.publish.yml

@@ -11,26 +11,12 @@ 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: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
 
       - name: Setup environment
         run: |

.github/workflows/web.tests.yml

@@ -25,26 +25,12 @@ 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: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
 
       - name: Setup environment
         run: |
@@ -76,25 +62,11 @@ 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: |
-          npm i --ignore-scripts --prefer-offline --no-audit
+          npm ci --ignore-scripts --prefer-offline --no-audit
           npm install -D @playwright/test otplib
 
       - name: Validate build extraction

.gitignore

@@ -7,4 +7,6 @@ nx-cloud.env
 .idea
 .eslintcache
 .env.local
-.nyc_output
+.nyc_output
+site
+node_modules.backup

.prettierrc.js

@@ -5,5 +5,6 @@ module.exports = {
   printWidth: 80,
   useTabs: false,
   tabWidth: 2,
-  bracketSpacing: true
+  bracketSpacing: true,
+  endOfLine: "lf"
 };

.vscode/notesnook.code-workspace

@@ -1,72 +0,0 @@
-{
-  "folders": [
-    {
-      "name": "✨ notesnook",
-      "path": ".."
-    },
-    {
-      "name": "🚀 @notesnook/mobile",
-      "path": "../apps/mobile"
-    },
-    {
-      "name": "🚀 @notesnook/web",
-      "path": "../apps/web"
-    },
-    {
-      "name": "🚀 @notesnook/desktop",
-      "path": "../apps/web/desktop"
-    },
-    {
-      "name": "🚀 @notesnook/web-clipper",
-      "path": "../extensions/web-clipper"
-    },
-    {
-      "name": "📦 @notesnook/clipper",
-      "path": "../packages/clipper"
-    },
-    {
-      "name": "📦 @notesnook/core",
-      "path": "../packages/core"
-    },
-    {
-      "name": "📦 @notesnook/crypto",
-      "path": "../packages/crypto"
-    },
-    {
-      "name": "📦 @notesnook/crypto-worker",
-      "path": "../packages/crypto-worker"
-    },
-    {
-      "name": "📦 @notesnook/editor",
-      "path": "../packages/editor"
-    },
-    {
-      "name": "📦 @notesnook/editor-mobile",
-      "path": "../packages/editor-mobile"
-    },
-    {
-      "name": "📦 @notesnook/logger",
-      "path": "../packages/logger"
-    },
-    {
-      "name": "📦 @notesnook/streamable-fs",
-      "path": "../packages/streamable-fs"
-    },
-    {
-      "name": "📦 @notesnook/theme",
-      "path": "../packages/theme"
-    }
-  ],
-  "settings": {
-    "typescript.tsdk": "node_modules/typescript/lib",
-    "javascript.format.enable": true,
-    "editor.formatOnSave": true,
-    "editor.formatOnSaveMode": "modificationsIfAvailable",
-    "eslint.packageManager": "npm",
-    "eslint.run": "onSave",
-    "[javascript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "eslint.execArgv": ["--cache"]
-  }
-}

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+  "files.eol": "\n",
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.formatOnSave": true,
+  "editor.formatOnSaveMode": "file",
+  "eslint.run": "onSave",
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "eslint.options": {
+    "cache": true,
+    "cacheStrategy": "content"
+  },
+  "git.rebaseWhenSync": true
+}

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. 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.0",
+  "version": "2.5.8",
   "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": {
-    "diary": "^0.3.1",
-    "electron-updater": "^5.3.0",
+    "@notesnook/crypto": "file:../../packages/crypto",
+    "@trpc/client": "10.31.0",
+    "@trpc/server": "10.31.0",
+    "electron-trpc": "0.5.2",
+    "electron-updater": "6.1.1",
     "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-builder": "^23.6.0",
-    "electron-builder-notarize": "^1.5.0",
-    "electron-reloader": "^1.2.3",
-    "esbuild": "^0.15.11",
-    "patch-package": "^6.5.1"
+    "@types/node": "^18.15.0",
+    "@types/yargs": "^17.0.24",
+    "chokidar": "^3.5.3",
+    "electron": "24.5.1",
+    "electron-builder": "24.4.0",
+    "electron-builder-notarize": "^1.5.1",
+    "esbuild": "^0.17.19",
+    "node-fetch": "^3.3.1",
+    "tree-kill": "^1.2.2"
+  },
+  "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": "node scripts/dev.mjs",
+    "staging": "node scripts/build.mjs --run",
+    "release": "node 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,17 @@
     "productName": "Notesnook",
     "copyright": "Copyright © 2023 Streetwriters (Private) Limited",
     "artifactName": "notesnook_${os}_${arch}.${ext}",
+    "npmRebuild": false,
+    "asar": false,
     "files": [
       "!*.chunk.js.map",
       "!*.chunk.js.LICENSE.txt",
       "build/",
-      "!build/screenshots",
-      "!node_modules"
+      "!build/screenshots${/*}",
+      "!build/banner.jpg",
+      "!build/*.ico",
+      "!build/*.png",
+      "!node_modules${/*}"
     ],
     "afterSign": "electron-builder-notarize",
     "afterPack": "./scripts/removeLocales.js",
@@ -174,9 +193,12 @@
     "extraResources": [
       "./assets/**"
     ],
+    "extraMetadata": {
+      "main": "./build/electron.js"
+    },
     "directories": {
       "buildResources": "assets",
-      "output": "./dist/"
+      "output": "./output/"
     },
     "publish": [
       {

apps/desktop/patches/app-builder-lib+24.4.0.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-index ffcc8bd..7e57c9e 100644
+index 3ba5d6a..cf8e147 100644
 --- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
 +++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
 @@ -105,6 +105,7 @@ class LinuxTargetHelper {
@@ -9,12 +9,12 @@ index ffcc8bd..7e57c9e 100644
 +            actions: undefined
          };
          const description = this.getDescription(targetSpecificOptions);
-         if (!builder_util_1.isEmptyOrSpaces(description)) {
+         if (!(0, builder_util_1.isEmptyOrSpaces)(description)) {
 @@ -148,6 +149,23 @@ class LinuxTargetHelper {
              data += `\n${name}=${desktopMeta[name]}`;
          }
          data += "\n";
-+       
++               
 +        if (targetSpecificOptions.desktop.actions) {
 +            let actionsData = "";
 +            const validActions = [];

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,117 @@
+/*
+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 yargs from "yargs-parser";
+import os from "os";
+import * as childProcess from "child_process";
+import { fileURLToPath } from "url";
+
+const args = yargs(process.argv);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+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"));
+
+await fs.rm("./build/", { force: true, recursive: true });
+
+if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
+  await exec(`cd ${webAppPath} && npm run build:desktop`);
+}
+
+await fs.cp(path.join(webAppPath, "build"), "build", {
+  recursive: true,
+  force: true
+});
+
+if (args.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 (args.run) {
+  await exec(`npx electron-builder --dir --x64`);
+  if (process.platform === "win32") {
+    await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
+  } else if (process.platform === "darwin") {
+    await exec(`./output/darwin-unpacked/Notesnook`);
+  } else {
+    await exec(`./output/linux-unpacked/Notesnook`);
+  }
+}
+
+async function exec(cmd) {
+  return childProcess.execSync(cmd, {
+    env: process.env,
+    stdio: "inherit"
+  });
+}

apps/desktop/scripts/dev.mjs

@@ -0,0 +1,197 @@
+/*
+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 chokidar from "chokidar";
+import { execSync, spawn } from "child_process";
+import { fileURLToPath } from "url";
+import treekill from "tree-kill";
+import crypto from "crypto";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const sodiumNativePrebuildPath = path.join(
+  `node_modules`,
+  `@notesnook`,
+  `crypto`,
+  `node_modules`,
+  `@notesnook`,
+  `sodium`,
+  `node_modules`,
+  `sodium-native`,
+  `prebuilds`
+);
+const RUNNING_PROCESSES = [];
+const RESTARTABLE_PROCESSES = [];
+let lastBundleHash = null;
+
+await onChange(true);
+
+console.log("Watching...");
+
+const watcher = chokidar.watch("src/", { ignoreInitial: true });
+watcher.on("all", () => {
+  onChange(false);
+});
+
+process.on("SIGINT", async (s) => {
+  await cleanup();
+});
+
+async function onChange(first) {
+  if (first) {
+    await fs.rm("./build/", { force: true, recursive: true });
+  }
+
+  await exec(`npm run bundle`);
+  execAsync(`npx`, [`tsc`]);
+
+  if (await isBundleSame()) {
+    console.log("Bundle is same. Doing nothing.");
+    return;
+  }
+
+  if (first) {
+    await fs.cp(sodiumNativePrebuildPath, "build/prebuilds", {
+      recursive: true,
+      force: true
+    });
+  }
+
+  if (first) {
+    await spawnAndWaitUntil(
+      ["npx", "nx", "start:desktop", "@notesnook/web"],
+      path.join(__dirname, "..", "..", ".."),
+      (data) => data.includes("Network: use --host to expose")
+    );
+  }
+
+  if (!first) {
+    console.log("Restarting...", RESTARTABLE_PROCESSES.length);
+    await killProcesses(RESTARTABLE_PROCESSES);
+  }
+
+  execAsync(
+    "npx",
+    ["electron", path.join("build", "electron.js")],
+    true,
+    cleanup
+  );
+}
+
+function spawnAndWaitUntil(cmd, cwd, predicate) {
+  return new Promise((resolve) => {
+    console.log(">", ...cmd);
+
+    const s = spawn(cmd[0], cmd.slice(1), {
+      cwd,
+      env: { ...process.env, NO_COLOR: "true" },
+      shell: false
+    });
+
+    RUNNING_PROCESSES.push(s);
+
+    s.stderr.pipe(process.stderr);
+    s.stdout.on("data", (data) => {
+      process.stdout.write(data);
+      if (predicate(data)) resolve(undefined); //
+    });
+  });
+}
+
+async function exec(cmd) {
+  try {
+    console.log(">", cmd);
+
+    return execSync(cmd, {
+      env: process.env,
+      stdio: "inherit",
+      shell: false
+    });
+  } catch {
+    //ignore
+  }
+}
+
+function execAsync(cmd, args, restartable, onExit) {
+  try {
+    console.log(">", cmd, ...args);
+
+    const proc = spawn(cmd, args, {
+      stdio: "inherit",
+      env: process.env,
+      shell: false
+    });
+
+    const array = restartable ? RESTARTABLE_PROCESSES : RUNNING_PROCESSES;
+    array.push(proc);
+    proc.on("exit", (code, signal) => {
+      console.log(cmd, ...args, "closed with code", code);
+      if (code === 0 && !signal) {
+        array.splice(array.indexOf(proc), 1);
+        onExit && onExit();
+      }
+    });
+  } catch {
+    //ignore
+  }
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function killProcesses(processes) {
+  for (const process of processes.slice()) {
+    processes.splice(processes.indexOf(process), 1);
+    await new Promise((resolve, reject) =>
+      treekill(process.pid, (err) => (err ? reject(err) : resolve()))
+    );
+  }
+}
+
+async function cleanup() {
+  console.log("Cleaning up");
+
+  await killProcesses(RESTARTABLE_PROCESSES);
+  await killProcesses(RUNNING_PROCESSES);
+  await sleep(1000);
+
+  await fs.rm("./build/", { force: true, recursive: true });
+  process.exit();
+}
+
+async function isBundleSame() {
+  const bundle = await fs.readFile(
+    path.join(__dirname, "..", "build", "electron.js")
+  );
+
+  const hashSum = crypto.createHash("sha256");
+  hashSum.update(bundle);
+  const hex = hashSum.digest("hex");
+
+  if (!lastBundleHash) {
+    lastBundleHash = hex;
+    return false;
+  }
+  if (hex === lastBundleHash) return true;
+  lastBundleHash = hex;
+  return 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 { mkdirSync, writeFileSync } from "fs";
-import { dirname } from "path";
-import { logger } from "../../logger";
-import { resolvePath } from "../utils";
+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";
 
-export default (args) => {
-  try {
-    const { data, filePath } = args;
-    if (!data || !filePath) return;
+const t = initTRPC.create();
 
-    const resolvedPath = resolvePath(filePath);
+export const router = t.router({
+  compress: compressionRouter,
+  integration: osIntegrationRouter,
+  spellChecker: spellCheckerRouter,
+  updater: updaterRouter,
+  bridge: bridgeRouter
+});
 
-    logger.info("Saving file to", resolvedPath);
+export const api = router.createCaller({});
 
-    mkdirSync(dirname(resolvedPath), { recursive: true });
-    writeFileSync(resolvedPath, data);
-
-    logger.info("File saved to", resolvedPath);
-  } catch (e) {
-    logger.error("Could not save file.", e);
-  }
-};
+// 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 } from "path";
+import { resolvePath } from "../utils/resolve-path";
+import { observable } from "@trpc/server/observable";
+import { AssetManager } from "../utils/asset-manager";
+
+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: AssetManager.appIcon({
+          size: 64,
+          format: process.platform === "win32" ? "ico" : "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,81 @@
+/*
+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";
+import { z } from "zod";
+import { config } from "../utils/config";
+
+type UpdateInfo = { version: string };
+type Progress = { percent: number };
+
+const t = initTRPC.create();
+
+export const updaterRouter = t.router({
+  autoUpdates: t.procedure.query(() => config.automaticUpdates),
+  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();
+  }),
+
+  toggleAutoUpdates: t.procedure
+    .input(z.boolean().optional())
+    .mutation(({ input }) => {
+      config.automaticUpdates =
+        input === undefined ? !config.automaticUpdates : input;
+    }),
+
+  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,18 +21,21 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 export type CLIOptions = {
-  note?: boolean | string;
-  notebook?: boolean | string;
-  reminder?: boolean | string;
+  note: boolean | string;
+  notebook: boolean | string;
+  reminder: boolean | string;
+  hidden: boolean;
 };
 
 export async function parseArguments(): Promise<CLIOptions> {
   const result: CLIOptions = {
     note: false,
     notebook: false,
-    reminder: false
+    reminder: false,
+    hidden: false
   };
-  await yargs(hideBin(process.argv))
+  const { hidden } = await yargs(hideBin(process.argv))
+    .boolean("hidden")
     .command("new", "Create a new item", (yargs) => {
       return yargs
         .command("note", "Create a new note", {}, () => {
@@ -52,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(
@@ -60,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(
@@ -76,5 +79,6 @@ export async function parseArguments(): Promise<CLIOptions> {
         );
     })
     .parse();
+  result.hidden = hidden || false;
   return result;
 }

apps/desktop/src/index.ts

@@ -0,0 +1,22 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+export * from "./constants";
+export type { AppRouter } from "./api";
+export { type UpdateInfo } from "builder-util-runtime";

apps/desktop/src/main.ts

@@ -16,37 +16,33 @@ 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/>.
 */
-/* global MAC_APP_STORE, RELEASE */
 
-import "isomorphic-fetch";
-import { app, BrowserWindow, nativeTheme, shell } from "electron";
+import { app, BrowserWindow, nativeTheme, session, 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()) {
   app.exit();
 }
@@ -55,65 +51,67 @@ if (process.platform === "win32") {
   app.setAppUserModelId(app.name);
 }
 
-var mainWindowState;
-async function createWindow() {
-  await AssetManager.loadIcons();
-  const cliOptions = await parseArguments();
+app.commandLine.appendSwitch("lang", "en-US");
 
-  mainWindowState = new WindowState({});
+async function createWindow() {
+  const cliOptions = await parseArguments();
   setTheme(getTheme());
 
+  const mainWindowState = new WindowState({});
   const mainWindow = new BrowserWindow({
+    show: !cliOptions.hidden,
     x: mainWindowState.x,
     y: mainWindowState.y,
     width: mainWindowState.width,
     height: mainWindowState.height,
     darkTheme: getTheme() === "dark",
     backgroundColor: getBackgroundColor(),
-
+    opacity: 0,
     autoHideMenuBar: true,
     icon: AssetManager.appIcon({
       size: 512,
       format: process.platform === "win32" ? "ico" : "png"
     }),
     webPreferences: {
-      zoomFactor: getZoomFactor(),
-      devTools: true, // isDev,
-      nodeIntegration: false, //true,
-      contextIsolation: true,
-      nativeWindowOpen: true,
-      spellcheck: getIsSpellCheckerEnabled(),
+      zoomFactor: config.zoomFactor,
+      nodeIntegration: true,
+      contextIsolation: false,
+      spellcheck: config.isSpellCheckerEnabled,
       preload: __dirname + "/preload.js"
     }
   });
 
-  mainWindowState.manage(mainWindow);
   globalThis.window = mainWindow;
-  setupMenu();
-  setupJumplist();
+  mainWindowState.manage(mainWindow);
+
+  if (cliOptions.hidden && !config.desktopSettings.minimizeToSystemTray)
+    mainWindow.minimize();
+
+  await mainWindow.webContents.loadURL(`${createURL(cliOptions, "/")}`);
+  mainWindow.setOpacity(1);
+
+  if (config.privacyMode) {
+    await api.integration.setPrivacyMode(config.privacyMode);
+  }
+
+  await AssetManager.loadIcons();
   setupDesktopIntegration();
+  createIPCHandler({ router, windows: [mainWindow] });
 
   mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
     "http://dictionaries.notesnook.com/"
   );
 
-  if (isDevelopment())
-    mainWindow.webContents.openDevTools({ mode: "right", activate: true });
-
-  if (getPrivacyMode()) {
-    setPrivacyMode({ privacyMode: getPrivacyMode() });
-  }
-
-  try {
-    await mainWindow.loadURL(`${createURL(cliOptions)}`);
-  } catch (e) {
-    logger.error(e);
-  }
-
-  mainWindow.on("closed", () => {
+  mainWindow.once("closed", () => {
     globalThis.window = null;
   });
 
+  setupMenu();
+  setupJumplist();
+
+  if (isDevelopment())
+    mainWindow.webContents.openDevTools({ mode: "right", activate: true });
+
   mainWindow.webContents.setWindowOpenHandler((details) => {
     shell.openExternal(details.url);
     return { action: "deny" };
@@ -122,25 +120,18 @@ 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.");
+app.once("ready", async () => {
+  console.info("App ready. Opening window.");
 
-  registerProtocol();
+  if (!isDevelopment()) registerProtocol();
   await createWindow();
   configureAutoUpdater();
 });
 
-app.on("window-all-closed", () => {
+app.once("window-all-closed", () => {
   if (process.platform !== "darwin" || MAC_APP_STORE) {
     app.quit();
   }
@@ -152,12 +143,10 @@ app.on("activate", () => {
   }
 });
 
-/**
- * @param {import("./cli").CLIOptions} options
- */
-function createURL(options) {
+function createURL(options: CLIOptions, path = "/") {
   const url = new URL(isDevelopment() ? "http://localhost:3000" : PROTOCOL_URL);
 
+  url.pathname = path;
   if (options.note === true) url.hash = "/notes/create/1";
   else if (options.notebook === true) url.hash = "/notebooks/create";
   else if (options.reminder === true) url.hash = "/reminders/create";
@@ -170,7 +159,7 @@ function createURL(options) {
 }
 
 function setupDesktopIntegration() {
-  const desktopIntegration = getDesktopIntegration();
+  const desktopIntegration = config.desktopSettings;
 
   if (
     desktopIntegration.closeToSystemTray ||
@@ -185,36 +174,32 @@ function setupDesktopIntegration() {
     app.on("before-quit", () => app.exit(0));
   }
 
-  globalThis.window.on("close", (e) => {
-    if (getDesktopIntegration().closeToSystemTray) {
+  globalThis.window?.once("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);
-
-    if (process.platform === "win32" && desktopIntegration.startMinimized) {
-      globalThis.window.minimize();
-    }
+    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";
+import { readFile } from "fs/promises";
 
 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
@@ -70,7 +70,7 @@ export class AssetManager {
           "icons",
           `${icon}${prefix}.ico`
         );
-        const icoBuffer = readFileSync(icoPath);
+        const icoBuffer = await readFile(icoPath);
         const images = await parse(icoBuffer, "image/png");
         ALL_ICONS.push({ id: icon, images, prefix });
       }
@@ -80,10 +80,10 @@ export class AssetManager {
   static appIcon(options: IconOptions<Formats>) {
     const { size = 32, format = "png" } = options;
 
-    if (format === "ico") return path.join("assets", "icons", "app.ico");
-    if (format === "icns") return path.join("assets", "icons", "app.icns");
+    if (format === "ico") return "assets\\icons\\app.ico";
+    if (format === "icns") return "assets/icons/app.icns";
 
-    return path.join("assets", "icons", `${size}x${size}.png`);
+    return `assets/icons/${size}x${size}.png`;
   }
 
   static icon<TFormat extends Formats>(

apps/desktop/src/utils/autolaunch.ts

@@ -47,7 +47,11 @@ export class AutoLaunch {
         LINUX_DESKTOP_ENTRY(hidden)
       );
     } else {
-      app.setLoginItemSettings({ openAtLogin: true, openAsHidden: hidden });
+      app.setLoginItemSettings({
+        openAtLogin: true,
+        openAsHidden: hidden,
+        args: ["--hidden"]
+      });
     }
   }
 

apps/desktop/src/utils/autoupdater.ts

@@ -17,13 +17,20 @@ 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";
+import { config } from "./config";
 
-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 = config.automaticUpdates;
+  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,56 @@
+/*
+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,
+  automaticUpdates: true
+};
+
+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,15 @@ 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 { existsSync } from "fs";
 
-function getPrivacyMode() {
-  let mode = JSONStorage.get("privacyMode");
-  return mode === undefined ? false : mode;
+export function isDevelopment() {
+  return process.env.ELECTRON_IS_DEV
+    ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1
+    : !app.isPackaged;
 }
 
-function setPrivacyMode(mode) {
-  return JSONStorage.set("privacyMode", mode);
+export function isFlatpak() {
+  return existsSync("/.flatpak-info");
 }
-
-export { setPrivacyMode, getPrivacyMode };

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
             )
         })
@@ -99,6 +101,26 @@ function setupMenu() {
         })
       );
 
+    if (params.linkURL?.length) {
+      menu.append(
+        new MenuItem({
+          label: "Copy link",
+          click() {
+            clipboard.writeText(params.linkURL);
+          }
+        })
+      );
+
+      menu.append(
+        new MenuItem({
+          label: "Copy link text",
+          click() {
+            clipboard.writeText(params.linkText);
+          }
+        })
+      );
+    }
+
     if (params.selectionText.length) {
       menu.append(
         new MenuItem({

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 { protocol, ProtocolRequest } from "electron";
+import { isDevelopment } from "./index";
 import { createReadStream } from "fs";
 import { extname, normalize } from "path";
-import { logger } from "./logger";
 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,23 +39,22 @@ 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(
+        const filePath = normalize(
           `${__dirname}${
             loadIndex
               ? `${BASE_PATH}/index.html`
               : `${BASE_PATH}/${url.pathname}`
           }`
         );
-        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 +66,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 +81,80 @@ 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 };

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,12 +19,15 @@ 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() {
+  if (tray) tray.destroy();
+}
+
 export function setupTray() {
   if (tray) tray.destroy();
 
@@ -55,7 +58,7 @@ export function setupTray() {
         : AssetManager.icon("note-add", { size: trayIconSize }),
       click: () => {
         bringToFront();
-        sendMessageToRenderer(EVENTS.createItem, { itemType: "note" });
+        bridge.onCreateItem("note");
       }
     },
     {
@@ -66,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/.gitignore

@@ -14,7 +14,9 @@ build_cache/
 .yarnrc.yml
 .yarn
 *.log
-
+.cxx/
+*.keystore
+!debug.keystore
 
 # Xcode
 #

apps/mobile/.vscode/launch.json

@@ -25,4 +25,4 @@
       "request": "attach"
     }
   ]
-}
+}

apps/mobile/__tests__/App-test.js

@@ -3,6 +3,7 @@
  */
 
 import "react-native";
+import { it } from "@jest/globals";
 // Note: test renderer must be required after react-native.
 import renderer from "react-test-renderer";
 import Heading from "../app/components/ui/typography/heading";

apps/mobile/app/app.js

@@ -16,34 +16,37 @@ 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 {
+  THEME_COMPATIBILITY_VERSION,
+  useThemeEngineStore
+} from "@notesnook/theme";
 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 { useThemeStore } from "./stores/use-theme-store";
 import { useUserStore } from "./stores/use-user-store";
-import { View } from "react-native";
-import { useState } from "react";
+import { themeTrpcClient } from "./screens/settings/theme-selector";
 
 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 +55,10 @@ const App = () => {
       }
       TipManager.init();
     }, 100);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
   return (
     <View
       style={{
@@ -81,10 +87,49 @@ const App = () => {
         }}
       >
         <ApplicationHolder />
-        {init && <Launcher />}
       </GestureHandlerRootView>
+      <AppLockedOverlay />
     </View>
   );
 };
 
-export default withErrorBoundry(App, "App");
+export const withTheme = (Element) => {
+  return function AppWithThemeProvider() {
+    const [colorScheme, darkTheme, lightTheme] = useThemeStore((state) => [
+      state.colorScheme,
+      state.darkTheme,
+      state.lightTheme
+    ]);
+
+    useEffect(() => {
+      const currentTheme = colorScheme === "dark" ? darkTheme : lightTheme;
+      if (!currentTheme) return;
+      themeTrpcClient.updateTheme
+        .query({
+          version: currentTheme.version,
+          compatibilityVersion: THEME_COMPATIBILITY_VERSION,
+          id: currentTheme.id
+        })
+        .then((theme) => {
+          if (theme) {
+            console.log(theme.version, "theme updated");
+            theme.colorScheme === "dark"
+              ? useThemeStore.getState().setDarkTheme(theme)
+              : useThemeStore.getState().setLightTheme(theme);
+          }
+        })
+        .catch(console.log);
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    useEffect(() => {
+      useThemeEngineStore
+        .getState()
+        .setTheme(colorScheme === "dark" ? darkTheme : lightTheme);
+    }, [colorScheme, darkTheme, lightTheme]);
+
+    return <Element />;
+  };
+};
+
+export default withTheme(withErrorBoundry(App, "App"));

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

@@ -22,10 +22,17 @@ import "react-native-get-random-values";
 import * as Keychain from "react-native-keychain";
 import { generateSecureRandom } from "react-native-securerandom";
 import Sodium from "@ammarahmed/react-native-sodium";
+import { MMKV } from "./mmkv";
+
+const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
+const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
+const IOS_KEYCHAIN_UPGRAGE_KEY = "keychain-ios:upgraded";
 
 const KEYSTORE_CONFIG = Platform.select({
   ios: {
-    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY
+    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
+    service: IOS_KEYCHAIN_SERVICE_NAME
   },
   android: {}
 });
@@ -39,12 +46,27 @@ export async function deriveCryptoKey(name, data) {
       credentials.key,
       KEYSTORE_CONFIG
     );
+    MMKV.setBool(IOS_KEYCHAIN_UPGRAGE_KEY, true);
     return credentials.key;
   } catch (e) {
     console.error(e);
   }
 }
 
+async function upgradeIOSKeychain(username, password) {
+  if (Platform.OS !== "ios") return;
+  if (!MMKV.getBool(IOS_KEYCHAIN_UPGRAGE_KEY)) {
+    await Keychain.setInternetCredentials(
+      "notesnook",
+      username,
+      password,
+      KEYSTORE_CONFIG
+    );
+    console.log("IOS KEYCHAIN MIGRATION COMPLETED!");
+    MMKV.setBool(IOS_KEYCHAIN_UPGRAGE_KEY, true);
+  }
+}
+
 export async function getCryptoKey(_name) {
   try {
     if (await Keychain.hasInternetCredentials("notesnook")) {
@@ -52,6 +74,9 @@ export async function getCryptoKey(_name) {
         "notesnook",
         KEYSTORE_CONFIG
       );
+      // upgrades ios keychain to use accessGroups
+      // so we have access to keychain in share extension.
+      await upgradeIOSKeychain(credentials.username, credentials.password);
       return credentials.password;
     } else {
       return null;

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,41 +29,44 @@ import * as Gzip from "react-native-gzip";
 const LoggerStorage = new MMKVLoader()
   .withInstanceID("notesnook_logs")
   .initialize();
+
+  
+  database.host(
+    __DEV__
+      ? {
+          API_HOST: "https://api.notesnook.com",
+          AUTH_HOST: "https://auth.streetwriters.co",
+          SSE_HOST: "https://events.streetwriters.co",
+          SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+          ISSUES_HOST: "https://issues.streetwriters.co"
+          // API_HOST: "http://192.168.8.101:5264",
+          // AUTH_HOST: "http://192.168.8.101:8264",
+          // SSE_HOST: "http://192.168.8.101:7264",
+          // SUBSCRIPTIONS_HOST: "http://192.168.8.101:9264",
+          // ISSUES_HOST: "http://192.168.8.101:2624"
+        }
+      : {
+          API_HOST: "https://api.notesnook.com",
+          AUTH_HOST: "https://auth.streetwriters.co",
+          SSE_HOST: "https://events.streetwriters.co",
+          SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+          ISSUES_HOST: "https://issues.streetwriters.co"
+        }
+  );
+
+  database.setup(
+    Storage,
+    Platform.OS === "ios" ? EventSource : AndroidEventSource,
+    filesystem,
+    {
+      compress: Gzip.deflate,
+      decompress: Gzip.inflate
+    }
+  );
+
+
+
 initalize(new KV(LoggerStorage), true);
+
+export const db = database;
 export const DatabaseLogger = dbLogger;
-
-/**
- * @type {import("@notesnook/core/api/index").default}
- */
-export var db = new Database(
-  Storage,
-  Platform.OS === "ios" ? EventSource : AndroidEventSource,
-  filesystem,
-  {
-    compress: Gzip.deflate,
-    decompress: Gzip.inflate
-  }
-);
-
-db.host(
-  __DEV__
-    ? {
-        API_HOST: "https://api.notesnook.com",
-        AUTH_HOST: "https://auth.streetwriters.co",
-        SSE_HOST: "https://events.streetwriters.co",
-        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-        ISSUES_HOST: "https://issues.streetwriters.co"
-        // API_HOST: "http://192.168.8.101:5264",
-        // AUTH_HOST: "http://192.168.8.101:8264",
-        // SSE_HOST: "http://192.168.8.101:7264",
-        // SUBSCRIPTIONS_HOST: "http://192.168.8.101:9264",
-        // ISSUES_HOST: "http://192.168.8.101:2624"
-      }
-    : {
-        API_HOST: "https://api.notesnook.com",
-        AUTH_HOST: "https://auth.streetwriters.co",
-        SSE_HOST: "https://events.streetwriters.co",
-        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-        ISSUES_HOST: "https://issues.streetwriters.co"
-      }
-);

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

@@ -130,7 +130,7 @@ export async function downloadAttachments(
     RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
     return;
   }
-  if (result.size) {
+  if (result?.size) {
     let sub;
     try {
       onProgress?.(0, `Zipping... Please wait`);

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

@@ -46,6 +46,7 @@ export async function downloadFile(filename, data, cancelToken) {
 
     if (!downloadUrl) throw new Error("Unable to resolve download url");
     let totalSize = 0;
+    console.log("Download starting");
     let request = RNFetchBlob.config({
       path: path,
       IOSBackgroundTask: true

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

@@ -23,14 +23,25 @@ import RNFetchBlob from "react-native-blob-util";
 import { cacheDir, getRandomId } from "./utils";
 import { db } from "../database";
 import { compressToBase64 } from "./compress";
+import { IOS_APPGROUPID } from "../../utils/constants";
 
 export async function readEncrypted(filename, key, cipherData) {
   let path = `${cacheDir}/${filename}`;
   try {
-    let exists = await RNFetchBlob.fs.exists(path);
+    const iosAppGroup =
+      Platform.OS === "ios"
+        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
+        : null;
+
+    const appGroupPath = `${iosAppGroup}/${filename}`;
+    let exists =
+      (await RNFetchBlob.fs.exists(path)) ||
+      (Platform.OS === "ios" && (await RNFetchBlob.fs.exists(appGroupPath)));
+
     if (!exists) {
       return false;
     }
+
     const attachment = db.attachments.attachment(filename);
     const isPng = /(png)/g.test(attachment?.metadata.type);
     const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
@@ -39,7 +50,8 @@ export async function readEncrypted(filename, key, cipherData) {
       key,
       {
         ...cipherData,
-        hash: filename
+        hash: filename,
+        appGroupId: IOS_APPGROUPID
       },
       cipherData.outputType === "base64"
         ? isPng || isJpeg

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

@@ -19,15 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import RNFetchBlob from "react-native-blob-util";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { db } from "../database";
+import { DatabaseLogger, db } from "../database";
 import { cacheDir } from "./utils";
 import { isImage, isDocument } from "@notesnook/core/utils/filename";
+import { Platform } from "react-native";
+import { IOS_APPGROUPID } from "../../utils/constants";
 
 export async function uploadFile(filename, data, cancelToken) {
   if (!data) return false;
   let { url, headers } = data;
 
-  console.log("uploading file: ", filename, headers);
+  DatabaseLogger.info(`Preparing to upload file: ${filename}`);
+
   try {
     let res = await fetch(url, {
       method: "PUT",
@@ -35,10 +38,22 @@ export async function uploadFile(filename, data, cancelToken) {
     });
     if (!res.ok) throw new Error(`${res.status}: Unable to resolve upload url`);
     const uploadUrl = await res.text();
-    if (!uploadUrl) throw new Error("Unable to resolve upload url");
+    if (!uploadUrl) throw new Error("Unable to resolve attachment upload url");
+    let uploadFilePath = `${cacheDir}/${filename}`;
+
+    const iosAppGroup =
+      Platform.OS === "ios"
+        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
+        : null;
+    const appGroupPath = `${iosAppGroup}/${filename}`;
+    let exists = await RNFetchBlob.fs.exists(uploadFilePath);
+    if (!exists && Platform.OS === "ios") {
+      uploadFilePath = appGroupPath;
+    }
+    DatabaseLogger.info(`Starting upload: ${filename}`);
 
     let request = RNFetchBlob.config({
-      IOSBackgroundTask: true
+      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
     })
       .fetch(
         "PUT",
@@ -46,14 +61,17 @@ export async function uploadFile(filename, data, cancelToken) {
         {
           "content-type": ""
         },
-        RNFetchBlob.wrap(`${cacheDir}/${filename}`)
+        RNFetchBlob.wrap(uploadFilePath)
       )
       .uploadProgress((sent, total) => {
         useAttachmentStore
           .getState()
           .setProgress(sent, total, filename, 0, "upload");
-        console.log("uploading: ", sent, total);
+        DatabaseLogger.info(
+          `File upload progress: ${filename}, ${sent}/${total}`
+        );
       });
+
     cancelToken.cancel = request.cancel;
     let response = await request;
 
@@ -62,6 +80,9 @@ export async function uploadFile(filename, data, cancelToken) {
     let result = status >= 200 && status < 300 && text.length === 0;
     useAttachmentStore.getState().remove(filename);
     if (result) {
+      DatabaseLogger.info(
+        `File upload status: ${filename}, ${status}, ${text}`
+      );
       let attachment = db.attachments.attachment(filename);
       if (!attachment) return result;
       if (
@@ -70,12 +91,20 @@ export async function uploadFile(filename, data, cancelToken) {
       ) {
         RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
       }
+    } else {
+      const fileInfo = await RNFetchBlob.fs.stat(uploadFilePath);
+      throw new Error(
+        `${status}, ${text}, name: ${fileInfo.filename}, length: ${
+          fileInfo.size
+        }, info: ${JSON.stringify(response.info())}`
+      );
     }
 
     return result;
   } catch (e) {
     useAttachmentStore.getState().remove(filename);
-    console.log("upload file: ", e, url, headers);
+    DatabaseLogger.info(`File upload error: ${filename}, ${e}`);
+    DatabaseLogger.error(e);
     return false;
   }
 }

apps/mobile/app/components/announcements/announcement.js

@@ -21,18 +21,18 @@ import React from "react";
 import { FlatList, View } from "react-native";
 import { useSelectionStore } from "../../stores/use-selection-store";
 import { useMessageStore } from "../../stores/use-message-store";
-import { useThemeStore } from "../../stores/use-theme-store";
+import { useThemeColors } from "@notesnook/theme";
 import { allowedOnPlatform, renderItem } from "./functions";
 
 export const Announcement = ({ color }) => {
-  const colors = useThemeStore((state) => state.colors);
+  const { colors } = useThemeColors();
   const announcements = useMessageStore((state) => state.announcements);
   let announcement = announcements.length > 0 ? announcements[0] : null;
   const selectionMode = useSelectionStore((state) => state.selectionMode);
   return !announcement || selectionMode ? null : (
     <View
       style={{
-        backgroundColor: colors.bg,
+        backgroundColor: colors.primary.background,
         width: "100%",
         paddingHorizontal: 12,
         paddingTop: 12,
@@ -44,28 +44,26 @@ export const Announcement = ({ color }) => {
           width: "100%",
           borderRadius: 10,
           overflow: "hidden",
-          backgroundColor: colors.nav,
+          backgroundColor: colors.secondary.background,
           paddingBottom: 12
         }}
       >
-        <View>
-          <FlatList
-            style={{
-              width: "100%",
-              marginTop: 12
-            }}
-            data={announcement?.body.filter((item) =>
-              allowedOnPlatform(item.platforms)
-            )}
-            renderItem={({ item, index }) =>
+        <View
+          style={{
+            width: "100%",
+            marginTop: 12
+          }}
+        >
+          {announcement?.body
+            .filter((item) => allowedOnPlatform(item.platforms))
+            .map((item, index) =>
               renderItem({
                 item: item,
                 index: index,
                 color: colors[color],
                 inline: true
               })
-            }
-          />
+            )}
         </View>
       </View>
     </View>

apps/mobile/app/components/announcements/cta.js

@@ -22,7 +22,7 @@ import { Linking, View } from "react-native";
 //import SettingsBackupAndRestore from '../../screens/settings/backup-restore';
 import { eSendEvent, presentSheet } from "../../services/event-manager";
 import Sync from "../../services/sync";
-import { useThemeStore } from "../../stores/use-theme-store";
+import { useThemeColors } from "@notesnook/theme";
 import { eCloseAnnouncementDialog, eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
@@ -33,7 +33,7 @@ import { Button } from "../ui/button";
 import { allowedOnPlatform, getStyle } from "./functions";
 
 export const Cta = ({ actions, style = {}, color, inline }) => {
-  const colors = useThemeStore((state) => state.colors);
+  const { colors } = useThemeColors();
   let buttons =
     actions.filter((item) => allowedOnPlatform(item.platforms)) || [];
 
@@ -92,8 +92,7 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 style={{
                   height: 30,
                   alignSelf: "flex-start",
-                  paddingHorizontal: 0,
-                  marginTop: -6
+                  paddingHorizontal: 0
                 }}
               />
             ))}
@@ -111,7 +110,6 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 style={{
                   alignSelf: "flex-start",
                   paddingHorizontal: 0,
-                  marginTop: -6,
                   marginLeft: 12
                 }}
                 textStyle={{
@@ -129,9 +127,9 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 title={item.title}
                 fontSize={SIZE.md}
                 buttonType={{
-                  color: color ? color : colors.accent,
-                  text: colors.light,
-                  selected: color ? color : colors.accent,
+                  color: color ? color : colors.primary.accent,
+                  text: colors.static.white,
+                  selected: color ? color : colors.primary.accent,
                   opacity: 1
                 }}
                 onPress={() => onPress(item)}

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

@@ -25,7 +25,7 @@ import {
   eUnSubscribeEvent
 } from "../../services/event-manager";
 import { useMessageStore } from "../../stores/use-message-store";
-import { useThemeStore } from "../../stores/use-theme-store";
+import { useThemeColors } from "@notesnook/theme";
 import {
   eCloseAnnouncementDialog,
   eOpenAnnouncementDialog
@@ -35,7 +35,7 @@ import { allowedOnPlatform, renderItem } from "./functions";
 import { useCallback } from "react";
 
 export const AnnouncementDialog = () => {
-  const colors = useThemeStore((state) => state.colors);
+  const { colors } = useThemeColors();
   const [visible, setVisible] = useState(false);
   const [info, setInfo] = useState(null);
   const remove = useMessageStore((state) => state.remove);
@@ -73,7 +73,7 @@ export const AnnouncementDialog = () => {
       <View
         style={{
           width: DDS.isTab ? 600 : "100%",
-          backgroundColor: colors.bg,
+          backgroundColor: colors.primary.background,
           maxHeight: DDS.isTab ? "90%" : "100%",
           borderRadius: DDS.isTab ? 10 : 0,
           overflow: "hidden",

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 { useThemeColors } from "@notesnook/theme";
+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 } = useThemeColors();
+  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.primary.border}
+          />
+          <Heading
+            color={colors.primary.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="transparent"
+              />
+            </View>
+          </View>
+        </View>
+      </View>
+    )
+  );
+};
+
+export default AppLockedOverlay;

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

@@ -33,8 +33,7 @@ import {
 } from "../../services/event-manager";
 import PremiumService from "../../services/premium";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { useThemeStore } from "../../stores/use-theme-store";
-import { formatBytes } from "../../utils";
+import { useThemeColors } from "@notesnook/theme";
 import { eCloseAttachmentDialog, eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
@@ -47,9 +46,10 @@ 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);
+  const { colors } = useThemeColors();
   const contextId = attachment.metadata.hash;
   const [filename, setFilename] = useState(attachment.metadata.filename);
   const [currentProgress] = useAttachmentProgress(attachment);
@@ -194,7 +194,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
       <View
         style={{
           borderBottomWidth: 1,
-          borderBottomColor: colors.nav,
+          borderBottomColor: colors.secondary.background,
           marginBottom: notes && notes.length > 0 ? 0 : 12
         }}
       >
@@ -219,7 +219,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
             style={{
               marginRight: 10
             }}
-            color={colors.icon}
+            color={colors.secondary.paragraph}
           >
             {attachment.metadata.type}
           </Paragraph>
@@ -228,7 +228,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
               marginRight: 10
             }}
             size={SIZE.xs}
-            color={colors.icon}
+            color={colors.secondary.paragraph}
           >
             {formatBytes(attachment.length)}
           </Paragraph>
@@ -239,7 +239,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 marginRight: 10
               }}
               size={SIZE.xs}
-              color={colors.icon}
+              color={colors.secondary.paragraph}
             >
               {attachment.noteIds.length} note
               {attachment.noteIds.length > 1 ? "s" : ""}
@@ -255,7 +255,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
               });
             }}
             size={SIZE.xs}
-            color={colors.icon}
+            color={colors.secondary.paragraph}
           >
             {attachment.metadata.hash}
           </Paragraph>
@@ -268,7 +268,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
         <View
           style={{
             borderBottomWidth: 1,
-            borderBottomColor: colors.nav,
+            borderBottomColor: colors.secondary.background,
             marginBottom: 12,
             paddingVertical: 12
           }}
@@ -322,10 +322,10 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
           key={item.name}
           buttonType={{
             text: item.on
-              ? colors.accent
+              ? colors.primary.accent
               : item.name === "Delete" || item.name === "PermDelete"
-              ? colors.errorText
-              : colors.pri
+              ? colors.error.paragraph
+              : colors.primary.paragraph
           }}
           onPress={item.onPress}
           title={item.name}

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

@@ -17,15 +17,14 @@ 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 { formatBytes } from "@notesnook/common";
 import React from "react";
 import { TouchableOpacity, View } from "react-native";
 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 { useThemeColors } from "@notesnook/theme";
 import { SIZE } from "../../utils/size";
-import SheetProvider from "../sheet-provider";
 import { IconButton } from "../ui/icon-button";
 import { ProgressCircleComponent } from "../ui/svg/lazy";
 import Paragraph from "../ui/typography/paragraph";
@@ -41,17 +40,17 @@ export const AttachmentItem = ({
   encryption,
   setAttachments,
   pressable = true,
-  hideWhenNotDownloading
+  hideWhenNotDownloading,
+  context
 }) => {
-  const colors = useThemeStore((state) => state.colors);
+  const { colors } = useThemeColors();
   const [currentProgress, setCurrentProgress] = useAttachmentProgress(
     attachment,
     encryption
   );
-
   const onPress = () => {
     if (!pressable) return;
-    Actions.present(attachment, setAttachments, attachment.metadata.hash);
+    Actions.present(attachment, setAttachments, context);
   };
 
   return hideWhenNotDownloading &&
@@ -66,11 +65,10 @@ export const AttachmentItem = ({
         padding: 12,
         paddingVertical: 6,
         borderRadius: 5,
-        backgroundColor: colors.nav
+        backgroundColor: colors.secondary.background
       }}
       type="grayBg"
     >
-      <SheetProvider context={attachment.metadata.hash} />
       <View
         style={{
           flexShrink: 1,
@@ -85,12 +83,12 @@ export const AttachmentItem = ({
             marginLeft: -5
           }}
         >
-          <Icon name="file" size={SIZE.xxxl} color={colors.icon} />
+          <Icon name="file" size={SIZE.xxxl} color={colors.primary.icon} />
 
           <Paragraph
             adjustsFontSizeToFit
             size={6}
-            color={colors.light}
+            color={colors.static.white}
             style={{
               position: "absolute"
             }}
@@ -113,13 +111,13 @@ export const AttachmentItem = ({
             }}
             numberOfLines={1}
             lineBreakMode="middle"
-            color={colors.pri}
+            color={colors.primary.paragraph}
           >
             {attachment.metadata.filename}
           </Paragraph>
 
           {!hideWhenNotDownloading ? (
-            <Paragraph color={colors.icon} size={SIZE.xs}>
+            <Paragraph color={colors.secondary.paragraph} size={SIZE.xs}>
               {formatBytes(attachment.length)}{" "}
               {currentProgress?.type
                 ? "(" + currentProgress.type + "ing - tap to cancel)"
@@ -151,7 +149,7 @@ export const AttachmentItem = ({
             textStyle={{
               fontSize: 10
             }}
-            color={colors.accent}
+            color={colors.primary.accent}
             formatText={(progress) => (progress * 100).toFixed(0)}
             borderWidth={0}
             thickness={2}
@@ -163,7 +161,7 @@ export const AttachmentItem = ({
             <IconButton
               onPress={onPress}
               name="alert-circle-outline"
-              color={colors.errorText}
+              color={colors.error.paragraph}
             />
           ) : null}
         </>

apps/mobile/app/components/attachments/download-attachments.js

@@ -26,12 +26,12 @@ import { Button } from "../ui/button";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { ProgressBarComponent } from "../ui/svg/lazy";
-import { useThemeStore } from "../../stores/use-theme-store";
+import { useThemeColors } from "@notesnook/theme";
 import { FlatList } from "react-native-actions-sheet";
 import { AttachmentItem } from "./attachment-item";
 
 const DownloadAttachments = ({ close, attachments, isNote, update }) => {
-  const colors = useThemeStore((state) => state.colors);
+  const { colors } = useThemeColors();
   const [downloading, setDownloading] = useState(false);
   const [progress, setProgress] = useState({
     value: 0,
@@ -55,7 +55,7 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
       groupId.current
     );
     if (canceled.current) return;
-    setResult(result);
+    setResult(result || new Map());
     setDownloading(false);
     update({
       disableClosing: false
@@ -113,7 +113,7 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
       <Heading>
         {downloading
           ? "Downloading attachments"
-          : result.size
+          : result?.size
           ? "Downloaded attachments"
           : "Download attachments"}
       </Heading>
@@ -126,7 +126,7 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
         >
           {progress.statusText}
         </Paragraph>
-      ) : result.size ? (
+      ) : result?.size ? (
         <Paragraph
           style={{
             textAlign: "center"
@@ -158,8 +158,8 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
             animated={true}
             useNativeDriver
             progress={progress.value ? progress.value / attachments.length : 0}
-            unfilledColor={colors.nav}
-            color={colors.accent}
+            unfilledColor={colors.secondary.background}
+            color={colors.primary.accent}
             borderWidth={0}
           />
         </View>
@@ -170,7 +170,7 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
           maxHeight: 300,
           width: "100%",
           minHeight: 60,
-          backgroundColor: colors.nav,
+          backgroundColor: colors.secondary.background,
           borderRadius: 5,
           marginVertical: 12
         }}
@@ -184,7 +184,9 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
               height: 60
             }}
           >
-            <Paragraph color={colors.icon}>No downloads in progress.</Paragraph>
+            <Paragraph color={colors.secondary.paragraph}>
+              No downloads in progress.
+            </Paragraph>
           </View>
         }
         keyExtractor={(item) => item.id}
@@ -200,7 +202,7 @@ const DownloadAttachments = ({ close, attachments, isNote, update }) => {
         }}
       />
 
-      {result.size ? (
+      {result?.size ? (
         <Button
           style={{
             width: 250,

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

@@ -19,12 +19,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useRef, useState } from "react";
 import { ActivityIndicator, ScrollView, View } from "react-native";
-import { FlatList } from "react-native-actions-sheet";
+
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import filesystem from "../../common/filesystem";
 import { presentSheet } from "../../services/event-manager";
-import { useThemeStore } from "../../stores/use-theme-store";
+import { useThemeColors } from "@notesnook/theme";
 import { SIZE } from "../../utils/size";
 import SheetProvider from "../sheet-provider";
 import { IconButton } from "../ui/icon-button";
@@ -41,10 +41,12 @@ import {
   isImage,
   isVideo
 } from "@notesnook/core/utils/filename";
+import { useSettingStore } from "../../stores/use-setting-store";
+import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
 
 export const AttachmentDialog = ({ note }) => {
-  const colors = useThemeStore((state) => state.colors);
-
+  const { colors } = useThemeColors();
+  const { height } = useSettingStore((state) => state.dimensions);
   const [attachments, setAttachments] = useState(
     note
       ? db.attachments.ofNote(note.id, "all")
@@ -80,7 +82,11 @@ export const AttachmentDialog = ({ note }) => {
   };
 
   const renderItem = ({ item }) => (
-    <AttachmentItem setAttachments={setAttachments} attachment={item} />
+    <AttachmentItem
+      setAttachments={setAttachments}
+      attachment={item}
+      context="attachments-list"
+    />
   );
 
   const onCheck = async () => {
@@ -159,7 +165,8 @@ export const AttachmentDialog = ({ note }) => {
       style={{
         width: "100%",
         alignSelf: "center",
-        paddingHorizontal: 12
+        paddingHorizontal: 12,
+        height: height * 0.85
       }}
     >
       <SheetProvider context="attachments-list" />
@@ -194,7 +201,7 @@ export const AttachmentDialog = ({ note }) => {
                 width: 40,
                 marginRight: 10
               }}
-              color={colors.pri}
+              color={colors.primary.paragraph}
               size={SIZE.lg}
               onPress={onCheck}
             />
@@ -206,7 +213,7 @@ export const AttachmentDialog = ({ note }) => {
               height: 40,
               width: 40
             }}
-            color={colors.pri}
+            color={colors.primary.paragraph}
             onPress={() => {
               DownloadAttachments.present(
                 "attachments-list",
@@ -228,51 +235,48 @@ export const AttachmentDialog = ({ note }) => {
         }}
       />
 
-      <FlatList
+      <View>
+        <ScrollView
+          style={{
+            width: "100%",
+            height: 50,
+            flexDirection: "row",
+            backgroundColor: colors.bg
+          }}
+          contentContainerStyle={{
+            minWidth: "100%",
+            height: 50
+          }}
+          horizontal
+        >
+          {attachmentTypes.map((item) => (
+            <Button
+              type={currentFilter === item.filterBy ? "grayAccent" : "gray"}
+              key={item.title}
+              title={
+                item.title +
+                ` (${filterAttachments(item.filterBy)?.length || 0})`
+              }
+              style={{
+                borderRadius: 0,
+                borderBottomWidth: 1,
+                flexGrow: 1,
+                borderBottomColor:
+                  currentFilter !== item.filterBy
+                    ? "transparent"
+                    : colors.primary.accent
+              }}
+              onPress={() => {
+                setCurrentFilter(item.filterBy);
+                setAttachments(filterAttachments(item.filterBy));
+              }}
+            />
+          ))}
+        </ScrollView>
+      </View>
+      <FlashList
         keyboardDismissMode="none"
         keyboardShouldPersistTaps="always"
-        maxToRenderPerBatch={10}
-        initialNumToRender={10}
-        windowSize={5}
-        stickyHeaderIndices={[0]}
-        ListHeaderComponent={
-          <ScrollView
-            style={{
-              width: "100%",
-              height: 50,
-              flexDirection: "row",
-              backgroundColor: colors.bg
-            }}
-            contentContainerStyle={{
-              minWidth: "100%"
-            }}
-            horizontal
-          >
-            {attachmentTypes.map((item) => (
-              <Button
-                type={currentFilter === item.filterBy ? "grayAccent" : "gray"}
-                key={item.title}
-                title={
-                  item.title +
-                  ` (${filterAttachments(item.filterBy)?.length || 0})`
-                }
-                style={{
-                  borderRadius: 0,
-                  borderBottomWidth: 1,
-                  flexGrow: 1,
-                  borderBottomColor:
-                    currentFilter !== item.filterBy
-                      ? "transparent"
-                      : colors.accent
-                }}
-                onPress={() => {
-                  setCurrentFilter(item.filterBy);
-                  setAttachments(filterAttachments(item.filterBy));
-                }}
-              />
-            ))}
-          </ScrollView>
-        }
         ListEmptyComponent={
           <View
             style={{
@@ -281,7 +285,7 @@ export const AttachmentDialog = ({ note }) => {
               alignItems: "center"
             }}
           >
-            <Icon name="attachment" size={60} color={colors.icon} />
+            <Icon name="attachment" size={60} color={colors.secondary.icon} />
             <Paragraph>
               {note ? "No attachments on this note" : "No attachments"}
             </Paragraph>
@@ -294,20 +298,24 @@ export const AttachmentDialog = ({ note }) => {
             }}
           />
         }
+        estimatedItemSize={50}
         data={attachments}
-        keyExtractor={(item) => item.id}
         renderItem={renderItem}
       />
 
       <Paragraph
-        color={colors.icon}
+        color={colors.secondary.paragraph}
         size={SIZE.xs}
         style={{
           textAlign: "center",
           marginTop: 10
         }}
       >
-        <Icon name="shield-key-outline" size={SIZE.xs} color={colors.icon} />
+        <Icon
+          name="shield-key-outline"
+          size={SIZE.xs}
+          color={colors.primary.icon}
+        />
         {"  "}All attachments are end-to-end encrypted.
       </Paragraph>
     </View>