web: fix more tests

the type guard was incorrect

.commitlintrc.js

@@ -14,12 +14,16 @@ const SCOPES = [
 
   "mobile",
   "web",
+  "vericrypt",
   "desktop",
   "crypto",
   "editor",
   "logger",
   "theme",
+  "server",
   "core",
+  "fs",
+  "ui",
   "clipper",
   "config",
   "ci",
@@ -27,7 +31,10 @@ const SCOPES = [
   "docs",
   "refactor",
   "misc",
-  "global"
+  "common",
+  "global",
+  "docs",
+  "themebuilder"
 ];
 
 module.exports = {

.eslintignore

@@ -15,6 +15,8 @@ apps/mobile/e2e/
 
 # web
 apps/web/public/an.js
+apps/web/src/common/sqlite/wa-sqlite-async.js
+apps/web/src/common/sqlite/wa-sqlite.js
 
 # editor
 packages/editor/styles/

.eslintrc.js

@@ -78,7 +78,13 @@ module.exports = {
     semi: ["error", "always"],
     "@typescript-eslint/no-empty-function": "off",
     "react/prop-types": "off",
-    "header/header": ["error", "block", LICENSE, 1]
+    "header/header": ["error", "block", LICENSE, 1],
+    "@typescript-eslint/no-empty-interface": [
+      "error",
+      {
+        allowSingleExtends: true
+      }
+    ]
   },
   settings: {
     react: {

.gitattributes

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

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

@@ -0,0 +1,26 @@
+name: "Setup node with cache action"
+description: "Setups node with cache"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Node
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20.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/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

@@ -6,59 +6,149 @@ jobs:
   build:
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      CMAKE_C_COMPILER_LAUNCHER: ccache
+      CMAKE_CXX_COMPILER_LAUNCHER: ccache
+      NDK_CCACHE: ccache
+      USE_CCACHE: 1
 
     steps:
       - 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
 
+      - name: Install CCache
+        uses: hendrikmuhs/ccache-action@v1.2.11
+        with:
+          key: ${{ runner.os }}-ccache-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          max-size: 1500M
+          restore-keys: |
+            ${{ runner.os }}-ccache-
+
+      - name: Setup CCache
+        run: |
+          ln -s $(which ccache) /usr/local/bin/gcc
+          ln -s $(which ccache) /usr/local/bin/g++
+          ln -s $(which ccache) /usr/local/bin/cc
+          ln -s $(which ccache) /usr/local/bin/c++
+          ln -s $(which ccache) /usr/local/bin/clang
+          ln -s $(which ccache) /usr/local/bin/clang++
+          ccache --set-config=base_dir=$PWD
+          ccache --set-config=inode_cache=true
+          ccache --set-config=compiler_check=content
+          ccache --set-config=depend_mode=true
+          ccache --set-config=file_clone=true
+          ccache --set-config=sloppiness=clang_index_store,file_stat_matches,include_file_ctime,include_file_mtime,ivfsoverlay,pch_defines,modules,system_headers,time_macros
+          ccache -p
+
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      - name: Patch CPP Projects to use CCache
+        run: |
+          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
+          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
+
+      - name: CCache Stats Before Build
+        run: ccache -sv
+
       - name: Build unsigned app bundle
         run: yarn release:android:bundle
 
+      - name: CCache Stats after build
+        run: ccache -sv
+
       - name: Sign app bundle for Playstore release
         id: sign_app
-        uses: r0adkll/sign-android-release@v1
+        uses: r0adkll/sign-android-release@master
         with:
           releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}   
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "33.0.0"
+
+      - name: Build apks for Github release
+        run: yarn release:android
+
+      - name: Sign apk files
+        id: sign_apk
+        uses: r0adkll/sign-android-release@master
+        with:
+          releaseDirectory: apps/mobile/native/android/app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
+          alias: ${{ secrets.PUBLIC_ALIAS }}
+          keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
+          keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "33.0.0"
+
+      - name: Rename apk files
+        run: |
+          cd apps/mobile/native/android/app/build/outputs/apk/release/
+          mv app-arm64-v8a-release-unsigned-signed.apk notesnook-arm64-v8a.apk
+          mv app-armeabi-v7a-release-unsigned-signed.apk notesnook-armeabi-v7a.apk
+          mv app-x86-release-unsigned-signed.apk notesnook-x86.apk
+          mv app-x86_64-release-unsigned-signed.apk notesnook-x86_64.apk
+
+      - name: Get app version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@master
+        with:
+          path: apps/mobile
 
       - name: Publish to Playstore
         id: deploy
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@v1.1.1
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: com.streetwriters.notesnook
-          releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: internal
+          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
+          track: alpha
           status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/             
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/
+
+      - name: Create release draft on Github
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          tag_name: ${{ steps.package-version.outputs.current-version}}-beta-android
+          name: Notesnook Android v${{ steps.package-version.outputs.current-version}} Beta
+          repository: streetwriters/notesnook
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: |
+            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
+
+      - name: Upload signed aab to Github
+        uses: actions/upload-artifact@v2
+        with:
+          name: Notesnook.aab
+          path: ${{steps.sign_app.outputs.signedReleaseFile}}

.github/workflows/android.publish.yml

@@ -1,4 +1,4 @@
-name: Publish @notesnook/mobile
+name: Publish @notesnook/android
 
 on: workflow_dispatch
 
@@ -6,62 +6,92 @@ jobs:
   build:
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      CMAKE_C_COMPILER_LAUNCHER: ccache
+      CMAKE_CXX_COMPILER_LAUNCHER: ccache
+      NDK_CCACHE: ccache
+      USE_CCACHE: 1
 
     steps:
       - 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
 
+      - name: Install CCache
+        uses: hendrikmuhs/ccache-action@v1.2.11
+        with:
+          key: ${{ runner.os }}-ccache-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          max-size: 1500M
+          restore-keys: |
+            ${{ runner.os }}-ccache-
+
+      - name: Setup CCache
+        run: |
+          ln -s $(which ccache) /usr/local/bin/gcc
+          ln -s $(which ccache) /usr/local/bin/g++
+          ln -s $(which ccache) /usr/local/bin/cc
+          ln -s $(which ccache) /usr/local/bin/c++
+          ln -s $(which ccache) /usr/local/bin/clang
+          ln -s $(which ccache) /usr/local/bin/clang++
+          ccache --set-config=base_dir=$PWD
+          ccache --set-config=inode_cache=true
+          ccache --set-config=compiler_check=content
+          ccache --set-config=depend_mode=true
+          ccache --set-config=file_clone=true
+          ccache --set-config=sloppiness=clang_index_store,file_stat_matches,include_file_ctime,include_file_mtime,ivfsoverlay,pch_defines,modules,system_headers,time_macros
+          ccache -p
+
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      - name: Patch CPP Projects to use CCache
+        run: |
+          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
+          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
+
+      - name: CCache Stats Before Build
+        run: ccache -sv
+
       - name: Build unsigned app bundle
         run: yarn release:android:bundle
 
+      - name: CCache Stats after build
+        run: ccache -sv
+
       - name: Sign app bundle for Playstore release
         id: sign_app
-        uses: r0adkll/sign-android-release@v1
+        uses: r0adkll/sign-android-release@master
         with:
           releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}  
-
-      - name: Publish to Playstore
-        id: deploy
-        uses: r0adkll/upload-google-play@v1.1.1
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-          packageName: com.streetwriters.notesnook
-          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: production
-          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/      
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -74,7 +104,9 @@ 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 }}
+        env:
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Rename apk files
         run: |
