mobile: fix reminders not working on android

.commitlintrc.js

@@ -10,21 +10,16 @@ const authors = readFileSync("AUTHORS", "utf-8");
 const isAuthor = authors.includes(`<${authorEmail}>`);
 
 const SCOPES = [
-  // for full list of scopes + details see: https://github.com/streetwriters/notesnook/blob/master/CONTRIBUTING.md#commit-guidelines
+  // for full list of scopes + details see: https://github.com/streetwriters/notesnook-private/blob/master/CONTRIBUTING.md#commit-guidelines
 
   "mobile",
   "web",
-  "vericrypt",
-  "monograph",
   "desktop",
   "crypto",
   "editor",
   "logger",
   "theme",
-  "server",
   "core",
-  "fs",
-  "ui",
   "clipper",
   "config",
   "ci",
@@ -32,12 +27,7 @@ const SCOPES = [
   "docs",
   "refactor",
   "misc",
-  "common",
-  "global",
-  "docs",
-  "themebuilder",
-  "intl",
-  "webclipper"
+  "global"
 ];
 
 module.exports = {

.eslintignore

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

.gitattributes

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,8 @@
 name: Bug Report
 description: Are you facing a bug or a crash in Notesnook?
-type: Bug
+labels: ["Type: Bug", "Status: Pending"]
+assignees:
+  - thecodrr
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Notesnook Discord Community
-    url: https://go.notesnook.com/discord
+    url: https://discord.gg/6mHHyncHJE
     about: Reach out to us directly & discuss your issues, suggestions & other feedback!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a feature you are missing in Notesnook
-type: Feature
+labels: ["Type: Feature Request", "Status: Pending"]
 body:
   - type: markdown
     attributes:

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

@@ -1,26 +0,0 @@
-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

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

.github/workflows/android.e2e.yml

@@ -1,100 +0,0 @@
-name: e2e-android
-on: workflow_dispatch
-
-jobs:
-  e2e-android:
-    runs-on: ubuntu-latest
-    env:
-      API_LEVEL: 34
-      ARCH: x86_64
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: false
-
-      - 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: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: wrapper
-          cache-read-only: false
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: "17"
-          architecture: "x64"
-
-      - name: Install Detox CLI
-        run: npm install detox-cli --global
-
-      - name: Detox build
-        run: |
-          yarn build:android
-          ls apps/mobile/native/android/app/build/outputs/apk
-          ls apps/mobile/native/android/app/build/outputs/apk/release
-
-      - name: Get device name
-        id: device
-        run: |
-          AVD_NAME=$(node -p "require('./apps/mobile/native/.detoxrc.js').devices.emulator.device.avdName")
-          echo "AVD_NAME=$AVD_NAME" >> $GITHUB_OUTPUT
-
-      - name: AVD cache
-        uses: actions/cache@v4
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: ${{ steps.device.outputs.AVD_NAME }}
-
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ env.API_LEVEL }}
-          arch: ${{ env.ARCH }}
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          script: echo "Generated AVD snapshot for caching."
-
-      - name: Detox test
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ env.API_LEVEL }}
-          arch: ${{ env.ARCH }}
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          disable-animations: true
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          force-avd-creation: false
-          script: yarn test:android --headless --record-logs failing --record-videos failing --take-screenshots failing
-
-      - name: Upload artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: detox-artifacts
-          path: artifacts
-          retention-days: 14

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

@@ -6,151 +6,59 @@ 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
 
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+      - 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: 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 --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
+          npm ci
       - 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@master
+        uses: r0adkll/sign-android-release@v1
         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 }}
-        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
+          keyPassword: ${{ secrets.KEY_PASSWORD }}   
 
       - name: Publish to Playstore
         id: deploy
-        uses: r0adkll/upload-google-play@v1.1.1
+        uses: r0adkll/upload-google-play@v1
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: com.streetwriters.notesnook
-          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: alpha
+          releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
+          track: internal
           status: completed
-          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 sourcemaps
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcemaps
-          path: |
-            apps/mobile/native/android/app/build/**/*.map
-            packages/editor-mobile/sourcemaps/*.map
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/             

.github/workflows/android.publish.yml

@@ -1,4 +1,4 @@
-name: Publish @notesnook/android
+name: Publish @notesnook/mobile
 
 on: workflow_dispatch
 
@@ -6,92 +6,62 @@ 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
 
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+      - 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: Use specific Java version for the builds
         uses: joschi/setup-jdk@v2
         with:
-          java-version: "17"
-          architecture: "x64"
+          java-version: '11'
+          architecture: 'x64'
 
       - name: Install node modules
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
+          npm ci
       - 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@master
+        uses: r0adkll/sign-android-release@v1
         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 }}
-        env:
-          BUILD_TOOLS_VERSION: "33.0.0"
+          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/      
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -104,9 +74,7 @@ jobs:
           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"
+          keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}    
 
       - name: Rename apk files
         run: |
@@ -122,17 +90,6 @@ 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:
@@ -145,12 +102,4 @@ jobs:
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
-
-      - name: Upload sourcemaps
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcemaps
-          path: |
-            apps/mobile/native/android/app/build/**/*.map
-            packages/editor-mobile/sourcemaps/*.map
+            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk           

.github/workflows/core.tests.yml

@@ -8,7 +8,7 @@ on:
     paths:
       - "packages/core/**"
       # re-run workflow if workflow file changes
-      - ".github/workflows/core.tests.yml"
+      - ".github/workflows/core.tests.yml" 
   pull_request:
     types:
       - "ready_for_review"
@@ -21,15 +21,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        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
 
       - name: Prepare environment
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=core
+          npm ci --prefer-offline --no-audit
       - name: Add environment variables
         run: |
           echo "USER_EMAIL=${{ secrets.USER_EMAIL }}" >> $GITHUB_ENV

.github/workflows/desktop.publish.yml

@@ -18,21 +18,6 @@ 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:
@@ -40,15 +25,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        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
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
 
       - name: Setup environment
         run: |
@@ -58,14 +57,14 @@ jobs:
         run: npx nx build:desktop @notesnook/web
 
       - name: Archive build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: build
           path: apps/web/build/**/*
 
       - name: Collect app metadata
         id: app_metadata
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
         run: |
           echo ::set-output name=app_version::$(cat package.json | jq -r .version)
 
@@ -82,43 +81,15 @@ 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') }}
-
-      - name: Generate flatpak sources
-        if: inputs.publish-github && inputs.build-linux
-        run: |
-          sudo apt-get install -y flatpak flatpak-builder pipx
-          git clone https://github.com/flatpak/flatpak-builder-tools.git /tmp/flatpak-builder-tools
-          cd /tmp/flatpak-builder-tools/node
-          pipx install .
-          cd -
-          node scripts/generate-sources.mjs
-
-      - name: Upload flatpak sources
-        uses: softprops/action-gh-release@v1
-        if: inputs.publish-github && inputs.build-linux
-        with:
-          draft: true
-          name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
-          tag_name: v${{ steps.app_metadata.outputs.app_version }}
-          files: ./generated-sources.json
-          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
   build-macos:
     name: Build for macOS
     needs: build
-    if: inputs.build-mac
-    runs-on: macos-14
+    runs-on: macos-12
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install setuptools
-        run: brew install python-setuptools
+        uses: actions/checkout@v3
 
       - name: Setup notarization
         run: |
@@ -127,17 +98,16 @@ jobs:
 
       - name: Collect app metadata
         id: app_metadata
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/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 }}
@@ -145,26 +115,26 @@ 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@v4
+        uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/web/build
+          path: ./apps/web/desktop/build
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
+          npm i
+          npm i dmg-license
+        working-directory: ./apps/web/desktop
+      
       - name: Install provisioning profile
         run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
 
       - name: Build app for Mac App Store
         if: inputs.publish-apple && steps.appstore.outputs.app-version-latest != steps.app_metadata.outputs.app_version
@@ -172,9 +142,9 @@ jobs:
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
         run: |
-          npx nx run release --project @notesnook/desktop -- --variant=mas
-          yarn electron-builder --mac mas --universal -p never
-        working-directory: ./apps/desktop
+          npm run build:mas
+          npx electron-builder --mac mas --universal -p never
+        working-directory: ./apps/web/desktop
 
       - name: Build zip and dmg
         env:
@@ -183,41 +153,37 @@ 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_ISSUER: ${{ secrets.api_key_issuer_id }}
+          APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }}
         run: |
-          npx nx run release --project @notesnook/desktop
+          npm run build
           if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --mac zip dmg --arm64 --x64 -p always
+            npx electron-builder --mac zip dmg --arm64 --x64 -p always
           else
-            yarn electron-builder --mac zip dmg --arm64 --x64 -p never
+            npx electron-builder --mac zip dmg --arm64 --x64 -p never
           fi
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/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 ./output/mas-universal/notesnook*.pkg)
+        run: |       
+          package=$(find ./dist/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/desktop
+        working-directory: ./apps/web/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@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/checkout@v3
 
       - name: Setup Snapcraft Auth
         if: inputs.publish-snap
@@ -226,103 +192,84 @@ 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@v4
+        uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/web/build
+          path: ./apps/web/desktop/build
 
       - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
+        run: npm i
+        working-directory: ./apps/web/desktop
 
       - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
+        run: npm run build
+        working-directory: ./apps/web/desktop
 
       - name: Build snap
         if: inputs.publish-snap
         run: |
-          yarn electron-builder --linux snap:x64 -p never
-        working-directory: ./apps/desktop
+          npx electron-builder --linux snap -p never
+        working-directory: ./apps/web/desktop
 
-      - name: Build AppImage
+      - name: Build AppImage deb and rpm
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p always
+            npx electron-builder --linux AppImage deb rpm -p always
           else
-            yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p never
+            npx electron-builder --linux AppImage deb rpm -p never
           fi
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
 
       - name: Publish on Snapcraft
         if: inputs.publish-snap
         run: |
-          snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
-        working-directory: ./apps/desktop
+          snapcraft upload --release=stable ./dist/notesnook_linux_amd64.snap
+        working-directory: ./apps/web/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@v4
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: 6.0.x
-
-      - name: Install TrustedSigning
-        run: Install-Module -Name TrustedSigning -RequiredVersion 0.3.15 -Force -Repository PSGallery
-        shell: pwsh
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
 
       - name: Download build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/web/build
+          path: ./apps/web/desktop/build
 
       - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+        run: npm i
+        working-directory: ./apps/web/desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/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: Publish
+      - name: Build app
         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) {
-            yarn electron-builder --win --publish always
+            npx electron-builder --win --publish always
           } else {
-            yarn electron-builder --win --publish never
+            npx electron-builder --win --publish never
           }
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop

.github/workflows/desktop.tests.yml

@@ -1,233 +0,0 @@
-name: Test @notesnook/desktop
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "app/desktop/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/desktop.tests.yml"
-  pull_request:
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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
-
-      - name: Generate desktop build
-        run: npx nx build:desktop @notesnook/web
-
-      - name: Archive build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build
-          path: apps/web/build/**/*
-
-  test-macos-x64:
-    name: Test macOS x64
-    needs: build
-    runs-on: macos-13
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --mac --dir --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests x64
-        run: |
-          EXECUTABLE_PATH=output/mac/Notesnook.app/Contents/MacOS/Notesnook npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-macos-x64
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-macos:
-    name: Test macOS
-    needs: build
-    runs-on: macos-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --mac --dir --arm64
-        working-directory: ./apps/desktop
-
-      - name: Run tests arm64
-        run: |
-          EXECUTABLE_PATH=output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-macos
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-linux:
-    name: Test for Linux
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --linux --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests
-        run: |
-          EXECUTABLE_PATH=output/linux-unpacked/notesnook xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-linux
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-windows:
-    name: Test for Windows
-    needs: build
-    runs-on: windows-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --win --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests
-        run: |
-          npx cross-env EXECUTABLE_PATH=output/win-unpacked/Notesnook.exe npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-win
-          path: apps/desktop/test-results
-          retention-days: 5

.github/workflows/editor.tests.yml

@@ -22,22 +22,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        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
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=editor
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
 
       - name: Setup environment
         run: |
           echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
 
-      - name: Build editor
-        run: npx nx build @notesnook/editor
-
       - name: Run all @notesnook/editor tests
         run: npx nx test @notesnook/editor

.github/workflows/help.publish.yml

@@ -1,35 +0,0 @@
-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@v4
-      - 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

@@ -1,107 +0,0 @@
-name: Publish @notesnook/ios
-
-on: workflow_dispatch
-
-jobs:
-  build:
-    runs-on: macos-latest
-    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@v4
-        with:
-          name: Notesnook.zip
-          path: |
-            Notesnook.ipa
-            apps/mobile/native/ios/**/*.map
-            packages/editor-mobile/sourcemaps/*.map

.github/workflows/monograph.publish.yml

@@ -1,89 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# GitHub recommends pinning actions to a commit SHA.
-# To get a newer version, you will need to update the SHA.
-# You can also reference a tag or branch, but the action may change without warning.
-
-name: Publish @notesnook/monograph
-
-on: workflow_dispatch
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - 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=monograph
-
-      - name: Collect package metadata
-        id: package_metadata
-        working-directory: ./apps/monograph
-        run: |
-          echo ::set-output name=app_version::$(cat package.json | jq -r .version)
-
-      - name: Generate build
-        run: npx nx build @notesnook/monograph
-
-      # Setup Buildx
-      - name: Docker Setup Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          ecr: auto
-          logout: true
-
-      # Pull previous image from docker hub to use it as cache to improve the image build time.
-      - name: docker pull cache image
-        continue-on-error: true
-        run: docker pull streetwriters/monograph:latest
-
-      # Setup QEMU
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v2
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: streetwriters/monograph
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: apps/monograph
-          file: apps/monograph/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-          tags: streetwriters/monograph:${{ steps.package_metadata.outputs.app_version }},streetwriters/monograph:latest
-          cache-from: streetwriters/monograph:latest
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-name: index.docker.io/streetwriters/monograph
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true

.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

@@ -1,31 +0,0 @@
-name: Publish @notesnook/theme-builder
-
-on: workflow_dispatch
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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

@@ -1,31 +0,0 @@
-name: Publish @notesnook/vericrypt
-
-on: workflow_dispatch
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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.benchmarks.yml

@@ -1,44 +0,0 @@
-name: Benchmark @notesnook/web
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "apps/web/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/web.benchmarks.yml"
-  pull_request:
-
-jobs:
-  bench:
-    name: Bench
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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
-
-      - name: Build
-        run: npm run build:web
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: apps/web
-
-      - name: Run benchmarks
-        id: benchmark
-        run: node __bench__/app.bench.mjs
-        working-directory: apps/web

.github/workflows/web.publish.yml

@@ -8,15 +8,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        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
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
 
       - name: Setup environment
         run: |
@@ -24,8 +38,8 @@ jobs:
           echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
           echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
 
-      - name: Generate build
+      - name: Generate desktop build
         run: npm run build:web
 
-      - name: Publish to Cloudflare Pages
-        run: npx --yes wrangler pages deploy --project-name=notesnook-app ./apps/web/build/
+      - name: Publish on Cloudflare Pages
+        run: npx --yes wrangler pages publish --project-name=notesnook-app ./apps/web/build/

.github/workflows/web.tests.yml

@@ -22,15 +22,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        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
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
 
       - name: Setup environment
         run: |
@@ -40,7 +54,7 @@ jobs:
         run: npm run build:test:web
 
       - name: Archive build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: build
           path: apps/web/build/**/*
@@ -53,21 +67,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Download build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: build
           path: ./apps/web/build
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        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
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm install -D @playwright/test otplib dayjs @zip.js/zip.js
+          npm i --ignore-scripts --prefer-offline --no-audit
+          npm install -D @playwright/test otplib
 
       - name: Validate build extraction
         run: ls -ld ./apps/web/build/index.html
@@ -88,7 +116,7 @@ jobs:
         working-directory: apps/web
 
       - name: Upload test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: test-results-${{ matrix.shard }}

.gitignore

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

.prettierignore

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

.prettierrc.js

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

.vscode/notesnook.code-workspace

@@ -0,0 +1,72 @@
+{
+  "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

@@ -1,15 +0,0 @@
-{
-  "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 you didn't expect, which the developer didn't intend.
+> A bug is when software behaves in a way that you didn't expect, and the developer didn't intend.
 
-To help us understand what's happening, we first want to **make sure you're using the latest version of Notesnook**.
+To help us understand what's going on, 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
 
-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.
+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.
 
 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
+1. `crypto`: changes related to the cryptographic core (including `@notesnook/crypto-worker`)
 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. 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.
+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.
 
-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/).
+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/).
 
 ## Developer guide
 
@@ -25,29 +25,25 @@ 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. 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.
+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.
 
 > **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 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                         |
+| 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                      |
 
 ### Contributing guidelines
 

apps/desktop/.gitignore

@@ -1,5 +0,0 @@
-node_modules
-build
-output
-dist
-_catalog

apps/desktop/README.md

@@ -1,81 +0,0 @@
-<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 for development:
-
-```bash
-npm run start:desktop
-```
-
-To run the app in release mode:
-
-```bash
-npm run staging -- --rebuild
-```
-
-This will compile and run the app in production mode but it won't generate any packages. To create the final packages, you'll have to run the following commands:
-
-```bash
-npm run release -- --rebuild
-
-# For macOS
-npx electron-builder --mac dmg --arm64 --x64 -publish never
-
-# For Linux (AppImage)
-npx electron-builder --linux AppImage:x64 AppImage:arm64 -publish never
-
-# For Windows
-npx electron-builder --win --publish never
-```
-
-Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`.
-
-## 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/__tests__/launch.test.mjs

@@ -1,53 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import test from "node:test";
-import { launchApp } from "./utils.mjs";
-import assert from "assert";
-import slugify from "slugify";
-import path from "path";
-import { mkdir } from "fs/promises";
-
-test("make sure app loads", async (t) => {
-  const { app, page } = await launchApp();
-  try {
-    await page.waitForSelector("#authForm");
-
-    assert.ok(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    );
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await page.waitForSelector(".ProseMirror");
-  } catch (e) {
-    await mkdir("test-results", { recursive: true });
-    await page.screenshot({
-      path: path.join(
-        "test-results",
-        `${slugify(t.name)}-${process.platform}-${process.arch}-error.png`
-      )
-    });
-    throw e;
-  } finally {
-    await app.close();
-  }
-});

apps/desktop/__tests__/utils.mjs

@@ -1,38 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { _electron as electron } from "playwright";
-
-const executablePath = process.env.EXECUTABLE_PATH;
-
-// process.platform === "linux"
-//   ? "output/linux-unpacked/Notesnook"
-//   : process.platform === "darwin"
-//   ? "output/mac/Notesnook.app/Contents/MacOS/Notesnook"
-//   : "output/win-unpacked/Notesnook.exe";
-
-export async function launchApp() {
-  const app = await electron.launch({
-    executablePath
-  });
-
-  const page = await app.firstWindow();
-
-  return { app, page };
-}

apps/desktop/app-update.yml

@@ -1,4 +0,0 @@
-owner: streetwriters
-repo: notesnook
-provider: github
-updaterCacheDirName: Notesnook

apps/desktop/global.d.ts

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

@@ -1,265 +0,0 @@
-{
-  "name": "@notesnook/desktop",
-  "productName": "Notesnook",
-  "description": "Your private note taking space",
-  "version": "3.0.22",
-  "appAppleId": "1544027013",
-  "private": true,
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "require": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      },
-      "import": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      }
-    }
-  },
-  "homepage": "https://notesnook.com/",
-  "repository": "https://github.com/streetwriters/notesnook",
-  "license": "GPL-3.0-or-later",
-  "dependencies": {
-    "@lingui/core": "4.11.4",
-    "@notesnook/intl": "file:../../packages/intl",
-    "@trpc/client": "10.45.2",
-    "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "11.5.0",
-    "electron-trpc": "0.6.1",
-    "electron-updater": "^6.3.4",
-    "icojs": "^0.19.4",
-    "sqlite-better-trigram": "^0.0.2",
-    "typed-emitter": "^2.1.0",
-    "yargs": "^17.7.2",
-    "zod": "^3.23.8"
-  },
-  "devDependencies": {
-    "@streetwriters/kysely": "^0.27.4",
-    "@types/node": "22.7.0",
-    "@types/yargs": "^17.0.33",
-    "chokidar": "^4.0.1",
-    "electron": "^31.7.4",
-    "electron-builder": "^25.1.8",
-    "esbuild": "^0.24.0",
-    "node-abi": "^3.68.0",
-    "node-gyp-build": "^4.8.2",
-    "playwright": "^1.48.2",
-    "prebuildify": "^6.0.1",
-    "slugify": "^1.6.6",
-    "tree-kill": "^1.2.2",
-    "undici": "^6.19.8",
-    "vitest": "^2.1.5"
-  },
-  "optionalDependencies": {
-    "dmg-license": "^1.0.11"
-  },
-  "scripts": {
-    "start": "node scripts/dev.mjs",
-    "staging": "node scripts/build.mjs --run",
-    "release": "node scripts/build.mjs",
-    "build": "node ../../scripts/build.mjs",
-    "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",
-    "test": "node --test --test-timeout 30000 --test-force-exit"
-  },
-  "author": {
-    "name": "Streetwriters (Private) Limited",
-    "email": "support@streetwriters.co",
-    "url": "https://streetwriters.co"
-  },
-  "build": {
-    "appId": "org.streetwriters.notesnook",
-    "productName": "Notesnook",
-    "copyright": "Copyright © 2023 Streetwriters (Private) Limited",
-    "artifactName": "notesnook_${os}_${arch}.${ext}",
-    "generateUpdatesFilesForAllChannels": true,
-    "asar": false,
-    "files": [
-      "!*.chunk.js.map",
-      "!*.chunk.js.LICENSE.txt",
-      "build/",
-      "!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/sqlite-better-trigram",
-      "node_modules/sodium-native/prebuilds/${platform}-${arch}",
-      {
-        "from": "node_modules/sqlite-better-trigram-linux-${arch}",
-        "to": "node_modules/sqlite-better-trigram-linux-${arch}"
-      },
-      {
-        "from": "node_modules/sqlite-better-trigram-darwin-${arch}",
-        "to": "node_modules/sqlite-better-trigram-darwin-${arch}"
-      },
-      {
-        "from": "node_modules/sqlite-better-trigram-windows-${arch}",
-        "to": "node_modules/sqlite-better-trigram-windows-${arch}"
-      },
-      "node_modules/sodium-native/index.js",
-      "node_modules/sodium-native/package.json"
-    ],
-    "afterPack": "./scripts/removeLocales.js",
-    "mac": {
-      "bundleVersion": "240",
-      "minimumSystemVersion": "10.12.0",
-      "target": [
-        {
-          "target": "dmg",
-          "arch": [
-            "arm64",
-            "x64"
-          ]
-        },
-        {
-          "target": "zip",
-          "arch": [
-            "arm64",
-            "x64"
-          ]
-        }
-      ],
-      "category": "public.app-category.productivity",
-      "darkModeSupport": true,
-      "type": "distribution",
-      "hardenedRuntime": true,
-      "entitlements": "assets/entitlements.mac.plist",
-      "entitlementsInherit": "assets/entitlements.mac.plist",
-      "gatekeeperAssess": false,
-      "icon": "assets/icons/app.icns",
-      "notarize": true
-    },
-    "dmg": {
-      "contents": [
-        {
-          "x": 130,
-          "y": 220
-        },
-        {
-          "x": 410,
-          "y": 220,
-          "type": "link",
-          "path": "/Applications"
-        }
-      ],
-      "icon": "assets/icons/app.icns",
-      "title": "Install Notesnook"
-    },
-    "mas": {
-      "entitlements": "assets/entitlements.mas.plist",
-      "entitlementsInherit": "assets/entitlements.mas.inherit.plist",
-      "entitlementsLoginHelper": "assets/entitlements.mas.loginhelper.plist",
-      "hardenedRuntime": true
-    },
-    "win": {
-      "target": [
-        {
-          "target": "nsis",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        },
-        {
-          "target": "portable",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        }
-      ],
-      "signtoolOptions": {
-        "signingHashAlgorithms": [
-          "sha256"
-        ],
-        "sign": "./scripts/sign.js"
-      },
-      "icon": "assets/icons/app.ico"
-    },
-    "portable": {
-      "artifactName": "notesnook_${os}_${arch}_portable.${ext}"
-    },
-    "nsis": {
-      "oneClick": true,
-      "createDesktopShortcut": "always",
-      "deleteAppDataOnUninstall": true
-    },
-    "linux": {
-      "target": [
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        },
-        {
-          "target": "snap",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        }
-      ],
-      "category": "Office",
-      "icon": "assets/icons/app.icns",
-      "description": "Your private note taking space",
-      "executableName": "notesnook",
-      "desktop": {
-        "actions": [
-          {
-            "id": "new-note",
-            "name": "New note",
-            "args": "new note"
-          },
-          {
-            "id": "new-notebook",
-            "name": "New notebook",
-            "args": "new notebook"
-          },
-          {
-            "id": "new-reminder",
-            "name": "New reminder",
-            "args": "new reminder"
-          }
-        ]
-      }
-    },
-    "snap": {
-      "autoStart": false,
-      "confinement": "strict",
-      "allowNativeWayland": true
-    },
-    "extraResources": [
-      "app-update.yml",
-      "./assets/**"
-    ],
-    "extraMetadata": {
-      "main": "./build/electron.js"
-    },
-    "directories": {
-      "buildResources": "assets",
-      "output": "./output/"
-    },
-    "publish": [
-      {
-        "provider": "github",
-        "repo": "notesnook",
-        "owner": "streetwriters"
-      }
-    ]
-  }
-}

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

@@ -1,39 +0,0 @@
-diff --git a/node_modules/electron-trpc/dist/main.mjs b/node_modules/electron-trpc/dist/main.mjs
-index 07971db..b67a3cf 100644
---- a/node_modules/electron-trpc/dist/main.mjs
-+++ b/node_modules/electron-trpc/dist/main.mjs
-@@ -537,8 +537,15 @@ class be {
-   attachWindow(r) {
-     F(this, w).includes(r) || (y("Attaching window", r.id), F(this, w).push(r), v(this, N, Z).call(this, r));
-   }
--  detachWindow(r) {
--    y("Detaching window", r.id), L(this, w, F(this, w).filter((e) => e !== r)), v(this, R, M).call(this, { webContentsId: r.webContents.id });
-+  detachWindow(r, webContentsId) {
-+    y("Detaching window", r.id);
-+
-+    if (r.isDestroyed() && webContentsId === undefined) {
-+      throw new Error('webContentsId is required when calling detachWindow on a destroyed window');
-+    }
-+
-+    L(this, w, F(this, w).filter((e) => e !== r));
-+    v(this, R, M).call(this, { webContentsId: webContentsId ?? r.webContents.id });
-   }
- }
- w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
-@@ -548,6 +555,7 @@ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
-   for (const [i, a] of F(this, E).entries())
-     i.startsWith(`${r}-${e ?? ""}`) && (y("Closing subscription", i), a.unsubscribe(), F(this, E).delete(i));
- }, N = new WeakSet(), Z = function(r) {
-+  const webContentsId = r.webContents.id;
-   r.webContents.on("did-start-navigation", ({ frame: e }) => {
-     y(
-       "Handling webContents `did-start-navigation` event",
-@@ -558,7 +566,7 @@ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
-       frameRoutingId: e.routingId
-     });
-   }), r.webContents.on("destroyed", () => {
--    y("Handling webContents `destroyed` event"), this.detachWindow(r);
-+    y("Handling webContents `destroyed` event"), this.detachWindow(r, webContentsId);
-   });
- };
- const me = ({

apps/desktop/scripts/build.mjs

@@ -1,77 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import path from "path";
-import fs from "fs/promises";
-import { existsSync } from "fs";
-import yargs from "yargs-parser";
-import os from "os";
-import * as childProcess from "child_process";
-import { fileURLToPath } from "url";
-import { patchBetterSQLite3 } from "./patch-better-sqlite3.mjs";
-
-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(
-    "yarn nx build:desktop @notesnook/web",
-    path.join(__dirname, "..", "..", "..")
-  );
-}
-
-// temporary until there's support for prebuilt binaries for linux ARM
-if (os.platform() === "linux") await patchBetterSQLite3();
-
-await fs.cp(path.join(webAppPath, "build"), "build", {
-  recursive: true,
-  force: true
-});
-
-if (args.variant === "mas") {
-  await exec(`yarn run bundle:mas`);
-} else {
-  await exec(`yarn run bundle`);
-}
-
-await exec(`yarn run build`);
-
-if (args.run) {
-  await exec(`yarn electron-builder --dir --x64`);
-  if (process.platform === "win32") {
-    await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
-  } else if (process.platform === "darwin") {
-    await exec(`./output/mac/Notesnook.app/Contents/MacOS/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()
-  });
-}

apps/desktop/scripts/dev.mjs