@@ -90,6 +122,18 @@ jobs:
         with:
           path: apps/mobile
 
+      - name: Publish to Playstore
+        id: deploy
+        uses: r0adkll/upload-google-play@v1.1.1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          packageName: com.streetwriters.notesnook
+          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
+          track: production
+          status: completed
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/
+
+     
       - name: Create release draft on Github
         uses: softprops/action-gh-release@v1
         with:
@@ -102,4 +146,10 @@ 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
+
+      - name: Upload signed aab to Github
+        uses: actions/upload-artifact@v2
+        with:
+          name: Notesnook.aab
+          path: ${{steps.sign_app.outputs.signedReleaseFile}}

.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

@@ -18,6 +18,21 @@ on:
         required: true
         default: true
         description: "Publish on GitHub releases?"
+      build-windows:
+        type: boolean
+        required: true
+        default: true
+        description: "Build for Windows?"
+      build-linux:
+        type: boolean
+        required: true
+        default: true
+        description: "Build for Linux?"
+      build-mac:
+        type: boolean
+        required: true
+        default: true
+        description: "Build for macOS?"
 
 jobs:
   build:
@@ -28,26 +43,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: |
@@ -57,14 +58,14 @@ jobs:
         run: npx nx build:desktop @notesnook/web
 
       - name: Archive build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build
           path: apps/web/build/**/*
 
       - 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)
 
@@ -81,16 +82,21 @@ jobs:
           name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
           tag_name: v${{ steps.app_metadata.outputs.app_version }}
           files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
+          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
   build-macos:
     name: Build for macOS
     needs: build
-    runs-on: macos-12
+    if: inputs.build-mac
+    runs-on: macos-14
 
     steps:
       - 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,16 +104,17 @@ 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
+        if: inputs.publish-apple
         with:
           app-id: ${{ steps.app_metadata.outputs.apple_app_id }}
           key-id: ${{ secrets.api_key_id }}
@@ -115,26 +122,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
+        uses: actions/download-artifact@v4
         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 +143,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:
@@ -153,38 +154,42 @@ jobs:
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
           APPLE_API_KEY: ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
           APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
-          APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }}
+          APPLE_API_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
     needs: build
+    if: inputs.build-linux
     runs-on: ubuntu-22.04
 
     steps:
       - 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 +197,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
+        uses: actions/download-artifact@v4
         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,49 +228,60 @@ 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
     needs: build
+    if: inputs.build-windows
     runs-on: windows-latest
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: actions/setup-node@v3
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v2
         with:
-          node-version: 16.x
+          dotnet-version: 6.0.x
+
+      - name: Install AzureCodeSigning
+        run: Install-Module -Name AzureCodeSigning -RequiredVersion 0.3.0 -Force -Repository PSGallery
+        shell: pwsh
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
 
       - name: Download build
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         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 }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
         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/ios.publish.yml

@@ -0,0 +1,104 @@
+name: Publish @notesnook/ios
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: macos-13
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Build packages
+        run: npx nx run @notesnook/mobile:build
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2.11
+        with:
+          key: ${{ runner.os }}-ccache-${{ hashFiles(format('apps/mobile/native/ios/Podfile.lock')) }}
+          max-size: 1500M
+          restore-keys: |
+            ${{ runner.os }}-ccache-
+
+      - name: Setup ccache
+        run: |
+          ccache --set-config=base_dir=$PWD
+          ccache --set-config=inode_cache=true
+          ccache --set-config=compiler_check=content
+          ccache --set-config=depend_mode=true
+          ccache --set-config=file_clone=true
+          ccache --set-config=sloppiness=clang_index_store,file_stat_matches,include_file_ctime,include_file_mtime,ivfsoverlay,pch_defines,modules,system_headers,time_macros
+          ln -s $(which ccache) /usr/local/bin/gcc
+          ln -s $(which ccache) /usr/local/bin/g++
+          ln -s $(which ccache) /usr/local/bin/cc
+          ln -s $(which ccache) /usr/local/bin/c++
+          ln -s $(which ccache) /usr/local/bin/clang
+          ln -s $(which ccache) /usr/local/bin/clang++
+          ccache -p
+
+      - name: Cache Pods
+        uses: actions/cache@v2
+        id: pods-cache
+        with:
+          path: apps/mobile/native/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/native/ios/Podfile.lock') }}
+
+      - name: Install Pods
+        run: npm run prepare:ios
+
+      - name: CCache Stats Before Build
+        run: ccache -sv
+
+      - name: Build iOS App
+        uses: ammarahm-ed/ios-build-action@master
+        with:
+          bundle-identifier: org.streetwriters.notesnook
+          scheme: Notesnook
+          configuration: "Release"
+          export-options: apps/mobile/native/ios/ExportOptions.plist
+          project-path: apps/mobile/native/ios/Notesnook.xcodeproj
+          workspace-path: apps/mobile/native/ios/Notesnook.xcworkspace
+          update-targets: |
+            Notesnook
+            Make Note
+            NotesWidgetExtension
+          disable-targets: Notesnook-tvOS,Notesnook-tvOSTests,NotesnookTests
+          code-signing-identity: Apple Distribution
+          team-id: ${{ secrets.APPLE_TEAM_ID }}
+          p12-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+          certificate-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
+          app-store-connect-api-key-issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
+          app-store-connect-api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+          app-store-connect-api-key-base64: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }}
+          output-path: Notesnook.ipa
+          mobileprovision-base64: |
+            ${{ secrets.APPLE_MOBILE_PROVISION_APP }}
+            ${{ secrets.APPLE_MOBILE_PROVISION_SHARE }}
+            ${{ secrets.APPLE_MOBILE_PROVISION_WIDGET }}
+
+      - name: CCache Stats After Build
+        run: ccache -sv
+
+      - name: "Upload app to TestFlight"
+        uses: apple-actions/upload-testflight-build@v1
+        with:
+          app-path: Notesnook.ipa
+          issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
+          api-key-id: ${{ secrets.API_KEY_ID }}
+          api-private-key: ${{ secrets.API_KEY }}
+
+      - name: Upload Notesnook.ipa to Github
+        uses: actions/upload-artifact@v2
+        with:
+          name: Notesnook.ipa
+          path: Notesnook.ipa