@@ -1,192 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import 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"
-};
-process.chdir(path.join(__dirname, ".."));
-
-await onChange(true);
-
-console.log("Watching...");
-
-const watcher = chokidar.watch("src/", { ignoreInitial: true });
-watcher.on("all", () => {
-  onChange(false);
-});
-
-process.on("SIGINT", async (s) => {
-  await cleanup();
-});
-
-async function onChange(first) {
-  if (first) {
-    await fs.rm("./build/", { force: true, recursive: true });
-
-    await exec("npm rebuild electron --verbose --foreground-scripts");
-
-    await exec("yarn electron-builder install-app-deps");
-  }
-
-  await exec(`yarn run bundle`);
-  await exec(`yarn run build`);
-
-  if (await isBundleSame()) {
-    console.log("Bundle is same. Doing nothing.");
-    return;
-  }
-
-  if (first) {
-    await spawnAndWaitUntil(
-      ["yarn", "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(
-    "yarn",
-    ["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/patch-better-sqlite3.mjs

@@ -1,48 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { readFile, writeFile } from "fs/promises";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export 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 = "11.5.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));
-}
-
-if (process.argv[1] === __filename) {
-  console.log("Patching better-sqlite3");
-  patchBetterSQLite3();
-}

apps/desktop/scripts/sign.js

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

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

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

@@ -1,45 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { 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";
-import { windowRouter } from "./window";
-
-const t = initTRPC.create();
-
-export const router = t.router({
-  compress: compressionRouter,
-  integration: osIntegrationRouter,
-  spellChecker: spellCheckerRouter,
-  updater: updaterRouter,
-  bridge: bridgeRouter,
-  safeStorage: safeStorageRouter,
-  window: windowRouter
-});
-
-export const api = router.createCaller({});
-
-// Export type router type signature,
-// NOT the router itself.
-export type AppRouter = typeof router;

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

@@ -1,228 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { z } from "zod";
-import { app, 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";
-import { disableCustomDns, enableCustomDns } from "../utils/custom-dns";
-
-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;
-  }),
-
-  customDns: t.procedure.query(() => config.customDns),
-  setCustomDns: t.procedure
-    .input(z.boolean().optional())
-    .mutation(({ input: customDns }) => {
-      if (customDns) enableCustomDns();
-      else disableCustomDns();
-      config.customDns = !!customDns;
-    }),
-
-  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);
-  }),
-
-  restart: t.procedure.query(() => {
-    app.relaunch();
-    app.exit();
-  }),
-  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(
-      z.object({
-        theme: Theme,
-        windowControlsIconColor: z.string().optional(),
-        backgroundColor: z.string().optional()
-      })
-    )
-    .mutation(
-      ({ input: { theme, windowControlsIconColor, backgroundColor } }) => {
-        if (windowControlsIconColor) {
-          config.windowControlsIconColor = windowControlsIconColor;
-          if (
-            process.platform === "win32" &&
-            !config.desktopSettings.nativeTitlebar
-          )
-            globalThis.window?.setTitleBarOverlay({
-              symbolColor: windowControlsIconColor
-            });
-        }
-
-        if (backgroundColor) {
-          config.backgroundColor = backgroundColor;
-        }
-
-        setTheme(theme);
-      }
-    ),
-
-  onThemeChanged: t.procedure.subscription(() =>
-    observable<"dark" | "light">((emit) => {
-      const updated = () => {
-        if (getTheme() === "system") {
-          emit.next(nativeTheme.shouldUseDarkColors ? "dark" : "light");
-        }
-      };
-      nativeTheme.on("updated", updated);
-      return () => {
-        nativeTheme.off("updated", updated);
-      };
-    })
-  )
-});

apps/desktop/src/api/safe-storage.ts

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

@@ -1,145 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import type { Database, Statement } from "better-sqlite3-multiple-ciphers";
-import type { QueryResult } from "@streetwriters/kysely";
-
-type SQLiteCompatibleType =
-  | number
-  | string
-  | Uint8Array
-  | Array<number>
-  | bigint
-  | null;
-
-export class SQLite {
-  sqlite?: Database;
-  initialized = false;
-  preparedStatements: Map<string, Statement<unknown[]>> = new Map();
-  retryCounter: Record<string, number> = {};
-  constructor() {
-    console.log("new sqlite worker");
-  }
-
-  async open(filePath: string) {
-    if (this.sqlite) {
-      console.error("Database is already initialized");
-      return;
-    }
-
-    this.sqlite = require("better-sqlite3-multiple-ciphers")(
-      filePath
-    ).unsafeMode(true);
-    const betterTrigram = require("sqlite-better-trigram");
-    betterTrigram.load(this.sqlite);
-  }
-
-  /**
-   * Wrapper function for preparing SQL statements with caching
-   * to avoid unnecessary computations.
-   */
-  async prepare(sql: string): Promise<Statement | undefined> {
-    if (!this.sqlite) throw new Error("Database is not initialized.");
-    try {
-      const cached = this.preparedStatements.get(sql);
-      if (cached !== undefined) return cached;
-
-      const prepared = this.sqlite.prepare(sql);
-      if (!prepared) return;
-
-      this.preparedStatements.set(sql, prepared);
-
-      // reset retry count on success
-      this.retryCounter[sql] = 0;
-      return prepared;
-    } catch (ex) {
-      console.error(ex);
-
-      // statement prepare process can be flaky so retry at least 5 times
-      // before giving up.
-      if (this.retryCounter[sql] < 5) {
-        this.retryCounter[sql] = (this.retryCounter[sql] || 0) + 1;
-        console.warn("Failed to prepare statement. Retrying:", sql);
-        return this.prepare(sql);
-      } else this.retryCounter[sql] = 0;
-
-      if (ex instanceof Error) ex.message += ` (query: ${sql})`;
-      throw ex;
-    }
-  }
-
-  async exec<R>(
-    sql: string,
-    parameters: SQLiteCompatibleType[] = []
-  ): Promise<QueryResult<R>> {
-    const prepared = await this.prepare(sql);
-    if (!prepared) return { rows: [] };
-    try {
-      if (prepared.reader) {
-        return {
-          rows: prepared.all(parameters) as R[]
-        };
-      } else {
-        const { changes, lastInsertRowid } = prepared.run(parameters);
-        const numAffectedRows =
-          changes !== undefined && changes !== null && !isNaN(changes)
-            ? BigInt(changes)
-            : undefined;
-        return {
-          numAffectedRows,
-          insertId:
-            lastInsertRowid !== undefined && lastInsertRowid !== null
-              ? typeof lastInsertRowid === "bigint"
-                ? lastInsertRowid
-                : BigInt(lastInsertRowid)
-              : undefined,
-          rows: [] as R[]
-        };
-      }
-    } catch (e) {
-      if (e instanceof Error) e.message += ` (query: ${sql})`;
-      throw e;
-    }
-  }
-
-  async run<R>(
-    sql: string,
-    parameters?: SQLiteCompatibleType[]
-  ): Promise<QueryResult<R>> {
-    if (!this.sqlite) throw new Error("No database is not opened.");
-    return await this.exec(sql, parameters);
-  }
-
-  async close() {
-    if (!this.sqlite) return;
-
-    this.preparedStatements.clear();
-    this.sqlite.close();
-    this.sqlite = undefined;
-  }
-
-  async delete(filePath: string) {
-    await this.close();
-    await require("fs/promises").rm(filePath, {
-      force: true,
-      maxRetries: 5,
-      retryDelay: 500
-    });
-  }
-}

apps/desktop/src/api/updater.ts

@@ -1,115 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { 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();
-let cancellationToken: CancellationToken | undefined = undefined;
-let downloadTimeout: NodeJS.Timeout | undefined = undefined;
-
-export const updaterRouter = t.router({
-  autoUpdates: t.procedure.query(() => config.automaticUpdates),
-  install: t.procedure.query(() => autoUpdater.quitAndInstall()),
-  download: t.procedure.query(async () => {
-    if (cancellationToken) return;
-    clearTimeout(downloadTimeout);
-    await new Promise<string[]>((resolve, reject) => {
-      downloadTimeout = setTimeout(async () => {
-        cancellationToken = new CancellationToken();
-        autoUpdater.isUpdaterActive();
-        await autoUpdater
-          .downloadUpdate(cancellationToken)
-          .then(resolve)
-          .catch(reject)
-          .finally(() => (cancellationToken = undefined));
-      }, 1000);
-    });
-  }),
-  check: t.procedure.query(async () => {
-    if (cancellationToken) return;
-    clearTimeout(downloadTimeout);
-    await new Promise<void>((resolve) => {
-      downloadTimeout = setTimeout(async () => {
-        await autoUpdater
-          .checkForUpdates()
-          .catch(console.error)
-          .finally(resolve);
-      }, 1000);
-    });
-  }),
-
-  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",
-    () => {
-      if (!config.automaticUpdates) return false;
-      autoUpdater.emit("download-progress", {
-        bytesPerSecond: 0,
-        delta: 0,
-        percent: 0,
-        total: 100,
-        transferred: 0
-      });
-      return true;
-    }
-  ),
-  onError: createSubscription("error")
-});
-
-function createSubscription<
-  TName extends keyof AppUpdaterEvents,
-  TReturnType = Parameters<AppUpdaterEvents[TName]>[0]
->(eventName: TName, handler?: (args: TReturnType) => boolean) {
-  return t.procedure.subscription(() => {
-    return observable<TReturnType>((emit) => {
-      const listener: AppUpdaterEvents[TName] = (...args: any[]) => {
-        if (handler?.(args[0])) return;
-        emit.next(args[0]);
-      };
-      autoUpdater.removeAllListeners(eventName);
-      autoUpdater.addListener(eventName, listener);
-      return () => {
-        autoUpdater.removeListener(eventName, listener);
-      };
-    });
-  });
-}

apps/desktop/src/api/window.ts

@@ -1,83 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { observable } from "@trpc/server/observable";
-
-const t = initTRPC.create();
-
-export const windowRouter = t.router({
-  maximize: t.procedure.mutation(() => {
-    globalThis.window?.maximize();
-  }),
-  restore: t.procedure.mutation(() => {
-    globalThis.window?.restore();
-  }),
-  minimze: t.procedure.mutation(() => {
-    globalThis.window?.minimize();
-  }),
-  maximized: t.procedure.query(() => globalThis.window?.isMaximized()),
-  fullscreen: t.procedure.query(() => globalThis.window?.isFullScreen()),
-  onWindowStateChanged: t.procedure.subscription(() => {
-    return observable<{ maximized: boolean; fullscreen: boolean }>((emit) => {
-      function listener() {
-        emit.next({
-          maximized: !!globalThis.window?.isMaximized(),
-          fullscreen: !!globalThis.window?.isFullScreen()
-        });
-      }
-      function enterFullscreen() {
-        emit.next({
-          maximized: !!globalThis.window?.isMaximized(),
-          fullscreen: true
-        });
-      }
-      function leaveFullscreen() {
-        emit.next({
-          maximized: !!globalThis.window?.isMaximized(),
-          fullscreen: false
-        });
-      }
-      globalThis.window?.addListener("maximize", listener);
-      globalThis.window?.addListener("minimize", listener);
-      globalThis.window?.addListener("unmaximize", listener);
-      globalThis.window?.addListener("restore", listener);
-      globalThis.window?.addListener("enter-full-screen", enterFullscreen);
-      globalThis.window?.addListener("leave-full-screen", leaveFullscreen);
-      globalThis.window?.addListener("leave-html-full-screen", leaveFullscreen);
-      globalThis.window?.addListener("enter-html-full-screen", enterFullscreen);
-      return () => {
-        globalThis.window?.removeListener("maximize", listener);
-        globalThis.window?.removeListener("minimize", listener);
-        globalThis.window?.removeListener("unmaximize", listener);
-        globalThis.window?.removeListener("restore", listener);
-        globalThis.window?.removeListener("enter-full-screen", enterFullscreen);
-        globalThis.window?.removeListener("leave-full-screen", leaveFullscreen);
-        globalThis.window?.removeListener(
-          "leave-html-full-screen",
-          leaveFullscreen
-        );
-        globalThis.window?.removeListener(
-          "enter-html-full-screen",
-          enterFullscreen
-        );
-      };
-    });
-  })
-});

apps/desktop/src/index.ts

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

apps/desktop/src/main.ts

@@ -1,216 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { 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";
-import { disableCustomDns, enableCustomDns } from "./utils/custom-dns";
-import { Messages, setI18nGlobal } from "@notesnook/intl";
-import { i18n } from "@lingui/core";
-
-const locale =
-  process.env.NODE_ENV === "development"
-    ? import("@notesnook/intl/locales/$pseudo-LOCALE.json")
-    : import("@notesnook/intl/locales/$en.json");
-locale.then(({ default: locale }) => {
-  i18n.load({
-    en: locale.messages as unknown as Messages
-  });
-  i18n.activate("en");
-});
-setI18nGlobal(i18n);
-
-// 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"
-    }),
-
-    ...(config.desktopSettings.nativeTitlebar
-      ? {}
-      : {
-          titleBarStyle: process.platform === "win32" || process.platform === "darwin" ? "hidden" : "default",
-          frame: process.platform === "win32" || process.platform === "darwin",
-          titleBarOverlay: {
-            height: 37,
-            color: "#00000000",
-            symbolColor: config.windowControlsIconColor
-          },
-          trafficLightPosition: {
-            x: 16,
-            y: 12
-          }
-        }),
-
-    webPreferences: {
-      zoomFactor: config.zoomFactor,
-      nodeIntegration: true,
-      contextIsolation: false,
-      nodeIntegrationInWorker: true,
-      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: "bottom", 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 (config.customDns) enableCustomDns();
-  else disableCustomDns();
-
-  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

@@ -1,43 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/* eslint-disable no-var */
-
-import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
-// import type { NNCrypto } from "@notesnook/crypto";
-import { ipcRenderer } from "electron";
-import { platform } from "os";
-
-declare global {
-  var os: () => "mas" | ReturnType<typeof platform>;
-  var electronTRPC: any;
-  // var NativeNNCrypto: (new () => NNCrypto) | undefined;
-}
-
-process.once("loaded", async () => {
-  const electronTRPC = {
-    sendMessage: (operation: any) =>
-      ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback: any) =>
-      ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
-  };
-  globalThis.electronTRPC = electronTRPC;
-});
-
-// globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
-globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());

apps/desktop/src/utils/config.ts

@@ -1,64 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { 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(),
-  nativeTitlebar: z.boolean().optional()
-});
-
-export type DesktopIntegration = z.infer<typeof DesktopIntegration>;
-
-export const config = {
-  desktopSettings: <DesktopIntegration>{
-    autoStart: false,
-    startMinimized: false,
-    minimizeToSystemTray: false,
-    closeToSystemTray: false,
-    nativeTitlebar: false
-  },
-  privacyMode: false,
-  isSpellCheckerEnabled: true,
-  zoomFactor: 1,
-  theme: nativeTheme.themeSource,
-  automaticUpdates: true,
-  proxyRules: "",
-  customDns: true,
-
-  backgroundColor: nativeTheme.themeSource === "dark" ? "#0f0f0f" : "#ffffff",
-  windowControlsIconColor:
-    nativeTheme.themeSource === "dark" ? "#ffffff" : "#000000"
-};
-
-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

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

@@ -1,78 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { net, 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 {
-      return net.fetch(request, { bypassCustomProtocolHandlers: true });
-    }
-  });
-  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/tsconfig.json

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

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

@@ -17,6 +17,15 @@ 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,6 +17,15 @@ 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,6 +5,7 @@ artifacts/
 .DS_Store
 
 native/android/app/src/main/assets/
+
 *Issues.md
 build_cache/
 #
@@ -13,9 +14,7 @@ build_cache/
 .yarnrc.yml
 .yarn
 *.log
-.cxx/
-*.keystore
-!debug.keystore
+
 
 # Xcode
 #
@@ -38,8 +37,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 *.hprof
-**/.xcode.env.local
-native/cache
+ios/.xcode.env.local
 # Android/IntelliJ
 #
 rn-build-deps/

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 the development environment
+### Setting up 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 with 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 that has 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 are integral to the app's functionality. For example, the 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 have integral role in app functionality, for example, 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 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.
+  - `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.
 
 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 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:
+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:
 
 ### 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 the iOS simulator, you must be on a Mac with XCode installed.
+To run e2e tests on 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,7 +3,6 @@
  */
 
 import "react-native";
-import { it } from "@jest/globals";
 // Note: test renderer must be required after react-native.
 import renderer from "react-test-renderer";
 import Heading from "../app/components/ui/typography/heading";

apps/mobile/app/app.js

@@ -0,0 +1,98 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import "react-native-gesture-handler";
+import React, { useEffect } from "react";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { SafeAreaProvider } from "react-native-safe-area-context";
+import { withErrorBoundry } from "./components/exception-handler";
+import GlobalSafeAreaProvider from "./components/globalsafearea";
+import Launcher from "./components/launcher";
+import { useAppEvents } from "./hooks/use-app-events";
+import { ApplicationHolder } from "./navigation";
+import Notifications from "./services/notifications";
+import SettingsService from "./services/settings";
+import { TipManager } from "./services/tip-manager";
+import { useUserStore } from "./stores/use-user-store";
+import { View } from "react-native";
+import { useState } from "react";
+import NetInfo from "@react-native-community/netinfo";
+NetInfo.configure({
+  reachabilityUrl: "https://notesnook.com",
+  reachabilityTest: (response) => {
+    if (!response) return false;
+    return response?.status >= 200 && response?.status < 300;
+  }
+});
+
+SettingsService.init();
+SettingsService.checkOrientation();
+const App = () => {
+  useAppEvents();
+  const [init, setInit] = useState(false);
+  useEffect(() => {
+    let { appLockMode } = SettingsService.get();
+    if (appLockMode && appLockMode !== "none") {
+      useUserStore.getState().setVerifyUser(true);
+    }
+    //BackgroundSync.start();
+    setInit(true);
+    setTimeout(async () => {
+      SettingsService.onFirstLaunch();
+      await Notifications.get();
+      if (SettingsService.get().notifNotes) {
+        Notifications.pinQuickNote(true);
+      }
+      TipManager.init();
+    }, 100);
+  }, []);
+  return (
+    <View
+      style={{
+        height: "100%",
+        width: "100%"
+      }}
+    >
+      <View
+        style={{
+          position: "absolute",
+          width: "100%",
+          height: "100%",
+          zIndex: -1
+        }}
+        pointerEvents="none"
+      >
+        <SafeAreaProvider>
+          <GlobalSafeAreaProvider />
+        </SafeAreaProvider>
+      </View>
+
+      <GestureHandlerRootView
+        style={{
+          height: "100%",
+          width: "100%"
+        }}
+      >
+        <ApplicationHolder />
+        {init && <Launcher />}
+      </GestureHandlerRootView>
+    </View>
+  );
+};
+
+export default withErrorBoundry(App, "App");

apps/mobile/app/app.tsx

@@ -1,153 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { i18n } from "@lingui/core";
-import { I18nProvider } from "@lingui/react";
-import {
-  THEME_COMPATIBILITY_VERSION,
-  useThemeEngineStore
-} from "@notesnook/theme";
-import React, { useEffect } from "react";
-import { I18nManager, View } from "react-native";
-import "react-native-gesture-handler";
-import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { SafeAreaProvider } from "react-native-safe-area-context";
-import AppLockedOverlay from "./components/app-lock-overlay";
-import { withErrorBoundry } from "./components/exception-handler";
-import GlobalSafeAreaProvider from "./components/globalsafearea";
-import { useAppEvents } from "./hooks/use-app-events";
-import { ApplicationHolder } from "./navigation";
-import { themeTrpcClient } from "./screens/settings/theme-selector";
-import Notifications from "./services/notifications";
-import SettingsService from "./services/settings";
-import { TipManager } from "./services/tip-manager";
-import { useThemeStore } from "./stores/use-theme-store";
-import { useUserStore } from "./stores/use-user-store";
-
-I18nManager.allowRTL(false);
-I18nManager.forceRTL(false);
-I18nManager.swapLeftAndRightInRTL(false);
-const { appLockEnabled, appLockMode } = SettingsService.get();
-if (appLockEnabled || appLockMode !== "none") {
-  useUserStore.getState().lockApp(true);
-}
-
-const App = () => {
-  useAppEvents();
-  //@ts-ignore
-  globalThis["IS_MAIN_APP_RUNNING"] = true;
-  useEffect(() => {
-    SettingsService.onFirstLaunch();
-    setTimeout(async () => {
-      await Notifications.get();
-      if (SettingsService.get().notifNotes) {
-        Notifications.pinQuickNote(true);
-      }
-      TipManager.init();
-    }, 100);
-  }, []);
-  return (
-    <View
-      style={{
-        height: "100%",
-        width: "100%",
-        justifyContent: "center",
-        alignItems: "center"
-      }}
-    >
-      <View
-        style={{
-          position: "absolute",
-          width: "100%",
-          height: "100%",
-          zIndex: -1
-        }}
-        pointerEvents="none"
-      >
-        <SafeAreaProvider>
-          <GlobalSafeAreaProvider />
-        </SafeAreaProvider>
-      </View>
-
-      <GestureHandlerRootView
-        style={{
-          height: "100%",
-          width: "100%"
-        }}
-      >
-        <ApplicationHolder />
-      </GestureHandlerRootView>
-      <AppLockedOverlay />
-    </View>
-  );
-};
-
-let currTheme =
-  useThemeStore.getState().colorScheme === "dark"
-    ? SettingsService.getProperty("darkTheme")
-    : SettingsService.getProperty("lighTheme");
-useThemeEngineStore.getState().setTheme(currTheme);
-
-export const withTheme = (Element: () => JSX.Element) => {
-  return function AppWithThemeProvider() {
-    const [colorScheme, darkTheme, lightTheme] = useThemeStore((state) => [
-      state.colorScheme,
-      state.darkTheme,
-      state.lightTheme
-    ]);
-
-    useEffect(() => {
-      setTimeout(() => {
-        const currentTheme = colorScheme === "dark" ? darkTheme : lightTheme;
-        if (!currentTheme) return;
-        themeTrpcClient.updateTheme
-          .query({
-            version: currentTheme.version,
-            compatibilityVersion: THEME_COMPATIBILITY_VERSION,
-            id: currentTheme.id
-          })
-          .then((theme) => {
-            if (theme) {
-              console.log(theme.version, "theme updated");
-              theme.colorScheme === "dark"
-                ? useThemeStore.getState().setDarkTheme(theme)
-                : useThemeStore.getState().setLightTheme(theme);
-            }
-          })
-          .catch(console.log);
-      }, 1000);
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
-    const nextTheme = colorScheme === "dark" ? darkTheme : lightTheme;
-    if (JSON.stringify(nextTheme) !== JSON.stringify(currTheme)) {
-      useThemeEngineStore
-        .getState()
-        .setTheme(colorScheme === "dark" ? darkTheme : lightTheme);
-      currTheme = nextTheme;
-    }
-
-    return (
-      <I18nProvider i18n={i18n}>
-        <Element />
-      </I18nProvider>
-    );
-  };
-};
-
-export default withTheme(withErrorBoundry(App, "App"));

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

@@ -0,0 +1,156 @@
+/*
+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 { Platform } from "react-native";
+import { MMKV } from "../database/mmkv";
+import { useSettingStore } from "../../stores/use-setting-store";
+
+const WEBSITE_ID = "3c6890ce-8410-49d5-8831-15fb2eb28a21";
+const baseUrl = "https://analytics.streetwriters.co/api/collect";
+
+const UA =
+  Platform.OS === "ios"
+    ? "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1"
+    : `
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36`;
+
+/**
+ *
+ * @param {Routes} route
+ * @param {Routes[]} conditions
+ * @returns
+ */
+async function canUpdateAnalytics(route, conditions = []) {
+  if (!useSettingStore?.getState()?.settings?.telemetry) return false;
+  let eventsList = MMKV.getString("notesnookUserEvents");
+
+  if (eventsList) {
+    eventsList = JSON.parse(eventsList);
+  }
+
+  if (eventsList && eventsList[route]) {
+    console.log("analytics: event already sent", route);
+    return false;
+  }
+  if (route !== "/welcome") {
+    for (let cond of conditions) {
+      if (!eventsList || !eventsList[cond]) {
+        console.log("analytics: conditions not met for event", route, cond);
+        return false;
+      }
+    }
+  }
+  console.log("analytics: will send event", route);
+  return true;
+}
+
+async function saveAnalytics(route, value = true) {
+  let eventsList = MMKV.getString("notesnookUserEvents");
+  if (eventsList) {
+    eventsList = JSON.parse(eventsList);
+  } else {
+    eventsList = {};
+  }
+  eventsList[route] = value;
+  MMKV.setString("notesnookUserEvents", JSON.stringify(eventsList));
+}
+
+/**
+ *@typedef {"/welcome" | "/home" | "/signup" | "/first-note" | "/account-created" | "/pro-sheet" | "/pro-plans" | "/iap-native" | "/pro-screen" | "/editor" | "/editor-toolbar" | "/properties" | "/sidemenu"} Routes
+ * @param {Routes} prevRoute
+ * @param {Routes} route
+ * @param {Routes[]} conditions
+ * @param {boolean} once
+ * @returns
+ */
+
+async function pageView(
+  route,
+  prevRoute = "",
+  conditions = ["/welcome"],
+  once = true
+) {
+  if (__DEV__) return;
+  if (!(await canUpdateAnalytics(route, conditions)) && once) return;
+  let body = {
+    payload: {
+      website: WEBSITE_ID,
+      url: `notesnook-${Platform.OS}${prevRoute}${route}`,
+      referrer: `https://notesnook.com/notesnook-${Platform.OS}${prevRoute}`,
+      hostname: `notesnook-${Platform.OS}`,
+      language: "en-US",
+      screen: "1920x1080"
+    },
+    type: "pageview"
+  };
+
+  try {
+    let response = await fetch(baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": UA
+      },
+      body: JSON.stringify(body)
+    });
+    console.log("analytics: event sent", route);
+    await saveAnalytics(route);
+    return await response.text();
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+async function sendEvent(type, value, once = true) {
+  if (__DEV__) return;
+  if (!(await canUpdateAnalytics(type)) && once) return;
+  let body = {
+    payload: {
+      website: WEBSITE_ID,
+      url: "/",
+      event_type: type,
+      event_value: value,
+      hostname: "notesnook-android-app",
+      language: "en-US",
+      screen: "1920x1080"
+    },
+    type: "event"
+  };
+
+  try {
+    let response = await fetch(baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": UA
+      },
+      body: JSON.stringify(body)
+    });
+    console.log(response.status);
+    return await response.text();
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+export default {
+  sendEvent,
+  pageView,
+  saveAnalytics
+};

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

@@ -17,270 +17,56 @@ 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 Sodium from "@ammarahmed/react-native-sodium";
 import { Platform } from "react-native";
 import "react-native-get-random-values";
 import * as Keychain from "react-native-keychain";
-import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
 import { generateSecureRandom } from "react-native-securerandom";
-import { DatabaseLogger } from ".";
-import { MMKV } from "./mmkv";
-import { ToastManager } from "../../services/event-manager";
-
-// Database key cipher is persisted across different user sessions hence it has
-// it's independent storage which we will never clear. This is only used when application has
-// app lock with password enabled.
-export const CipherStorage = new MMKVLoader()
-  .withInstanceID("cipher_storage")
-  .setProcessingMode(
-    Platform.OS === "ios"
-      ? ProcessingModes.MULTI_PROCESS
-      : ProcessingModes.SINGLE_PROCESS
-  )
-  .disableIndexing()
-  .initialize();
-
-const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
-const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
-const KEYCHAIN_SERVER_DBKEY = "notesnook:db";
-
-const NOTESNOOK_APPLOCK_KEY_SALT = "kBwr1Kre86ebOZ8ThLu2OA";
-const NOTESNOOK_DB_KEY_SALT = "SNuzOcEK3amoqL0WvPeKqw";
-
-const DB_KEY_CIPHER = "databaseKeyCipher";
-const USER_KEY_CIPHER = "userKeyCipher";
-const APPLOCK_CIPHER = "applockCipher";
+import Sodium from "@ammarahmed/react-native-sodium";
 
 const KEYSTORE_CONFIG = Platform.select({
   ios: {
-    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
-    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
-    service: IOS_KEYCHAIN_SERVICE_NAME
+    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY
   },
   android: {}
 });
 