.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/theme-builder.publish.yml

@@ -0,0 +1,31 @@
+name: Publish @notesnook/theme-builder
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=themebuilder
+
+      - name: Setup environment
+        run: |
+          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Generate build
+        run: npm run build:theme-builder
+
+      - name: Publish to Cloudflare Pages
+        run: npx --yes wrangler pages deploy --project-name=notesnook-theme-builder ./apps/theme-builder/build/

.github/workflows/vericrypt.publish.yml

@@ -0,0 +1,31 @@
+name: Publish @notesnook/vericrypt
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=vericrypt
+
+      - name: Setup environment
+        run: |
+          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Generate build
+        run: npm run build:vericrypt
+
+      - name: Publish on Cloudflare Pages
+        run: npx --yes wrangler pages deploy --project-name=vericrypt ./apps/vericrypt/build/

.github/workflows/web.beta.publish.yml

@@ -0,0 +1,69 @@
+name: Publish @notesnook/web Beta
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - "!v3-beta"
+    paths-ignore:
+      - "apps/mobile/**"
+      - "packages/editor-mobile/**"
+      - "apps/desktop/**"
+      - "apps/vericrypt/**"
+      - "servers/**"
+      - "packages/clipper/**"
+      - "extensions/web-clipper/**"
+  pull_request:
+    types:
+      - closed
+      - ready_for_review
+      - reopened
+      - opened
+      - synchronize
+    branches:
+      - master
+      - "!v3-beta"
+    paths-ignore:
+      - "apps/mobile/**"
+      - "packages/editor-mobile/**"
+      - "apps/desktop/**"
+      - "apps/vericrypt/**"
+      - "servers/**"
+      - "packages/clipper/**"
+      - "extensions/web-clipper/**"
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
+
+      - name: Setup environment
+        run: |
+          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Generate beta build
+        run: npm run build:beta:web
+
+      - name: Publish to Cloudflare Pages
+        uses: unlike-ltd/github-actions-cloudflare-pages@v0.1.1
+        id: pages
+        with:
+          cloudflare-api-token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          cloudflare-account-id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          cloudflare-project-name: notesnook-beta-app
+          directory: ./apps/web/build
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-environment: ${{ (github.ref == 'refs/heads/master' && 'beta') || 'preview' }}

.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: |
@@ -38,8 +24,8 @@ jobs:
           echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
           echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
 
-      - name: Generate desktop build
+      - name: Generate build
         run: npm run build:web
 
-      - name: Publish on Cloudflare Pages
-        run: npx --yes wrangler pages publish --project-name=notesnook-app ./apps/web/build/
+      - name: Publish to Cloudflare Pages
+        run: npx --yes wrangler pages deploy --project-name=notesnook-app ./apps/web/build/

.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

.github/workflows/web.v3-beta.publish.yml

@@ -0,0 +1,32 @@
+name: Publish @notesnook/web v3 Beta
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
+
+      - name: Setup environment
+        run: |
+          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Build
+        run: npm run build:web
+
+      - name: Publish to Cloudflare Pages
+        run: npx --yes wrangler pages deploy --project-name=notesnook-v3-beta ./apps/web/build/

.gitignore

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

.prettierignore

@@ -11,4 +11,5 @@ apps/mobile/native/
 apps/web/public/an.js
 
 # editor
-packages/editor/styles/
+packages/editor/styles/
+/.nx/cache

.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
+}

CONTRIBUTING.md

@@ -8,9 +8,9 @@ Thank you so much for considering to contribute to Notesnook! If you have no ide
 
 Ugh! Bugs!
 
-> A bug is when software behaves in a way that you didn't expect, and the developer didn't intend.
+> A bug is when software behaves in a way you didn't expect, which the developer didn't intend.
 
-To help us understand what's going on, we first want to **make sure you're using the latest version of Notesnook**.
+To help us understand what's happening, we first want to **make sure you're using the latest version of Notesnook**.
 
 Once you've **confirmed that the bug still exists in the latest version**, you'll want to check to make sure it's not something we already know about in the [opened GitHub issues](https://github.com/streetwriters/notesnook/issues).
 
@@ -30,7 +30,7 @@ Before you open a new feature request, please make sure it's not a duplicate. **
 
 ### Helping out in the issue tracker
 
-There are always new issues getting opened that need to be triaged, sorted & organized, so the developers can easily find the most critical and/or relevant bugs to fix. Any help in this regard is appreciated.
+New issues are always opened that need to be triaged, sorted & organized, so the developers can easily find the most critical and/or relevant bugs to fix. Any help in this regard is appreciated.
 
 In addition to this, you can help out in the following ways:
 