-function generatePassword() {
-  const length = 80;
-  const crypto = window.crypto || window.msCrypto;
-  if (typeof crypto === "undefined") {
-    throw new Error(
-      "Crypto API is not supported. Please upgrade your web browser"
-    );
-  }
-  const charset =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!@#$%^&+_{}[]():<>/?;";
-  const indexes = crypto.getRandomValues(new Uint32Array(length));
-  let secret = "";
-  for (const index of indexes) {
-    secret += charset[index % charset.length];
-  }
-  return secret;
-}
-
-export async function encryptDatabaseKeyWithPassword(appLockPassword) {
-  const key = getDatabaseKey();
-  const appLockCredentials = await Sodium.deriveKey(
-    appLockPassword,
-    NOTESNOOK_APPLOCK_KEY_SALT
-  );
-  const databaseKeyCipher = await encrypt(appLockCredentials, key);
-  MMKV.setMap(DB_KEY_CIPHER, databaseKeyCipher);
-  // We reset the database key from keychain once app lock password is set.
-  await Keychain.resetInternetCredentials(KEYCHAIN_SERVER_DBKEY);
-  return true;
-}
-
-export async function restoreDatabaseKeyToKeyChain(appLockPassword) {
-  const databaseKeyCipher = CipherStorage.getMap(DB_KEY_CIPHER);
-  const databaseKey = await decrypt(
-    {
-      password: appLockPassword
-    },
-    databaseKeyCipher
-  );
-
-  await Keychain.setInternetCredentials(
-    KEYCHAIN_SERVER_DBKEY,
-    "notesnook",
-    databaseKey,
-    KEYSTORE_CONFIG
-  );
-  MMKV.removeItem(DB_KEY_CIPHER);
-  return true;
-}
-
-export async function setAppLockVerificationCipher(appLockPassword) {
-  try {
-    const appLockCredentials = await Sodium.deriveKey(
-      appLockPassword,
-      NOTESNOOK_APPLOCK_KEY_SALT
-    );
-    const encrypted = await encrypt(appLockCredentials, generatePassword());
-    CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
-    DatabaseLogger.info("setAppLockVerificationCipher");
-  } catch (e) {
-    DatabaseLogger.error(e);
-    console.log(e);
-  }
-}
-
-export async function clearAppLockVerificationCipher() {
-  CipherStorage.removeItem(APPLOCK_CIPHER);
-}
-
-export async function validateAppLockPassword(appLockPassword) {
-  try {
-    const appLockCipher = CipherStorage.getMap(APPLOCK_CIPHER);
-    if (!appLockCipher) return true;
-    const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
-    const decrypted = await decrypt(key, appLockCipher);
-
-    DatabaseLogger.info(
-      `validateAppLockPassword: ${typeof decrypted === "string"}`
-    );
-    return typeof decrypted === "string";
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return false;
-  }
-}
-
-let DB_KEY;
-export function clearDatabaseKey() {
-  DB_KEY = undefined;
-  DatabaseLogger.info("Cleared database key");
-}
-
-export async function getDatabaseKey(appLockPassword) {
-  if (DB_KEY) return DB_KEY;
-  try {
-    if (appLockPassword) {
-      const databaseKeyCipher = CipherStorage.getMap("databaseKeyCipher");
-      const databaseKey = await decrypt(
-        {
-          password: appLockPassword
-        },
-        databaseKeyCipher
-      );
-      DatabaseLogger.info("Getting database key from cipher");
-      DB_KEY = databaseKey;
-    }
-
-    if (!DB_KEY) {
-      const hasKey = await Keychain.hasInternetCredentials(
-        KEYCHAIN_SERVER_DBKEY
-      );
-      if (hasKey) {
-        let credentials = await Keychain.getInternetCredentials(
-          KEYCHAIN_SERVER_DBKEY,
-          KEYSTORE_CONFIG
-        );
-
-        DatabaseLogger.info("Getting database key from Keychain");
-        DB_KEY = credentials.password;
-      }
-    }
-
-    if (!DB_KEY) {
-      DatabaseLogger.info("Generating new database key");
-      const password = generatePassword();
-      const derivedDatabaseKey = await Sodium.deriveKey(
-        password,
-        NOTESNOOK_DB_KEY_SALT
-      );
-
-      DB_KEY = derivedDatabaseKey.key;
-
-      await Keychain.setInternetCredentials(
-        KEYCHAIN_SERVER_DBKEY,
-        "notesnook",
-        DB_KEY,
-        KEYSTORE_CONFIG
-      );
-    }
-
-    if (await Keychain.hasInternetCredentials("notesnook")) {
-      const userKeyCredentials = await Keychain.getInternetCredentials(
-        "notesnook",
-        KEYSTORE_CONFIG
-      );
-
-      if (userKeyCredentials) {
-        const userKeyCipher = await encrypt(
-          {
-            key: DB_KEY,
-            salt: NOTESNOOK_DB_KEY_SALT
-          },
-          userKeyCredentials.password
-        );
-        // Store encrypted user key in MMKV
-        MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-        await Keychain.resetInternetCredentials("notesnook");
-      }
-      DatabaseLogger.info("Migrated user credentials to cipher storage");
-    }
-
-    return DB_KEY;
-  } catch (e) {
-    ToastManager.error(e, "Error getting database key");
-    console.log(e, "error");
-    DatabaseLogger.error(e);
-    return null;
-  }
-}
-
-export async function deriveCryptoKey(data) {
+export async function deriveCryptoKey(name, data) {
   try {
     let credentials = await Sodium.deriveKey(data.password, data.salt);
-    const userKeyCipher = await encrypt(
-      {
-        key: await getDatabaseKey(),
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key
+    await Keychain.setInternetCredentials(
+      "notesnook",
+      name,
+      credentials.key,
+      KEYSTORE_CONFIG
     );
-    DatabaseLogger.info("User key stored: ", !!userKeyCipher);
-
-    // Store encrypted user key in MMKV
-    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
     return credentials.key;
   } catch (e) {
-    DatabaseLogger.error(e);
+    console.error(e);
   }
 }
 
 export async function getCryptoKey(_name) {
   try {
-    const keyCipher = MMKV.getMap(USER_KEY_CIPHER);
-
-    if (!keyCipher) {
-      DatabaseLogger.info("User key cipher is null");
+    if (await Keychain.hasInternetCredentials("notesnook")) {
+      let credentials = await Keychain.getInternetCredentials(
+        "notesnook",
+        KEYSTORE_CONFIG
+      );
+      return credentials.password;
+    } else {
       return null;
     }
-
-    const key = await decrypt(
-      {
-        key: await getDatabaseKey(),
-        salt: keyCipher.salt
-      },
-      keyCipher
-    );
-
-    return key;
   } catch (e) {
-    console.log("getCryptoKey", e);
-    DatabaseLogger.error(e);
+    console.error(e);
   }
 }
 
 export async function removeCryptoKey(_name) {
   try {
-    MMKV.removeItem(USER_KEY_CIPHER);
-    await Keychain.resetInternetCredentials("notesnook");
-    return true;
+    let result = await Keychain.resetInternetCredentials("notesnook");
+    return result;
   } catch (e) {
-    DatabaseLogger.error(e);
+    console.error(e);
   }
 }
 
@@ -298,7 +84,7 @@ export async function generateCryptoKey(password, salt) {
     let credentials = await Sodium.deriveKey(password, salt || null);
     return credentials;
   } catch (e) {
-    DatabaseLogger.error(e);
+    console.log("generateCryptoKey: ", e);
   }
 }
 
@@ -312,28 +98,9 @@ export async function decrypt(password, data) {
     return undefined;
   let _data = { ...data };
   _data.output = "plain";
-
-  if (!password.salt) password.salt = data.salt;
   return await Sodium.decrypt(password, _data);
 }
 
-export async function decryptMulti(password, data) {
-  if (!password.password && !password.key) return undefined;
-  if (password.password && password.password === "" && !password.key)
-    return undefined;
-
-  data = data.map((d) => {
-    d.output = "plain";
-    return d;
-  });
-
-  if (data.length && !password.salt) {
-    password.salt = data[0].salt;
-  }
-
-  return await Sodium.decryptMulti(password, data);
-}
-
 export function parseAlgorithm(alg) {
   if (!alg) return {};
   const [enc, kdf, compressed, compressionAlg, base64variant] = alg.split("-");
@@ -362,24 +129,3 @@ export async function encrypt(password, data) {
     alg: getAlgorithm(7)
   };
 }
-
-export async function encryptMulti(password, data) {
-  if (!password.password && !password.key) return undefined;
-  if (password.password && password.password === "" && !password.key)
-    return undefined;
-
-  let results = await Sodium.encryptMulti(
-    password,
-    data.map((item) => ({
-      type: "plain",
-      data: item
-    }))
-  );
-
-  return !results
-    ? []
-    : results.map((result) => ({
-        ...result,
-        alg: getAlgorithm(7)
-      }));
-}

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

@@ -16,70 +16,66 @@ 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 "./logger";
-import { database } from "@notesnook/common";
-import { logger as dbLogger } from "@notesnook/core";
+
+import Database from "@notesnook/core/api/index";
+import { initalize, logger as dbLogger } from "@notesnook/core/logger";
 import { Platform } from "react-native";
-import * as Gzip from "react-native-gzip";
+import { MMKVLoader } from "react-native-mmkv-storage";
+import filesystem from "../filesystem";
 import EventSource from "../../utils/sse/even-source-ios";
 import AndroidEventSource from "../../utils/sse/event-source";
-import {
-  SqliteAdapter,
-  SqliteIntrospector,
-  SqliteQueryCompiler
-} from "@streetwriters/kysely";
-import filesystem from "../filesystem";
-import Storage from "./storage";
-import { RNSqliteDriver } from "./sqlite.kysely";
-import { getDatabaseKey } from "./encryption";
-import SettingsService from "../../services/settings";
-import { strings } from "@notesnook/intl";
+import Storage, { KV } from "./storage";
+import * as Gzip from "react-native-gzip";
 
-export async function setupDatabase(password) {
-  const key = await getDatabaseKey(password);
-  if (!key) throw new Error(strings.databaseSetupFailed());
+const LoggerStorage = new MMKVLoader()
+  .withInstanceID("notesnook_logs")
+  .initialize();
+initalize(new KV(LoggerStorage), true);
+export const DatabaseLogger = dbLogger;
 
-  console.log("Opening database with key:", !!key);
+/**
+ * @type {import("@notesnook/core/api/index").default}
+ */
+export var db = new Database(
+  Storage,
+  Platform.OS === "ios" ? EventSource : AndroidEventSource,
+  filesystem,
+  {
+    compress: Gzip.deflate,
+    decompress: Gzip.inflate
+  }
+);
 
-  database.host({
-    API_HOST: "https://api.notesnook.com",
-    AUTH_HOST: "https://auth.streetwriters.co",
-    SSE_HOST: "https://events.streetwriters.co",
-    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-    ISSUES_HOST: "https://issues.streetwriters.co",
-    ...(SettingsService.getProperty("serverUrls") || {})
-  });
+db.host(
+  __DEV__
+    ? {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+        // API_HOST: "http://192.168.8.101:5264",
+        // AUTH_HOST: "http://192.168.8.101:8264",
+        // SSE_HOST: "http://192.168.8.101:7264",
+        // SUBSCRIPTIONS_HOST: "http://192.168.8.101:9264",
+        // ISSUES_HOST: "http://192.168.8.101:2624"
+      }
+    : {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+      }
+);
 
-  database.setup({
-    storage: Storage,
-    eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
-    fs: filesystem,
-    compressor: () => ({
-      compress: Gzip.deflate,
-      decompress: Gzip.inflate
-    }),
-    batchSize: 100,
-    sqliteOptions: {
-      dialect: (name) => ({
-        createDriver: () => {
-          return new RNSqliteDriver({ async: true, dbName: name });
-        },
-        createAdapter: () => new SqliteAdapter(),
-        createIntrospector: (db) => new SqliteIntrospector(db),
-        createQueryCompiler: () => new SqliteQueryCompiler()
-      }),
-      tempStore: "memory",
-      journalMode: Platform.OS === "ios" ? "DELETE" : "WAL",
-      password: key
-    }
-  });
+export async function loadDatabase() {
+  // if (!DB) {
+  //   let module = await import(/* webpackChunkName: "notes-core" */ 'notes-core/api/index');
+  //   DB = module.default;
+  // }
+  // db = new DB(Storage, Platform.OS === 'ios' ? EventSource : AndroidEventSource, filesystem);
+  // if (DOMParser) {
+  //   await DOMParser.prepare();
+  // }
 }
-
-export const db = database;
-let DatabaseLogger = dbLogger.scope(Platform.OS);
-
-const setLogger = () => {
-  DatabaseLogger = dbLogger.scope(Platform.OS);
-};
-
-export { DatabaseLogger, setLogger };

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

@@ -1,49 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initialize } from "@notesnook/core";
-import {
-  SqliteAdapter,
-  SqliteIntrospector,
-  SqliteQueryCompiler
-} from "@streetwriters/kysely";
-import { Platform } from "react-native";
-import { setLogger } from ".";
-import { RNSqliteDriver } from "./sqlite.kysely";
-
-let loggerLoaded = false;
-const initializeLogger = async () => {
-  if (loggerLoaded) return;
-  await initialize({
-    dialect: (name) => ({
-      createDriver: () => {
-        return new RNSqliteDriver({ async: true, dbName: name });
-      },
-      createAdapter: () => new SqliteAdapter(),
-      createIntrospector: (db) => new SqliteIntrospector(db),
-      createQueryCompiler: () => new SqliteQueryCompiler()
-    }),
-    tempStore: "memory",
-    journalMode: Platform.OS === "ios" ? "DELETE" : "WAL"
-  });
-  setLogger();
-  loggerLoaded = true;
-};
-
-export { initializeLogger };

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

@@ -18,13 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Platform } from "react-native";
-import { ProcessingModes, MMKVLoader } from "react-native-mmkv-storage";
+import MMKVStorage, { ProcessingModes } from "react-native-mmkv-storage";
 
-export const MMKV = new MMKVLoader()
+export const MMKV = new MMKVStorage.Loader()
   .setProcessingMode(
     Platform.OS === "ios"
       ? ProcessingModes.MULTI_PROCESS
       : ProcessingModes.SINGLE_PROCESS
   )
-  .disableIndexing()
   .initialize();

apps/mobile/app/common/database/sqlite.kysely.ts

@@ -1,128 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import type {
-  DatabaseConnection,
-  Driver,
-  QueryResult
-} from "@streetwriters/kysely";
-import { CompiledQuery } from "@streetwriters/kysely";
-import { QuickSQLiteConnection, open } from "react-native-quick-sqlite";
-import { strings } from "@notesnook/intl";
-
-type Config = { dbName: string; async: boolean; location: string };
-
-export class RNSqliteDriver implements Driver {
-  private connection?: DatabaseConnection;
-  private connectionMutex = new ConnectionMutex();
-  private db: QuickSQLiteConnection;
-  constructor(private readonly config: Config) {
-    this.db = open({
-      name: config.dbName
-    });
-  }
-
-  async init(): Promise<void> {
-    this.connection = new RNSqliteConnection(this.db);
-  }
-
-  async acquireConnection(): Promise<DatabaseConnection> {
-    // SQLite only has one single connection. We use a mutex here to wait
-    // until the single connection has been released.
-    await this.connectionMutex.lock();
-    return this.connection!;
-  }
-
-  async beginTransaction(connection: DatabaseConnection): Promise<void> {
-    await connection.executeQuery(CompiledQuery.raw("BEGIN TRANSACTION"));
-  }
-
-  async commitTransaction(connection: DatabaseConnection): Promise<void> {
-    await connection.executeQuery(CompiledQuery.raw("COMMIT"));
-  }
-
-  async rollbackTransaction(connection: DatabaseConnection): Promise<void> {
-    await connection.executeQuery(CompiledQuery.raw("ROLLBACK"));
-  }
-
-  async releaseConnection(): Promise<void> {
-    this.connectionMutex.unlock();
-  }
-
-  async destroy(): Promise<void> {
-    this.db.close();
-  }
-}
-
-class ConnectionMutex {
-  private promise?: Promise<void>;
-  private resolve?: () => void;
-
-  async lock(): Promise<void> {
-    while (this.promise) {
-      await this.promise;
-    }
-
-    this.promise = new Promise((resolve) => {
-      this.resolve = resolve;
-    });
-  }
-
-  unlock(): void {
-    const resolve = this.resolve;
-
-    this.promise = undefined;
-    this.resolve = undefined;
-
-    resolve?.();
-  }
-}
-
-class RNSqliteConnection implements DatabaseConnection {
-  constructor(private readonly db: QuickSQLiteConnection) {}
-
-  streamQuery<R>(): AsyncIterableIterator<QueryResult<R>> {
-    throw new Error(strings.streamingNotSupported());
-  }
-
-  async executeQuery<R>(
-    compiledQuery: CompiledQuery<unknown>
-  ): Promise<QueryResult<R>> {
-    const { parameters, sql, query } = compiledQuery;
-    const mode =
-      query.kind === "SelectQueryNode"
-        ? "query"
-        : query.kind === "RawNode"
-        ? "raw"
-        : "exec";
-
-    const result = await this.db.executeAsync(sql, parameters as any[]);
-
-    if (mode === "query" || !result.insertId)
-      return {
-        rows: result.rows?._array || []
-      };
-
-    return {
-      insertId: BigInt(result.insertId),
-      numAffectedRows: BigInt(result.rowsAffected),
-      rows: mode === "raw" ? result.rows?._array || [] : []
-    };
-  }
-}

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

@@ -18,13 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
+import RNFetchBlob from "rn-fetch-blob";
 import {
   decrypt,
-  decryptMulti,
   deriveCryptoKey,
   encrypt,
-  encryptMulti,
   generateCryptoKey,
   getCryptoKey,
   getRandomBytes,
@@ -34,9 +32,6 @@ import {
 import { MMKV } from "./mmkv";
 
 export class KV {
-  /**
-   * @type {typeof MMKV}
-   */
   storage = null;
   constructor(storage) {
     this.storage = storage;
@@ -58,7 +53,6 @@ export class KV {
       key,
       typeof data === "string" ? data : JSON.stringify(data)
     );
-
     return true;
   }
 
@@ -66,37 +60,27 @@ export class KV {
     if (keys.length <= 0) {
       return [];
     } else {
-      try {
-        let data = await this.storage.getMultipleItemsAsync(
-          keys.slice(),
-          "string"
-        );
-        return data.map(([key, value]) => {
-          let obj;
-          try {
-            obj = JSON.parse(value);
-          } catch (e) {
-            obj = value;
-          }
-          return [key, obj];
-        });
-      } catch (e) {
-        console.log(e);
-      }
+      let data = await this.storage.getMultipleItemsAsync(keys.slice());
+
+      return data.map(([key, value]) => {
+        let obj;
+        try {
+          obj = JSON.parse(value);
+        } catch (e) {
+          obj = value;
+        }
+
+        return [key, obj];
+      });
     }
   }
 
   async remove(key) {
-    return this.storage.removeItem(key);
-  }
-
-  async removeMulti(keys) {
-    if (!keys) return true;
-    return this.storage.removeItems(keys);
+    return await this.storage.removeItem(key);
   }
 
   async clear() {
-    return this.storage.clearStore();
+    return await this.storage.clearStore();
   }
 
   async getAllKeys() {
@@ -112,10 +96,6 @@ export class KV {
     );
     return keys;
   }
-
-  async writeMulti(items) {
-    return this.storage.setMultipleItemsAsync(items, "object");
-  }
 }
 
 const DefaultStorage = new KV(MMKV);
@@ -149,11 +129,8 @@ export default {
   remove: (key) => DefaultStorage.remove(key),
   clear: () => DefaultStorage.clear(),
   getAllKeys: () => DefaultStorage.getAllKeys(),
-  writeMulti: (items) => DefaultStorage.writeMulti(items),
-  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
   encrypt,
   decrypt,
-  decryptMulti,
   getRandomBytes,
   checkAndCreateDir,
   requestPermission,
@@ -161,6 +138,5 @@ export default {
   getCryptoKey,
   removeCryptoKey,
   hash,
-  generateCryptoKey,
-  encryptMulti
+  generateCryptoKey
 };

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

@@ -16,60 +16,20 @@ 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 { Dimensions, Image, Platform } from "react-native";
+import { Dimensions, Platform } from "react-native";
 import ImageResizer from "@bam.tech/react-native-image-resizer";
-import RNFetchBlob from "react-native-blob-util";
-
+import RNFetchBlob from "rn-fetch-blob";
 /**
  * Scale down & compress images to screen width
  * for loading in editor.
  * @returns
  */
 export async function compressToBase64(path, type) {
-  const { width: screenWidth, scale } = Dimensions.get("window");
-  console.log("COMPRESSING TO BASE64...");
-  return new Promise((resolve) => {
-    console.log(path, "image path...");
-
-    Image.getSize(path, async (width) => {
-      console.log("image width", width);
-
-      const response = await ImageResizer.createResizedImage(
-        path,
-        screenWidth * scale,
-        99999,
-        type,
-        width <= 1920 ? 100 : 90,
-        0,
-        undefined,
-        true,
-        {
-          mode: "contain",
-          onlyScaleDown: true
-        }
-      );
-
-      const base64 = await RNFetchBlob.fs.readFile(
-        Platform.OS === "ios"
-          ? response.uri?.replace("file://", "")
-          : response.uri,
-        "base64"
-      );
-      RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
-      RNFetchBlob.fs
-        .unlink(response.uri.replace("file://", ""))
-        .catch(console.log);
-
-      resolve(base64);
-    });
-  });
-}
-
-export async function compressToFile(path, type) {
+  const { width, scale } = Dimensions.get("window");
   const response = await ImageResizer.createResizedImage(
     path,
-    1920,
-    99999,
+    width * scale,
+    9999,
     type,
     80,
     0,
@@ -80,6 +40,11 @@ export async function compressToFile(path, type) {
       onlyScaleDown: true
     }
   );
+  const base64 = await RNFetchBlob.fs.readFile(
+    Platform.OS === "ios" ? response.uri?.replace("file://", "") : response.uri,
+    "base64"
+  );
   RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
-  return response.uri;
+  RNFetchBlob.fs.unlink(response.uri.replace("file://", "")).catch(console.log);
+  return base64;
 }

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

@@ -17,318 +17,100 @@ 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 Sodium from "@ammarahmed/react-native-sodium";
-import { getFileNameWithExtension } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import React from "react";
 import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
 import * as ScopedStorage from "react-native-scoped-storage";
-import { subscribe, zip } from "react-native-zip-archive";
+import Sodium from "@ammarahmed/react-native-sodium";
+import RNFetchBlob from "rn-fetch-blob";
 import { ShareComponent } from "../../components/sheets/export-notes/share";
-import { ToastManager, presentSheet } from "../../services/event-manager";
+import { presentSheet, ToastEvent } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
-import { DatabaseLogger, db } from "../database";
+import { db } from "../database";
 import Storage from "../database/storage";
-import { createCacheDir, exists } from "./io";
-import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
+import { cacheDir } from "./utils";
 
-export const FileDownloadStatus = {
-  Success: 1,
-  Fail: 0
-};
-
-/**
- * Download all user's attachments
- * @returns
- */
-export async function downloadAllAttachments() {
-  const attachments = await db.attachments.all.ids();
-  return downloadAttachments(attachments);
-}
-
-/**
- * Downloads provided attachments to a .zip file
- * on user's device.
- * @param {string[]} attachments
- * @param onProgress
- * @returns
- */
-export async function downloadAttachments(attachments) {
-  await createCacheDir();
-  if (!attachments || !attachments.length) return;
-  const groupId = `download-all-${Date.now()}`;
-
-  let outputFolder;
-  if (Platform.OS === "android") {
-    // Ask the user to select a directory to store the file
-    let file = await ScopedStorage.openDocumentTree(true);
-    outputFolder = file.uri;
-    if (!outputFolder) return;
-  } else {
-    outputFolder = await Storage.checkAndCreateDir("/downloads/");
-  }
-
-  // Create the folder to zip;
-  const zipSourceFolder = `${cacheDir}/notesnook-attachments`;
-  const zipOutputFile =
-    Platform.OS === "ios"
-      ? `${outputFolder}/notesnook-attachments-${Date.now()}.zip`
-      : `${cacheDir}/notesnook-attachments.zip`;
-  if (await RNFetchBlob.fs.exists(zipSourceFolder)) {
-    await RNFetchBlob.fs.unlink(zipSourceFolder);
-  }
-
-  await RNFetchBlob.fs.mkdir(zipSourceFolder);
-
-  const isCancelled = () => {
-    if (useAttachmentStore.getState().downloading[groupId]?.canceled) {
-      RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-      useAttachmentStore.getState().setDownloading({
-        groupId,
-        current: 0,
-        total: 0,
-        success: false,
-        message: strings.network.dowloadCancelled(),
-        canceled: true
-      });
-      return true;
-    }
-  };
-
-  for (let i = 0; i < attachments.length; i++) {
-    if (isCancelled()) return;
-    let attachment = await db.attachments.attachment(attachments[i]);
-    const hash = attachment.hash;
-    try {
-      useAttachmentStore.getState().setDownloading({
-        groupId: groupId,
-        current: i + 1,
-        total: attachments.length,
-        filename: attachment.hash
-      });
-      // Download to cache
-      let uri = await downloadAttachment(hash, false, {
-        silent: true,
-        cache: true,
-        groupId: groupId
-      });
-
-      if (isCancelled()) return;
-
-      if (!uri) throw new Error(strings.failedToDownloadFile());
-      // Move file to the source folder we will zip eventually and rename the file to it's actual name.
-      const filePath = `${zipSourceFolder}/${attachment.filename}`;
-      await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, filePath);
-    } catch (e) {
-      DatabaseLogger.error(e);
-    }
-  }
-
-  useAttachmentStore.getState().setDownloading({
-    groupId: groupId,
-    current: 0,
-    total: 0,
-    success: true
-  });
-
-  if (isCancelled()) return;
-
-  let sub;
-  try {
-    useAttachmentStore.getState().setDownloading({
-      current: 0,
-      total: 1,
-      message: strings.savingZipFile(),
-      groupId
-    });
-    // If all goes well, zip the notesnook-attachments folder in cache.
-
-    sub = subscribe(({ progress }) => {
-      useAttachmentStore.getState().setDownloading({
-        groupId,
-        current: progress,
-        total: 1,
-        message: strings.savingZipFile((progress * 100).toFixed(1))
-      });
-    });
-    await zip(zipSourceFolder, zipOutputFile);
-    sub?.remove();
-
-    if (Platform.OS === "android") {
-      // Move the zip to user selected directory.
-      const file = await ScopedStorage.createFile(
-        outputFolder,
-        `notesnook-attachments-${Date.now()}.zip`,
-        "application/zip"
-      );
-      await copyFileAsync(`file://${zipOutputFile}`, file.uri);
-    }
-
-    useAttachmentStore.getState().setDownloading({
-      current: 0,
-      total: 0,
-      message: undefined,
-      success: true,
-      groupId
-    });
-    releasePermissions(outputFolder);
-  } catch (e) {
-    useAttachmentStore.getState().setDownloading({
-      current: 0,
-      total: 0,
-      message: undefined,
-      success: false,
-      groupId
-    });
-    releasePermissions(outputFolder);
-    sub?.remove();
-    ToastManager.error(e, "Error zipping attachments");
-  }
-  // Remove source & zip file from cache.
-  RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-  if (Platform.OS === "android") {
-    RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
-  }
-}
-
-export default async function downloadAttachment(
-  hash,
-  global = true,
-  options = {
-    silent: false,
-    cache: false,
-    throwError: false,
-    groupId: undefined,
-    base64: false,
-    text: false
-  }
-) {
-  await createCacheDir();
-
-  let attachment = await db.attachments.attachment(hash);
+export default async function downloadAttachment(hash, global = true) {
+  let attachment = db.attachments.attachment(hash);
   if (!attachment) {
-    DatabaseLogger.log("Attachment not found");
+    console.log("attachment not found");
     return;
   }
 
   let folder = {};
-  if (!options.cache) {
-    if (Platform.OS === "android") {
-      folder = await ScopedStorage.openDocumentTree();
-      if (!folder) return;
-    } else {
-      folder.uri = await Storage.checkAndCreateDir("/downloads/");
-    }
+  if (Platform.OS === "android") {
+    folder = await ScopedStorage.openDocumentTree();
+    if (!folder) return;
+  } else {
+    folder.uri = await Storage.checkAndCreateDir("/downloads/");
   }
 
   try {
-    useAttachmentStore.getState().setDownloading({
-      groupId: options.groupId || attachment.hash,
-      current: 0,
-      total: 1,
-      filename: attachment.filename
-    });
-
-    await db
-      .fs()
-      .downloadFile(
-        options.groupId || attachment.hash,
-        attachment.hash,
-        attachment.chunkSize
-      );
-
-    useAttachmentStore.getState().setDownloading({
-      groupId: options.groupId || attachment.hash,
-      current: 1,
-      total: 1,
-      filename: attachment.filename,
-      success: true
-    });
-
-    if (!(await exists(attachment.hash))) {
-      DatabaseLogger.log("Attachment does not exist after download.");
-      return;
-    }
-
-    if (options.base64 || options.text) {
-      DatabaseLogger.log(`Starting to decrypt... hash: ${attachment.hash}`);
-      return await db.attachments.read(
-        attachment.hash,
-        options.base64 ? "base64" : "text"
-      );
-    }
-
-    let filename = await getFileNameWithExtension(
-      attachment.filename,
-      attachment.mimeType
+    await db.fs.downloadFile(
+      attachment.metadata.hash,
+      attachment.metadata.hash
     );
+    if (
+      !(await RNFetchBlob.fs.exists(`${cacheDir}/${attachment.metadata.hash}`))
+    )
+      return;
 
     let key = await db.attachments.decryptKey(attachment.key);
-
     let info = {
       iv: attachment.iv,
       salt: attachment.salt,
-      length: attachment.size,
+      length: attachment.length,
       alg: attachment.alg,
-      hash: attachment.hash,
-      hashType: attachment.hashType,
-      mime: attachment.mimeType,
-      fileName: options.cache ? undefined : filename,
-      uri: options.cache ? undefined : folder.uri,
-      chunkSize: attachment.chunkSize,
-      appGroupId: IOS_APPGROUPID
+      hash: attachment.metadata.hash,
+      hashType: attachment.metadata.hashType,
+      mime: attachment.metadata.type,
+      fileName: attachment.metadata.filename,
+      uri: folder.uri,
+      chunkSize: attachment.chunkSize
     };
-    let fileUri = await Sodium.decryptFile(
-      key,
-      info,
-      options.cache ? "cache" : "file"
-    );
 
-    if (!options.silent) {
-      ToastManager.show({
-        heading: strings.network.downloadSuccess(),
-        message: strings.network.fileDownloaded(filename),
-        type: "success"
-      });
-    }
+    let fileUri = await Sodium.decryptFile(key, info, "file");
+    ToastEvent.show({
+      heading: "Download successful",
+      message: attachment.metadata.filename + " downloaded",
+      type: "success"
+    });
 
-    if (Platform.OS === "ios" && !options.cache) {
-      fileUri = folder.uri + `/${filename}`;
-    }
-    if (!options.silent) {
-      presentSheet({
-        title: strings.network.fileDownloaded(),
-        paragraph: strings.fileSaved(filename, Platform.OS),
-        icon: "download",
-        context: global ? null : attachment.hash,
-        component: <ShareComponent uri={fileUri} name={filename} padding={12} />
-      });
-    }
-
-    return fileUri;
-  } catch (e) {
     if (attachment.dateUploaded) {
       RNFetchBlob.fs
-        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
-        .catch(console.log);
-      RNFetchBlob.fs
-        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.metadata.hash}`)
         .catch(console.log);
     }
 
-    useAttachmentStore.getState().setDownloading({
-      groupId: options.groupId || attachment.hash,
-      current: 0,
-      total: 0,
-      filename: attachment.filename,
-      success: false
-    });
-    DatabaseLogger.error(e);
-    useAttachmentStore.getState().remove(attachment.hash);
-    if (options.throwError) {
-      throw e;
+    if (Platform.OS === "ios") {
+      fileUri = folder.uri + `/${attachment.metadata.filename}`;
     }
+    console.log("saved file uri: ", fileUri);
+
+    presentSheet({
+      title: "File downloaded",
+      paragraph: `${attachment.metadata.filename} saved to ${
+        Platform.OS === "android"
+          ? "selected path"
+          : "File Manager/Notesnook/downloads"
+      }`,
+      icon: "download",
+      context: global ? null : attachment.metadata.hash,
+      component: (
+        <ShareComponent
+          uri={fileUri}
+          name={attachment.metadata.filename}
+          padding={12}
+        />
+      )
+    });
+    return fileUri;
+  } catch (e) {
+    console.log("download attachment error: ", e);
+    if (attachment.dateUploaded) {
+      RNFetchBlob.fs
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.metadata.hash}`)
+        .catch(console.log);
+    }
+    useAttachmentStore.getState().remove(attachment.metadata.hash);
   }
 }

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

@@ -17,172 +17,99 @@ 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 { strings } from "@notesnook/intl";
+import hosts from "@notesnook/core/utils/constants";
 import NetInfo from "@react-native-community/netinfo";
-import RNFetchBlob from "react-native-blob-util";
-import { ToastManager } from "../../services/event-manager";
+import RNFetchBlob from "rn-fetch-blob";
+import { ToastEvent } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { DatabaseLogger, db } from "../database";
-import { createCacheDir, exists } from "./io";
-import { ABYTES, cacheDir, getUploadedFileSize, parseS3Error } from "./utils";
+import { db } from "../database";
+import { cacheDir, fileCheck } from "./utils";
 
-export async function downloadFile(filename, requestOptions, cancelToken) {
-  if (!requestOptions) {
-    DatabaseLogger.log(
-      `Error downloading file: ${filename}, reason: No requestOptions`
-    );
-    return false;
-  }
+export async function downloadFile(filename, data, cancelToken) {
+  if (!data) return false;
+  let { url, headers } = data;
 
-  DatabaseLogger.log(`Downloading ${filename}`);
-  await createCacheDir();
-  let { url, headers, chunkSize } = requestOptions;
-  let tempFilePath = `${cacheDir}/${filename}_temp`;
-  let originalFilePath = `${cacheDir}/${filename}`;
+  let path = `${cacheDir}/${filename}`;
   try {
-    if (await exists(filename)) {
-      DatabaseLogger.log(`File Exists already: ${filename}`);
+    let exists = await RNFetchBlob.fs.exists(path);
+    if (exists) {
       return true;
     }
 
-    const attachment = await db.attachments.attachment(filename);
-    const size = await getUploadedFileSize(filename);
-
-    if (size === -1) {
-      const error = `${strings.fileVerificationFailed()} (File hash: ${filename})`;
-      throw new Error(error);
-    }
-
-    if (size === 0) {
-      const error = `${strings.fileLengthError()} (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
-
-    const totalChunks = Math.ceil(size / chunkSize);
-    const decryptedLength = size - totalChunks * ABYTES;
-
-    if (attachment && attachment.size !== decryptedLength) {
-      const error = `${strings.fileLengthMismatch(
-        attachment.size,
-        decryptedLength
-      )} (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
-
     let res = await fetch(url, {
       method: "GET",
       headers
     });
-
-    if (!res.ok) {
-      DatabaseLogger.log(
-        `Error downloading file: ${filename}, ${res.status}, ${res.statusText}, reason: Unable to resolve download url`
-      );
-      throw new Error(
-        `${res.status}: ${strings.failedToResolvedDownloadUrl()}`
-      );
-    }
-
+    if (!res.ok)
+      throw new Error(`${res.status}: Unable to resolve download url`);
     const downloadUrl = await res.text();
 
-    if (!downloadUrl) {
-      DatabaseLogger.log(
-        `Error downloading file: ${filename}, reason: Unable to resolve download url`
-      );
-      throw new Error(strings.failedToResolvedDownloadUrl());
-    }
-
-    DatabaseLogger.log(`Download starting: ${filename}`);
+    if (!downloadUrl) throw new Error("Unable to resolve download url");
+    let totalSize = 0;
     let request = RNFetchBlob.config({
-      path: tempFilePath,
-      IOSBackgroundTask: true,
-      overwrite: true
+      path: path,
+      IOSBackgroundTask: true
     })
       .fetch("GET", downloadUrl, null)
-      .progress(async (recieved, total) => {
+      .progress((recieved, total) => {
         useAttachmentStore
           .getState()
           .setProgress(0, total, filename, recieved, "download");
-
-        DatabaseLogger.log(`Downloading: ${filename}, ${recieved}/${total}`);
+        totalSize = total;
+        console.log("downloading: ", recieved, total);
       });
 
-    cancelToken.cancel = () => {
-      useAttachmentStore.getState().remove(filename);
-      request.cancel();
-      RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
-      DatabaseLogger.log(`Download cancelled: ${filename}`);
-    };
-
+    cancelToken.cancel = request.cancel;
     let response = await request;
-    console.log(response.info().headers);
-
-    const contentType =
-      response.info().headers?.["content-type"] ||
-      response.info().headers?.["Content-Type"];
-
-    if (contentType === "application/xml") {
-      const error = parseS3Error(await response.text());
-      throw new Error(`[${error.Code}] ${error.Message}`);
-    }
-
+    await fileCheck(response, totalSize);
     let status = response.info().status;
     useAttachmentStore.getState().remove(filename);
-
-    if (exists(originalFilePath)) {
-      await RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
-    }
-
-    await RNFetchBlob.fs.mv(tempFilePath, originalFilePath);
-
-    if (!(await exists(filename))) {
-      throw new Error("File size mismatch");
-    }
-
     return status >= 200 && status < 300;
   } catch (e) {
-    if (e.message !== "canceled" && !e.message.includes("NoSuchKey")) {
-      const toast = {
-        heading: strings.downloadError(),
-        message: e.message,
-        type: "error",
-        context: "global"
-      };
-      ToastManager.show(toast);
-      toast.context = "local";
-      ToastManager.show(toast);
-    }
+    ToastEvent.show({
+      heading: "Error downloading file",
+      message: e.message,
+      type: "error",
+      context: "global"
+    });
+    ToastEvent.show({
+      heading: "Error downloading file",
+      message: e.message,
+      type: "error",
+      context: "local"
+    });
 
     useAttachmentStore.getState().remove(filename);
-    RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
-    RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
-    DatabaseLogger.error(e, {
-      url,
-      headers
-    });
+    RNFetchBlob.fs.unlink(path).catch(console.log);
+    console.log("download file error: ", e, url, headers);
     return false;
   }
 }
 
+export async function getUploadedFileSize(hash) {
+  const url = `${hosts.API_HOST}/s3?name=${hash}`;
+  const token = await db.user.tokenManager.getAccessToken();
+
+  const attachmentInfo = await fetch(url, {
+    method: "HEAD",
+    headers: { Authorization: `Bearer ${token}` }
+  });
+
+  const contentLength = parseInt(attachmentInfo.headers?.get("content-length"));
+  return isNaN(contentLength) ? 0 : contentLength;
+}
+
 export async function checkAttachment(hash) {
   const internetState = await NetInfo.fetch();
   const isInternetReachable =
     internetState.isConnected && internetState.isInternetReachable;
-  if (!isInternetReachable) return;
-  const attachment = await db.attachments.attachment(hash);
+  if (!isInternetReachable) return { success: true };
+  const attachment = db.attachments.attachment(hash);
   if (!attachment) return { failed: "Attachment not found." };
 
   try {
     const size = await getUploadedFileSize(hash);
-    console.log("File Size", size);
-    if (size === -1) return { success: true };
-
-    if (size === 0)
-      return {
-        failed: `File length is 0. Please upload this file again from the attachment manager. (File hash: ${hash})`
-      };
+    if (size <= 0) return { failed: "File length is 0." };
   } catch (e) {
     return { failed: e?.message };
   }

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

@@ -17,37 +17,25 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { checkAttachment, downloadFile } from "./download";
+import { checkAttachment, downloadFile, getUploadedFileSize } from "./download";
 import {
   clearFileStorage,
   deleteFile,
   exists,
   readEncrypted,
-  writeEncryptedBase64,
-  hashBase64,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  bulkExists,
-  getCacheSize
+  writeEncrypted
 } from "./io";
 import { uploadFile } from "./upload";
-import { cancelable, getUploadedFileSize } from "./utils";
+import { cancelable } from "./utils";
 
 export default {
   readEncrypted,
-  writeEncryptedBase64,
-  hashBase64,
+  writeEncrypted,
   uploadFile: cancelable(uploadFile),
   downloadFile: cancelable(downloadFile),
   deleteFile,
   exists,
   clearFileStorage,
   getUploadedFileSize,
-  checkAttachment,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  bulkExists,
-  getCacheSize
+  checkAttachment
 };

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

@@ -17,68 +17,64 @@ 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 Sodium from "@ammarahmed/react-native-sodium";
 import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import { eSendEvent } from "../../services/event-manager";
-import { IOS_APPGROUPID } from "../../utils/constants";
-import { DatabaseLogger, db } from "../database";
-import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";
+import Sodium from "@ammarahmed/react-native-sodium";
+import RNFetchBlob from "rn-fetch-blob";
+import { cacheDir, getRandomId } from "./utils";
+import { db } from "../database";
+import { compressToBase64 } from "./compress";
 
 export async function readEncrypted(filename, key, cipherData) {
-  await migrateFilesFromCache();
-  DatabaseLogger.log("Read encrypted file...");
   let path = `${cacheDir}/${filename}`;
-
   try {
-    if (!(await exists(filename))) {
+    let exists = await RNFetchBlob.fs.exists(path);
+    if (!exists) {
       return false;
     }
+    const attachment = db.attachments.attachment(filename);
+    const isPng = /(png)/g.test(attachment?.metadata.type);
+    const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
 
     let output = await Sodium.decryptFile(
       key,
       {
         ...cipherData,
-        hash: filename,
-        appGroupId: IOS_APPGROUPID
+        hash: filename
       },
-      cipherData.outputType === "base64" ? "base64" : "text"
+      cipherData.outputType === "base64"
+        ? isPng || isJpeg
+          ? "cache"
+          : "base64"
+        : "text"
     );
-
-    DatabaseLogger.log("File decrypted...");
+    if (cipherData.outputType === "base64" && (isPng || isJpeg)) {
+      const dCachePath = `${cacheDir}/${output}`;
+      output = await compressToBase64(
+        `file://${dCachePath}`,
+        isPng ? "PNG" : "JPEG"
+      );
+    }
 
     return output;
   } catch (e) {
     RNFetchBlob.fs.unlink(path).catch(console.log);
-    DatabaseLogger.error(e);
+    console.log(e);
     return false;
   }
 }
 
-export async function hashBase64(data) {
-  const hash = await Sodium.hashFile({
-    type: "base64",
-    data,
-    uri: ""
-  });
-  return {
-    hash: hash,
-    type: "xxh64"
-  };
-}
-
-export async function writeEncryptedBase64(data, key) {
-  await createCacheDir();
+export async function writeEncrypted(filename, { data, type, key }) {
+  console.log("file input: ", { type, key });
   let filepath = cacheDir + `/${getRandomId("imagecache_")}`;
+  console.log(filepath);
   await RNFetchBlob.fs.writeFile(filepath, data, "base64");
   let output = await Sodium.encryptFile(key, {
     uri: Platform.OS === "ios" ? filepath : "file://" + filepath,
     type: "url"
   });
   RNFetchBlob.fs.unlink(filepath).catch(console.log);
+
   console.log("encrypted file output: ", output);
-  output.size = output.length;
-  delete output.length;
   return {
     ...output,
     alg: "xcha-stream"
@@ -86,7 +82,6 @@ export async function writeEncryptedBase64(data, key) {
 }
 
 export async function deleteFile(filename, data) {
-  await createCacheDir();
   let delFilePath = cacheDir + `/${filename}`;
   if (!data) {
     if (!filename) return;
@@ -112,158 +107,19 @@ export async function deleteFile(filename, data) {
 export async function clearFileStorage() {
   try {
     let files = await RNFetchBlob.fs.ls(cacheDir);
-    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
-
     for (let file of files) {
-      await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(console.log);
-    }
-    for (let file of oldCache) {
-      await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(console.log);
+      try {
+        await RNFetchBlob.fs.unlink(cacheDir + `/${file}`);
+      } catch (e) {
+        console.log(e);
+      }
     }
   } catch (e) {
-    console.log("clearFileStorage", e);
-  }
-}
-
-export async function createCacheDir() {
-  try {
-    if (!(await RNFetchBlob.fs.exists(cacheDir))) {
-      await RNFetchBlob.fs.mkdir(cacheDir);
-      DatabaseLogger.log("Cache directory created");
-    }
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function migrateFilesFromCache() {
-  try {
-    await createCacheDir();
-    const migratedFilesPath = cacheDir + "/.migrated_1";
-    const migrated = await RNFetchBlob.fs.exists(migratedFilesPath);
-    if (migrated) {
-      console.log("Files migrated already");
-      return;
-    }
-
-    let files = await RNFetchBlob.fs.ls(cacheDir);
-    console.log("Files to migrate:", files.join(","));
-
-    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
-    for (let file of oldCache) {
-      if (file.startsWith("org.") || file.startsWith("com.")) continue;
-      RNFetchBlob.fs
-        .mv(cacheDirOld + `/${file}`, cacheDir + `/${file}`)
-        .catch(console.log);
-      console.log("Moved", file);
-    }
-    await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
-  } catch (e) {
-    console.log("migrateFilesFromCache", e);
-  }
-}
-
-export async function clearCache() {
-  await RNFetchBlob.fs.unlink(cacheDir).catch(console.log);
-  await createCacheDir();
-  eSendEvent("cache-cleared");
-}
-
-export async function deleteCacheFileByPath(path) {
-  await RNFetchBlob.fs.unlink(path).catch(console.log);
-}
-
-export async function deleteCacheFileByName(name) {
-  const iosAppGroup =
-    Platform.OS === "ios"
-      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-      : null;
-  const appGroupPath = `${iosAppGroup}/${name}`;
-  await RNFetchBlob.fs.unlink(appGroupPath).catch(console.log);
-  await RNFetchBlob.fs.unlink(`${cacheDir}/${name}`).catch(console.log);
-}
-
-export async function deleteDCacheFiles() {
-  const files = await RNFetchBlob.fs.ls(cacheDir);
-  for (const file of files) {
-    if (file.includes("_dcache")) {
-      await RNFetchBlob.fs.unlink(file).catch(console.log);
-    }
+    console.log(e);
   }
 }
 
 export async function exists(filename) {
-  let path = `${cacheDir}/${filename}`;
-
-  const iosAppGroup =
-    Platform.OS === "ios"
-      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-      : null;
-  const appGroupPath = `${iosAppGroup}/${filename}`;
-
-  let exists = await RNFetchBlob.fs.exists(path);
-
-  // Check if file is present in app group path.
-  let existsInAppGroup = false;
-  if (!exists && Platform.OS === "ios") {
-    existsInAppGroup = await RNFetchBlob.fs.exists(appGroupPath);
-  }
-
-  if (exists || existsInAppGroup) {
-    const attachment = await db.attachments.attachment(filename);
-    const totalChunks = Math.ceil(attachment.size / attachment.chunkSize);
-    const totalAbytes = totalChunks * ABYTES;
-    const expectedFileSize = attachment.size + totalAbytes;
-
-    const stat = await RNFetchBlob.fs.stat(
-      existsInAppGroup ? appGroupPath : path
-    );
-
-    if (stat.size !== expectedFileSize) {
-      DatabaseLogger.log(
-        `File size mismatch: ${filename}, expected: ${expectedFileSize}, actual: ${stat.size}`
-      );
-      RNFetchBlob.fs
-        .unlink(existsInAppGroup ? appGroupPath : path)
-        .catch(console.log);
-      return false;
-    }
-
-    exists = true;
-  }
+  let exists = await RNFetchBlob.fs.exists(`${cacheDir}/${filename}`);
   return exists;
 }
-
-export async function bulkExists(files) {
-  try {
-    await createCacheDir();
-    const cacheFiles = await RNFetchBlob.fs.ls(cacheDir);
-    let missingFiles = files.filter((file) => !cacheFiles.includes(file));
-
-    if (Platform.OS === "ios") {
-      const iosAppGroup =
-        Platform.OS === "ios"
-          ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-          : null;
-      const appGroupFiles = await RNFetchBlob.fs.ls(iosAppGroup);
-      missingFiles = missingFiles.filter(
-        (file) => !appGroupFiles.includes(file)
-      );
-    }
-    return missingFiles;
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return [];
-  }
-}
-
-export async function getCacheSize() {
-  await createCacheDir();
-  const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
-  let total = 0;
-  console.log("Total files", stat.length);
-  stat.forEach((s) => {
-    total += parseInt(s.size);
-  });
-  return total;
-}

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

@@ -17,69 +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 { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import { ToastManager } from "../../services/event-manager";
+import RNFetchBlob from "rn-fetch-blob";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
-import { DatabaseLogger, db } from "../database";
-import { createCacheDir } from "./io";
-import { cacheDir, checkUpload, getUploadedFileSize } from "./utils";
+import { db } from "../database";
+import { cacheDir } from "./utils";
 
-export async function uploadFile(filename, requestOptions, cancelToken) {
-  if (!requestOptions) return false;
-  let { url, headers } = requestOptions;
-  await createCacheDir();
-  DatabaseLogger.info(`Preparing to upload file: ${filename}`);
+export async function uploadFile(filename, data, cancelToken) {
+  if (!data) return false;
+  let { url, headers } = data;
 
+  console.log("uploading file: ", filename, headers);
   try {
-    let filePath = `${cacheDir}/${filename}`;
-    let exists = await RNFetchBlob.fs.exists(filePath);
-    // Check for file in appGroupPath if it doesn't exist in cacheDir
-    if (!exists && Platform.OS === "ios") {
-      const iosAppGroup =
-        Platform.OS === "ios"
-          ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-          : null;
-      const appGroupPath = `${iosAppGroup}/${filename}`;
-      filePath = appGroupPath;
-      exists = await RNFetchBlob.fs.exists(filePath);
-    }
-
-    if (!exists) {
-      throw new Error(
-        `Trying to upload file at path ${filePath} that doest not exist.`
-      );
-    }
-
-    const fileSize = (await RNFetchBlob.fs.stat(filePath)).size;
-
-    let remoteFileSize = await getUploadedFileSize(filename);
-    if (remoteFileSize === -1) return false;
-    if (remoteFileSize > 0 && remoteFileSize === fileSize) {
-      DatabaseLogger.log(`File ${filename} is already uploaded.`);
-      return true;
-    }
-
-    let uploadUrlResponse = await fetch(url, {
+    let res = await fetch(url, {
       method: "PUT",
       headers
     });
+    if (!res.ok) throw new Error(`${res.status}: Unable to resolve upload url`);
+    const uploadUrl = await res.text();
+    if (!uploadUrl) throw new Error("Unable to resolve upload url");
 
-    const uploadUrl = uploadUrlResponse.ok
-      ? await uploadUrlResponse.text()
-      : await uploadUrlResponse.json();
-
-    if (typeof uploadUrl !== "string") {
-      throw new Error(
-        uploadUrl.error || "Unable to resolve attachment upload url."
-      );
-    }
-
-    DatabaseLogger.info(`Starting upload: ${filename}`);
-
-    let uploadRequest = RNFetchBlob.config({
-      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
+    let request = RNFetchBlob.config({
+      IOSBackgroundTask: true
     })
       .fetch(
         "PUT",
@@ -87,46 +45,33 @@ export async function uploadFile(filename, requestOptions, cancelToken) {
         {
           "content-type": ""
         },
-        RNFetchBlob.wrap(filePath)
+        RNFetchBlob.wrap(`${cacheDir}/${filename}`)
       )
       .uploadProgress((sent, total) => {
         useAttachmentStore
           .getState()
           .setProgress(sent, total, filename, 0, "upload");
-        DatabaseLogger.info(
-          `File upload progress: ${filename}, ${sent}/${total}`
-        );
+        console.log("uploading: ", sent, total);
       });
+    cancelToken.cancel = request.cancel;
+    let response = await request;
 
-    cancelToken.cancel = () => {
-      useAttachmentStore.getState().remove(filename);
-      uploadRequest.cancel();
-    };
-
-    let uploadResponse = await uploadRequest;
-    let status = uploadResponse.info().status;
-    let uploaded = status >= 200 && status < 300;
-
+    let status = response.info().status;
+    let text = await response.text();
+    let result = status >= 200 && status < 300 && text.length === 0;
     useAttachmentStore.getState().remove(filename);
-
-    if (!uploaded) {
-      const fileInfo = await RNFetchBlob.fs.stat(filePath);
-      throw new Error(
-        `${status}, name: ${fileInfo.filename}, length: ${
-          fileInfo.size
-        }, info: ${JSON.stringify(uploadResponse.info())}`
-      );
+    if (result) {
+      let attachment = db.attachments.attachment(filename);
+      if (!attachment) return result;
+      if (!attachment.metadata.type.startsWith("image/")) {
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
+      }
     }
-    const attachment = await db.attachments.attachment(filename);
-    await checkUpload(filename, requestOptions.chunkSize, attachment.size);
-    DatabaseLogger.info(`File upload status: ${filename}, ${status}`);
-    return uploaded;
+
+    return result;
   } catch (e) {
     useAttachmentStore.getState().remove(filename);
-    ToastManager.error(e, "File upload failed");
-    DatabaseLogger.error(e, "File upload failed", {
-      filename
-    });
+    console.log("upload file: ", e, url, headers);
     return false;
   }
 }

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

@@ -17,19 +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 { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { DatabaseLogger, db } from "../database";
-import { hosts } from "@notesnook/core";
+import RNFetchBlob from "rn-fetch-blob";
 
-export const ABYTES = 17;
-export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
-
-export const cacheDir =
-  Platform.OS == "ios"
-    ? RNFetchBlob.fs.dirs.LibraryDir + "/.cache"
-    : RNFetchBlob.fs.dirs.DocumentDir + "/.cache";
+export const cacheDir = RNFetchBlob.fs.dirs.CacheDir;
 
 export function getRandomId(prefix) {
   return Math.random()
@@ -37,36 +27,24 @@ export function getRandomId(prefix) {
     .replace("0.", prefix || "");
 }
 
-/**
- *
- * @param {string | undefined} data
- * @returns
- */
-export function parseS3Error(data) {
-  const xml = typeof data === "string" ? data : null;
+export function extractValueFromXmlTag(code, xml) {
+  if (!xml.includes(code)) return `Unknown ${code}`;
+  return xml.slice(
+    xml.indexOf(`<${code}>`) + code.length + 2,
+    xml.indexOf(`</${code}>`)
+  );
+}
 
-  const error = {
-    Code: "UNKNOWN",
-    Message: xml
-  };
-
-  try {
-    if (!xml) return error;
-    const doc = new DOMParser().parseFromString(xml, "text/xml");
-
-    const ErrorElement = doc.getElementsByTagName("Error")[0];
-    if (!ErrorElement) return error;
-
-    for (const child of ErrorElement.children) {
-      if (
-        child.textContent &&
-        (child.tagName === "Code" || child.tagName === "Message")
-      )
-        error[child.tagName] = child.textContent;
+export async function fileCheck(response, totalSize) {
+  if (totalSize < 1000) {
+    let text = await response.text();
+    if (text.startsWith("<?xml")) {
+      let errorJson = {
+        Code: extractValueFromXmlTag("Code", text),
+        Message: extractValueFromXmlTag("Message", text)
+      };
+      throw new Error(`${errorJson.Code}: ${errorJson.Message}`);
     }
-    return error;
-  } catch (e) {
-    return error;
   }
 }
 
@@ -74,67 +52,13 @@ export function cancelable(operation) {
   const cancelToken = {
     cancel: () => {}
   };
-  return (filename, requestOptions) => {
+  return (filename, { url, headers }) => {
     return {
-      execute: () => operation(filename, requestOptions, cancelToken),
+      execute: () => operation(filename, { url, headers }, cancelToken),
       cancel: async () => {
         await cancelToken.cancel();
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
       }
     };
   };
 }
-
-export function copyFileAsync(source, dest) {
-  return new Promise((resolve, reject) => {
-    ScopedStorage.copyFile(source, dest, (e, r) => {
-      if (e) {
-        reject(e);
-        return;
-      }
-      resolve();
-    });
-  });
-}
-
-export async function releasePermissions(path) {
-  if (Platform.OS === "ios") return;
-  const uris = await ScopedStorage.getPersistedUriPermissions();
-  for (let uri of uris) {
-    if (path.startsWith(uri)) {
-      await ScopedStorage.releasePersistableUriPermission(uri);
-    }
-  }
-}
-
-export async function getUploadedFileSize(hash) {
-  try {
-    const url = `${hosts.API_HOST}/s3?name=${hash}`;
-    const token = await db.tokenManager.getAccessToken();
-    const attachmentInfo = await fetch(url, {
-      method: "HEAD",
-      headers: { Authorization: `Bearer ${token}` }
-    });
-    const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length")
-    );
-    return isNaN(contentLength) ? 0 : contentLength;
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return -1;
-  }
-}
-
-export async function checkUpload(filename, chunkSize, expectedSize) {
-  const size = await getUploadedFileSize(filename);
-  const totalChunks = Math.ceil(size / chunkSize);
-  const decryptedLength = size - totalChunks * ABYTES;
-  const error =
-    size === 0
-      ? `File size is 0.`
-      : size === -1
-      ? `File verification check failed.`
-      : expectedSize !== decryptedLength
-      ? `File size mismatch. Expected ${size} bytes but got ${decryptedLength} bytes.`
-      : undefined;
-  if (error) throw new Error(error);
-}

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

@@ -17,24 +17,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { useThemeColors } from "@notesnook/theme";
 import React from "react";
-import { View } from "react-native";
-import { useMessageStore } from "../../stores/use-message-store";
+import { FlatList, View } from "react-native";
 import { useSelectionStore } from "../../stores/use-selection-store";
+import { useMessageStore } from "../../stores/use-message-store";
+import { useThemeStore } from "../../stores/use-theme-store";
 import { allowedOnPlatform, renderItem } from "./functions";
-import { getContainerBorder } from "../../utils/colors";
 
 export const Announcement = ({ color }) => {
-  const { colors } = useThemeColors();
+  const colors = useThemeStore((state) => state.colors);
   const announcements = useMessageStore((state) => state.announcements);
   let announcement = announcements.length > 0 ? announcements[0] : null;
   const selectionMode = useSelectionStore((state) => state.selectionMode);
-
   return !announcement || selectionMode ? null : (
     <View
       style={{
-        backgroundColor: colors.primary.background,
+        backgroundColor: colors.bg,
         width: "100%",
         paddingHorizontal: 12,
         paddingTop: 12,
@@ -46,27 +44,28 @@ export const Announcement = ({ color }) => {
           width: "100%",
           borderRadius: 10,
           overflow: "hidden",
-          backgroundColor: colors.secondary.background,
-          paddingBottom: 12,
-          ...getContainerBorder(colors.secondary.background)
+          backgroundColor: colors.nav,
+          paddingBottom: 12
         }}
       >
-        <View
-          style={{
-            width: "100%",
-            marginTop: 12
-          }}
-        >
-          {announcement?.body
-            .filter((item) => allowedOnPlatform(item.platforms))
-            .map((item, index) =>
+        <View>
+          <FlatList
+            style={{
+              width: "100%",
+              marginTop: 12
+            }}
+            data={announcement?.body.filter((item) =>
+              allowedOnPlatform(item.platforms)
+            )}
+            renderItem={({ item, index }) =>
               renderItem({
                 item: item,
                 index: index,
                 color: colors[color],
                 inline: true
               })
-            )}
+            }
+          />
         </View>
       </View>
     </View>

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

@@ -20,18 +20,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React from "react";
 import { Linking, View } from "react-native";
 //import SettingsBackupAndRestore from '../../screens/settings/backup-restore';
-import { useThemeColors } from "@notesnook/theme";
 import { eSendEvent, presentSheet } from "../../services/event-manager";
-import { eCloseAnnouncementDialog } from "../../utils/events";
+import Sync from "../../services/sync";
+import { useThemeStore } from "../../stores/use-theme-store";
+import { eCloseAnnouncementDialog, eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { PricingPlans } from "../premium/pricing-plans";
 import SheetProvider from "../sheet-provider";
+import { Progress } from "../sheets/progress";
 import { Button } from "../ui/button";
 import { allowedOnPlatform, getStyle } from "./functions";
 
 export const Cta = ({ actions, style = {}, color, inline }) => {
-  const { colors } = useThemeColors();
+  const colors = useThemeStore((state) => state.colors);
   let buttons =
     actions.filter((item) => allowedOnPlatform(item.platforms)) || [];
 
@@ -54,6 +56,13 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
           />
         )
       });
+    } else if (item.type === "force-sync") {
+      eSendEvent(eCloseSheet);
+      await sleep(300);
+      Progress.present();
+      Sync.run("global", true, true, () => {
+        eSendEvent(eCloseSheet);
+      });
     }
   };
   return (
@@ -83,7 +92,8 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 style={{
                   height: 30,
                   alignSelf: "flex-start",
-                  paddingHorizontal: 0
+                  paddingHorizontal: 0,
+                  marginTop: -6
                 }}
               />
             ))}
@@ -94,13 +104,14 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 key={item.title}
                 title={item.title}
                 fontSize={SIZE.sm}
-                type="plain"
+                type="gray"
                 onPress={() => onPress(item)}
                 width={null}
                 height={30}
                 style={{
                   alignSelf: "flex-start",
                   paddingHorizontal: 0,
+                  marginTop: -6,
                   marginLeft: 12
                 }}
                 textStyle={{
@@ -118,11 +129,9 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 title={item.title}
                 fontSize={SIZE.md}
                 buttonType={{
-                  color: color ? color : colors.primary.accent,
-                  text: color
-                    ? colors.static.white
-                    : colors.primary.accentForeground,
-                  selected: color ? color : colors.primary.accent,
+                  color: color ? color : colors.accent,
+                  text: colors.light,
+                  selected: color ? color : colors.accent,
                   opacity: 1
                 }}
                 onPress={() => onPress(item)}
@@ -139,8 +148,8 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
               <Button
                 key={item.title}
                 title={item.title}
-                fontSize={SIZE.xs}
-                type="plain"
+                fontSize={SIZE.xs + 1}
+                type="gray"
                 onPress={() => onPress(item)}
                 width={null}
                 height={30}