@@ -62,7 +62,7 @@ Once you are done, [open a new pull request](https://docs.github.com/en/pull-req
 
 1. Fork [the repository](https://github.com/streetwriters/notesnook) and create your branch from `master` (you can name your branch anything).
 2. Run `npm run bootstrap` in the repository root.
-3. If you’ve fixed a bug or added code that should be tested, add tests!
+3. If you've fixed a bug or added code that should be tested, add tests!
 4. Ensure the test suite passes (`npm run test`).
 5. Format your code with prettier (`npm run prettier`).
 6. Make sure your code lints (`npm run lint`). Tip: `npm run linc` to only check changed files.
@@ -103,7 +103,7 @@ All commits must include valid scopes in the commit message. **Valid commit scop
 
 **Packages:**
 
-1. `crypto`: changes related to the cryptographic core (including `@notesnook/crypto-worker`)
+1. `crypto`: changes related to the cryptographic core
 2. `editor`: changes related to the editor (including `@notesnook/editor-mobile`)
 3. `logger`: changes related to the logger
 4. `theme`: changes related to the theme
@@ -131,11 +131,11 @@ We use an automatic code formatter called [Prettier](https://prettier.io/). Run
 
 Then, our linter will catch most issues that may exist in your code. You can check the status of your code styling by simply running `npm run lint`.
 
-However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb’s Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
+However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
 
 ## Git Branch Organization
 
-Submit all changes directly to the [`master branch`](https://github.com/streetwriters/notesnook). We don’t use separate branches for development or for upcoming releases. This requires us to always keep the `master` branch in a deployable state which means:
+Submit all changes directly to the [`master branch`](https://github.com/streetwriters/notesnook). We don't use separate branches for development or for upcoming releases. This requires us to always keep the `master` branch in a deployable state which means:
 
 1. All tests must be passing at all times
 2. There should be as few breaking changes as possible

README.md

@@ -10,11 +10,11 @@
 
 ## Overview
 
-Notesnook is a free (as in speech) & open source note taking app focused on user privacy & ease of use. To ensure zero knowledge principles, Notesnook encrypts everything on your device using `XChaCha20-Poly1305` & `Argon2`.
+Notesnook is a free (as in speech) & open-source note-taking app focused on user privacy & ease of use. To ensure zero knowledge principles, Notesnook encrypts everything on your device using `XChaCha20-Poly1305` & `Argon2`.
 
-Notesnook is our **proof** that privacy does _not_ (always) have to come at the cost of convenience. Our goal is to provide users peace of mind & 100% confidence that their notes are safe and secure. The decision to go fully open source is one of the most crucial steps towards that.
+Notesnook is our **proof** that privacy does _not_ (always) have to come at the cost of convenience. We aim to provide users peace of mind & 100% confidence that their notes are safe and secure. The decision to go fully open source is one of the most crucial steps towards that.
 
-This repository contains all the code required to build & use the Notesnook web, desktop & mobile clients. If you are looking for a full features list or screenshots, please check the [website](https://notesnook.com/).
+This repository contains all the code required to build & use the Notesnook web, desktop & mobile clients. If you are looking for a full feature list or screenshots, please check the [website](https://notesnook.com/).
 
 ## Developer guide
 
@@ -25,25 +25,29 @@ 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/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,5 @@
+node_modules
+build
+output
+dist
+_catalog

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/dev-app-update.yml

@@ -0,0 +1,3 @@
+owner: streetwriters
+repo: notesnook
+provider: github

apps/desktop/global.d.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/>.
+*/
+/* eslint-disable no-var */
+
+import { BrowserWindow } from "electron";
+import {
+  type FormData as FormDataType,
+  type Headers as HeadersType,
+  type Request as RequestType,
+  type Response as ResponseType
+} from "undici";
+
+declare global {
+  var window: BrowserWindow | null;
+  var RELEASE: boolean;
+  var MAC_APP_STORE: boolean;
+
+  // Re-export undici fetch function and various classes to global scope.
+  // These are classes and functions expected to be at global scope according to Node.js v18 API
+  // documentation.
+  // See: https://nodejs.org/dist/latest-v18.x/docs/api/globals.html
+  // eslint-disable-next-line no-var
+  export var {
+    FormData,
+    Headers,
+    Request,
+    Response,
+    fetch
+  }: typeof import("undici");
+
+  type FormData = FormDataType;
+  type Headers = HeadersType;
+  type Request = RequestType;
+  type Response = ResponseType;
+}
+
+// NOTE: the import in the global block above needs to be a var for this to work properly.
+globalThis.fetch = fetch;
+globalThis.FormData = FormData;
+globalThis.Headers = Headers;
+globalThis.Request = Request;
+globalThis.Response = Response;

apps/desktop/package.json

@@ -2,32 +2,47 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "2.4.6",
+  "version": "3.0.7-beta",
   "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.38.3",
+    "@trpc/server": "10.38.3",
+    "better-sqlite3-multiple-ciphers": "^9.4.0",
+    "electron-trpc": "0.5.2",
+    "electron-updater": "6.1.4",
     "icojs": "^0.17.1",
-    "isomorphic-fetch": "^3.0.0",
-    "yargs": "^17.6.2"
+    "sodium-native": "^4.0.6",
+    "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.16.1",
+    "@types/yargs": "^17.0.24",
+    "chokidar": "^3.5.3",
+    "electron": "^28.2.1",
+    "electron-builder": "^24.9.1",
+    "esbuild": "^0.20.0",
+    "tree-kill": "^1.2.2",
+    "undici": "^6.6.1"
+  },
+  "optionalDependencies": {
+    "dmg-license": "^1.0.11"
   },
   "scripts": {
-    "build": "esbuild ./electron.js ./preload.js --external:electron --external:fsevents --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
-    "build:mas": "esbuild ./electron.js ./preload.js --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "pack": "rm -rf ./build && cp -r ../build ./ && npm run build && yarn electron-builder --linux AppImage:x64 AppImage:arm64",
+    "start": "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 --external:better-sqlite3-multiple-ciphers --external:sodium-native --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,14 +55,27 @@
     "productName": "Notesnook",
     "copyright": "Copyright © 2023 Streetwriters (Private) Limited",
     "artifactName": "notesnook_${os}_${arch}.${ext}",
+    "asar": false,
+    "generateUpdatesFilesForAllChannels": true,
     "files": [
       "!*.chunk.js.map",
       "!*.chunk.js.LICENSE.txt",
       "build/",
-      "!build/screenshots",
-      "!node_modules"
+      "!build/screenshots${/*}",
+      "!build/banner.jpg",
+      "!build/*.ico",
+      "!build/*.png",
+      "!node_modules${/*}",
+      "node_modules/better-sqlite3-multiple-ciphers/build/Release/better_sqlite3.node",
+      "node_modules/better-sqlite3-multiple-ciphers/lib",
+      "node_modules/better-sqlite3-multiple-ciphers/package.json",
+      "node_modules/file-uri-to-path",
+      "node_modules/bindings",
+      "node_modules/node-gyp-build",
+      "node_modules/sodium-native/prebuilds/${platform}-${arch}",
+      "node_modules/sodium-native/index.js",
+      "node_modules/sodium-native/package.json"
     ],
-    "afterSign": "electron-builder-notarize",
     "afterPack": "./scripts/removeLocales.js",
     "mac": {
       "bundleVersion": "240",
@@ -75,7 +103,8 @@
       "entitlements": "assets/entitlements.mac.plist",
       "entitlementsInherit": "assets/entitlements.mac.plist",
       "gatekeeperAssess": false,
-      "icon": "assets/icons/app.icns"
+      "icon": "assets/icons/app.icns",
+      "notarize": true
     },
     "dmg": {
       "contents": [
@@ -116,6 +145,10 @@
           ]
         }
       ],
+      "signingHashAlgorithms": [
+        "sha256"
+      ],
+      "sign": "./scripts/sign.js",
       "icon": "assets/icons/app.ico"
     },
     "portable": {
@@ -172,17 +205,22 @@
       "allowNativeWayland": true
     },
     "extraResources": [
+      "app-update.yml",
       "./assets/**"
     ],
+    "extraMetadata": {
+      "main": "./build/electron.js"
+    },
     "directories": {
       "buildResources": "assets",
-      "output": "./dist/"
+      "output": "./output/"
     },
     "publish": [
       {
         "provider": "github",
         "repo": "notesnook",
-        "owner": "streetwriters"
+        "owner": "streetwriters",
+        "channel": "beta"
       }
     ]
   }

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

@@ -1,20 +1,20 @@
 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 fcb7f54..cb1c7f7 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 {
+@@ -116,6 +116,7 @@ class LinuxTargetHelper {
              StartupWMClass: appInfo.productName,
              ...extra,
              ...targetSpecificOptions.desktop,
 +            actions: undefined
          };
          const description = this.getDescription(targetSpecificOptions);
-         if (!builder_util_1.isEmptyOrSpaces(description)) {
-@@ -148,6 +149,23 @@ class LinuxTargetHelper {
+         if (!(0, builder_util_1.isEmptyOrSpaces)(description)) {
+@@ -159,6 +160,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,97 @@
+/*
+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, { readFile, writeFile } 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 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`);
+}
+
+// temporary until there's support for prebuilt binaries for windows ARM & linux ARM
+await patchBetterSQLite3();
+
+if (os.platform() === "win32")
+  await exec(
+    "npx prebuildify --arch=arm64 --strip",
+    path.join(__dirname, "..", "node_modules", "sodium-native")
+  );
+
+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 (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, cwd) {
+  return childProcess.execSync(cmd, {
+    env: { ...process.env, NOTESNOOK_STAGING: true },
+    stdio: "inherit",
+    cwd: cwd || process.cwd()
+  });
+}
+
+async function patchBetterSQLite3() {
+  const jsonPath = path.join(
+    __dirname,
+    "..",
+    "node_modules",
+    "better-sqlite3-multiple-ciphers",
+    "package.json"
+  );
+  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
+
+  json.version = "9.4.1";
+  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
+  json.repository.url =
+    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
+
+  await writeFile(jsonPath, JSON.stringify(json));
+}

apps/desktop/scripts/dev.mjs

@@ -0,0 +1,188 @@
+/*
+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 RUNNING_PROCESSES = [];
+const RESTARTABLE_PROCESSES = [];
+let lastBundleHash = null;
+const ENV = {
+  ...process.env,
+  NO_COLOR: "true",
+  FORCE_COLOR: "false",
+  COLOR: "0"
+};
+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("npx electron-rebuild");
+  }
+
+  await exec(`npm run bundle`);
+  execAsync(`npx`, [`tsc`]);
+
+  if (await isBundleSame()) {
+    console.log("Bundle is same. Doing nothing.");
+    return;
+  }
+
+  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: ENV,
+      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, cwd) {
+  try {
+    console.log(">", cmd);
+
+    return execSync(cmd, {
+      env: ENV,
+      stdio: "inherit",
+      shell: false,
+      cwd: cwd || process.cwd()
+    });
+  } catch {
+    //ignore
+  }
+}
+
+function execAsync(cmd, args, restartable, onExit) {
+  try {
+    console.log(">", cmd, ...args);
+
+    const proc = spawn(cmd, args, {
+      stdio: "inherit",
+      env: 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 = Buffer.concat([
+    await fs.readFile(path.join(__dirname, "..", "build", "electron.js")),
+    await fs.readFile(path.join(__dirname, "..", "build", "preload.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/scripts/sign.js

@@ -0,0 +1,59 @@
+/*
+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/>.
+*/
+const { writeFileSync, rmSync } = require("fs");
+const { execSync } = require("child_process");
+const { relative, join } = require("path");
+
+module.exports = async function (configuration) {
+  if (process.env.NOTESNOOK_STAGING) return;
+
+  const Endpoint = "https://weu.codesigning.azure.net";
+  const CodeSigningAccountName = "Notesnook";
+  const CertificateProfileName = "Notesnook";
+  const FileDigest = configuration.hash.toUpperCase();
+  const TimestampRfc3161 = "http://timestamp.acs.microsoft.com";
+  const TimestampDigest = configuration.hash.toUpperCase();
+  const Description = "The Notesnook app";
+  const DescriptionUrl = "https://notesnook.com/";
+  const FilesCatalog = createCatalog(configuration.path);
+
+  const command = `Invoke-AzureCodeSigning -Endpoint "${Endpoint}" -CodeSigningAccountName "${CodeSigningAccountName}" -CertificateProfileName "${CertificateProfileName}" -FileDigest "${FileDigest}" -TimestampRfc3161 "${TimestampRfc3161}" -TimestampDigest "${TimestampDigest}" -Description "${Description}" -DescriptionUrl "${DescriptionUrl}" -FilesCatalog "${FilesCatalog}"`;
+
+  console.debug("Signing", configuration.path, "using command", command);
+
+  psexec(command);
+
+  console.debug("Signed", configuration.path);
+
+  rmSync(FilesCatalog);
+};
+
+function createCatalog(path) {
+  const catalogPath = join(__dirname, "_catalog");
+  writeFileSync(catalogPath, relative(__dirname, path));
+  return catalogPath;
+}
+
+function psexec(cmd) {
+  return execSync(cmd, {
+    env: process.env,
+    stdio: "inherit",
+    shell: "pwsh"
+  });
+}

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

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

@@ -0,0 +1,185 @@
+/*
+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";
+import { isFlatpak } from "../utils";
+import { setupDesktopIntegration } from "../utils/desktop-integration";
+import { rm } from "fs/promises";
+
+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({
+  isFlatpak: t.procedure.query(() => isFlatpak()),
+
+  zoomFactor: t.procedure.query(() => config.zoomFactor),
+  setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
+    globalThis.window?.webContents.setZoomFactor(factor);
+    config.zoomFactor = factor;
+  }),
+
+  proxyRules: t.procedure.query(() => config.proxyRules),
+  setProxyRules: t.procedure
+    .input(z.string().optional())
+    .mutation(({ input: proxyRules }) => {
+      globalThis.window?.webContents.session.setProxy({ proxyRules });
+      config.proxyRules = proxyRules || "";
+    }),
+
+  privacyMode: t.procedure.query(() => config.privacyMode),
+  setPrivacyMode: t.procedure
+    .input(z.object({ enabled: z.boolean() }))
+    .mutation(({ input: { enabled } }) => {
+      if (!globalThis.window || !["win32", "darwin"].includes(process.platform))
+        return;
+
+      globalThis.window.setContentProtection(enabled);
+
+      if (process.platform === "win32") {
+        globalThis.window.setThumbnailClip(
+          enabled
+            ? { x: 0, y: 0, width: 1, height: 1 }
+            : { x: 0, y: 0, width: 0, height: 0 }
+        );
+      }
+      config.privacyMode = enabled;
+    }),
+
+  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;
+      setupDesktopIntegration(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);
+    }),
+
+  resolvePath: t.procedure
+    .input(z.object({ filePath: z.string() }))
+    .query(({ input }) => {
+      const { filePath } = input;
+      return resolvePath(filePath);
+    }),
+
+  deleteFile: t.procedure.input(z.string()).query(async ({ input }) => {
+    await rm(input);
+  }),
+
+  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/safe-storage.ts

@@ -0,0 +1,44 @@
+/*
+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 { safeStorage } from "electron";
+import { initTRPC } from "@trpc/server";
+import { z } from "zod";
+
+const t = initTRPC.create();
+
+export const safeStorageRouter = t.router({
+  isEncryptionAvailable: t.procedure.query(() => {
+    return (
+      !process.env.PORTABLE_EXECUTABLE_DIR &&
+      safeStorage.isEncryptionAvailable()
+    );
+  }),
+  /**
+   * Takes a string and returns an encrypted base64 string
+   */
+  encryptString: t.procedure.input(z.string()).query(({ input }) => {
+    return safeStorage.encryptString(input).toString("base64");
+  }),
+  /**
+   * Takes an encrypted base64 string and returns a string
+   */
+  decryptString: t.procedure.input(z.string()).query(({ input }) => {
+    return safeStorage.decryptString(Buffer.from(input, "base64"));
+  })
+});

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,49 @@ 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.object({ enabled: z.boolean() }))
+    .mutation(({ input: { enabled } }) => {
+      globalThis.window?.webContents.session.setSpellCheckerEnabled(enabled);
+      config.isSpellCheckerEnabled = enabled;
+    }),
+  words: t.procedure.query(() =>
+    globalThis.window?.webContents.session.listWordsInSpellCheckerDictionary()
+  ),
+  deleteWord: t.procedure.input(z.string()).mutation(({ input: word }) => {
+    globalThis.window?.webContents.session.removeWordFromSpellCheckerDictionary(
+      word
+    );
+  })
+});

apps/desktop/src/api/updater.ts

@@ -0,0 +1,80 @@
+/*
+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.object({ enabled: z.boolean() }))
+    .mutation(({ input: { enabled } }) => {
+      config.automaticUpdates = enabled;
+    }),
+
+  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,22 +21,29 @@ 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> {
+export async function parseArguments(argv: string[]): 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(argv))
+    .boolean("hidden")
+    // have to account for this flag added on Windows when launching
+    // via Jumplist
+    .boolean("allow-file-access-from-files")
     .command("new", "Create a new item", (yargs) => {
       return yargs
         .command("note", "Create a new note", {}, () => {
           result.note = true;
+          console.log("HERE!");
         })
         .command("notebook", "Create a new notebook", {}, () => {
           result.notebook = true;
@@ -52,7 +59,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 +67,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 +83,6 @@ export async function parseArguments(): Promise<CLIOptions> {
         );
     })
     .parse();
+  result.hidden = hidden || false;
   return result;
 }

apps/desktop/src/index.ts

@@ -0,0 +1,23 @@
+/*
+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";
+export { type DesktopIntegration } from "./utils/config";

apps/desktop/src/main.ts

@@ -0,0 +1,180 @@
+/*
+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 { app, BrowserWindow, nativeTheme, shell } from "electron";
+import { isDevelopment } from "./utils";
+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 { 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";
+import { bringToFront } from "./utils/bring-to-front";
+import { bridge } from "./api/bridge";
+import { setupDesktopIntegration } from "./utils/desktop-integration";
+
+// only run a single instance
+if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
+  console.log("Another instance is already running!");
+  app.exit();
+}
+
+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"));
+}
+
+if (process.platform === "win32") {
+  app.setAppUserModelId(app.name);
+}
+
+process.on("uncaughtException", (error) => {
+  console.error("uncaughtException:", error);
+});
+process.on("unhandledRejection", (reason) => {
+  console.error("unhandledRejection:", reason);
+});
+
+app.commandLine.appendSwitch("lang", "en-US");
+
+async function createWindow() {
+  const cliOptions = await parseArguments(process.argv);
+  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: false,
+    icon: AssetManager.appIcon({
+      size: 512,
+      format: process.platform === "win32" ? "ico" : "png"
+    }),
+    webPreferences: {
+      zoomFactor: config.zoomFactor,
+      nodeIntegration: true,
+      contextIsolation: false,
+      spellcheck: config.isSpellCheckerEnabled,
+      preload: __dirname + "/preload.js"
+    }
+  });
+
+  createIPCHandler({ router, windows: [mainWindow] });
+  globalThis.window = mainWindow;
+  mainWindow.setMenuBarVisibility(false);
+  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({ enabled: config.privacyMode });
+  }
+
+  await AssetManager.loadIcons();
+  setupDesktopIntegration(config.desktopSettings);
+
+  mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
+    "http://dictionaries.notesnook.com/"
+  );
+  mainWindow.webContents.session.setProxy({ proxyRules: config.proxyRules });
+
+  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" };
+  });
+
+  nativeTheme.on("updated", () => {
+    setupTray();
+    setupJumplist();
+  });
+}
+
+app.once("ready", async () => {
+  console.info("App ready. Opening window.");
+
+  if (!isDevelopment()) registerProtocol();
+  await createWindow();
+  configureAutoUpdater();
+});
+
+app.once("window-all-closed", () => {
+  if (process.platform !== "darwin" || MAC_APP_STORE) {
+    app.quit();
+  }
+});
+
+app.on("second-instance", async (_ev, argv) => {
+  if (!globalThis.window) return;
+  const cliOptions = await parseArguments(argv);
+  if (cliOptions.note) bridge.onCreateItem("note");
+  if (cliOptions.notebook) bridge.onCreateItem("notebook");
+  if (cliOptions.reminder) bridge.onCreateItem("reminder");
+  bringToFront();
+});
+
+app.on("activate", () => {
+  if (globalThis.window === null) {
+    createWindow();
+  }
+});
+
+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";
+  else if (typeof options.note === "string")
+    url.hash = `/notes/${options.note}/edit`;
+  else if (typeof options.notebook === "string")
+    url.hash = `/notebooks/${options.notebook}`;
+
+  return url;
+}

apps/desktop/src/preload.ts

@@ -0,0 +1,47 @@
+/*
+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";
+import sqlite3, { Database } from "better-sqlite3-multiple-ciphers";
+
+declare global {
+  var os: () => "mas" | ReturnType<typeof platform>;
+  var electronTRPC: RendererGlobalElectronTRPC;
+  var NativeNNCrypto: (new () => NNCrypto) | undefined;
+  var createSQLite3Database: (filename: string) => Database;
+}
+
+process.once("loaded", async () => {
+  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 = require("@notesnook/crypto").NNCrypto;
+globalThis.createSQLite3Database = (filename) => sqlite3(filename);
+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

@@ -25,7 +25,11 @@ Type=Application
 Version=${app.getVersion()}
 Name=${app.getName()}
 Comment=${app.getName()} startup script
-Exec=${process.execPath}${hidden ? " --hidden" : ""}
+Exec=${
+  process.env.APPIMAGE
+    ? `${process.env.APPIMAGE}${hidden ? " --hidden" : ""}`
+    : `${process.execPath}${hidden ? " --hidden" : ""}`
+}
 StartupNotify=false
 Terminal=false`;
 
@@ -35,6 +39,8 @@ const LINUX_AUTOSTART_DIRECTORY_PATH = path.join(
   "autostart"
 );
 
+const STARTUP_ARGS = ["--hidden"];
+
 export class AutoLaunch {
   static enable(hidden: boolean) {
     if (process.platform === "linux") {
@@ -47,7 +53,15 @@ export class AutoLaunch {
         LINUX_DESKTOP_ENTRY(hidden)
       );
     } else {
-      app.setLoginItemSettings({ openAtLogin: true, openAsHidden: hidden });
+      const loginItemSettings = app.getLoginItemSettings({
+        args: STARTUP_ARGS
+      });
+      if (loginItemSettings.openAtLogin) return;
+      app.setLoginItemSettings({
+        openAtLogin: true,
+        openAsHidden: hidden,
+        args: STARTUP_ARGS
+      });
     }
   }
 

apps/desktop/src/utils/autoupdater.ts

@@ -17,13 +17,24 @@ 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);
-};
+const CHANNEL = autoUpdater.currentVersion.raw.endsWith("-beta")
+  ? "beta"
+  : "latest";
+async function configureAutoUpdater() {
+  autoUpdater.setFeedURL({
+    provider: "generic",
+    url: `https://notesnook.com/api/v1/releases/${process.platform}/${CHANNEL}`,
+    useMultipleRangeRequest: false,
+    channel: CHANNEL
+  });
+
+  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,57 @@
+/*
+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: true,
+  zoomFactor: 1,
+  theme: nativeTheme.themeSource,
+  automaticUpdates: true,
+  proxyRules: ""
+};
+
+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/desktop-integration.ts

@@ -0,0 +1,74 @@
+/*
+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 { app } from "electron";
+import { DesktopIntegration, config } from "./config";
+import { setupTray, destroyTray } from "./tray";
+import { AutoLaunch } from "./autolaunch";
+
+export function setupDesktopIntegration(
+  desktopIntegration: DesktopIntegration
+) {
+  if (
+    desktopIntegration.closeToSystemTray ||
+    desktopIntegration.minimizeToSystemTray
+  ) {
+    setupTray();
+  } else {
+    destroyTray();
+  }
+
+  // when close to system tray is enabled, it becomes nigh impossible
+  // to "quit" the app. This is necessary in order to fix that.
+  app.on("before-quit", () =>
+    desktopIntegration.closeToSystemTray ? app.exit(0) : null
+  );
+
+  globalThis.window?.on("close", (e) => {
+    if (config.desktopSettings.closeToSystemTray) {
+      e.preventDefault();
+      if (process.platform == "darwin") {
+        // on macOS window cannot be minimized/hidden if it is already fullscreen
+        // so we just close it.
+        if (globalThis.window?.isFullScreen()) app.exit(0);
+        else app.hide();
+      } else {
+        try {
+          globalThis.window?.minimize();
+          globalThis.window?.hide();
+        } catch (error) {
+          console.error(error);
+        }
+      }
+    }
+  });
+
+  globalThis.window?.on("minimize", () => {
+    if (config.desktopSettings.minimizeToSystemTray) {
+      if (process.platform == "darwin") {
+        app.hide();
+      } else {
+        globalThis.window?.hide();
+      }
+    }
+  });
+
+  if (desktopIntegration.autoStart) {
+    AutoLaunch.enable(!!desktopIntegration.startMinimized);
+  }
+}

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({
@@ -109,6 +131,17 @@ function setupMenu() {
       );
     }
 
+    if (params.mediaType === "image")
+      menu.append(
+        new MenuItem({
+          id: "copy-image",
+          label: "Copy Image",
+          click() {
+            globalThis.window?.webContents.copyImageAt(params.x, params.y);
+          }
+        })
+      );
+
     if (params.isEditable)
       menu.append(
         new MenuItem({

apps/desktop/src/utils/protocol.ts

@@ -0,0 +1,97 @@
+/*
+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 { protocol } from "electron";
+import { isDevelopment } from "./index";
+import { createReadStream } from "fs";
+import { extname, normalize } from "path";
+import { URL } from "url";
+
+const BASE_PATH = isDevelopment() ? "../public" : "";
+const HOSTNAME = `app.notesnook.com`;
+const SCHEME = "https";
+const extensionToMimeType: Record<string, string> = {
+  html: "text/html",
+  json: "application/json",
+  js: "application/javascript",
+  css: "text/css",
+  svg: "image/svg+xml",
+  png: "image/png",
+  jpg: "image/jpg",
+  ttf: "font/ttf",
+  woff: "font/woff",
+  woff2: "font/woff2"
+};
+
+function registerProtocol() {
+  protocol.handle(SCHEME, async (request) => {
+    const url = new URL(request.url);
+    if (shouldInterceptRequest(url)) {
+      console.info("Intercepting request:", request.url);
+      const loadIndex = !extname(url.pathname);
+      const filePath = normalize(
+        `${__dirname}${
+          loadIndex ? `${BASE_PATH}/index.html` : `${BASE_PATH}/${url.pathname}`
+        }`
+      );
+      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(".", "");
+      return new Response(createReadStream(filePath), {
+        headers: { "Content-Type": extensionToMimeType[fileExtension] }
+      });
+    } else {
+      if (request.headers.has("X-Content-Length")) {
+        request.headers.set(
+          "Content-Length",
+          request.headers.get("X-Content-Length") || "0"
+        );
+        request.headers.delete("X-Content-Length");
+      }
+      const headers = Object.fromEntries(request.headers.entries());
+
+      return await fetch(request.url, {
+        signal: request.signal,
+        mode: request.mode,
+        headers,
+        method: request.method,
+        body: request.body,
+        credentials: request.credentials,
+        referrer: (request as any).referrer,
+        duplex: "half",
+        redirect: "manual"
+      });
+    }
+  });
+  console.info(`${SCHEME} protocol inteception "successful"`);
+}
+
+const bypassedRoutes: string[] = [];
+function shouldInterceptRequest(url: URL) {
+  const shouldIntercept = url.hostname === HOSTNAME;
+  return shouldIntercept && !bypassedRoutes.includes(url.pathname);
+}
+
+const PROTOCOL_URL = `${SCHEME}://${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

@@ -5,7 +5,6 @@ artifacts/
 .DS_Store
 
 native/android/app/src/main/assets/
-
 *Issues.md
 build_cache/
 #
@@ -14,7 +13,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/README.md

@@ -19,9 +19,9 @@
 
 ## Build instructions
 
-> **Before you start it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
+> **Before you start, it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
 
-### Setting up development environment
+### Setting up the development environment
 
 Requirements:
 
@@ -57,7 +57,7 @@ npm install
 
 ### Running the app on Android
 
-[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already and then run the following command to start the app in the Emulator:
+[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already, and then run the following command to start the app in the Emulator:
 
 ```bash
 npm run start:android
@@ -78,11 +78,11 @@ npm run start:ios
 
 ## Developer guide
 
-> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript so if you can help with that, it'd be great!
+> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript, so if you can help with that, it'd be great!
 
 ### The tech stack
 
-We try to keep the stack as lean as possible
+We try to keep the stack as lean as possible:
 
 1. React Native
 2. Typescript/Javascript
@@ -95,17 +95,17 @@ We try to keep the stack as lean as possible
 
 The app codebase is distributed over two primary directories. `native/` and `app/`.
 
-- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development and packaging. Any react-native dependency that has native code i.e android & ios folders, is installed here.
+- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development, and packaging. Any react-native dependency with native code, i.e., android & ios folders, is installed here.
 
-- `app/`: Includes all the app code other than the native part. All JS only dependencies are installed here.
-  - `components/`: Each component serves a specific purpose in the app UI, for example the `Paragraph` component is used to render paragraphs in the app and a `Header` component is used to render a `header` on all screens.
-  - `common/`: Features that have integral role in app functionality, for example, notesnook core is initialized here.
+- `app/`: Includes all the app code other than the native part. All JS-only dependencies are installed here.
+  - `components/`: Each component serves a specific purpose in the app UI. For example, the `Paragraph` component is used to render paragraphs in the app, and a `Header` component is used to render a `header` on all screens.
+  - `common/`: Features that are integral to the app's functionality. For example, the notesnook core is initialized here.
   - `hooks/`: Hooks for different app logic
-  - `navigation/`: Includes app navigation specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
+  - `navigation/`: Includes app navigation-specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
   - `screens`: Navigator screens.
-  - `services`: Parts of code that do a specific function, for example, the `sync` service is responsibe for running Sync from anywhere in the app.
-  - `stores`: We use `zustand` for global state management in the app. There are multiple stores that provide the state for different parts of the app.
-  - `utils`: General purpose stuff such as constant values, utility functions etc.
+  - `services`: Parts of code that do a specific function. For example, the `sync` service runs Sync from anywhere in the app.
+  - `stores`: We use `zustand` for global state management in the app. Multiple stores provide the state for different parts of the app.
+  - `utils`: General purpose stuff such as constant values, utility functions, etc.
 
 There are several other folders at the root:
 
@@ -115,11 +115,11 @@ There are several other folders at the root:
 
 ### Running the tests
 
-When you are done making the required changes, you will need to run the tests to make sure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
+When you are done making the required changes, you must run the tests to ensure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
 
 ### Android
 
-To run the tests on android, you will need to create an emulator device on your system:
+To run the tests on Android, you will need to create an emulator device on your system:
 
 ```
 $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --package "system-images;android-31;default;x86_64"
@@ -127,13 +127,13 @@ $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --packa
 
 If you face problems, follow the detailed guide in [Detox documentation](https://wix.github.io/Detox/docs/introduction/android-dev-env). Keep the emulator name set to `Pixel_5_API_31`.
 
-Once you have created an emulator device, build the android apks
+Once you have created an emulator device, build the Android apks:
 
 ```
 npm run build:android
 ```
 
-Finally run the tests
+Finally, run the tests:
 
 ```
 npm run test:android
@@ -141,9 +141,9 @@ npm run test:android
 
 ### iOS
 
-To run e2e tests on iOS simulator, you must be on a Mac with XCode installed.
+To run e2e tests on the iOS simulator, you must be on a Mac with XCode installed.
 
-First install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils)
+First, install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils):
 
 ```
 brew tap wix/brew
@@ -156,7 +156,7 @@ Now build the iOS app for testing:
 npm run build:ios
 ```
 
-Finally run the tests:
+Finally, run the tests:
 
 ```
 npm run test:ios

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";