python: fail fast on the tests

Do not waste CI time running the rest of the tests
if CI is not going to be green anyway.

.gitattributes

@@ -2,14 +2,6 @@
 # ensures this even if the user has not set core.autocrlf.
 *  text=auto
 
-# Checkout JavaScript files with LF line endings
-# to prevent `prettier` from reporting errors on Windows.
-*.js eol=lf
-*.jsx eol=lf
-*.ts eol=lf
-*.tsx eol=lf
-*.json eol=lf
-
 # This directory contains email messages verbatim, and changing CRLF to
 # LF will corrupt them.
 test-data/** text=false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Report something that isn't working.
-title: ''
-assignees: ''
-labels: bug
----
-
-<!--
-This is the chatmail core's bug report tracker.
-For Delta Chat feature requests and support, please go to the forum: https://support.delta.chat
-Please fill out as much of this form as you can (leaving out stuff that is not applicable is ok).
--->
-
-- Operating System (Linux/Mac/Windows/iOS/Android):
-- Core Version: 
-- Client Version:
-
-## Expected behavior
-
-*What did you try to achieve?*
-
-## Actual behavior
-
-*What happened instead?*
-
-### Steps to reproduce the problem
-
-1. 
-2. 
-
-### Screenshots
-
-### Logs
-

.github/dependabot.yml

@@ -5,12 +5,5 @@ updates:
     schedule:
       interval: "monthly"
     commit-message:
-      prefix: "chore(cargo)"
+      prefix: "cargo"
     open-pull-requests-limit: 50
-
-  # Keep GitHub Actions up to date.
-  # <https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot>
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/mergeable.yml

@@ -0,0 +1,26 @@
+version: 2
+mergeable:
+  - when: pull_request.*
+    name: "Changelog check"
+    validate:
+      - do: or
+        validate:
+          - do: description
+            must_include:
+              regex: "#skip-changelog"
+          - do: and
+            validate:
+              - do: dependent
+                changed:
+                  file: "src/**"
+                  required: ["CHANGELOG.md"]
+              - do: dependent
+                changed:
+                  file: "deltachat-ffi/src/**"
+                  required: ["CHANGELOG.md"]
+    fail:
+      - do: checks
+        status: "action_required"
+        payload:
+          title: Changelog might need an update
+          summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."

.github/workflows/ci.yml

@@ -1,7 +1,3 @@
-# GitHub Actions workflow to
-# lint Rust and Python code
-# and run Rust tests, Python tests and async Python tests.
-
 name: Rust CI
 
 # Cancel previously started workflow runs
@@ -14,48 +10,34 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - master
-
-permissions: {}
 
 env:
   RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.86.0
-
-  # Minimum Supported Rust Version
-  MSRV: 1.82.0
 
 jobs:
-  lint_rust:
+  lint:
-    name: Lint Rust
+    name: Rustfmt and Clippy
     runs-on: ubuntu-latest
+    env:
+      RUSTUP_TOOLCHAIN: 1.68.0
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
-          show-progress: false
-          persist-credentials: false
       - name: Install rustfmt and clippy
-        run: rustup toolchain install $RUST_VERSION --profile minimal --component rustfmt --component clippy
+        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Run rustfmt
         run: cargo fmt --all -- --check
       - name: Run clippy
         run: scripts/clippy.sh
-      - name: Check with all features
-        run: cargo check --workspace --all-targets --all-features
-      - name: Check with only default features
-        run: cargo check --all-targets
 
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
+      - uses: EmbarkStudios/cargo-deny-action@v1
-          show-progress: false
-          persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@v2
         with:
           arguments: --all-features --workspace
           command: check
@@ -65,10 +47,7 @@ jobs:
     name: Check provider database
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
-          show-progress: false
-          persist-credentials: false
       - name: Check provider database
         run: scripts/update-provider-database.sh
 
@@ -78,257 +57,104 @@ jobs:
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout sources
-        with:
+        uses: actions/checkout@v3
-          show-progress: false
-          persist-credentials: false
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Rustdoc
         run: cargo doc --document-private-items --no-deps
 
-  rust_tests:
+  build_and_test:
-    name: Rust tests
+    name: Build and test
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            rust: latest
-          - os: windows-latest
-            rust: latest
-          - os: macos-latest
-            rust: latest
-
-          # Minimum Supported Rust Version
-          - os: ubuntu-latest
-            rust: minimum
-    runs-on: ${{ matrix.os }}
-    steps:
-      - run:
-          echo "RUSTUP_TOOLCHAIN=$MSRV" >> $GITHUB_ENV
-        shell: bash
-        if: matrix.rust == 'minimum'
-      - run:
-          echo "RUSTUP_TOOLCHAIN=$RUST_VERSION" >> $GITHUB_ENV
-        shell: bash
-        if: matrix.rust == 'latest'
-
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Install Rust ${{ matrix.rust }}
-        run: rustup toolchain install --profile minimal $RUSTUP_TOOLCHAIN
-        shell: bash
-      - run: rustup override set $RUSTUP_TOOLCHAIN
-        shell: bash
-
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-
-      - name: Install nextest
-        uses: taiki-e/install-action@v2
-        with:
-          tool: nextest
-
-      - name: Tests
-        env:
-          RUST_BACKTRACE: 1
-        run: cargo nextest run --workspace
-
-      - name: Doc-Tests
-        env:
-          RUST_BACKTRACE: 1
-        run: cargo test --workspace --doc
-
-      - name: Test cargo vendor
-        run: cargo vendor
-
-  c_library:
-    name: Build C library
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-
-      - name: Build C library
-        run: cargo build -p deltachat_ffi
-
-      - name: Upload C library
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-libdeltachat.a
-          path: target/debug/libdeltachat.a
-          retention-days: 1
-
-  rpc_server:
-    name: Build deltachat-rpc-server
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-
-      - name: Build deltachat-rpc-server
-        run: cargo build -p deltachat-rpc-server
-
-      - name: Upload deltachat-rpc-server
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-deltachat-rpc-server
-          path: ${{ matrix.os == 'windows-latest' && 'target/debug/deltachat-rpc-server.exe' || 'target/debug/deltachat-rpc-server' }}
-          retention-days: 1
-
-  python_lint:
-    name: Python lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Lint Python bindings
-        working-directory: python
-        run: tox -e lint
-
-      - name: Lint deltachat-rpc-client
-        working-directory: deltachat-rpc-client
-        run: tox -e lint
-
-  cffi_python_tests:
-    name: CFFI Python tests
-    needs: ["c_library", "python_lint"]
     strategy:
       fail-fast: false
       matrix:
         include:
           # Currently used Rust version.
           - os: ubuntu-latest
-            python: 3.13
+            rust: 1.68.0
-          - os: macos-latest
+            python: 3.9
-            python: 3.13
+          - os: windows-latest
+            rust: 1.68.0
+            python: false # Python bindings compilation on Windows is not supported.
 
-          # PyPy tests
+          # Minimum Supported Rust Version = 1.64.0
-          - os: ubuntu-latest
+          #
-            python: pypy3.10
+          # Minimum Supported Python Version = 3.7
-          - os: macos-latest
-            python: pypy3.10
-
-          # Minimum Supported Python Version = 3.8
           # This is the minimum version for which manylinux Python wheels are
-          # built. Test it with minimum supported Rust version.
+          # built.
           - os: ubuntu-latest
-            python: 3.8
+            rust: 1.64.0
-
+            python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@master
-        with:
-          show-progress: false
-          persist-credentials: false
 
-      - name: Download libdeltachat.a
+      - name: Install Rust ${{ matrix.rust }}
-        uses: actions/download-artifact@v4
+        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
-        with:
+      - run: rustup override set ${{ matrix.rust }}
-          name: ${{ matrix.os }}-libdeltachat.a
+
-          path: target/debug
+      - name: Cache rust cargo artifacts
+        uses: swatinem/rust-cache@v2
+
+      - name: Check
+        run: cargo check --workspace --bins --examples --tests --benches
+
+      - name: Tests
+        run: cargo test --workspace
+
+      - name: Test cargo vendor
+        run: cargo vendor
 
       - name: Install python
-        uses: actions/setup-python@v5
+        if: ${{ matrix.python }}
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: Install tox
+        if: ${{ matrix.python }}
         run: pip install tox
 
+      - name: Build C library
+        if: ${{ matrix.python }}
+        run: cargo build -p deltachat_ffi --features jsonrpc
+
       - name: Run python tests
+        if: ${{ matrix.python }}
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
           DCC_RS_TARGET: debug
           DCC_RS_DEV: ${{ github.workspace }}
         working-directory: python
-        run: tox -e mypy,doc,py
+        run: tox -e lint,mypy,doc,py3
 
-  rpc_python_tests:
+      - name: Build deltachat-rpc-server
-    name: JSON-RPC Python tests
+        if: ${{ matrix.python }}
-    needs: ["python_lint", "rpc_server"]
+        run: cargo build -p deltachat-rpc-server
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            python: 3.13
-          - os: macos-latest
-            python: 3.13
-          - os: windows-latest
-            python: 3.13
-
-          # PyPy tests
-          - os: ubuntu-latest
-            python: pypy3.10
-          - os: macos-latest
-            python: pypy3.10
-
-          # Minimum Supported Python Version = 3.8
-          - os: ubuntu-latest
-            python: 3.8
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Install python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.os }}-deltachat-rpc-server
-          path: target/debug
-
-      - name: Make deltachat-rpc-server executable
-        if: ${{ matrix.os != 'windows-latest' }}
-        run: chmod +x target/debug/deltachat-rpc-server
 
       - name: Add deltachat-rpc-server to path
-        if: ${{ matrix.os != 'windows-latest' }}
+        if: ${{ matrix.python }}
         run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
 
-      - name: Add deltachat-rpc-server to path
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          "${{ github.workspace }}/target/debug" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
       - name: Run deltachat-rpc-client tests
+        if: ${{ matrix.python }}
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
         working-directory: deltachat-rpc-client
-        run: tox -e py
+        run: tox -e py3,lint
+
+      - name: Install pypy
+        if: ${{ matrix.python }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: "pypy${{ matrix.python }}"
+
+      - name: Run pypy tests
+        if: ${{ matrix.python }}
+        env:
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+          DCC_RS_TARGET: debug
+          DCC_RS_DEV: ${{ github.workspace }}
+        working-directory: python
+        run: tox -e pypy3

.github/workflows/deltachat-rpc-server.yml

@@ -1,10 +1,4 @@
-# GitHub Actions workflow
+# Manually triggered action to build deltachat-rpc-server binaries.
-# to build `deltachat-rpc-server` binaries
-# and upload them to the release.
-#
-# The workflow is automatically triggered on releases.
-# It can also be triggered manually
-# to produce binary artifacts for testing.
 
 name: Build deltachat-rpc-server binaries
 
@@ -17,400 +11,116 @@ on:
   release:
     types: [published]
 
-permissions: {}
-
 jobs:
   # Build a version statically linked against musl libc
   # to avoid problems with glibc version incompatibility.
   build_linux:
-    name: Linux
+    name: Cross-compile deltachat-rpc-server for x86_64, aarch64 and armv7 Linux
-    strategy:
+    runs-on: ubuntu-22.04
-      fail-fast: false
-      matrix:
-        arch: [aarch64, armv7l, armv6l, i686, x86_64]
-    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
 
-      - name: Build deltachat-rpc-server binaries
+      - name: Build
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
+        run: sh scripts/zig-rpc-server.sh
 
-      - name: Upload binary
+      - name: Upload x86_64 binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-linux
+          name: deltachat-rpc-server-x86_64
-          path: result/bin/deltachat-rpc-server
+          path: target/x86_64-unknown-linux-musl/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload aarch64 binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-aarch64
+          path: target/aarch64-unknown-linux-musl/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload armv7 binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-armv7
+          path: target/armv7-unknown-linux-musleabihf/release/deltachat-rpc-server
           if-no-files-found: error
 
   build_windows:
-    name: Windows
+    name: Build deltachat-rpc-server for Windows
     strategy:
       fail-fast: false
       matrix:
-        arch: [win32, win64]
+        include:
-    runs-on: ubuntu-latest
+          - os: windows-latest
+            artifact: win32.exe
+            path: deltachat-rpc-server.exe
+            target: i686-pc-windows-msvc
+
+          - os: windows-latest
+            artifact: win64.exe
+            path: deltachat-rpc-server.exe
+            target: x86_64-pc-windows-msvc
+
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}
-          path: result/bin/deltachat-rpc-server.exe
-          if-no-files-found: error
-
-  build_macos:
-    name: macOS
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x86_64, aarch64]
-
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
 
       - name: Setup rust target
-        run: rustup target add ${{ matrix.arch }}-apple-darwin
+        run: rustup target add ${{ matrix.target }}
 
       - name: Build
-        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.arch }}-apple-darwin --features vendored
+        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.target }} --features vendored
 
       - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-macos
+          name: deltachat-rpc-server-${{ matrix.artifact }}
-          path: target/${{ matrix.arch }}-apple-darwin/release/deltachat-rpc-server
+          path: target/${{ matrix.target}}/release/${{ matrix.path }}
-          if-no-files-found: error
-
-  build_android:
-    name: Android
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [arm64-v8a, armeabi-v7a]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-android
-          path: result/bin/deltachat-rpc-server
           if-no-files-found: error
 
   publish:
-    name: Build wheels and upload binaries to the release
+    name: Upload binaries to the release
-    needs: ["build_linux", "build_windows", "build_macos"]
+    needs: ["build_linux", "build_windows"]
-    environment:
-      name: pypi
-      url: https://pypi.org/p/deltachat-rpc-server
     permissions:
-      id-token: write
       contents: write
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
+      - name: Download deltachat-rpc-server-x86_64
+        uses: "actions/download-artifact@v3"
         with:
-          show-progress: false
+          name: "deltachat-rpc-server-x86_64"
-          persist-credentials: false
+          path: "dist/deltachat-rpc-server-x86_64"
-      - uses: DeterminateSystems/nix-installer-action@main
 
-      - name: Download Linux aarch64 binary
+      - name: Download deltachat-rpc-server-aarch64
-        uses: actions/download-artifact@v4
+        uses: "actions/download-artifact@v3"
         with:
-          name: deltachat-rpc-server-aarch64-linux
+          name: "deltachat-rpc-server-aarch64"
-          path: deltachat-rpc-server-aarch64-linux.d
+          path: "dist/deltachat-rpc-server-aarch64"
 
-      - name: Download Linux armv7l binary
+      - name: Download deltachat-rpc-server-armv7
-        uses: actions/download-artifact@v4
+        uses: "actions/download-artifact@v3"
         with:
-          name: deltachat-rpc-server-armv7l-linux
+          name: "deltachat-rpc-server-armv7"
-          path: deltachat-rpc-server-armv7l-linux.d
+          path: "dist/deltachat-rpc-server-armv7"
 
-      - name: Download Linux armv6l binary
+      - name: Download deltachat-rpc-server-win32.exe
-        uses: actions/download-artifact@v4
+        uses: "actions/download-artifact@v3"
         with:
-          name: deltachat-rpc-server-armv6l-linux
+          name: "deltachat-rpc-server-win32.exe"
-          path: deltachat-rpc-server-armv6l-linux.d
+          path: "dist/deltachat-rpc-server-win32.exe"
 
-      - name: Download Linux i686 binary
+      - name: Download deltachat-rpc-server-win64.exe
-        uses: actions/download-artifact@v4
+        uses: "actions/download-artifact@v3"
         with:
-          name: deltachat-rpc-server-i686-linux
+          name: "deltachat-rpc-server-win64.exe"
-          path: deltachat-rpc-server-i686-linux.d
+          path: "dist/deltachat-rpc-server-win64.exe"
 
-      - name: Download Linux x86_64 binary
+      - name: List downloaded artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-linux
-          path: deltachat-rpc-server-x86_64-linux.d
-
-      - name: Download Win32 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win32
-          path: deltachat-rpc-server-win32.d
-
-      - name: Download Win64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win64
-          path: deltachat-rpc-server-win64.d
-
-      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-macos
-          path: deltachat-rpc-server-x86_64-macos.d
-
-      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-macos
-          path: deltachat-rpc-server-aarch64-macos.d
-
-      - name: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android
-          path: deltachat-rpc-server-arm64-v8a-android.d
-
-      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android
-          path: deltachat-rpc-server-armeabi-v7a-android.d
-
-      - name: Create bin/ directory
-        run: |
-          mkdir -p bin
-          mv deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-aarch64-linux
-          mv deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-armv7l-linux
-          mv deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-armv6l-linux
-          mv deltachat-rpc-server-i686-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-i686-linux
-          mv deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-x86_64-linux
-          mv deltachat-rpc-server-win32.d/deltachat-rpc-server.exe bin/deltachat-rpc-server-win32.exe
-          mv deltachat-rpc-server-win64.d/deltachat-rpc-server.exe bin/deltachat-rpc-server-win64.exe
-          mv deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server bin/deltachat-rpc-server-x86_64-macos
-          mv deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server bin/deltachat-rpc-server-aarch64-macos
-          mv deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server bin/deltachat-rpc-server-arm64-v8a-android
-          mv deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server bin/deltachat-rpc-server-armeabi-v7a-android
-
-      - name: List binaries
-        run: ls -l bin/
-
-      # Python 3.11 is needed for tomllib used in scripts/wheel-rpc-server.py
-      - name: Install python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-
-      - name: Install wheel
-        run: pip install wheel
-
-      - name: Build deltachat-rpc-server Python wheels and source package
-        run: |
-          mkdir -p dist
-          nix build .#deltachat-rpc-server-x86_64-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armv7l-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armv6l-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-aarch64-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-i686-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-win64-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-win32-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-source
-          cp result/*.tar.gz dist/
-          python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
-          python3 scripts/wheel-rpc-server.py aarch64-darwin bin/deltachat-rpc-server-aarch64-macos
-          mv *.whl dist/
-
-      - name: List artifacts
         run: ls -l dist/
 
       - name: Upload binaries to the GitHub release
-        if: github.event_name == 'release'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          REF_NAME: ${{ github.ref_name }}
         run: |
-          gh release upload "$REF_NAME" \
+          gh release upload ${{ github.ref_name }} \
             --repo ${{ github.repository }} \
-            bin/* dist/*
+            dist/deltachat-rpc-server-*
-
-      - name: Publish deltachat-rpc-client to PyPI
-        if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@release/v1
-
-  publish_npm_package:
-    name: Build & Publish npm prebuilds and deltachat-rpc-server
-    needs: ["build_linux", "build_windows", "build_macos"]
-    runs-on: "ubuntu-latest"
-    permissions:
-      id-token: write
-
-      # Needed to publish the binaries to the release.
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-linux
-          path: deltachat-rpc-server-aarch64-linux.d
-
-      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv7l-linux
-          path: deltachat-rpc-server-armv7l-linux.d
-
-      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv6l-linux
-          path: deltachat-rpc-server-armv6l-linux.d
-
-      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-i686-linux
-          path: deltachat-rpc-server-i686-linux.d
-
-      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-linux
-          path: deltachat-rpc-server-x86_64-linux.d
-
-      - name: Download Win32 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win32
-          path: deltachat-rpc-server-win32.d
-
-      - name: Download Win64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win64
-          path: deltachat-rpc-server-win64.d
-
-      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-macos
-          path: deltachat-rpc-server-x86_64-macos.d
-
-      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-macos
-          path: deltachat-rpc-server-aarch64-macos.d
-
-      - name: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android
-          path: deltachat-rpc-server-arm64-v8a-android.d
-
-      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android
-          path: deltachat-rpc-server-armeabi-v7a-android.d
-
-      - name: make npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        run: |
-          cd deltachat-rpc-server/npm-package
-
-          python --version
-
-          python scripts/pack_binary_for_platform.py aarch64-unknown-linux-musl     ../../deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-unknown-linux-musleabihf ../../deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py arm-unknown-linux-musleabihf   ../../deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py i686-unknown-linux-musl        ../../deltachat-rpc-server-i686-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py x86_64-unknown-linux-musl      ../../deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py i686-pc-windows-gnu            ../../deltachat-rpc-server-win32.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-pc-windows-gnu          ../../deltachat-rpc-server-win64.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-apple-darwin            ../../deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-apple-darwin           ../../deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-linux-android          ../../deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-linux-androideabi        ../../deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server
-
-          ls -lah platform_package
-
-          for platform in ./platform_package/*; do npm pack "$platform"; done
-          npm pack    
-          ls -lah
-
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-npm-package
-          path: deltachat-rpc-server/npm-package/*.tgz
-          if-no-files-found: error
-
-      - name: Upload npm packets to the GitHub release
-        if: github.event_name == 'release'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          REF_NAME: ${{ github.ref_name }}
-        run: |
-          gh release upload "$REF_NAME" \
-            --repo ${{ github.repository }} \
-            deltachat-rpc-server/npm-package/*.tgz
-
-      # Configure Node.js for publishing.
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Publish npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        if: github.event_name == 'release'
-        working-directory: deltachat-rpc-server/npm-package
-        run: |
-          ls -lah platform_package
-          for platform in *.tgz; do npm publish --provenance "$platform" --access public; done
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/dependabot.yml

@@ -1,6 +1,3 @@
-# GitHub Actions workflow
-# to automatically approve PRs made by Dependabot.
-
 name: Dependabot auto-approve
 on: pull_request
 
@@ -14,7 +11,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.3.0
+        uses: dependabot/fetch-metadata@v1.1.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR

.github/workflows/jsonrpc-client-npm-package.yml

@@ -1,41 +1,82 @@
-name: "Publish @deltachat/jsonrpc-client"
+name: "jsonrpc js client build"
 on:
-  workflow_dispatch:
+  pull_request:
-  release:
+  push:
-    types: [published]
+    tags:
-
+      - "*"
-permissions: {}
+      - "!py-*"
 
 jobs:
   pack-module:
-    name: "Publish @deltachat/jsonrpc-client"
+    name: "Package @deltachat/jsonrpc-client and upload to download.delta.chat"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
-    permissions:
-      id-token: write
-      contents: read
     steps:
-      - uses: actions/checkout@v4
+      - name: Install tree
+        run: sudo apt install tree
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          show-progress: false
+          node-version: "16"
-          persist-credentials: false
+      - name: Get tag
-
+        id: tag
-      - uses: actions/setup-node@v4
+        uses: dawidd6/action-get-tag@v1
-        with:
+        continue-on-error: true
-          node-version: 20
+      - name: Get Pull Request ID
-          registry-url: "https://registry.npmjs.org"
+        id: prepare
-
-      - name: Install dependencies without running scripts
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm install --ignore-scripts
-
-      - name: Package
-        working-directory: deltachat-jsonrpc/typescript
         run: |
+          tag=${{ steps.tag.outputs.tag }}
+          if [ -z "$tag" ]; then
+            node -e "console.log('DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
+          else
+            echo "DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
+            echo "No preview will be uploaded this time, but the $tag release"
+          fi
+      - name: System info
+        run: |
+          npm --version
+          node --version
+          echo $DELTACHAT_JSONRPC_TAR_GZ
+      - name: Install dependencies without running scripts
+        run: |
+          cd deltachat-jsonrpc/typescript
+          npm install --ignore-scripts
+      - name: Package
+        shell: bash
+        run: |
+          cd deltachat-jsonrpc/typescript
           npm run build
           npm pack .
-
+          ls -lah
-      - name: Publish
+          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
-        working-directory: deltachat-jsonrpc/typescript
+      - name: Upload Prebuild
-        run: npm publish --provenance deltachat-jsonrpc-client-* --access public
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-jsonrpc-client.tgz
+          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
+      # Upload to download.delta.chat/node/preview/
+      - name: Upload deltachat-jsonrpc-client preview to download.delta.chat/node/preview/
+        if: ${{ ! steps.tag.outputs.tag }}
+        id: upload-preview
+        shell: bash
+        run: |
+          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
+          chmod 600 __TEMP_INPUT_KEY_FILE
+          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
+        continue-on-error: true
+      - name: Post links to details
+        if: steps.upload-preview.outcome == 'success'
+        run: node ./node/scripts/postLinksToDetails.js
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
+      # Upload to download.delta.chat/node/
+      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
+        if: ${{ steps.tag.outputs.tag }}
+        id: upload
+        shell: bash
+        run: |
+          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
+          chmod 600 __TEMP_INPUT_KEY_FILE
+          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/jsonrpc.yml

@@ -2,11 +2,9 @@ name: JSON-RPC API Test
 
 on:
   push:
-    branches: [main]
+    branches: [master]
   pull_request:
-    branches: [main]
+    branches: [master]
-
-permissions: {}
 
 env:
   CARGO_TERM_COLOR: always
@@ -16,27 +14,32 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          show-progress: false
+          node-version: 16.x
-          persist-credentials: false
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
       - name: Add Rust cache
         uses: Swatinem/rust-cache@v2
       - name: npm install
-        working-directory: deltachat-jsonrpc/typescript
+        run: |
-        run: npm install
+          cd deltachat-jsonrpc/typescript
+          npm install
       - name: Build TypeScript, run Rust tests, generate bindings
-        working-directory: deltachat-jsonrpc/typescript
+        run: |
-        run: npm run build
+          cd deltachat-jsonrpc/typescript
+          npm run build
       - name: Run integration tests
-        working-directory: deltachat-jsonrpc/typescript
+        run: |
-        run: npm run test
+          cd deltachat-jsonrpc/typescript
+          npm run test
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+      - name: make sure websocket server version still builds
+        run: |
+          cd deltachat-jsonrpc
+          cargo build --bin deltachat-jsonrpc-server --features webserver
       - name: Run linter
-        working-directory: deltachat-jsonrpc/typescript
+        run: |
-        run: npm run prettier:check
+          cd deltachat-jsonrpc/typescript
+          npm run prettier:check

.github/workflows/nix.yml

@@ -1,108 +0,0 @@
-name: Test Nix flake
-
-on:
-  pull_request:
-    paths:
-      - flake.nix
-      - flake.lock
-  push:
-    paths:
-      - flake.nix
-      - flake.lock
-    branches:
-      - main
-
-permissions: {}
-
-jobs:
-  format:
-    name: check flake formatting
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix fmt
-
-      # Check that formatting does not change anything.
-      - run: git diff --exit-code
-
-  build:
-    name: nix build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        installable:
-          # Ensure `nix develop` will work.
-          - devShells.x86_64-linux.default
-
-          - deltachat-python
-          - deltachat-repl
-          - deltachat-repl-aarch64-linux
-          - deltachat-repl-arm64-v8a-android
-          - deltachat-repl-armeabi-v7a-android
-          - deltachat-repl-armv6l-linux
-          - deltachat-repl-armv7l-linux
-          - deltachat-repl-i686-linux
-          - deltachat-repl-win32
-          - deltachat-repl-win64
-          - deltachat-repl-x86_64-linux
-          - deltachat-rpc-client
-          - deltachat-rpc-server
-          - deltachat-rpc-server-aarch64-linux
-          - deltachat-rpc-server-aarch64-linux-wheel
-          - deltachat-rpc-server-arm64-v8a-android
-          - deltachat-rpc-server-arm64-v8a-android-wheel
-          - deltachat-rpc-server-armeabi-v7a-android
-          - deltachat-rpc-server-armeabi-v7a-android-wheel
-          - deltachat-rpc-server-armv6l-linux
-          - deltachat-rpc-server-armv6l-linux-wheel
-          - deltachat-rpc-server-armv7l-linux
-          - deltachat-rpc-server-armv7l-linux-wheel
-          - deltachat-rpc-server-i686-linux
-          - deltachat-rpc-server-i686-linux-wheel
-          - deltachat-rpc-server-source
-          - deltachat-rpc-server-win32
-          - deltachat-rpc-server-win32-wheel
-          - deltachat-rpc-server-win64
-          - deltachat-rpc-server-win64-wheel
-          - deltachat-rpc-server-x86_64-linux
-          - deltachat-rpc-server-x86_64-linux-wheel
-          - docs
-          - libdeltachat
-          - python-docs
-
-          # Fails to build
-          #- deltachat-repl-x86_64-android
-          #- deltachat-repl-x86-android
-          #- deltachat-rpc-server-x86_64-android
-          #- deltachat-rpc-server-x86-android
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix build .#${{ matrix.installable }}
-
-  build-macos:
-    name: nix build on macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        installable:
-          - deltachat-rpc-server-aarch64-darwin
-
-          # Fails to bulid
-          # - deltachat-rpc-server-x86_64-darwin
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix build .#${{ matrix.installable }}

.github/workflows/node-delete-preview.yml

@@ -0,0 +1,31 @@
+# documentation: https://github.com/deltachat/sysadmin/tree/master/download.delta.chat
+name: Delete node PR previews
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  delete:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get Pull Request ID
+        id: getid
+        run: |
+          export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
+          echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
+      - name: Renaming
+        run: |
+          # create empty file to copy it over the outdated deliverable on download.delta.chat
+          echo "This preview build is outdated and has been removed." > empty
+          cp empty deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz
+      - name: Replace builds with dummy files
+        uses: horochx/deploy-via-scp@v1.0.1
+        with:
+          user: ${{ secrets.USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          host: "download.delta.chat"
+          port: 22
+          local: "deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz"
+          remote: "/var/www/html/download/node/preview/"

.github/workflows/node-docs.yml

@@ -0,0 +1,34 @@
+name: Generate & upload node.js documentation
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
+      - name: npm install and generate documentation
+        run: |
+          cd node
+          npm i --ignore-scripts
+          npx typedoc
+          mv docs js
+
+      - name: Upload
+        uses: horochx/deploy-via-scp@v1.0.1
+        with:
+          user: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          host: "delta.chat"
+          port: 22
+          local: "node/js"
+          remote: "/var/www/html/"

.github/workflows/node-package.yml

@@ -0,0 +1,164 @@
+name: "node.js build"
+on:
+  pull_request:
+  push:
+    tags:
+      - "*"
+      - "!py-*"
+
+jobs:
+  prebuild:
+    name: Prebuild
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry/
+            ~/.cargo/git
+            target
+          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
+
+      - name: Install dependencies & build
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          cd node
+          npm install --verbose
+
+      - name: Build Prebuild
+        run: |
+          cd node
+          npm run prebuildify
+          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
+
+      - name: Upload Prebuild
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }}
+          path: node/${{ matrix.os }}.tar.gz
+
+  pack-module:
+    needs: prebuild
+    name: Package deltachat-node and upload to download.delta.chat
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Install tree
+        run: sudo apt install tree
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        continue-on-error: true
+      - name: Get Pull Request ID
+        id: prepare
+        run: |
+          tag=${{ steps.tag.outputs.tag }}
+          if [ -z "$tag" ]; then
+            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
+          else
+            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
+            echo "No preview will be uploaded this time, but the $tag release"
+          fi
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+          echo $DELTACHAT_NODE_TAR_GZ
+      - name: Download Ubuntu prebuild
+        uses: actions/download-artifact@v1
+        with:
+          name: ubuntu-20.04
+      - name: Download macOS prebuild
+        uses: actions/download-artifact@v1
+        with:
+          name: macos-latest
+      - name: Download Windows prebuild
+        uses: actions/download-artifact@v1
+        with:
+          name: windows-latest
+      - shell: bash
+        run: |
+          mkdir node/prebuilds
+          tar -xvzf ubuntu-20.04/ubuntu-20.04.tar.gz -C node/prebuilds
+          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
+          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
+          tree node/prebuilds
+          rm -rf ubuntu-20.04 macos-latest windows-latest
+      - name: Install dependencies without running scripts
+        run: |
+          npm install --ignore-scripts
+      - name: Build constants
+        run: |
+          npm run build:core:constants
+      - name: Build TypeScript part
+        run: |
+          npm run build:bindings:ts
+      - name: Package
+        shell: bash
+        run: |
+          mv node/README.md README.md
+          npm pack .
+          ls -lah
+          mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
+      - name: Upload prebuild
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-node.tgz
+          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
+      # Upload to download.delta.chat/node/preview/
+      - name: Upload deltachat-node preview to download.delta.chat/node/preview/
+        if: ${{ ! steps.tag.outputs.tag }}
+        id: upload-preview
+        shell: bash
+        run: |
+          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
+          chmod 600 __TEMP_INPUT_KEY_FILE
+          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
+        continue-on-error: true
+      - name: Post links to details
+        if: steps.upload-preview.outcome == 'success'
+        run: node ./node/scripts/postLinksToDetails.js
+        env:
+          URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Upload to download.delta.chat/node/
+      - name: Upload deltachat-node build to download.delta.chat/node/
+        if: ${{ steps.tag.outputs.tag }}
+        id: upload
+        shell: bash
+        run: |
+          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
+          chmod 600 __TEMP_INPUT_KEY_FILE
+          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/node-tests.yml

@@ -0,0 +1,76 @@
+name: "node.js tests"
+
+# Cancel previously started workflow runs
+# when the branch is updated.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry/
+            ~/.cargo/git
+            target
+          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
+
+      - name: Install dependencies & build
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          cd node
+          npm install --verbose
+
+      - name: Test
+        timeout-minutes: 10
+        if: runner.os != 'Windows'
+        run: |
+          cd node
+          npm run test
+        env:
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"
+      - name: Run tests on Windows, except lint
+        timeout-minutes: 10
+        if: runner.os == 'Windows'
+        run: |
+          cd node
+          npm run test:mocha
+        env:
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"

.github/workflows/publish-deltachat-rpc-client-pypi.yml

@@ -1,50 +0,0 @@
-name: Publish deltachat-rpc-client to PyPI
-
-on:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-permissions: {}
-
-jobs:
-  build:
-    name: Build distribution
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - name: Install pypa/build
-        run: python3 -m pip install build
-      - name: Build a binary wheel and a source tarball
-        working-directory: deltachat-rpc-client
-        run: python3 -m build
-      - name: Store the distribution packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-package-distributions
-          path: deltachat-rpc-client/dist/
-
-  publish-to-pypi:
-    name: Publish Python distribution to PyPI
-    if: github.event_name == 'release'
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/deltachat-rpc-client
-    permissions:
-      id-token: write
-
-    steps:
-      - name: Download all the dists
-        uses: actions/download-artifact@v4
-        with:
-          name: python-package-distributions
-          path: dist/
-      - name: Publish deltachat-rpc-client to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/repl.yml

@@ -1,5 +1,4 @@
-# Manually triggered GitHub Actions workflow
+# Manually triggered action to build a Windows repl.exe which users can
-# to build a Windows repl.exe which users can
 # download to debug complex bugs.
 
 name: Build Windows REPL .exe
@@ -7,22 +6,18 @@ name: Build Windows REPL .exe
 on:
   workflow_dispatch:
 
-permissions: {}
-
 jobs:
   build_repl:
     name: Build REPL example
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
+
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
       - name: Build
-        run: nix build .#deltachat-repl-win64
+        run: cargo build -p deltachat-repl --features vendored
+
       - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: repl.exe
-          path: "result/bin/deltachat-repl.exe"
+          path: "target/debug/deltachat-repl.exe"

.github/workflows/upload-docs.yml

@@ -1,95 +1,25 @@
-name: Build & deploy documentation on rs.delta.chat, c.delta.chat, and py.delta.chat
+name: Build & Deploy Documentation on rs.delta.chat
 
 on:
   push:
     branches:
-      - main
+      - master
-      - build_jsonrpc_docs_ci
+      - docs-gh-action
-
-permissions: {}
 
 jobs:
-  build-rs:
+  build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
-          show-progress: false
-          persist-credentials: false
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat --no-deps --document-private-items
       - name: Upload to rs.delta.chat
-        run: |
+        uses: up9cloud/action-rsync@v1.3
-          mkdir -p "$HOME/.ssh"
+        env:
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
+          USER: ${{ secrets.USERNAME }}
-          chmod 600 "$HOME/.ssh/key"
+          KEY: ${{ secrets.KEY }}
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc "${{ secrets.USERNAME }}@rs.delta.chat:/var/www/html/rs/"
+          HOST: "delta.chat"
-
+          SOURCE: "target/doc"
-  build-python:
+          TARGET: "/var/www/html/rs/"
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: DeterminateSystems/nix-installer-action@main
-      - name: Build Python documentation
-        run: nix build .#python-docs
-      - name: Upload to py.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@py.delta.chat:/home/delta/build/master"
-
-  build-c:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: DeterminateSystems/nix-installer-action@main
-      - name: Build C documentation
-        run: nix build .#docs
-      - name: Upload to c.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@c.delta.chat:/home/delta/build-c/master"
-
-  build-ts:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./deltachat-jsonrpc/typescript
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-      - name: npm install
-        run: npm install
-      - name: npm run build
-        run: npm run build
-      - name: Run docs script
-        run: npm run docs
-      - name: Upload to js.jsonrpc.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.USERNAME }}@js.jsonrpc.delta.chat:/var/www/html/js-jsonrpc/"

.github/workflows/upload-ffi-docs.yml

@@ -1,31 +1,25 @@
-# GitHub Actions workflow
-# to build `deltachat_ffi` crate documentation
-# and upload it to <https://cffi.delta.chat/>
-
 name: Build & Deploy Documentation on cffi.delta.chat
 
 on:
   push:
     branches:
-      - main
+      - master
-
+      - docs-gh-action
-permissions: {}
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-        with:
-          show-progress: false
-          persist-credentials: false
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat_ffi --no-deps
       - name: Upload to cffi.delta.chat
-        run: |
+        uses: up9cloud/action-rsync@v1.3
-          mkdir -p "$HOME/.ssh"
+        env:
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
+          USER: ${{ secrets.USERNAME }}
-          chmod 600 "$HOME/.ssh/key"
+          KEY: ${{ secrets.KEY }}
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.USERNAME }}@delta.chat:/var/www/html/cffi/"
+          HOST: "delta.chat"
+          SOURCE: "target/doc"
+          TARGET: "/var/www/html/cffi/"

.github/workflows/zizmor-scan.yml

@@ -1,31 +0,0 @@
-name: GitHub Actions Security Analysis with zizmor
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["**"]
-
-jobs:
-  zizmor:
-    name: zizmor latest via PyPI
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v5
-
-      - name: Run zizmor
-        run: uvx zizmor --format sarif . > results.sarif
-
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: results.sarif
-          category: zizmor

.gitignore

@@ -1,9 +1,6 @@
-target/
+/target
 **/*.rs.bk
 /build
-/dist
-/fuzz/fuzz_targets/corpus/
-/fuzz/fuzz_targets/crashes/
 
 # ignore vi temporaries
 *~
@@ -21,9 +18,6 @@ python/.eggs
 __pycache__
 python/src/deltachat/capi*.so
 python/.venv/
-python/venv/
-venv/
-env/
 
 python/liveconfig*
 
@@ -35,7 +29,7 @@ deltachat-ffi/xml
 
 coverage/
 .DS_Store
-.vscode
+.vscode/launch.json
 python/accounts.txt
 python/all-testaccounts.txt
 tmp/
@@ -46,10 +40,3 @@ node/build/
 node/dist/
 node/prebuilds/
 node/.nyc_output/
-
-# Nix symlink.
-result
-
-# direnv
-.envrc
-.direnv

CMakeLists.txt

@@ -12,22 +12,26 @@ else()
        set(DYNAMIC_EXT "dll")
 endif()
 
-if(DEFINED ENV{CARGO_BUILD_TARGET})
-    set(ARCH_DIR "$ENV{CARGO_BUILD_TARGET}")
-else()
-    set(ARCH_DIR "./")
-endif()
-
 add_custom_command(
 	OUTPUT
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
+	"target/release/libdeltachat.a"
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
+	"target/release/libdeltachat.${DYNAMIC_EXT}"
-	"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
+	"target/release/pkgconfig/deltachat.pc"
         COMMAND
         PREFIX=${CMAKE_INSTALL_PREFIX}
         LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
         INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-	${CARGO} build --target-dir=${CMAKE_BINARY_DIR}/target --release
+        ${CARGO} build --release --no-default-features --features jsonrpc
+
+	# Build in `deltachat-ffi` directory instead of using
+	# `--package deltachat_ffi` to avoid feature resolver version
+	# "1" bug which makes `--no-default-features` affect only
+	# `deltachat`, but not `deltachat-ffi` package.
+	#
+	# We can't enable version "2" resolver [1] because it is not
+	# stable yet on rust 1.50.0.
+	#
+	# [1] https://doc.rust-lang.org/nightly/cargo/reference/features.html#resolver-version-2-command-line-flags
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
 )
 
@@ -35,12 +39,12 @@ add_custom_target(
 	lib_deltachat
 	ALL
 	DEPENDS
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
+	"target/release/libdeltachat.a"
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
+	"target/release/libdeltachat.${DYNAMIC_EXT}"
-	"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
+	"target/release/pkgconfig/deltachat.pc"
 )
 
 install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

CONTRIBUTING.md

@@ -1,122 +0,0 @@
-# Contributing to Delta Chat
-
-## Bug reports
-
-If you found a bug, [report it on GitHub](https://github.com/chatmail/core/issues).
-If the bug you found is specific to
-[Android](https://github.com/deltachat/deltachat-android/issues),
-[iOS](https://github.com/deltachat/deltachat-ios/issues) or
-[Desktop](https://github.com/deltachat/deltachat-desktop/issues),
-report it to the corresponding repository.
-
-## Feature proposals
-
-If you have a feature request, create a new topic on the [forum](https://support.delta.chat/).
-
-## Code contributions
-
-If you want to contribute a code, follow this guide.
-
-1. **Select an issue to work on.**
-
-   If you have an write access to the repository, assign the issue to yourself.
-   Otherwise state in the comment that you are going to work on the issue
-   to avoid duplicate work.
-
-   If the issue does not exist yet, create it first.
-
-2. **Write the code.**
-
-   Follow the [coding conventions](STYLE.md) when writing the code.
-
-3. **Commit the code.**
-
-   If you have write access to the repository,
-   push a branch named `<username>/<feature>`
-   so it is clear who is responsible for the branch,
-   and open a PR proposing to merge the change.
-   Otherwise fork the repository and create a branch in your fork.
-
-   Commit messages follow the [Conventional Commits] notation.
-   We use [git-cliff] to generate the changelog from commit messages before the release.
-
-   With **`git cliff --unreleased`**, you can check how the changelog entry for your commit will look.
-
-   The following prefix types are used:
-   - `feat`: Features, e.g. "feat: Pause IO for BackupProvider". If you are unsure what's the category of your commit, you can often just use `feat`.
-   - `fix`: Bug fixes, e.g. "fix: delete `smtp` rows when message sending is cancelled"
-   - `api`: API changes, e.g. "api(rust): add `get_msg_read_receipts(context, msg_id)`"
-   - `refactor`: Refactorings, e.g. "refactor: iterate over `msg_ids` without `.iter()`"
-   - `perf`: Performance improvements, e.g. "perf: improve SQLite performance with `PRAGMA synchronous=normal`"
-   - `test`: Test changes and improvements to the testing framework.
-   - `build`: Build system and tool configuration changes, e.g. "build(git-cliff): put "ci" commits into "CI" section of changelog"
-   - `ci`: CI configuration changes, e.g. "ci: limit artifact retention time for `libdeltachat.a` to 1 day"
-   - `docs`: Documentation changes, e.g. "docs: add contributing guidelines"
-   - `chore`: miscellaneous tasks, e.g. "chore: add `.DS_Store` to `.gitignore`"
-
-   Release preparation commits are marked as "chore(release): prepare for X.Y.Z"
-   as described in [releasing guide](RELEASE.md).
-
-   Use a `!` to mark breaking changes, e.g. "api!: Remove `dc_chat_can_send`".
-
-   Alternatively, breaking changes can go into the commit description, e.g.:
-
-   ```
-   fix: Fix race condition and db corruption when a message was received during backup
-
-   BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
-   ```
-
-4. [**Open a Pull Request**](https://github.com/chatmail/core/pulls).
-
-   Refer to the corresponding issue.
-
-   If you intend to squash merge the PR from the web interface,
-   make sure the PR title follows the conventional commits notation
-   as it will end up being a commit title.
-   Otherwise make sure each commit title follows the conventional commit notation.
-
-5. **Make sure all CI checks succeed.**
-
-   CI runs the tests and checks code formatting.
-
-   While it is running, self-review your PR to make sure all the changes you expect are there
-   and there are no accidentally committed unrelated changes and files.
-
-   Push the necessary fixup commits or force-push to your branch if needed.
-
-6. **Ask for review.**
-
-   Use built-in GitHub feature to request a review from suggested reviewers.
-
-   If you do not have write access to the repository, ask for review in the comments.
-
-7. **Merge the PR.**
-
-   Once a PR has an approval and passes CI, it can be merged.
-
-   PRs from a branch created in the main repository,
-   i.e. authored by those who have write access, are merged by their authors.
-
-   This is to ensure that PRs are merged as intended by the author,
-   e.g. as a squash merge, by rebasing from the web interface or manually from the command line.
-
-   If you have multiple changes in one PR, do a rebase merge.
-   Otherwise, you should usually do a squash merge.
-
-   If PR author does not have write access to the repository,
-   maintainers who reviewed the PR can merge it.
-
-   If you do not have access to the repository and created a PR from a fork,
-   ask the maintainers to merge the PR and say how it should be merged.
-
-## Other ways to contribute
-
-For other ways to contribute, refer to the [website](https://delta.chat/en/contribute).
-
-You can find the list of good first issues
-and a link to this guide
-on the contributing page: <https://github.com/chatmail/core/contribute>
-
-[Conventional Commits]: https://www.conventionalcommits.org/
-[git-cliff]: https://git-cliff.org/

Cargo.toml

@@ -1,10 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.159.3"
+version = "1.111.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.82"
+rust-version = "1.64"
-repository = "https://github.com/chatmail/core"
 
 [profile.dev]
 debug = 0
@@ -12,10 +11,6 @@ panic = 'abort'
 opt-level = 1
 
 [profile.test]
-# Make anyhow `backtrace` feature useful.
-# With `debug = 0` there are no line numbers in the backtrace
-# produced with RUST_BACKTRACE=1.
-debug = 1
 opt-level = 0
 
 # Always optimize dependencies.
@@ -28,99 +23,87 @@ opt-level = "z"
 lto = true
 panic = 'abort'
 opt-level = "z"
-codegen-units = 1
+
-strip = true
+[patch.crates-io]
+default-net = { git = "https://github.com/dignifiedquire/default-net.git", branch="feat-android" }
+quinn-udp = { git = "https://github.com/quinn-rs/quinn", branch="main" }
+quinn-proto = { git = "https://github.com/quinn-rs/quinn", branch="main" }
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
-deltachat-time = { path = "./deltachat-time" }
-deltachat-contact-tools = { workspace = true }
 format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }
 
-anyhow = { workspace = true }
+anyhow = "1"
-async-broadcast = "0.7.2"
+async-channel = "1.8.0"
-async-channel = { workspace = true }
+async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
-async-imap = { version = "0.10.4", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
-async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
+async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
-base64 = { workspace = true }
+backtrace = "0.3"
-brotli = { version = "8", default-features=false, features = ["std"] }
+base64 = "0.21"
-bytes = "1"
+bitflags = "1.3"
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
+chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
-data-encoding = "2.9.0"
+email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
-fast-socks5 = "0.10"
+fast-socks5 = "0.8"
-fd-lock = "4"
+futures = "0.3"
-futures-lite = { workspace = true }
+futures-lite = "1.12.0"
-futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.5"
-http-body-util = "0.1.3"
 humansize = "2"
-hyper = "1"
+image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-hyper-util = "0.1.11"
+# iroh = { version = "0.3.0", default-features = false }
-image = { version = "0.25.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh = { git = 'https://github.com/n0-computer/iroh', branch = "flub/ticket-multiple-addrs" }
-iroh-gossip = { version = "0.33", default-features = false, features = ["net"] }
+kamadak-exif = "0.5"
-iroh = { version = "0.33", default-features = false }
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-kamadak-exif = "0.6.1"
+libc = "0.2"
-libc = { workspace = true }
+mailparse = "0.14"
-mail-builder = { version = "0.4.2", default-features = false }
+num_cpus = "1.15"
-mailparse = { workspace = true }
+num-derive = "0.3"
-mime = "0.3.17"
+num-traits = "0.2"
-num_cpus = "1.16"
+once_cell = "1.17.0"
-num-derive = "0.4"
+percent-encoding = "2.2"
-num-traits = { workspace = true }
 parking_lot = "0.12"
-percent-encoding = "2.3"
+pgp = { version = "0.9", default-features = false }
-pgp = { version = "0.15.0", default-features = false }
+pretty_env_logger = { version = "0.4", optional = true }
-pin-project = "1"
 qrcodegen = "1.7.0"
-quick-xml = "0.37"
+quick-xml = "0.27"
-quoted_printable = "0.5"
+rand = "0.8"
-rand = { workspace = true }
+regex = "1.7"
-regex = { workspace = true }
+reqwest = { version = "0.11.14", features = ["json"] }
-rusqlite = { workspace = true, features = ["sqlcipher"] }
+rusqlite = { version = "0.28", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.11.0"
+sanitize-filename = "0.4"
-rustls = { version = "0.23.22", default-features = false }
+serde_json = "1.0"
-sanitize-filename = { workspace = true }
+serde = { version = "1.0", features = ["derive"] }
-serde_json = { workspace = true }
-serde_urlencoded = "0.7.1"
-serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.23.1", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
+smallvec = "1"
-smallvec = "1.15.0"
+strum = "0.24"
-strum = "0.27"
+strum_macros = "0.24"
-strum_macros = "0.27"
 tagger = "4.3.4"
-textwrap = "0.16.2"
+textwrap = "0.16.0"
-thiserror = { workspace = true }
+thiserror = "1"
 tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.2", default-features = false }
+tokio-stream = { version = "0.1.11", features = ["fs"] }
-tokio-stream = { version = "0.1.17", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = { workspace = true }
+tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
+toml = "0.7"
-toml = "0.8"
+trust-dns-resolver = "0.22"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-webpki-roots = "0.26.8"
-blake3 = "1.8.2"
 
 [dev-dependencies]
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
+ansi_term = "0.12.0"
-criterion = { version = "0.5.1", features = ["async_tokio"] }
+criterion = { version = "0.4.0", features = ["async_tokio"] }
-futures-lite = { workspace = true }
+futures-lite = "1.12"
-log = { workspace = true }
+log = "0.4"
-nu-ansi-term = { workspace = true }
+pretty_env_logger = "0.4"
-pretty_assertions = "1.4.1"
 proptest = { version = "1", default-features = false, features = ["std"] }
-tempfile = { workspace = true }
+tempfile = "3"
-testdir = "0.9.3"
+testdir = "0.7.2"
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 
 [workspace]
 members = [
@@ -130,12 +113,14 @@ members = [
   "deltachat-rpc-server",
   "deltachat-ratelimit",
   "deltachat-repl",
-  "deltachat-time",
   "format-flowed",
-  "deltachat-contact-tools",
-  "fuzz",
 ]
 
+[[example]]
+name = "simple"
+path = "examples/simple.rs"
+
+
 [[bench]]
 name = "create_account"
 harness = false
@@ -150,17 +135,12 @@ harness = false
 
 [[bench]]
 name = "receive_emails"
-required-features = ["internals"]
 harness = false
 
 [[bench]]
 name = "get_chat_msgs"
 harness = false
 
-[[bench]]
-name = "marknoticed_chat"
-harness = false
-
 [[bench]]
 name = "get_chatlist"
 harness = false
@@ -169,40 +149,11 @@ harness = false
 name = "send_events"
 harness = false
 
-[workspace.dependencies]
-anyhow = "1"
-async-channel = "2.3.1"
-base64 = "0.22"
-chrono = { version = "0.4.41", default-features = false }
-deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
-deltachat = { path = ".", default-features = false }
-futures = "0.3.31"
-futures-lite = "2.6.0"
-libc = "0.2"
-log = "0.4"
-mailparse = "0.16.1"
-nu-ansi-term = "0.46"
-num-traits = "0.2"
-rand = "0.8"
-regex = "1.10"
-rusqlite = "0.32"
-sanitize-filename = "0.5"
-serde = "1.0"
-serde_json = "1"
-tempfile = "3.19.1"
-thiserror = "2"
-tokio = "1"
-tokio-util = "0.7.14"
-tracing-subscriber = "0.3"
-yerpc = "0.6.4"
-
 [features]
 default = ["vendored"]
 internals = []
 vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl"
+  "async-native-tls/vendored",
+  "rusqlite/bundled-sqlcipher-vendored-openssl",
+  "reqwest/native-tls-vendored"
 ]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }

LICENSE

@@ -361,7 +361,7 @@ Exhibit A - Source Code Form License Notice
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE

README.md

@@ -1,41 +1,8 @@
-<p align="center">
+# Delta Chat Rust
-<img alt="Chatmail logo" src="https://github.com/user-attachments/assets/25742da7-a837-48cd-a503-b303af55f10d" width="300" style="float:middle;" />
-</p>
 
-<p align="center">
+> Deltachat-core written in Rust 
-  <a href="https://github.com/chatmail/core/actions/workflows/ci.yml">
-    <img alt="Rust CI" src="https://github.com/chatmail/core/actions/workflows/ci.yml/badge.svg">
-  </a>
-  <a href="https://deps.rs/repo/github/chatmail/core">
-    <img alt="dependency status" src="https://deps.rs/repo/github/chatmail/core/status.svg">
-  </a>
-</p>
-
-The chatmail core library implements low-level network and encryption protocols, 
-integrated by many chat bots and higher level applications, 
-allowing to securely participate in the globally scaled e-mail server network. 
-We provide reproducibly-built `deltachat-rpc-server` static binaries
-that offer a stdio-based high-level JSON-RPC API for instant messaging purposes. 
-
-The following protocols are handled without requiring API users to know much about them: 
-
-- secure TLS setup with DNS caching and shadowsocks/proxy support 
-
-- robust [SMTP](https://github.com/chatmail/async-imap) 
-  and [IMAP](https://github.com/chatmail/async-smtp) handling
-
-- safe and interoperable [MIME parsing](https://github.com/staktrace/mailparse) 
-  and [MIME building](https://github.com/stalwartlabs/mail-builder). 
-
-- security-audited end-to-end encryption with [rPGP](https://github.com/rpgp/rpgp)
-  and [Autocrypt and SecureJoin protocols](https://securejoin.rtfd.io)
-
-- ephemeral [Peer-to-Peer networking using Iroh](https://iroh.computer) for multi-device setup and
-  [webxdc realtime data](https://delta.chat/en/2024-11-20-webxdc-realtime). 
-
-- a simulation- and real-world tested [P2P group membership
-  protocol without requiring server state](https://github.com/chatmail/models/tree/main/group-membership). 
 
+[![Rust CI](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml)
 
 ## Installing Rust and Cargo
 
@@ -49,26 +16,26 @@ $ curl https://sh.rustup.rs -sSf | sh
 
 ## Using the CLI client
 
-Compile and run the command line utility, using `cargo`:
+Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ cargo run --locked -p deltachat-repl -- ~/profile-db
+$ RUST_LOG=deltachat_repl=info cargo run -p deltachat-repl -- ~/deltachat-db
 ```
-where ~/profile-db is the database file. The utility will create it if it does not exist.
+where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
 Optionally, install `deltachat-repl` binary with
 ```
-$ cargo install --locked --path deltachat-repl/
+$ cargo install --path deltachat-repl/
 ```
 and run as
 ```
-$ deltachat-repl ~/profile-db
+$ deltachat-repl ~/deltachat-db
 ```
 
 Configure your account (if not already configured):
 
 ```
-Chatmail is awaiting your commands.
+Delta Chat Core is awaiting your commands.
 > set addr your@email.org
 > set mail_pw yourpassword
 > configure
@@ -106,6 +73,11 @@ Single#10: yourfriends@email.org [yourfriends@email.org]
 Message sent.
 ```
 
+If `yourfriend@email.org` uses DeltaChat, but does not receive message just
+sent, it is advisable to check `Spam` folder. It is known that at least
+`gmx.com` treat such test messages as spam, unless told otherwise with web
+interface.
+
 List messages when inside a chat:
 
 ```
@@ -121,7 +93,7 @@ For more commands type:
 ## Installing libdeltachat system wide
 
 ```
-$ git clone https://github.com/chatmail/core.git
+$ git clone https://github.com/deltachat/deltachat-core-rust.git
 $ cd deltachat-core-rust
 $ cmake -B build . -DCMAKE_INSTALL_PREFIX=/usr
 $ cmake --build build
@@ -141,7 +113,7 @@ $ cargo build -p deltachat_ffi --release
 
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
 
-- `RUST_LOG=async_imap=trace,async_smtp=trace`: enable IMAP and
+- `RUST_LOG=deltachat_repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.
 
 ### Expensive tests
@@ -156,7 +128,7 @@ $ cargo test -- --ignored
 
 Install [`cargo-bolero`](https://github.com/camshaft/bolero) with
 ```sh
-$ cargo install cargo-bolero@0.8.0
+$ cargo install cargo-bolero
 ```
 
 Run fuzzing tests with
@@ -178,20 +150,25 @@ $ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
 ## Features
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
+- `nightly`: Enable nightly only performance and security related features.
 
 ## Update Provider Data
 
 To add the updates from the
-[provider-db](https://github.com/chatmail/provider-db) to the core,
+[provider-db](https://github.com/deltachat/provider-db) to the core, run:
-check line `REV=` inside `./scripts/update-provider-database.sh`
+
-and then run the script.
+```
+./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
+```
 
 ## Language bindings and frontend projects
 
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **JS**: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\]
+- **Node.js** 
+  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
 - **Go**
   - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\]
@@ -207,7 +184,6 @@ or its language bindings:
 - [Desktop](https://github.com/deltachat/deltachat-desktop)
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
-- [Ubuntu Touch](https://codeberg.org/lk108/deltatouch)
 - several **Bots**
 
 [^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.

RELEASE.md

@@ -1,21 +0,0 @@
-# Releasing a new version of DeltaChat core
-
-For example, to release version 1.116.0 of the core, do the following steps.
-
-1. Resolve all [blocker issues](https://github.com/chatmail/core/labels/blocker).
-
-2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
-
-3. add a link to compare previous with current version to the end of CHANGELOG.md:
-  `[1.116.0]: https://github.com/chatmail/core/compare/v1.115.2...v1.116.0`
-
-4. Update the version by running `scripts/set_core_version.py 1.116.0`.
-
-5. Commit the changes as `chore(release): prepare for 1.116.0`.
-   Optionally, use a separate branch like `prep-1.116.0` for this commit and open a PR for review.
-
-6. Tag the release: `git tag --annotate v1.116.0`.
-
-7. Push the release tag: `git push origin v1.116.0`.
-
-8. Create a GitHub release: `gh release create v1.116.0 --notes ''`.

STYLE.md

@@ -1,98 +0,0 @@
-# Coding conventions
-
-We format the code using `rustfmt`. Run `cargo fmt` prior to committing the code.
-Run `scripts/clippy.sh` to check the code for common mistakes with [Clippy].
-
-[Clippy]: https://doc.rust-lang.org/clippy/
-
-## SQL
-
-Multi-line SQL statements should be formatted using string literals,
-for example
-```
-    sql.execute(
-        "CREATE TABLE messages (
-id INTEGER PRIMARY KEY AUTOINCREMENT,
-text TEXT DEFAULT '' NOT NULL -- message text
-) STRICT",
-    )
-    .await?;
-```
-
-Do not use macros like [`concat!`](https://doc.rust-lang.org/std/macro.concat.html)
-or [`indoc!](https://docs.rs/indoc).
-Do not escape newlines like this:
-```
-    sql.execute(
-        "CREATE TABLE messages ( \
-id INTEGER PRIMARY KEY AUTOINCREMENT, \
-text TEXT DEFAULT '' NOT NULL \
-) STRICT",
-    )
-    .await?;
-```
-Escaping newlines
-is prone to errors like this if space before backslash is missing:
-```
-"SELECT foo\
- FROM bar"
-```
-Literal above results in `SELECT fooFROM bar` string.
-This style also does not allow using `--` comments.
-
----
-
-Declare new SQL tables with [`STRICT`](https://sqlite.org/stricttables.html) keyword
-to make SQLite check column types.
-
-Declare primary keys with [`AUTOINCREMENT`](https://www.sqlite.org/autoinc.html) keyword.
-This avoids reuse of the row IDs and can avoid dangerous bugs
-like forwarding wrong message because the message was deleted
-and another message took its row ID.
-
-Declare all new columns as `NOT NULL`
-and set the `DEFAULT` value if it is optional so the column can be skipped in `INSERT` statements.
-Dealing with `NULL` values both in SQL and in Rust is tricky and we try to avoid it.
-If column is already declared without `NOT NULL`, use `IFNULL` function to provide default value when selecting it.
-Use `HAVING COUNT(*) > 0` clause
-to [prevent aggregate functions such as `MIN` and `MAX` from returning `NULL`](https://stackoverflow.com/questions/66527856/aggregate-functions-max-etc-return-null-instead-of-no-rows).
-
-Don't delete unused columns too early, but maybe after several months/releases, unused columns are
-still used by older versions, so deleting them breaks downgrading the core or importing a backup in
-an older version. Also don't change the column type, consider adding a new column with another name
-instead. Finally, never change column semantics, this is especially dangerous because the `STRICT`
-keyword doesn't help here.
-
-## Errors
-
-Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.
-When using [`Context`](https://docs.rs/anyhow/latest/anyhow/trait.Context.html),
-capitalize it but do not add a full stop as the contexts will be separated by `:`.
-For example:
-```
-.with_context(|| format!("Unable to trash message {msg_id}"))
-```
-
-All errors should be handled in one of these ways:
-- With `if let Err() =` (incl. logging them into `warn!()`/`err!()`).
-- With `.log_err().ok()`.
-- Bubbled up with `?`.
-
-`backtrace` feature is enabled for `anyhow` crate
-and `debug = 1` option is set in the test profile.
-This allows to run `RUST_BACKTRACE=1 cargo test`
-and get a backtrace with line numbers in resultified tests
-which return `anyhow::Result`.
-
-## Logging
-
-For logging, use `info!`, `warn!` and `error!` macros.
-Log messages should be capitalized and have a full stop in the end. For example:
-```
-info!(context, "Ignoring addition of {added_addr:?} to {chat_id}.");
-```
-
-Format anyhow errors with `{:#}` to print all the contexts like this:
-```
-error!(context, "Failed to set selfavatar timestamp: {err:#}.");
-```

assets/qr_overlay_delta.svg-part

@@ -1,12 +0,0 @@
-<path
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   d="m 24.015419,1.2870249 c -12.549421,0 -22.7283936,10.1789711 -22.7283936,22.7283931 0,12.549422 10.1789726,22.728395 22.7283936,22.728395 14.337742,-0.342877 9.614352,-4.702705 23.697556,0.969161 -7.545453,-13.001555 -1.082973,-13.32964 -0.969161,-23.697556 0,-12.549422 -10.178973,-22.7283931 -22.728395,-22.7283931 z" />
-<path
-   style="fill:#000000;fill-opacity:1;stroke:none"
-   d="M 23.982249,5.3106163 C 13.645822,5.4364005 5.2618355,13.92999 5.2618355,24.275753 c 0,10.345764 8.3839865,18.635301 18.7204135,18.509516 9.827724,-0.03951 7.516769,-5.489695 18.380082,-0.443187 -5.950849,-9.296115 0.201753,-10.533667 0.340336,-18.521947 0,-10.345766 -8.383989,-18.6353031 -18.720418,-18.5095187 z" />
-<g
-    style="fill:#ffffff"
-    transform="scale(1.1342891,0.88160947)">
-  <path
-     d="m 21.360141,23.513382 q -1.218487,-1.364705 -3.387392,-3.265543 -2.388233,-2.095797 -3.216804,-3.289913 -0.828571,-1.218486 -0.828571,-2.6563 0,-2.144536 1.998318,-3.363022 1.998317,-1.2428565 5.215121,-1.2428565 3.216804,0 5.605037,1.0966375 2.412603,1.096638 2.412603,3.021846 0,0.92605 -0.584873,1.535293 -0.584874,0.609243 -1.364705,0.609243 -1.121008,0 -2.631931,-1.681511 -1.535292,-1.705881 -2.60756,-2.388233 -1.047898,-0.706722 -2.461343,-0.706722 -1.803359,0 -2.973106,0.804201 -1.145377,0.804201 -1.145377,2.047057 0,1.169747 0.950419,2.193275 0.950419,1.023529 4.898315,3.728568 4.215963,2.899998 5.946213,4.532769 1.75462,1.632772 2.851258,3.972265 1.096638,2.339494 1.096638,4.947055 0,4.581508 -3.241174,8.090749 -3.216804,3.484871 -7.530245,3.484871 -3.923526,0 -6.628566,-2.802519 -2.705039,-2.802518 -2.705039,-7.481506 0,-4.508399 2.973106,-7.530245 2.997477,-3.021846 7.359658,-3.655459 z m 1.072268,1.121008 q -6.994112,1.145377 -6.994112,9.601672 0,4.36218 1.730251,6.774783 1.75462,2.412603 4.069744,2.412603 2.412603,0 3.972265,-2.315124 1.559663,-2.339493 1.559663,-6.311759 0,-5.751255 -4.337811,-10.162175 z" />
-</g>

benches/contacts.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;

benches/create_account.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::PathBuf;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
@@ -9,8 +8,7 @@ async fn create_accounts(n: u32) {
     let dir = tempdir().unwrap();
     let p: PathBuf = dir.path().join("accounts");
 
-    let writable = true;
+    let mut accounts = Accounts::new(p.clone()).await.unwrap();
-    let mut accounts = Accounts::new(p.clone(), writable).await.unwrap();
 
     for expected_id in 2..n {
         let id = accounts.add_account().await.unwrap();

benches/get_chat_msgs.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/get_chatlist.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/marknoticed_chat.rs

@@ -1,94 +0,0 @@
-#![recursion_limit = "256"]
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, BatchSize, Criterion};
-use deltachat::chat::{self, ChatId};
-use deltachat::chatlist::Chatlist;
-use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-use deltachat::Events;
-use futures_lite::future::block_on;
-use tempfile::tempdir;
-
-async fn marknoticed_chat_benchmark(context: &Context, chats: &[ChatId]) {
-    for c in chats.iter().take(20) {
-        chat::marknoticed_chat(context, *c).await.unwrap();
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
-    // messages, such as your primary account.
-    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
-        let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
-                .await
-                .unwrap();
-            let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
-            let len = chatlist.len();
-            (1..len).map(|i| chatlist.get_chat_id(i).unwrap()).collect()
-        });
-
-        // This mainly tests the performance of marknoticed_chat()
-        // when nothing has to be done
-        c.bench_function(
-            "chat::marknoticed_chat (mark 20 chats as noticed repeatedly)",
-            |b| {
-                let dir = tempdir().unwrap();
-                let dir = dir.path();
-                let new_db = dir.join("dc.db");
-                std::fs::copy(&path, &new_db).unwrap();
-
-                let context = block_on(async {
-                    Context::new(Path::new(&new_db), 100, Events::new(), StockStrings::new())
-                        .await
-                        .unwrap()
-                });
-
-                b.to_async(&rt)
-                    .iter(|| marknoticed_chat_benchmark(&context, black_box(&chats)))
-            },
-        );
-
-        // If the first 20 chats contain fresh messages or reactions,
-        // this tests the performance of marking them as noticed.
-        c.bench_function(
-            "chat::marknoticed_chat (mark 20 chats as noticed, resetting after every iteration)",
-            |b| {
-                b.to_async(&rt).iter_batched(
-                    || {
-                        let dir = tempdir().unwrap();
-                        let new_db = dir.path().join("dc.db");
-                        std::fs::copy(&path, &new_db).unwrap();
-
-                        let context = block_on(async {
-                            Context::new(
-                                Path::new(&new_db),
-                                100,
-                                Events::new(),
-                                StockStrings::new(),
-                            )
-                            .await
-                            .unwrap()
-                        });
-                        (dir, context)
-                    },
-                    |(_dir, context)| {
-                        let chats = &chats;
-                        async move {
-                            marknoticed_chat_benchmark(black_box(&context), black_box(chats)).await
-                        }
-                    },
-                    BatchSize::PerIteration,
-                );
-            },
-        );
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
-    }
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

benches/receive_emails.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::PathBuf;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
@@ -12,18 +11,18 @@ use deltachat::{
 };
 use tempfile::tempdir;
 
-async fn recv_all_emails(context: Context, iteration: u32) -> Context {
+async fn recv_all_emails(context: Context) -> Context {
     for i in 0..100 {
         let imf_raw = format!(
             "Subject: Benchmark
-Message-ID: Mr.{iteration}.{i}@testrun.org
+Message-ID: Mr.OssSYnOFkhR.{i}@testrun.org
 Date: Sat, 07 Dec 2019 19:00:27 +0000
 To: alice@example.com
 From: sender@testrun.org
 Chat-Version: 1.0
 Chat-Disposition-Notification-To: sender@testrun.org
 Chat-User-Avatar: 0
-In-Reply-To: Mr.{iteration}.{i_dec}@testrun.org
+In-Reply-To: Mr.OssSYnOFkhR.{i_dec}@testrun.org
 MIME-Version: 1.0
 
 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
@@ -41,11 +40,11 @@ Hello {i}",
 
 /// Receive 100 emails that remove charlie@example.com and add
 /// him back
-async fn recv_groupmembership_emails(context: Context, iteration: u32) -> Context {
+async fn recv_groupmembership_emails(context: Context) -> Context {
     for i in 0..50 {
         let imf_raw = format!(
             "Subject: Benchmark
-Message-ID: Gr.{iteration}.ADD.{i}@testrun.org
+Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
 Date: Sat, 07 Dec 2019 19:00:27 +0000
 To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
 From: sender@testrun.org
@@ -53,12 +52,13 @@ Chat-Version: 1.0
 Chat-Disposition-Notification-To: sender@testrun.org
 Chat-User-Avatar: 0
 Chat-Group-Member-Added: charlie@example.com
-In-Reply-To: Gr.{iteration}.REMOVE.{i_dec}@testrun.org
+In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
 MIME-Version: 1.0
 
 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
 
 Hello {i}",
+            i = i,
             i_dec = i - 1,
         );
         receive_imf(&context, black_box(imf_raw.as_bytes()), false)
@@ -67,7 +67,7 @@ Hello {i}",
 
         let imf_raw = format!(
             "Subject: Benchmark
-Message-ID: Gr.{iteration}.REMOVE.{i}@testrun.org
+Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
 Date: Sat, 07 Dec 2019 19:00:27 +0000
 To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
 From: sender@testrun.org
@@ -75,12 +75,14 @@ Chat-Version: 1.0
 Chat-Disposition-Notification-To: sender@testrun.org
 Chat-User-Avatar: 0
 Chat-Group-Member-Removed: charlie@example.com
-In-Reply-To: Gr.{iteration}.ADD.{i}@testrun.org
+In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
 MIME-Version: 1.0
 
 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
 
-Hello {i}"
+Hello {i}",
+            i = i,
+            i_dec = i - 1,
         );
         receive_imf(&context, black_box(imf_raw.as_bytes()), false)
             .await
@@ -126,13 +128,11 @@ fn criterion_benchmark(c: &mut Criterion) {
     group.bench_function("Receive 100 simple text msgs", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
         let context = rt.block_on(create_context());
-        let mut i = 0;
 
         b.to_async(&rt).iter(|| {
             let ctx = context.clone();
-            i += 1;
             async move {
-                recv_all_emails(black_box(ctx), i).await;
+                recv_all_emails(black_box(ctx)).await;
             }
         });
     });
@@ -141,13 +141,11 @@ fn criterion_benchmark(c: &mut Criterion) {
         |b| {
             let rt = tokio::runtime::Runtime::new().unwrap();
             let context = rt.block_on(create_context());
-            let mut i = 0;
 
             b.to_async(&rt).iter(|| {
                 let ctx = context.clone();
-                i += 1;
                 async move {
-                    recv_groupmembership_emails(black_box(ctx), i).await;
+                    recv_groupmembership_emails(black_box(ctx)).await;
                 }
             });
         },

benches/search_msgs.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/send_events.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use deltachat::context::Context;

cliff.toml

@@ -1,93 +0,0 @@
-# configuration file for git-cliff
-# see https://git-cliff.org/docs/configuration/
-
-
-[git]
-# parse the commits based on https://www.conventionalcommits.org
-conventional_commits = true
-# filter out the commits that are not conventional
-filter_unconventional = false
-# process each line of a commit as an individual commit
-split_commits = false
-# regex for preprocessing the commit messages
-commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/chatmail/core/pull/${2}))"}, # replace pull request / issue numbers
-]
-# regex for parsing and grouping commits
-commit_parsers = [
-    { message = "^feat", group = "Features / Changes"},
-    { message = "^fix", group = "Fixes"},
-    { message = "^api", group = "API-Changes" },
-    { message = "^refactor", group = "Refactor"},
-    { message = "^perf", group = "Performance"},
-    { message = "^test", group = "Tests"},
-    { message = "^style", group = "Styling"},
-    { message = "^chore\\(release\\): prepare for", skip = true},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { message = "^build", group = "Build system"},
-    { message = "^docs", group = "Documentation"},
-    { message = "^ci", group = "CI"},
-    { message = ".*", group = "Other"},
-#    { body = ".*security", group = "Security"},
-]
-# protect breaking changes from being skipped due to matching a skipping commit_parser
-protect_breaking_commits = true
-# filter out the commits that are not matched by commit parsers
-filter_commits = true
-# glob pattern for matching git tags
-tag_pattern = "v[0-9]*"
-# regex for skipping tags
-#skip_tags = "v0.1.0-beta.1"
-# regex for ignoring tags
-ignore_tags = ""
-# sort the tags topologically
-topo_order = false
-# sort the commits inside sections by oldest/newest order
-sort_commits = "oldest"
-# limit the number of commits included in the changelog.
-# limit_commits = 42
-
-
-[changelog]
-# changelog header
-header = """
-# Changelog\n
-"""
-# template for the changelog body
-# https://keats.github.io/tera/docs/#templates
-body = """
-{% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{% else %}\
-    ## [unreleased]
-{% endif %}\
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits %}
-        - {% if commit.breaking %}[**breaking**] {% endif %}\
-	{% if commit.scope %}{{ commit.scope }}: {% endif %}\
-	{{ commit.message | upper_first }}.\
-	{% if commit.footers is defined %}\
-	  {% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
-	    {% raw %}  {% endraw %}- {{ footer.value }}\
-	  {% endif %}{% endfor %}\
-	{% endif%}\
-    {% endfor %}
-{% endfor %}\n
-"""
-# remove the leading and trailing whitespace from the template
-trim = true
-footer = """
-{% for release in releases -%}
-    {% if release.version -%}
-        {% if release.previous.version -%}
-            [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/chatmail/core\
-                    /compare/{{ release.previous.version }}..{{ release.version }}
-        {% endif -%}
-    {% else -%}
-        [unreleased]: https://github.com/chatmail/core\
-            /compare/{{ release.previous.version }}..HEAD
-    {% endif -%}
-{% endfor %}
-"""

contrib/proxy.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# Examples:
+#
+# Original server that doesn't use SSL:
+# ./proxy.py 8080 imap.nauta.cu 143
+# ./proxy.py 8081 smtp.nauta.cu 25
+#
+# Original server that uses SSL:
+# ./proxy.py 8080 testrun.org 993 --ssl
+# ./proxy.py 8081 testrun.org 465 --ssl
+
+from datetime import datetime
+import argparse
+import selectors
+import ssl
+import socket
+import socketserver
+
+
+class Proxy(socketserver.ThreadingTCPServer):
+    allow_reuse_address = True
+
+    def __init__(self, proxy_host, proxy_port, real_host, real_port, use_ssl):
+        self.real_host = real_host
+        self.real_port = real_port
+        self.use_ssl = use_ssl
+        super().__init__((proxy_host, proxy_port), RequestHandler)
+
+
+class RequestHandler(socketserver.BaseRequestHandler):
+
+    def handle(self):
+        print('{} - {} CONNECTED.'.format(datetime.now(), self.client_address))
+
+        total = 0
+        real_server = (self.server.real_host, self.server.real_port)
+        with socket.create_connection(real_server) as sock:
+            if self.server.use_ssl:
+                context = ssl.create_default_context()
+                sock = context.wrap_socket(
+                    sock, server_hostname=real_server[0])
+
+            forward = {self.request: sock, sock: self.request}
+
+            sel = selectors.DefaultSelector()
+            sel.register(self.request, selectors.EVENT_READ,
+                         self.client_address)
+            sel.register(sock, selectors.EVENT_READ, real_server)
+
+            active = True
+            while active:
+                events = sel.select()
+                for key, mask in events:
+                    print('\n{} - {} wrote:'.format(datetime.now(), key.data))
+                    data = key.fileobj.recv(1024)
+                    received = len(data)
+                    total += received
+                    print(data)
+                    print('{} Bytes\nTotal: {} Bytes'.format(received, total))
+                    if data:
+                        forward[key.fileobj].sendall(data)
+                    else:
+                        print('\nCLOSING CONNECTION.\n\n')
+                        forward[key.fileobj].close()
+                        key.fileobj.close()
+                        active = False
+
+
+if __name__ == '__main__':
+    p = argparse.ArgumentParser(description='Simple Python Proxy')
+    p.add_argument(
+        "proxy_port", help="the port where the proxy will listen", type=int)
+    p.add_argument('host', help="the real host")
+    p.add_argument('port', help="the port of the real host", type=int)
+    p.add_argument("--ssl", help="use ssl to connect to the real host",
+                   action="store_true")
+    args = p.parse_args()
+
+    with Proxy('', args.proxy_port, args.host, args.port, args.ssl) as proxy:
+        proxy.serve_forever()

deltachat-contact-tools/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "deltachat-contact-tools"
-version = "0.0.0" # No semver-stable versioning
-edition = "2021"
-description = "Contact-related tools, like parsing vcards and sanitizing name and address. Meant for internal use in the deltachat crate."
-license = "MPL-2.0"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = { workspace = true }
-regex = { workspace = true }
-rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-
-[dev-dependencies]
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.

deltachat-contact-tools/src/lib.rs

@@ -1,401 +0,0 @@
-//! Contact-related tools, like parsing vcards and sanitizing name and address
-
-#![forbid(unsafe_code)]
-#![warn(
-    unused,
-    clippy::correctness,
-    missing_debug_implementations,
-    missing_docs,
-    clippy::all,
-    clippy::wildcard_imports,
-    clippy::needless_borrow,
-    clippy::cast_lossless,
-    clippy::unused_async,
-    clippy::explicit_iter_loop,
-    clippy::explicit_into_iter_loop,
-    clippy::cloned_instead_of_copied
-)]
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
-#![allow(
-    clippy::match_bool,
-    clippy::mixed_read_write_in_expression,
-    clippy::bool_assert_comparison,
-    clippy::manual_split_once,
-    clippy::format_push_string,
-    clippy::bool_to_int_with_if,
-    clippy::manual_range_contains
-)]
-
-use std::fmt;
-use std::ops::Deref;
-use std::sync::LazyLock;
-
-use anyhow::bail;
-use anyhow::Result;
-use regex::Regex;
-
-mod vcard;
-pub use vcard::{make_vcard, parse_vcard, VcardContact};
-
-/// Valid contact address.
-#[derive(Debug, Clone)]
-pub struct ContactAddress(String);
-
-impl Deref for ContactAddress {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl AsRef<str> for ContactAddress {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl fmt::Display for ContactAddress {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl ContactAddress {
-    /// Constructs a new contact address from string,
-    /// normalizing and validating it.
-    pub fn new(s: &str) -> Result<Self> {
-        let addr = addr_normalize(s);
-        if !may_be_valid_addr(&addr) {
-            bail!("invalid address {:?}", s);
-        }
-        Ok(Self(addr.to_string()))
-    }
-}
-
-/// Allow converting [`ContactAddress`] to an SQLite type.
-impl rusqlite::types::ToSql for ContactAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
-        let val = rusqlite::types::Value::Text(self.0.to_string());
-        let out = rusqlite::types::ToSqlOutput::Owned(val);
-        Ok(out)
-    }
-}
-
-/// Takes a name and an address and sanitizes them:
-/// - Extracts a name from the addr if the addr is in form "Alice <alice@example.org>"
-/// - Removes special characters from the name, see [`sanitize_name()`]
-/// - Removes the name if it is equal to the address by setting it to ""
-pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
-    static ADDR_WITH_NAME_REGEX: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new("(.*)<(.*)>").unwrap());
-    let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
-        (
-            if name.is_empty() {
-                captures.get(1).map_or("", |m| m.as_str())
-            } else {
-                name
-            },
-            captures
-                .get(2)
-                .map_or("".to_string(), |m| m.as_str().to_string()),
-        )
-    } else {
-        (name, addr.to_string())
-    };
-    let mut name = sanitize_name(name);
-
-    // If the 'display name' is just the address, remove it:
-    // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
-    // If the display name is empty, DC will just show the address when it needs a display name.
-    if name == addr {
-        name = "".to_string();
-    }
-
-    (name, addr)
-}
-
-/// Sanitizes a name.
-///
-/// - Removes newlines and trims the string
-/// - Removes quotes (come from some bad MUA implementations)
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_name(name: &str) -> String {
-    let name = sanitize_single_line(name);
-
-    match name.as_bytes() {
-        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => name
-            .get(1..name.len() - 1)
-            .map_or("".to_string(), |s| s.trim().to_string()),
-        _ => name.to_string(),
-    }
-}
-
-/// Sanitizes user input
-///
-/// - Removes newlines and trims the string
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_single_line(input: &str) -> String {
-    sanitize_bidi_characters(input.replace(['\n', '\r'], " ").trim())
-}
-
-const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}'];
-const ISOLATE_CHARACTERS: [char; 3] = ['\u{2066}', '\u{2067}', '\u{2068}'];
-const POP_ISOLATE_CHARACTER: char = '\u{2069}';
-/// Some control unicode characters can influence whether adjacent text is shown from
-/// left to right or from right to left.
-///
-/// Since user input is not supposed to influence how adjacent text looks,
-/// this function removes some of these characters.
-///
-/// Also see https://github.com/deltachat/deltachat-core-rust/issues/3479.
-pub fn sanitize_bidi_characters(input_str: &str) -> String {
-    // RTLO_CHARACTERS are apparently rarely used in practice.
-    // They can impact all following text, so, better remove them all:
-    let input_str = input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "");
-
-    // If the ISOLATE characters are not ended with a POP DIRECTIONAL ISOLATE character,
-    // we regard the input as potentially malicious and simply remove all ISOLATE characters.
-    // See https://en.wikipedia.org/wiki/Bidirectional_text#Unicode_bidi_support
-    // and https://www.w3.org/International/questions/qa-bidi-unicode-controls.en
-    // for an explanation about ISOLATE characters.
-    fn isolate_characters_are_valid(input_str: &str) -> bool {
-        let mut isolate_character_nesting: i32 = 0;
-        for char in input_str.chars() {
-            if ISOLATE_CHARACTERS.contains(&char) {
-                isolate_character_nesting += 1;
-            } else if char == POP_ISOLATE_CHARACTER {
-                isolate_character_nesting -= 1;
-            }
-
-            // According to Wikipedia, 125 levels are allowed:
-            // https://en.wikipedia.org/wiki/Unicode_control_characters
-            // (although, in practice, we could also significantly lower this number)
-            if isolate_character_nesting < 0 || isolate_character_nesting > 125 {
-                return false;
-            }
-        }
-        isolate_character_nesting == 0
-    }
-
-    if isolate_characters_are_valid(&input_str) {
-        input_str
-    } else {
-        input_str.replace(
-            |char| ISOLATE_CHARACTERS.contains(&char) || POP_ISOLATE_CHARACTER == char,
-            "",
-        )
-    }
-}
-
-/// Returns false if addr is an invalid address, otherwise true.
-pub fn may_be_valid_addr(addr: &str) -> bool {
-    let res = EmailAddress::new(addr);
-    res.is_ok()
-}
-
-/// Returns address lowercased,
-/// with whitespace trimmed and `mailto:` prefix removed.
-pub fn addr_normalize(addr: &str) -> String {
-    let norm = addr.trim().to_lowercase();
-
-    if norm.starts_with("mailto:") {
-        norm.get(7..).unwrap_or(&norm).to_string()
-    } else {
-        norm
-    }
-}
-
-/// Compares two email addresses, normalizing them beforehand.
-pub fn addr_cmp(addr1: &str, addr2: &str) -> bool {
-    let norm1 = addr_normalize(addr1);
-    let norm2 = addr_normalize(addr2);
-
-    norm1 == norm2
-}
-
-///
-/// Represents an email address, right now just the `name@domain` portion.
-///
-/// # Example
-///
-/// ```
-/// use deltachat_contact_tools::EmailAddress;
-/// let email = match EmailAddress::new("someone@example.com") {
-///     Ok(addr) => addr,
-///     Err(e) => panic!("Error parsing address, error was {}", e),
-/// };
-/// assert_eq!(&email.local, "someone");
-/// assert_eq!(&email.domain, "example.com");
-/// assert_eq!(email.to_string(), "someone@example.com");
-/// ```
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct EmailAddress {
-    /// Local part of the email address.
-    pub local: String,
-
-    /// Email address domain.
-    pub domain: String,
-}
-
-impl fmt::Display for EmailAddress {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}@{}", self.local, self.domain)
-    }
-}
-
-impl EmailAddress {
-    /// Performs a dead-simple parse of an email address.
-    pub fn new(input: &str) -> Result<EmailAddress> {
-        if input.is_empty() {
-            bail!("empty string is not valid");
-        }
-        let parts: Vec<&str> = input.rsplitn(2, '@').collect();
-
-        if input
-            .chars()
-            .any(|c| c.is_whitespace() || c == '<' || c == '>')
-        {
-            bail!("Email {:?} must not contain whitespaces, '>' or '<'", input);
-        }
-
-        match &parts[..] {
-            [domain, local] => {
-                if local.is_empty() {
-                    bail!("empty string is not valid for local part in {:?}", input);
-                }
-                if domain.is_empty() {
-                    bail!("missing domain after '@' in {:?}", input);
-                }
-                if domain.ends_with('.') {
-                    bail!("Domain {domain:?} should not contain the dot in the end");
-                }
-                Ok(EmailAddress {
-                    local: (*local).to_string(),
-                    domain: (*domain).to_string(),
-                })
-            }
-            _ => bail!("Email {:?} must contain '@' character", input),
-        }
-    }
-}
-
-impl rusqlite::types::ToSql for EmailAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
-        let val = rusqlite::types::Value::Text(self.to_string());
-        let out = rusqlite::types::ToSqlOutput::Owned(val);
-        Ok(out)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_contact_address() -> Result<()> {
-        let alice_addr = "alice@example.org";
-        let contact_address = ContactAddress::new(alice_addr)?;
-        assert_eq!(contact_address.as_ref(), alice_addr);
-
-        let invalid_addr = "<> foobar";
-        assert!(ContactAddress::new(invalid_addr).is_err());
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_emailaddress_parse() {
-        assert_eq!(EmailAddress::new("").is_ok(), false);
-        assert_eq!(
-            EmailAddress::new("user@domain.tld").unwrap(),
-            EmailAddress {
-                local: "user".into(),
-                domain: "domain.tld".into(),
-            }
-        );
-        assert_eq!(
-            EmailAddress::new("user@localhost").unwrap(),
-            EmailAddress {
-                local: "user".into(),
-                domain: "localhost".into()
-            }
-        );
-        assert_eq!(EmailAddress::new("uuu").is_ok(), false);
-        assert_eq!(EmailAddress::new("dd.tt").is_ok(), false);
-        assert!(EmailAddress::new("tt.dd@uu").is_ok());
-        assert!(EmailAddress::new("u@d").is_ok());
-        assert!(EmailAddress::new("u@d.").is_err());
-        assert!(EmailAddress::new("u@d.t").is_ok());
-        assert_eq!(
-            EmailAddress::new("u@d.tt").unwrap(),
-            EmailAddress {
-                local: "u".into(),
-                domain: "d.tt".into(),
-            }
-        );
-        assert!(EmailAddress::new("u@tt").is_ok());
-        assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
-    }
-
-    #[test]
-    fn test_sanitize_name() {
-        assert_eq!(&sanitize_name(" hello world   "), "hello world");
-        assert_eq!(&sanitize_name("<"), "<");
-        assert_eq!(&sanitize_name(">"), ">");
-        assert_eq!(&sanitize_name("'"), "'");
-        assert_eq!(&sanitize_name("\""), "\"");
-    }
-
-    #[test]
-    fn test_sanitize_single_line() {
-        assert_eq!(sanitize_single_line("Hi\naiae "), "Hi aiae");
-        assert_eq!(sanitize_single_line("\r\nahte\n\r"), "ahte");
-    }
-
-    #[test]
-    fn test_sanitize_bidi_characters() {
-        // Legit inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat\u{2069}"),
-            "Tes\u{2067}ting Delta Chat\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"),
-            "Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"),
-            "Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"
-        );
-
-        // Potentially-malicious inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{202C}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Testing Delta Chat\u{2069}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2069}ting Delta Chat\u{2067}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2068}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-    }
-}

deltachat-contact-tools/src/vcard.rs

@@ -1,232 +0,0 @@
-use std::sync::LazyLock;
-
-use anyhow::Context as _;
-use anyhow::Result;
-use chrono::DateTime;
-use chrono::NaiveDateTime;
-use regex::Regex;
-
-use crate::sanitize_name_and_addr;
-
-#[derive(Debug)]
-/// A Contact, as represented in a VCard.
-pub struct VcardContact {
-    /// The email address, vcard property `email`
-    pub addr: String,
-    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
-    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
-    pub authname: String,
-    /// The contact's public PGP key in Base64, vcard property `key`
-    pub key: Option<String>,
-    /// The contact's profile image (=avatar) in Base64, vcard property `photo`
-    pub profile_image: Option<String>,
-    /// The timestamp when the vcard was created / last updated, vcard property `rev`
-    pub timestamp: Result<i64>,
-}
-
-impl VcardContact {
-    /// Returns the contact's display name.
-    pub fn display_name(&self) -> &str {
-        match self.authname.is_empty() {
-            false => &self.authname,
-            true => &self.addr,
-        }
-    }
-}
-
-/// Returns a vCard containing given contacts.
-///
-/// Calling [`parse_vcard()`] on the returned result is a reverse operation.
-pub fn make_vcard(contacts: &[VcardContact]) -> String {
-    fn format_timestamp(c: &VcardContact) -> Option<String> {
-        let timestamp = *c.timestamp.as_ref().ok()?;
-        let datetime = DateTime::from_timestamp(timestamp, 0)?;
-        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        let addr = &c.addr;
-        let display_name = c.display_name();
-        res += &format!(
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:{addr}\r\n\
-             FN:{display_name}\r\n"
-        );
-        if let Some(key) = &c.key {
-            res += &format!("KEY:data:application/pgp-keys;base64,{key}\r\n");
-        }
-        if let Some(profile_image) = &c.profile_image {
-            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\r\n");
-        }
-        if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\r\n");
-        }
-        res += "END:VCARD\r\n";
-    }
-    res
-}
-
-/// Parses `VcardContact`s from a given `&str`.
-pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
-    fn remove_prefix<'a>(s: &'a str, prefix: &str) -> Option<&'a str> {
-        let start_of_s = s.get(..prefix.len())?;
-
-        if start_of_s.eq_ignore_ascii_case(prefix) {
-            s.get(prefix.len()..)
-        } else {
-            None
-        }
-    }
-    /// Returns (parameters, value) tuple.
-    fn vcard_property<'a>(line: &'a str, property: &str) -> Option<(&'a str, &'a str)> {
-        let remainder = remove_prefix(line, property)?;
-        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
-        // then `remainder` is now `;TYPE=work:alice@example.com`
-
-        // Note: This doesn't handle the case where there are quotes around a colon,
-        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
-        // This could be improved in the future, but for now, the parsing is good enough.
-        let (mut params, value) = remainder.split_once(':')?;
-        // In the example from above, `params` is now `;TYPE=work`
-        // and `value` is now `alice@example.com`
-
-        if params
-            .chars()
-            .next()
-            .filter(|c| !c.is_ascii_punctuation() || *c == '_')
-            .is_some()
-        {
-            // `s` started with `property`, but the next character after it was not punctuation,
-            // so this line's property is actually something else
-            return None;
-        }
-        if let Some(p) = remove_prefix(params, ";") {
-            params = p;
-        }
-        if let Some(p) = remove_prefix(params, "PREF=1") {
-            params = p;
-        }
-        Some((params, value))
-    }
-    fn base64_key(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property(line, "key")?;
-        if params.eq_ignore_ascii_case("PGP;ENCODING=BASE64")
-            || params.eq_ignore_ascii_case("TYPE=PGP;ENCODING=b")
-        {
-            return Some(value);
-        }
-        if let Some(value) = remove_prefix(value, "data:application/pgp-keys;base64,")
-            .or_else(|| remove_prefix(value, r"data:application/pgp-keys;base64\,"))
-        {
-            return Some(value);
-        }
-
-        None
-    }
-    fn base64_photo(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property(line, "photo")?;
-        if params.eq_ignore_ascii_case("JPEG;ENCODING=BASE64")
-            || params.eq_ignore_ascii_case("ENCODING=BASE64;JPEG")
-            || params.eq_ignore_ascii_case("TYPE=JPEG;ENCODING=b")
-            || params.eq_ignore_ascii_case("ENCODING=b;TYPE=JPEG")
-            || params.eq_ignore_ascii_case("ENCODING=BASE64;TYPE=JPEG")
-            || params.eq_ignore_ascii_case("TYPE=JPEG;ENCODING=BASE64")
-        {
-            return Some(value);
-        }
-        if let Some(value) = remove_prefix(value, "data:image/jpeg;base64,")
-            .or_else(|| remove_prefix(value, r"data:image/jpeg;base64\,"))
-        {
-            return Some(value);
-        }
-
-        None
-    }
-    fn parse_datetime(datetime: &str) -> Result<i64> {
-        // According to https://www.rfc-editor.org/rfc/rfc6350#section-4.3.5, the timestamp
-        // is in ISO.8601.2004 format. DateTime::parse_from_rfc3339() apparently parses
-        // ISO.8601, but fails to parse any of the examples given.
-        // So, instead just parse using a format string.
-
-        // Parses 19961022T140000Z, 19961022T140000-05, or 19961022T140000-0500.
-        let timestamp = match DateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S%#z") {
-            Ok(datetime) => datetime.timestamp(),
-            // Parses 19961022T140000.
-            Err(e) => match NaiveDateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S") {
-                Ok(datetime) => datetime
-                    .and_local_timezone(chrono::offset::Local)
-                    .single()
-                    .context("Could not apply local timezone to parsed date and time")?
-                    .timestamp(),
-                Err(_) => return Err(e.into()),
-            },
-        };
-        Ok(timestamp)
-    }
-
-    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
-    static NEWLINE_AND_SPACE_OR_TAB: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new("\r?\n[\t ]").unwrap());
-    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
-
-    let mut lines = unfolded_lines.lines().peekable();
-    let mut contacts = Vec::new();
-
-    while lines.peek().is_some() {
-        // Skip to the start of the vcard:
-        for line in lines.by_ref() {
-            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
-                break;
-            }
-        }
-
-        let mut display_name = None;
-        let mut addr = None;
-        let mut key = None;
-        let mut photo = None;
-        let mut datetime = None;
-
-        for mut line in lines.by_ref() {
-            if let Some(remainder) = remove_prefix(line, "item1.") {
-                // Remove the group name, if the group is called "item1".
-                // If necessary, we can improve this to also remove groups that are called something different that "item1".
-                //
-                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
-                line = remainder;
-            }
-
-            if let Some((_params, email)) = vcard_property(line, "email") {
-                addr.get_or_insert(email);
-            } else if let Some((_params, name)) = vcard_property(line, "fn") {
-                display_name.get_or_insert(name);
-            } else if let Some(k) = base64_key(line) {
-                key.get_or_insert(k);
-            } else if let Some(p) = base64_photo(line) {
-                photo.get_or_insert(p);
-            } else if let Some((_params, rev)) = vcard_property(line, "rev") {
-                datetime.get_or_insert(rev);
-            } else if line.eq_ignore_ascii_case("END:VCARD") {
-                let (authname, addr) =
-                    sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
-
-                contacts.push(VcardContact {
-                    authname,
-                    addr,
-                    key: key.map(|s| s.to_string()),
-                    profile_image: photo.map(|s| s.to_string()),
-                    timestamp: datetime
-                        .context("No timestamp in vcard")
-                        .and_then(parse_datetime),
-                });
-                break;
-            }
-        }
-    }
-
-    contacts
-}
-
-#[cfg(test)]
-mod vcard_tests;

deltachat-contact-tools/src/vcard/vcard_tests.rs

@@ -1,274 +0,0 @@
-use chrono::TimeZone as _;
-
-use super::*;
-
-#[test]
-fn test_vcard_thunderbird() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:4.0
-FN:'Alice Mueller'
-EMAIL;PREF=1:alice.mueller@posteo.de
-UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
-END:VCARD
-BEGIN:VCARD
-VERSION:4.0
-FN:'bobzzz@freenet.de'
-EMAIL;PREF=1:bobzzz@freenet.de
-UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
-END:VCARD
-",
-    );
-
-    assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
-    assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
-    assert_eq!(contacts[0].key, None);
-    assert_eq!(contacts[0].profile_image, None);
-    assert!(contacts[0].timestamp.is_err());
-
-    assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
-    assert_eq!(contacts[1].authname, "".to_string());
-    assert_eq!(contacts[1].key, None);
-    assert_eq!(contacts[1].profile_image, None);
-    assert!(contacts[1].timestamp.is_err());
-
-    assert_eq!(contacts.len(), 2);
-}
-
-#[test]
-fn test_vcard_simple_example() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:4.0
-FN:Alice Wonderland
-N:Wonderland;Alice;;;Ms.
-GENDER:W
-EMAIL;TYPE=work:alice@example.com
-KEY;TYPE=PGP;ENCODING=b:[base64-data]
-REV:20240418T184242Z
-
-END:VCARD",
-    );
-
-    assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-    assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-    assert_eq!(contacts[0].profile_image, None);
-    assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-    assert_eq!(contacts.len(), 1);
-}
-
-#[test]
-fn test_vcard_with_trailing_newline() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD\r
-VERSION:4.0\r
-FN:Alice Wonderland\r
-N:Wonderland;Alice;;;Ms.\r
-GENDER:W\r
-EMAIL;TYPE=work:alice@example.com\r
-KEY;TYPE=PGP;ENCODING=b:[base64-data]\r
-REV:20240418T184242Z\r
-END:VCARD\r
-\r",
-    );
-
-    assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-    assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-    assert_eq!(contacts[0].profile_image, None);
-    assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-    assert_eq!(contacts.len(), 1);
-}
-
-#[test]
-fn test_make_and_parse_vcard() {
-    let contacts = [
-        VcardContact {
-            addr: "alice@example.org".to_string(),
-            authname: "Alice Wonderland".to_string(),
-            key: Some("[base64-data]".to_string()),
-            profile_image: Some("image in Base64".to_string()),
-            timestamp: Ok(1713465762),
-        },
-        VcardContact {
-            addr: "bob@example.com".to_string(),
-            authname: "".to_string(),
-            key: None,
-            profile_image: None,
-            timestamp: Ok(0),
-        },
-    ];
-    let items = [
-        "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:alice@example.org\r\n\
-             FN:Alice Wonderland\r\n\
-             KEY:data:application/pgp-keys;base64,[base64-data]\r\n\
-             PHOTO:data:image/jpeg;base64,image in Base64\r\n\
-             REV:20240418T184242Z\r\n\
-             END:VCARD\r\n",
-        "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:bob@example.com\r\n\
-             FN:bob@example.com\r\n\
-             REV:19700101T000000Z\r\n\
-             END:VCARD\r\n",
-    ];
-    let mut expected = "".to_string();
-    for len in 0..=contacts.len() {
-        let contacts = &contacts[0..len];
-        let vcard = make_vcard(contacts);
-        if len > 0 {
-            expected += items[len - 1];
-        }
-        assert_eq!(vcard, expected);
-        let parsed = parse_vcard(&vcard);
-        assert_eq!(parsed.len(), contacts.len());
-        for i in 0..parsed.len() {
-            assert_eq!(parsed[i].addr, contacts[i].addr);
-            assert_eq!(parsed[i].authname, contacts[i].authname);
-            assert_eq!(parsed[i].key, contacts[i].key);
-            assert_eq!(parsed[i].profile_image, contacts[i].profile_image);
-            assert_eq!(
-                parsed[i].timestamp.as_ref().unwrap(),
-                contacts[i].timestamp.as_ref().unwrap()
-            );
-        }
-    }
-}
-
-#[test]
-fn test_vcard_android() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-TEL;CELL:+1-234-567-890
-EMAIL;HOME:bob@example.org
-END:VCARD
-BEGIN:VCARD
-VERSION:2.1
-N:;Alice;;;
-FN:Alice
-EMAIL;HOME:alice@example.org
-END:VCARD
-",
-    );
-
-    assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-    assert_eq!(contacts[0].authname, "Bob".to_string());
-    assert_eq!(contacts[0].key, None);
-    assert_eq!(contacts[0].profile_image, None);
-
-    assert_eq!(contacts[1].addr, "alice@example.org".to_string());
-    assert_eq!(contacts[1].authname, "Alice".to_string());
-    assert_eq!(contacts[1].key, None);
-    assert_eq!(contacts[1].profile_image, None);
-
-    assert_eq!(contacts.len(), 2);
-}
-
-#[test]
-fn test_vcard_local_datetime() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             FN:Alice Wonderland\n\
-             EMAIL;TYPE=work:alice@example.org\n\
-             REV:20240418T184242\n\
-             END:VCARD",
-    );
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(contacts[0].addr, "alice@example.org".to_string());
-    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-    assert_eq!(
-        *contacts[0].timestamp.as_ref().unwrap(),
-        chrono::offset::Local
-            .with_ymd_and_hms(2024, 4, 18, 18, 42, 42)
-            .unwrap()
-            .timestamp()
-    );
-}
-
-#[test]
-fn test_vcard_with_base64_avatar() {
-    // This is not an actual base64-encoded avatar, it's just to test the parsing.
-    // This one is Android-like.
-    let vcard0 = "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-EMAIL;HOME:bob@example.org
-PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
- AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
- L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
-
-END:VCARD
-";
-    // This one is DOS-like.
-    let vcard1 = vcard0.replace('\n', "\r\n");
-    for vcard in [vcard0, vcard1.as_str()] {
-        let contacts = parse_vcard(vcard);
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Bob".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
-    }
-}
-
-#[test]
-fn test_protonmail_vcard() {
-    let contacts = parse_vcard(
-        "BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice Wonderland
-UID:proton-web-03747582-328d-38dc-5ddd-000000000000
-ITEM1.EMAIL;PREF=1:alice@example.org
-ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-ITEM1.X-PM-ENCRYPT:true
-ITEM1.X-PM-SIGN:true
-END:VCARD",
-    );
-
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(&contacts[0].addr, "alice@example.org");
-    assert_eq!(&contacts[0].authname, "Alice Wonderland");
-    assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-    assert!(contacts[0].timestamp.is_err());
-    assert_eq!(contacts[0].profile_image, None);
-}
-
-/// Proton at some point slightly changed the format of their vcards
-#[test]
-fn test_protonmail_vcard2() {
-    let contacts = parse_vcard(
-        r"BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice
-PHOTO;PREF=1:data:image/jpeg;base64,/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z
-REV:Invalid Date
-ITEM1.EMAIL;PREF=1:alice@example.org
-KEY;PREF=1:data:application/pgp-keys;base64,xsaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==
-UID:proton-web-aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
-END:VCARD",
-    );
-
-    assert_eq!(contacts.len(), 1);
-    assert_eq!(&contacts[0].addr, "alice@example.org");
-    assert_eq!(&contacts[0].authname, "Alice");
-    assert_eq!(contacts[0].key.as_ref().unwrap(), "xsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==");
-    assert!(contacts[0].timestamp.is_err());
-    assert_eq!(contacts[0].profile_image.as_ref().unwrap(), "/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z");
-}

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.159.3"
+version = "1.111.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -14,19 +14,20 @@ name = "deltachat"
 crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
-deltachat = { workspace = true, default-features = false }
+deltachat = { path = "../", default-features = false }
-deltachat-jsonrpc = { workspace = true }
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
-libc = { workspace = true }
+libc = "0.2"
-human-panic = { version = "2", default-features = false }
+human-panic = { version = "1", default-features = false }
-num-traits = { workspace = true }
+num-traits = "0.2"
-serde_json = { workspace = true }
+serde_json = "1.0"
-tokio = { workspace = true, features = ["rt-multi-thread"] }
+tokio = { version = "1", features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
+anyhow = "1"
-thiserror = { workspace = true }
+thiserror = "1"
-rand = { workspace = true }
+rand = "0.7"
-yerpc = { workspace = true, features = ["anyhow_expose"] }
+once_cell = "1.17.0"
 
 [features]
 default = ["vendored"]
-vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
+vendored = ["deltachat/vendored"]
+jsonrpc = ["dep:deltachat-jsonrpc"]
 

deltachat-ffi/Doxyfile

@@ -846,7 +846,7 @@ EXCLUDE_PATTERNS       =
 # exclude all test directories use the pattern */test/*
 
 ######################################################
-EXCLUDE_SYMBOLS        = dc_aheader_t dc_apeerstate_t dc_e2ee_helper_t dc_imap_t dc_job*_t dc_key_t dc_loginparam_t dc_mime*_t
+EXCLUDE_SYMBOLS        = dc_aheader_t dc_apeerstate_t dc_e2ee_helper_t dc_imap_t dc_job*_t dc_key_t dc_keyring_t dc_loginparam_t dc_mime*_t
 EXCLUDE_SYMBOLS       += dc_saxparser_t dc_simplify_t dc_smtp_t dc_sqlite3_t dc_strbuilder_t dc_param_t dc_hash_t dc_hashelem_t
 EXCLUDE_SYMBOLS       += _dc_* jsmn*
 ######################################################

deltachat-ffi/DoxygenLayout.xml

@@ -9,7 +9,7 @@
       <tab type="hierarchy" visible="no" title="" intro=""/>
       <tab type="classmembers" visible="no" title="" intro=""/>
     </tab>
-    <tab type="topics" visible="yes" title="Constants" intro="Here is a list of constants:"/>
+    <tab type="modules" visible="yes" title="Constants" intro="Here is a list of constants:"/>
     <tab type="pages" visible="yes" title="" intro=""/>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>

deltachat-ffi/src/lot.rs

@@ -34,35 +34,33 @@ pub enum Meaning {
 }
 
 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<str>> {
+    pub fn get_text1(&self) -> Option<&str> {
         match self {
             Self::Summary(summary) => match &summary.prefix {
                 None => None,
-                Some(SummaryPrefix::Draft(text)) => Some(Cow::Borrowed(text)),
+                Some(SummaryPrefix::Draft(text)) => Some(text),
-                Some(SummaryPrefix::Username(username)) => Some(Cow::Borrowed(username)),
+                Some(SummaryPrefix::Username(username)) => Some(username),
-                Some(SummaryPrefix::Me(text)) => Some(Cow::Borrowed(text)),
+                Some(SummaryPrefix::Me(text)) => Some(text),
             },
             Self::Qr(qr) => match qr {
                 Qr::AskVerifyContact { .. } => None,
-                Qr::AskVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::AskVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::FprOk { .. } => None,
                 Qr::FprMismatch { .. } => None,
-                Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
+                Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
-                Qr::Account { domain } => Some(Cow::Borrowed(domain)),
+                Qr::Account { domain } => Some(domain),
-                Qr::Backup2 { .. } => None,
+                Qr::Backup { .. } => None,
-                Qr::BackupTooNew { .. } => None,
+                Qr::WebrtcInstance { domain, .. } => Some(domain),
-                Qr::WebrtcInstance { domain, .. } => Some(Cow::Borrowed(domain)),
+                Qr::Addr { draft, .. } => draft.as_deref(),
-                Qr::Proxy { host, port, .. } => Some(Cow::Owned(format!("{host}:{port}"))),
+                Qr::Url { url } => Some(url),
-                Qr::Addr { draft, .. } => draft.as_deref().map(Cow::Borrowed),
+                Qr::Text { text } => Some(text),
-                Qr::Url { url } => Some(Cow::Borrowed(url)),
-                Qr::Text { text } => Some(Cow::Borrowed(text)),
                 Qr::WithdrawVerifyContact { .. } => None,
-                Qr::WithdrawVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
-                Qr::ReviveVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
-                Qr::Login { address, .. } => Some(Cow::Borrowed(address)),
+                Qr::Login { address, .. } => Some(address),
             },
-            Self::Error(err) => Some(Cow::Borrowed(err)),
+            Self::Error(err) => Some(err),
         }
     }
 
@@ -103,10 +101,8 @@ impl Lot {
                 Qr::FprMismatch { .. } => LotState::QrFprMismatch,
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
-                Qr::Backup2 { .. } => LotState::QrBackup2,
+                Qr::Backup { .. } => LotState::QrBackup,
-                Qr::BackupTooNew { .. } => LotState::QrBackupTooNew,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
-                Qr::Proxy { .. } => LotState::QrProxy,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
                 Qr::Text { .. } => LotState::QrText,
@@ -130,10 +126,8 @@ impl Lot {
                 Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
-                Qr::Backup2 { .. } => Default::default(),
+                Qr::Backup { .. } => Default::default(),
-                Qr::BackupTooNew { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Proxy { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
                 Qr::Text { .. } => Default::default(),
@@ -181,16 +175,11 @@ pub enum LotState {
     /// text1=domain
     QrAccount = 250,
 
-    QrBackup2 = 252,
+    QrBackup = 251,
-
-    QrBackupTooNew = 255,
 
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 
-    /// text1=address, text2=protocol
-    QrProxy = 271,
-
     /// id=contact
     QrAddr = 320,
 

deltachat-jsonrpc/.gitignore

@@ -1,4 +1,3 @@
-openrpc/openrpc.json
 accounts/
 
 .cargo

deltachat-jsonrpc/Cargo.toml

@@ -1,33 +1,42 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.159.3"
+version = "1.111.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
+default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
-repository = "https://github.com/chatmail/core"
+
+[[bin]]
+name = "deltachat-jsonrpc-server"
+path = "src/webserver.rs"
+required-features = ["webserver"]
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow = "1"
-deltachat = { workspace = true }
+deltachat = { path = ".." }
-deltachat-contact-tools = { workspace = true }
+num-traits = "0.2"
-num-traits = { workspace = true }
+serde = { version = "1.0", features = ["derive"] }
-schemars = "0.8.22"
+tempfile = "3.3.0"
-serde = { workspace = true, features = ["derive"] }
+log = "0.4"
-async-channel = { workspace = true }
+async-channel = { version = "1.8.0" }
-serde_json = { workspace = true }
+futures = { version = "0.3.26" }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
+serde_json = "1.0.91"
-typescript-type-def = { version = "0.5.13", features = ["json_value"] }
+yerpc = { version = "0.4.3", features = ["anyhow_expose"] }
-tokio = { workspace = true }
+typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-sanitize-filename = { workspace = true }
+tokio = { version = "1.25.0" }
-walkdir = "2.5.0"
+sanitize-filename = "0.4"
-base64 = { workspace = true }
+walkdir = "2.3.2"
+base64 = "0.21"
+
+# optional dependencies
+axum = { version = "0.6.11", optional = true, features = ["ws"] }
+env_logger = { version = "0.10.0", optional = true }
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.25.0", features = ["full", "rt-multi-thread"] }
-tempfile = { workspace = true }
-futures = { workspace = true }
 
 
 [features]
 default = ["vendored"]
+webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
 vendored = ["deltachat/vendored"]

deltachat-jsonrpc/README.md

@@ -4,16 +4,46 @@ This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) inte
 
 The JSON-RPC API is exposed in two fashions:
 
-* A executable `deltachat-rpc-server` that exposes the JSON-RPC API through stdio.
+* A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
-* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). It exposes the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
+* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
 
-We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder.
+We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder. The client can easily be used with the WebSocket server to build DeltaChat apps for web browsers or Node.js. See the [examples](typescript/example) for details.
 
 ## Usage
 
+#### Running the WebSocket server
+
+From within this folder, you can start the WebSocket server with the following command:
+
+```sh
+cargo run --features webserver
+```
+
+If you want to use the server in a production setup, first build it in release mode:
+
+```sh
+cargo build --features webserver --release
+```
+You will then find the `deltachat-jsonrpc-server` executable in your `target/release` folder.
+
+The executable currently does not support any command-line arguments. By default, once started it will accept WebSocket connections on `ws://localhost:20808/ws`. It will store the persistent configuration and databases in a `./accounts` folder relative to the directory from where it is started.
+
+The server can be configured with environment variables:
+
+|variable|default|description|
+|-|-|-|
+|`DC_PORT`|`20808`|port to listen on|
+|`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|
+
+If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
+
+```sh
+cross build --features=webserver --target armv7-linux-androideabi --release
+```
+
 #### Using the TypeScript/JavaScript client
 
-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/chatmail/yerpc)). Find the source in the [`typescript`](typescript) folder. 
+The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder. 
 
 To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
 ```sh
@@ -22,7 +52,15 @@ npm install
 npm run build
 ```
 
-The JavaScript client is [published on NPM](https://www.npmjs.com/package/@deltachat/jsonrpc-client).
+The JavaScript client is not yet published on NPM (but will likely be soon). Currently, it is recommended to vendor the bundled build. After running `npm run build` as documented above, there will be a file `dist/deltachat.bundle.js`. This is an ESM module containing all dependencies. Copy this file to your project and import the DeltaChat class.
+
+
+```typescript
+import { DeltaChat } from './deltachat.bundle.js'
+const dc = new DeltaChat('ws://localhost:20808/ws')
+const accounts = await dc.rpc.getAllAccounts()
+console.log('accounts', accounts)
+```
 
 A script is included to build autogenerated documentation, which includes all RPC methods:
 ```sh
@@ -35,6 +73,18 @@ Then open the [`typescript/docs`](typescript/docs) folder in a web browser.
 
 #### Running the example app
 
+We include a small demo web application that talks to the WebSocket server. It can be used for testing. Feel invited to expand this.
+
+```sh
+cd typescript
+npm run build
+npm run example:build
+npm run example:start
+```
+Then, open [`http://localhost:8080/example.html`](http://localhost:8080/example.html) in a web browser.
+
+Run `npm run example:dev` to live-rebuild the example app when files changes.
+
 ### Testing
 
 The crate includes both a basic Rust smoke test and more featureful integration tests that use the TypeScript client.
@@ -54,12 +104,14 @@ cd typescript
 npm run test
 ```
 
-This will build the `deltachat-jsonrpc-server` binary and then run a test suite.
+This will build the `deltachat-jsonrpc-server` binary and then run a test suite against the WebSocket server.
 
-The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
+The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, talk to DeltaChat developers to get a token for the `testrun.org` service, or use a local instance of [`mailadm`](https://github.com/deltachat/docker-mailadm).
+
+Then, set the `DCC_NEW_TMP_EMAIL` environment variable to your mailadm token before running the tests.
 
 ```
-CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
+DCC_NEW_TMP_EMAIL=https://testrun.org/new_email?t=yourtoken npm run test
 ```
 
 #### Test Coverage

deltachat-jsonrpc/TODO.md

@@ -0,0 +1,28 @@
+# TODO
+
+- [ ] different test type to simulate two devices: to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer
+
+## MVP - Websocket server&client
+
+For kaiOS and other experiments, like a deltachat "web" over network from an android phone.
+
+- [ ] coverage for a majority of the API
+- [ ] Blobs served
+- [ ] Blob upload (for attachments, setting profile-picture, importing backup and so on)
+- [ ] other way blobs can be addressed when using websocket vs. jsonrpc over dc-node
+- [ ] Web push API? At least some kind of notification hook closure this lib can accept.
+
+### Other Ideas for the Websocket server
+
+- [ ] make sure there can only be one connection at a time to the ws
+  - why? , it could give problems if its commanded from multiple connections
+- [ ] encrypted connection?
+- [ ] authenticated connection?
+- [ ] Look into unit-testing for the proc macros?
+- [ ] proc macro taking over doc comments to generated typescript file
+
+## Desktop Apis
+
+Incomplete todo for desktop api porting, just some remainders for points that might need more work:
+
+- [ ] manual start/stop io functions in the api for context and accounts, so "not syncing all accounts" can still be done in desktop -> webserver should then not do start io on all accounts by default

deltachat-jsonrpc/src/api/events.rs

@@ -0,0 +1,402 @@
+use deltachat::{Event, EventType};
+use serde::Serialize;
+use serde_json::{json, Value};
+use typescript_type_def::TypeDef;
+
+pub fn event_to_json_rpc_notification(event: Event) -> Value {
+    let id: JSONRPCEventType = event.typ.into();
+    json!({
+        "event": id,
+        "contextId": event.id,
+    })
+}
+
+#[derive(Serialize, TypeDef)]
+#[serde(tag = "type", rename = "Event")]
+pub enum JSONRPCEventType {
+    /// The library-user may write an informational string to the log.
+    ///
+    /// This event should *not* be reported to the end-user using a popup or something like
+    /// that.
+    Info {
+        msg: String,
+    },
+
+    /// Emitted when SMTP connection is established and login was successful.
+    SmtpConnected {
+        msg: String,
+    },
+
+    /// Emitted when IMAP connection is established and login was successful.
+    ImapConnected {
+        msg: String,
+    },
+
+    /// Emitted when a message was successfully sent to the SMTP server.
+    SmtpMessageSent {
+        msg: String,
+    },
+
+    /// Emitted when an IMAP message has been marked as deleted
+    ImapMessageDeleted {
+        msg: String,
+    },
+
+    /// Emitted when an IMAP message has been moved
+    ImapMessageMoved {
+        msg: String,
+    },
+
+    /// Emitted when an new file in the $BLOBDIR was created
+    NewBlobFile {
+        file: String,
+    },
+
+    /// Emitted when an file in the $BLOBDIR was deleted
+    DeletedBlobFile {
+        file: String,
+    },
+
+    /// The library-user should write a warning string to the log.
+    ///
+    /// This event should *not* be reported to the end-user using a popup or something like
+    /// that.
+    Warning {
+        msg: String,
+    },
+
+    /// The library-user should report an error to the end-user.
+    ///
+    /// As most things are asynchronous, things may go wrong at any time and the user
+    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
+    ///
+    /// However, for ongoing processes (eg. configure())
+    /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
+    /// it might be better to delay showing these events until the function has really
+    /// failed (returned false). It should be sufficient to report only the *last* error
+    /// in a messasge box then.
+    Error {
+        msg: String,
+    },
+
+    /// An action cannot be performed because the user is not in the group.
+    /// Reported eg. after a call to
+    /// setChatName(), setChatProfileImage(),
+    /// addContactToChat(), removeContactFromChat(),
+    /// and messages sending functions.
+    ErrorSelfNotInGroup {
+        msg: String,
+    },
+
+    /// Messages or chats changed.  One or more messages or chats changed for various
+    /// reasons in the database:
+    /// - Messages sent, received or removed
+    /// - Chats created, deleted or archived
+    /// - A draft has been set
+    ///
+    /// `chatId` is set if only a single chat is affected by the changes, otherwise 0.
+    /// `msgId` is set if only a single message is affected by the changes, otherwise 0.
+    #[serde(rename_all = "camelCase")]
+    MsgsChanged {
+        chat_id: u32,
+        msg_id: u32,
+    },
+
+    /// Reactions for the message changed.
+    #[serde(rename_all = "camelCase")]
+    ReactionsChanged {
+        chat_id: u32,
+        msg_id: u32,
+        contact_id: u32,
+    },
+
+    /// There is a fresh message. Typically, the user will show an notification
+    /// when receiving this message.
+    ///
+    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
+    #[serde(rename_all = "camelCase")]
+    IncomingMsg {
+        chat_id: u32,
+        msg_id: u32,
+    },
+
+    /// Downloading a bunch of messages just finished. This is an experimental
+    /// event to allow the UI to only show one notification per message bunch,
+    /// instead of cluttering the user with many notifications.
+    ///
+    /// msg_ids contains the message ids.
+    #[serde(rename_all = "camelCase")]
+    IncomingMsgBunch {
+        msg_ids: Vec<u32>,
+    },
+
+    /// Messages were seen or noticed.
+    /// chat id is always set.
+    #[serde(rename_all = "camelCase")]
+    MsgsNoticed {
+        chat_id: u32,
+    },
+
+    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
+    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
+    #[serde(rename_all = "camelCase")]
+    MsgDelivered {
+        chat_id: u32,
+        msg_id: u32,
+    },
+
+    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
+    /// DC_STATE_OUT_FAILED, see `Message.state`.
+    #[serde(rename_all = "camelCase")]
+    MsgFailed {
+        chat_id: u32,
+        msg_id: u32,
+    },
+
+    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
+    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
+    #[serde(rename_all = "camelCase")]
+    MsgRead {
+        chat_id: u32,
+        msg_id: u32,
+    },
+
+    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
+    /// Or the verify state of a chat has changed.
+    /// See setChatName(), setChatProfileImage(), addContactToChat()
+    /// and removeContactFromChat().
+    ///
+    /// This event does not include ephemeral timer modification, which
+    /// is a separate event.
+    #[serde(rename_all = "camelCase")]
+    ChatModified {
+        chat_id: u32,
+    },
+
+    /// Chat ephemeral timer changed.
+    #[serde(rename_all = "camelCase")]
+    ChatEphemeralTimerModified {
+        chat_id: u32,
+        timer: u32,
+    },
+
+    /// Contact(s) created, renamed, blocked or deleted.
+    ///
+    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
+    #[serde(rename_all = "camelCase")]
+    ContactsChanged {
+        contact_id: Option<u32>,
+    },
+
+    /// Location of one or more contact has changed.
+    ///
+    /// @param data1 (u32) contact_id of the contact for which the location has changed.
+    ///     If the locations of several contacts have been changed,
+    ///     this parameter is set to `None`.
+    #[serde(rename_all = "camelCase")]
+    LocationChanged {
+        contact_id: Option<u32>,
+    },
+
+    /// Inform about the configuration progress started by configure().
+    ConfigureProgress {
+        /// Progress.
+        ///
+        /// 0=error, 1-999=progress in permille, 1000=success and done
+        progress: usize,
+
+        /// Progress comment or error, something to display to the user.
+        comment: Option<String>,
+    },
+
+    /// Inform about the import/export progress started by imex().
+    ///
+    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
+    /// @param data2 0
+    #[serde(rename_all = "camelCase")]
+    ImexProgress {
+        progress: usize,
+    },
+
+    /// A file has been exported. A file has been written by imex().
+    /// This event may be sent multiple times by a single call to imex().
+    ///
+    /// A typical purpose for a handler of this event may be to make the file public to some system
+    /// services.
+    ///
+    /// @param data2 0
+    #[serde(rename_all = "camelCase")]
+    ImexFileWritten {
+        path: String,
+    },
+
+    /// Progress information of a secure-join handshake from the view of the inviter
+    /// (Alice, the person who shows the QR code).
+    ///
+    /// These events are typically sent after a joiner has scanned the QR code
+    /// generated by getChatSecurejoinQrCodeSvg().
+    ///
+    /// @param data1 (int) ID of the contact that wants to join.
+    /// @param data2 (int) Progress as:
+    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
+    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
+    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
+    ///     1000=Protocol finished for this contact.
+    #[serde(rename_all = "camelCase")]
+    SecurejoinInviterProgress {
+        contact_id: u32,
+        progress: usize,
+    },
+
+    /// Progress information of a secure-join handshake from the view of the joiner
+    /// (Bob, the person who scans the QR code).
+    /// The events are typically sent while secureJoin(), which
+    /// may take some time, is executed.
+    /// @param data1 (int) ID of the inviting contact.
+    /// @param data2 (int) Progress as:
+    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
+    ///     (Bob has verified alice and waits until Alice does the same for him)
+    #[serde(rename_all = "camelCase")]
+    SecurejoinJoinerProgress {
+        contact_id: u32,
+        progress: usize,
+    },
+
+    /// The connectivity to the server changed.
+    /// This means that you should refresh the connectivity view
+    /// and possibly the connectivtiy HTML; see getConnectivity() and
+    /// getConnectivityHtml() for details.
+    ConnectivityChanged,
+
+    SelfavatarChanged,
+
+    #[serde(rename_all = "camelCase")]
+    WebxdcStatusUpdate {
+        msg_id: u32,
+        status_update_serial: u32,
+    },
+
+    /// Inform that a message containing a webxdc instance has been deleted
+    #[serde(rename_all = "camelCase")]
+    WebxdcInstanceDeleted {
+        msg_id: u32,
+    },
+}
+
+impl From<EventType> for JSONRPCEventType {
+    fn from(event: EventType) -> Self {
+        use JSONRPCEventType::*;
+        match event {
+            EventType::Info(msg) => Info { msg },
+            EventType::SmtpConnected(msg) => SmtpConnected { msg },
+            EventType::ImapConnected(msg) => ImapConnected { msg },
+            EventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
+            EventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
+            EventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
+            EventType::NewBlobFile(file) => NewBlobFile { file },
+            EventType::DeletedBlobFile(file) => DeletedBlobFile { file },
+            EventType::Warning(msg) => Warning { msg },
+            EventType::Error(msg) => Error { msg },
+            EventType::ErrorSelfNotInGroup(msg) => ErrorSelfNotInGroup { msg },
+            EventType::MsgsChanged { chat_id, msg_id } => MsgsChanged {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+            },
+            EventType::ReactionsChanged {
+                chat_id,
+                msg_id,
+                contact_id,
+            } => ReactionsChanged {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+                contact_id: contact_id.to_u32(),
+            },
+            EventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+            },
+            EventType::IncomingMsgBunch { msg_ids } => IncomingMsgBunch {
+                msg_ids: msg_ids.into_iter().map(|id| id.to_u32()).collect(),
+            },
+            EventType::MsgsNoticed(chat_id) => MsgsNoticed {
+                chat_id: chat_id.to_u32(),
+            },
+            EventType::MsgDelivered { chat_id, msg_id } => MsgDelivered {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+            },
+            EventType::MsgFailed { chat_id, msg_id } => MsgFailed {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+            },
+            EventType::MsgRead { chat_id, msg_id } => MsgRead {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+            },
+            EventType::ChatModified(chat_id) => ChatModified {
+                chat_id: chat_id.to_u32(),
+            },
+            EventType::ChatEphemeralTimerModified { chat_id, timer } => {
+                ChatEphemeralTimerModified {
+                    chat_id: chat_id.to_u32(),
+                    timer: timer.to_u32(),
+                }
+            }
+            EventType::ContactsChanged(contact) => ContactsChanged {
+                contact_id: contact.map(|c| c.to_u32()),
+            },
+            EventType::LocationChanged(contact) => LocationChanged {
+                contact_id: contact.map(|c| c.to_u32()),
+            },
+            EventType::ConfigureProgress { progress, comment } => {
+                ConfigureProgress { progress, comment }
+            }
+            EventType::ImexProgress(progress) => ImexProgress { progress },
+            EventType::ImexFileWritten(path) => ImexFileWritten {
+                path: path.to_str().unwrap_or_default().to_owned(),
+            },
+            EventType::SecurejoinInviterProgress {
+                contact_id,
+                progress,
+            } => SecurejoinInviterProgress {
+                contact_id: contact_id.to_u32(),
+                progress,
+            },
+            EventType::SecurejoinJoinerProgress {
+                contact_id,
+                progress,
+            } => SecurejoinJoinerProgress {
+                contact_id: contact_id.to_u32(),
+                progress,
+            },
+            EventType::ConnectivityChanged => ConnectivityChanged,
+            EventType::SelfavatarChanged => SelfavatarChanged,
+            EventType::WebxdcStatusUpdate {
+                msg_id,
+                status_update_serial,
+            } => WebxdcStatusUpdate {
+                msg_id: msg_id.to_u32(),
+                status_update_serial: status_update_serial.to_u32(),
+            },
+            EventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
+                msg_id: msg_id.to_u32(),
+            },
+        }
+    }
+}
+
+#[cfg(test)]
+#[test]
+fn generate_events_ts_types_definition() {
+    let events = {
+        let mut buf = Vec::new();
+        let options = typescript_type_def::DefinitionFileOptions {
+            root_namespace: None,
+            ..typescript_type_def::DefinitionFileOptions::default()
+        };
+        typescript_type_def::write_definition_file::<_, JSONRPCEventType>(&mut buf, options)
+            .unwrap();
+        String::from_utf8(buf).unwrap()
+    };
+    std::fs::write("typescript/generated/events.ts", events).unwrap();
+}

deltachat-jsonrpc/src/api/types/account.rs

@@ -6,8 +6,8 @@ use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
-#[serde(tag = "kind")]
+#[serde(tag = "type")]
 pub enum Account {
     #[serde(rename_all = "camelCase")]
     Configured {
@@ -17,9 +17,6 @@ pub enum Account {
         // size: u32,
         profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
         color: String,
-        /// Optional tag as "Work", "Family".
-        /// Meant to help profile owner to differ between profiles with similar names.
-        private_tag: Option<String>,
     },
     #[serde(rename_all = "camelCase")]
     Unconfigured { id: u32 },
@@ -34,14 +31,12 @@ impl Account {
             let color = color_int_to_hex_string(
                 Contact::get_by_id(ctx, ContactId::SELF).await?.get_color(),
             );
-            let private_tag = ctx.get_config(Config::PrivateTag).await?;
             Ok(Account::Configured {
                 id,
                 display_name,
                 addr,
                 profile_image,
                 color,
-                private_tag,
             })
         } else {
             Ok(Account::Unconfigured { id })

deltachat-jsonrpc/src/api/types/chat.rs

@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};
 
-use anyhow::{bail, Context as _, Result};
+use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_chat_contacts, get_past_chat_contacts, ChatVisibility};
+use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
@@ -13,41 +13,24 @@ use typescript_type_def::TypeDef;
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct FullChat {
     id: u32,
     name: String,
-
-    /// True if the chat is protected.
-    ///
-    /// UI should display a green checkmark
-    /// in the chat title,
-    /// in the chat profile title and
-    /// in the chatlist item
-    /// if chat protection is enabled.
-    /// UI should also display a green checkmark
-    /// in the contact profile
-    /// if 1:1 chat with this contact exists and is protected.
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     // subtitle  - will be moved to frontend because it uses translation functions
     chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
     contacts: Vec<ContactObject>,
     contact_ids: Vec<u32>,
-
-    /// Contact IDs of the past chat members.
-    past_contact_ids: Vec<u32>,
-
     color: String,
     fresh_message_counter: usize,
     // is_group - please check over chat.type in frontend instead
     is_contact_request: bool,
-    is_protection_broken: bool,
     is_device_chat: bool,
     self_in_group: bool,
     is_muted: bool,
@@ -63,7 +46,6 @@ impl FullChat {
         let chat = Chat::load_from_db(context, rust_chat_id).await?;
 
         let contact_ids = get_chat_contacts(context, rust_chat_id).await?;
-        let past_contact_ids = get_past_chat_contacts(context, rust_chat_id).await?;
 
         let mut contacts = Vec::with_capacity(contact_ids.len());
 
@@ -71,9 +53,7 @@ impl FullChat {
             contacts.push(
                 ContactObject::try_from_dc_contact(
                     context,
-                    Contact::get_by_id(context, *contact_id)
+                    Contact::load_from_db(context, *contact_id).await?,
-                        .await
-                        .context("failed to load contact")?,
                 )
                 .await?,
             )
@@ -91,10 +71,9 @@ impl FullChat {
         let can_send = chat.can_send(context).await?;
 
         let was_seen_recently = if chat.get_type() == Chattype::Single {
-            match contact_ids.first() {
+            match contact_ids.get(0) {
-                Some(contact) => Contact::get_by_id(context, *contact)
+                Some(contact) => Contact::load_from_db(context, *contact)
-                    .await
+                    .await?
-                    .context("failed to load contact for was_seen_recently")?
                     .was_seen_recently(),
                 None => false,
             }
@@ -110,17 +89,17 @@ impl FullChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
+            chat_type: chat
-            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
+                .get_type()
+                .to_u32()
+                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
             contacts,
             contact_ids: contact_ids.iter().map(|id| id.to_u32()).collect(),
-            past_contact_ids: past_contact_ids.iter().map(|id| id.to_u32()).collect(),
             color,
             fresh_message_counter,
             is_contact_request: chat.is_contact_request(),
-            is_protection_broken: chat.is_protection_broken(),
             is_device_chat: chat.is_device_talk(),
             self_in_group: contact_ids.contains(&ContactId::SELF),
             is_muted: chat.is_muted(),
@@ -142,32 +121,19 @@ impl FullChat {
 /// - can_send
 ///
 /// used when you only need the basic metadata of a chat like type, name, profile picture
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct BasicChat {
     id: u32,
     name: String,
-
-    /// True if the chat is protected.
-    ///
-    /// UI should display a green checkmark
-    /// in the chat title,
-    /// in the chat profile title and
-    /// in the chatlist item
-    /// if chat protection is enabled.
-    /// UI should also display a green checkmark
-    /// in the contact profile
-    /// if 1:1 chat with this contact exists and is protected.
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
     color: String,
     is_contact_request: bool,
-    is_protection_broken: bool,
     is_device_chat: bool,
     is_muted: bool,
 }
@@ -189,25 +155,25 @@ impl BasicChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
+            chat_type: chat
-            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
+                .get_type()
+                .to_u32()
+                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
             color,
             is_contact_request: chat.is_contact_request(),
-            is_protection_broken: chat.is_protection_broken(),
             is_device_chat: chat.is_device_talk(),
             is_muted: chat.is_muted(),
         })
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
+#[derive(Clone, Serialize, Deserialize, TypeDef)]
-#[serde(tag = "kind")]
 pub enum MuteDuration {
     NotMuted,
     Forever,
-    Until { duration: i64 },
+    Until(i64),
 }
 
 impl MuteDuration {
@@ -215,20 +181,20 @@ impl MuteDuration {
         match self {
             MuteDuration::NotMuted => Ok(chat::MuteDuration::NotMuted),
             MuteDuration::Forever => Ok(chat::MuteDuration::Forever),
-            MuteDuration::Until { duration } => {
+            MuteDuration::Until(n) => {
-                if duration <= 0 {
+                if n <= 0 {
                     bail!("failed to read mute duration")
                 }
 
                 Ok(SystemTime::now()
-                    .checked_add(Duration::from_secs(duration as u64))
+                    .checked_add(Duration::from_secs(n as u64))
                     .map_or(chat::MuteDuration::Forever, chat::MuteDuration::Until))
             }
         }
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
+#[derive(Clone, Serialize, Deserialize, TypeDef)]
 #[serde(rename = "ChatVisibility")]
 pub enum JSONRPCChatVisibility {
     Normal,

deltachat-jsonrpc/src/api/types/chat_list.rs

@@ -1,21 +1,25 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
-use deltachat::chat::{Chat, ChatId};
-use deltachat::chatlist::get_last_message_for_chat;
 use deltachat::constants::*;
 use deltachat::contact::{Contact, ContactId};
 use deltachat::{
     chat::{get_chat_contacts, ChatVisibility},
     chatlist::Chatlist,
 };
+use deltachat::{
+    chat::{Chat, ChatId},
+    message::MsgId,
+};
 use num_traits::cast::ToPrimitive;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
-use super::message::MessageViewtype;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Deserialize, Serialize, TypeDef)]
-#[serde(tag = "kind")]
+pub struct ChatListEntry(pub u32, pub u32);
+
+#[derive(Serialize, TypeDef)]
+#[serde(tag = "type")]
 pub enum ChatListItemFetchResult {
     #[serde(rename_all = "camelCase")]
     ChatListItem {
@@ -27,8 +31,6 @@ pub enum ChatListItemFetchResult {
         summary_text1: String,
         summary_text2: String,
         summary_status: u32,
-        /// showing preview if last chat message is image
-        summary_preview_image: Option<String>,
         is_protected: bool,
         is_group: bool,
         fresh_message_counter: usize,
@@ -45,8 +47,6 @@ pub enum ChatListItemFetchResult {
         /// contact id if this is a dm chat (for view profile entry in context menu)
         dm_chat_contact: Option<u32>,
         was_seen_recently: bool,
-        last_message_type: Option<MessageViewtype>,
-        last_message_id: Option<u32>,
     },
     #[serde(rename_all = "camelCase")]
     ArchiveLink { fresh_message_counter: usize },
@@ -56,9 +56,14 @@ pub enum ChatListItemFetchResult {
 
 pub(crate) async fn get_chat_list_item_by_id(
     ctx: &deltachat::context::Context,
-    entry: u32,
+    entry: &ChatListEntry,
 ) -> Result<ChatListItemFetchResult> {
-    let chat_id = ChatId::new(entry);
+    let chat_id = ChatId::new(entry.0);
+    let last_msgid = match entry.1 {
+        0 => None,
+        _ => Some(MsgId::new(entry.1)),
+    };
+
     let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
 
     if chat_id.is_archived_link() {
@@ -67,18 +72,12 @@ pub(crate) async fn get_chat_list_item_by_id(
         });
     }
 
-    let last_msgid = get_last_message_for_chat(ctx, chat_id).await?;
+    let chat = Chat::load_from_db(ctx, chat_id).await?;
-
+    let summary = Chatlist::get_summary2(ctx, chat_id, last_msgid, Some(&chat)).await?;
-    let chat = Chat::load_from_db(ctx, chat_id).await.context("chat")?;
-    let summary = Chatlist::get_summary2(ctx, chat_id, last_msgid, Some(&chat))
-        .await
-        .context("summary")?;
 
     let summary_text1 = summary.prefix.map_or_else(String::new, |s| s.to_string());
     let summary_text2 = summary.text.to_owned();
 
-    let summary_preview_image = summary.thumbnail_path;
-
     let visibility = chat.get_visibility();
 
     let avatar_path = chat
@@ -86,21 +85,12 @@ pub(crate) async fn get_chat_list_item_by_id(
         .await?
         .map(|path| path.to_str().unwrap_or("invalid/path").to_owned());
 
-    let (last_updated, message_type) = match last_msgid {
+    let last_updated = match last_msgid {
         Some(id) => {
-            if let Some(last_message) =
+            let last_message = deltachat::message::Message::load_from_db(ctx, id).await?;
-                deltachat::message::Message::load_from_db_optional(ctx, id).await?
+            Some(last_message.get_timestamp() * 1000)
-            {
-                (
-                    Some(last_message.get_timestamp() * 1000),
-                    Some(last_message.get_viewtype().into()),
-                )
-            } else {
-                // Message may be deleted by the time we try to load it.
-                (None, None)
-            }
         }
-        None => (None, None),
+        None => None,
     };
 
     let chat_contacts = get_chat_contacts(ctx, chat_id).await?;
@@ -108,11 +98,10 @@ pub(crate) async fn get_chat_list_item_by_id(
     let self_in_group = chat_contacts.contains(&ContactId::SELF);
 
     let (dm_chat_contact, was_seen_recently) = if chat.get_type() == Chattype::Single {
-        let contact = chat_contacts.first();
+        let contact = chat_contacts.get(0);
         let was_seen_recently = match contact {
-            Some(contact) => Contact::get_by_id(ctx, *contact)
+            Some(contact) => Contact::load_from_db(ctx, *contact)
-                .await
+                .await?
-                .context("contact")?
                 .was_seen_recently(),
             None => false,
         };
@@ -135,7 +124,6 @@ pub(crate) async fn get_chat_list_item_by_id(
         summary_text1,
         summary_text2,
         summary_status: summary.state.to_u32().expect("impossible"), // idea and a function to transform the constant to strings? or return string enum
-        summary_preview_image,
         is_protected: chat.is_protected(),
         is_group: chat.get_type() == Chattype::Group,
         fresh_message_counter,
@@ -150,7 +138,5 @@ pub(crate) async fn get_chat_list_item_by_id(
         is_broadcast: chat.get_type() == Chattype::Broadcast,
         dm_chat_contact,
         was_seen_recently,
-        last_message_type: message_type,
-        last_message_id: last_msgid.map(|id| id.to_u32()),
     })
 }

deltachat-jsonrpc/src/api/types/contact.rs

@@ -1,12 +1,12 @@
 use anyhow::Result;
-use deltachat::color;
+use deltachat::contact::VerifiedStatus;
 use deltachat::context::Context;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename = "Contact", rename_all = "camelCase")]
 pub struct ContactObject {
     address: String,
@@ -19,37 +19,14 @@ pub struct ContactObject {
     profile_image: Option<String>, // BLOBS
     name_and_addr: String,
     is_blocked: bool,
-    e2ee_avail: bool,
-
-    /// True if the contact can be added to verified groups.
-    ///
-    /// If this is true
-    /// UI should display green checkmark after the contact name
-    /// in contact list items,
-    /// in chat member list items
-    /// and in profiles if no chat with the contact exist.
     is_verified: bool,
-
+    /// the address that verified this contact
-    /// True if the contact profile title should have a green checkmark.
+    verifier_addr: Option<String>,
-    ///
+    /// the id of the contact that verified this contact
-    /// This indicates whether 1:1 chat has a green checkmark
-    /// or will have a green checkmark if created.
-    is_profile_verified: bool,
-
-    /// The ID of the contact that verified this contact.
-    ///
-    /// If this is present,
-    /// display a green checkmark and "Introduced by ..."
-    /// string followed by the verifier contact name and address
-    /// in the contact profile.
     verifier_id: Option<u32>,
-
     /// the contact's last seen timestamp
     last_seen: i64,
     was_seen_recently: bool,
-
-    /// If the contact is a bot.
-    is_bot: bool,
 }
 
 impl ContactObject {
@@ -61,13 +38,19 @@ impl ContactObject {
             Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
             None => None,
         };
-        let is_verified = contact.is_verified(context).await?;
+        let is_verified = contact.is_verified(context).await? == VerifiedStatus::BidirectVerified;
-        let is_profile_verified = contact.is_profile_verified(context).await?;
 
-        let verifier_id = contact
+        let (verifier_addr, verifier_id) = if is_verified {
-            .get_verifier_id(context)
+            (
-            .await?
+                contact.get_verifier_addr(context).await?,
-            .map(|contact_id| contact_id.to_u32());
+                contact
+                    .get_verifier_id(context)
+                    .await?
+                    .map(|contact_id| contact_id.to_u32()),
+            )
+        } else {
+            (None, None)
+        };
 
         Ok(ContactObject {
             address: contact.get_addr().to_owned(),
@@ -80,45 +63,11 @@ impl ContactObject {
             profile_image, //BLOBS
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
-            e2ee_avail: contact.e2ee_avail(context).await?,
             is_verified,
-            is_profile_verified,
+            verifier_addr,
             verifier_id,
             last_seen: contact.last_seen(),
             was_seen_recently: contact.was_seen_recently(),
-            is_bot: contact.is_bot(),
         })
     }
 }
-
-#[derive(Clone, Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct VcardContact {
-    /// Email address.
-    addr: String,
-    /// The contact's name, or the email address if no name was given.
-    display_name: String,
-    /// Public PGP key in Base64.
-    key: Option<String>,
-    /// Profile image in Base64.
-    profile_image: Option<String>,
-    /// Contact color as hex string.
-    color: String,
-    /// Last update timestamp.
-    timestamp: Option<i64>,
-}
-
-impl From<deltachat_contact_tools::VcardContact> for VcardContact {
-    fn from(vc: deltachat_contact_tools::VcardContact) -> Self {
-        let display_name = vc.display_name().to_string();
-        let color = color::str_to_color(&vc.addr.to_lowercase());
-        Self {
-            addr: vc.addr,
-            display_name,
-            key: vc.key,
-            profile_image: vc.profile_image,
-            color: color_int_to_hex_string(color),
-            timestamp: vc.timestamp.ok(),
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/events.rs

@@ -1,575 +0,0 @@
-use deltachat::{Event as CoreEvent, EventType as CoreEventType};
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct Event {
-    /// Event payload.
-    event: EventType,
-
-    /// Account ID.
-    context_id: u32,
-}
-
-impl From<CoreEvent> for Event {
-    fn from(event: CoreEvent) -> Self {
-        Event {
-            event: event.typ.into(),
-            context_id: event.id,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(tag = "kind")]
-pub enum EventType {
-    /// The library-user may write an informational string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Info { msg: String },
-
-    /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected { msg: String },
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected { msg: String },
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent { msg: String },
-
-    /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted { msg: String },
-
-    /// Emitted when an IMAP message has been moved
-    ImapMessageMoved { msg: String },
-
-    /// Emitted before going into IDLE on the Inbox folder.
-    ImapInboxIdle,
-
-    /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile { file: String },
-
-    /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile { file: String },
-
-    /// The library-user should write a warning string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Warning { msg: String },
-
-    /// The library-user should report an error to the end-user.
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. configure())
-    /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the *last* error
-    /// in a message box then.
-    Error { msg: String },
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// setChatName(), setChatProfileImage(),
-    /// addContactToChat(), removeContactFromChat(),
-    /// and messages sending functions.
-    ErrorSelfNotInGroup { msg: String },
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    #[serde(rename_all = "camelCase")]
-    MsgsChanged {
-        /// Set if only a single chat is affected by the changes, otherwise 0.
-        chat_id: u32,
-
-        /// Set if only a single message is affected by the changes, otherwise 0.
-        msg_id: u32,
-    },
-
-    /// Reactions for the message changed.
-    #[serde(rename_all = "camelCase")]
-    ReactionsChanged {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message for which reactions were changed.
-        msg_id: u32,
-
-        /// ID of the contact whose reaction set is changed.
-        contact_id: u32,
-    },
-
-    /// A reaction to one's own sent message received.
-    /// Typically, the UI will show a notification for that.
-    ///
-    /// In addition to this event, ReactionsChanged is emitted.
-    #[serde(rename_all = "camelCase")]
-    IncomingReaction {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the contact whose reaction set is changed.
-        contact_id: u32,
-
-        /// ID of the message for which reactions were changed.
-        msg_id: u32,
-
-        /// The reaction.
-        reaction: String,
-    },
-
-    /// Incoming webxdc info or summary update, should be notified.
-    #[serde(rename_all = "camelCase")]
-    IncomingWebxdcNotify {
-        /// ID of the chat.
-        chat_id: u32,
-
-        /// ID of the contact sending.
-        contact_id: u32,
-
-        /// ID of the added info message or webxdc instance in case of summary change.
-        msg_id: u32,
-
-        /// Text to notify.
-        text: String,
-
-        /// Link assigned to this notification, if any.
-        href: Option<String>,
-    },
-
-    /// There is a fresh message. Typically, the user will show a notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event sent together with this event.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsg {
-        /// ID of the chat where the message is assigned.
-        chat_id: u32,
-
-        /// ID of the message.
-        msg_id: u32,
-    },
-
-    /// Downloading a bunch of messages just finished. This is an
-    /// event to allow the UI to only show one notification per message bunch,
-    /// instead of cluttering the user with many notifications.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch,
-
-    /// Messages were seen or noticed.
-    /// chat id is always set.
-    #[serde(rename_all = "camelCase")]
-    MsgsNoticed { chat_id: u32 },
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgDelivered {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that was successfully sent.
-        msg_id: u32,
-    },
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgFailed {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that could not be sent.
-        msg_id: u32,
-    },
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgRead {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that was read.
-        msg_id: u32,
-    },
-
-    /// A single message was deleted.
-    ///
-    /// This event means that the message will no longer appear in the messagelist.
-    /// UI should remove the message from the messagelist
-    /// in response to this event if the message is currently displayed.
-    ///
-    /// The message may have been explicitly deleted by the user or expired.
-    /// Internally the message may have been removed from the database,
-    /// moved to the trash chat or hidden.
-    ///
-    /// This event does not indicate the message
-    /// deletion from the server.
-    #[serde(rename_all = "camelCase")]
-    MsgDeleted {
-        /// ID of the chat where the message was prior to deletion.
-        /// Never 0.
-        chat_id: u32,
-
-        /// ID of the deleted message. Never 0.
-        msg_id: u32,
-    },
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See setChatName(), setChatProfileImage(), addContactToChat()
-    /// and removeContactFromChat().
-    ///
-    /// This event does not include ephemeral timer modification, which
-    /// is a separate event.
-    #[serde(rename_all = "camelCase")]
-    ChatModified { chat_id: u32 },
-
-    /// Chat ephemeral timer changed.
-    #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified {
-        /// Chat ID.
-        chat_id: u32,
-
-        /// New ephemeral timer value.
-        timer: u32,
-    },
-
-    /// Chat deleted.
-    ChatDeleted {
-        /// Chat ID.
-        chat_id: u32,
-    },
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    #[serde(rename_all = "camelCase")]
-    ContactsChanged {
-        /// If set, this is the contact_id of an added contact that should be selected.
-        contact_id: Option<u32>,
-    },
-
-    /// Location of one or more contact has changed.
-    #[serde(rename_all = "camelCase")]
-    LocationChanged {
-        /// contact_id of the contact for which the location has changed.
-        /// If the locations of several contacts have been changed,
-        /// this parameter is set to `None`.
-        contact_id: Option<u32>,
-    },
-
-    /// Inform about the configuration progress started by configure().
-    ConfigureProgress {
-        /// Progress.
-        ///
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-
-        /// Progress comment or error, something to display to the user.
-        comment: Option<String>,
-    },
-
-    /// Inform about the import/export progress started by imex().
-    ///
-    #[serde(rename_all = "camelCase")]
-    ImexProgress {
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-    },
-
-    /// A file has been exported. A file has been written by imex().
-    /// This event may be sent multiple times by a single call to imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexFileWritten { path: String },
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by getChatSecurejoinQrCodeSvg().
-    #[serde(rename_all = "camelCase")]
-    SecurejoinInviterProgress {
-        /// ID of the contact that wants to join.
-        contact_id: u32,
-
-        /// Progress as:
-        /// 300=vg-/vc-request received, typically shown as "bob@addr joins".
-        /// 600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-        /// 800=contact added to chat, shown as "bob@addr securely joined GROUP". Only for the verified-group-protocol.
-        /// 1000=Protocol finished for this contact.
-        progress: usize,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while secureJoin(), which
-    /// may take some time, is executed.
-    #[serde(rename_all = "camelCase")]
-    SecurejoinJoinerProgress {
-        /// ID of the inviting contact.
-        contact_id: u32,
-
-        /// Progress as:
-        /// 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-        /// (Bob has verified alice and waits until Alice does the same for him)
-        /// 1000=vg-member-added/vc-contact-confirm received
-        progress: usize,
-    },
-
-    /// The connectivity to the server changed.
-    /// This means that you should refresh the connectivity view
-    /// and possibly the connectivtiy HTML; see getConnectivity() and
-    /// getConnectivityHtml() for details.
-    ConnectivityChanged,
-
-    /// Deprecated by `ConfigSynced`.
-    SelfavatarChanged,
-
-    /// A multi-device synced config value changed. Maybe the app needs to refresh smth. For
-    /// uniformity this is emitted on the source device too. The value isn't here, otherwise it
-    /// would be logged which might not be good for privacy.
-    ConfigSynced {
-        /// Configuration key.
-        key: String,
-    },
-
-    #[serde(rename_all = "camelCase")]
-    WebxdcStatusUpdate {
-        /// Message ID.
-        msg_id: u32,
-
-        /// Status update ID.
-        status_update_serial: u32,
-    },
-
-    /// Data received over an ephemeral peer channel.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeData {
-        /// Message ID.
-        msg_id: u32,
-
-        /// Realtime data.
-        data: Vec<u8>,
-    },
-
-    /// Advertisement received over an ephemeral peer channel.
-    /// This can be used by bots to initiate peer-to-peer communication from their side.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeAdvertisementReceived {
-        /// Message ID of the webxdc instance.
-        msg_id: u32,
-    },
-
-    /// Inform that a message containing a webxdc instance has been deleted
-    #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted {
-        /// ID of the deleted message.
-        msg_id: u32,
-    },
-
-    /// Tells that the Background fetch was completed (or timed out).
-    /// This event acts as a marker, when you reach this event you can be sure
-    /// that all events emitted during the background fetch were processed.
-    ///
-    /// This event is only emitted by the account manager
-    AccountsBackgroundFetchDone,
-    /// Inform that set of chats or the order of the chats in the chatlist has changed.
-    ///
-    /// Sometimes this is emitted together with `UIChatlistItemChanged`.
-    ChatlistChanged,
-
-    /// Inform that a single chat list item changed and needs to be rerendered.
-    /// If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache.
-    #[serde(rename_all = "camelCase")]
-    ChatlistItemChanged {
-        /// ID of the changed chat
-        chat_id: Option<u32>,
-    },
-
-    /// Inform that the list of accounts has changed (an account removed or added or (not yet implemented) the account order changes)
-    ///
-    /// This event is only emitted by the account manager
-    AccountsChanged,
-
-    /// Inform that an account property that might be shown in the account list changed, namely:
-    /// - is_configured (see is_configured())
-    /// - displayname
-    /// - selfavatar
-    /// - private_tag
-    ///
-    /// This event is emitted from the account whose property changed.
-    AccountsItemChanged,
-
-    /// Inform than some events have been skipped due to event channel overflow.
-    EventChannelOverflow {
-        /// Number of events skipped.
-        n: u64,
-    },
-}
-
-impl From<CoreEventType> for EventType {
-    fn from(event: CoreEventType) -> Self {
-        use EventType::*;
-        match event {
-            CoreEventType::Info(msg) => Info { msg },
-            CoreEventType::SmtpConnected(msg) => SmtpConnected { msg },
-            CoreEventType::ImapConnected(msg) => ImapConnected { msg },
-            CoreEventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
-            CoreEventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
-            CoreEventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
-            CoreEventType::ImapInboxIdle => ImapInboxIdle,
-            CoreEventType::NewBlobFile(file) => NewBlobFile { file },
-            CoreEventType::DeletedBlobFile(file) => DeletedBlobFile { file },
-            CoreEventType::Warning(msg) => Warning { msg },
-            CoreEventType::Error(msg) => Error { msg },
-            CoreEventType::ErrorSelfNotInGroup(msg) => ErrorSelfNotInGroup { msg },
-            CoreEventType::MsgsChanged { chat_id, msg_id } => MsgsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::ReactionsChanged {
-                chat_id,
-                msg_id,
-                contact_id,
-            } => ReactionsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-            },
-            CoreEventType::IncomingReaction {
-                chat_id,
-                contact_id,
-                msg_id,
-                reaction,
-            } => IncomingReaction {
-                chat_id: chat_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                reaction: reaction.as_str().to_string(),
-            },
-            CoreEventType::IncomingWebxdcNotify {
-                chat_id,
-                contact_id,
-                msg_id,
-                text,
-                href,
-            } => IncomingWebxdcNotify {
-                chat_id: chat_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                text,
-                href,
-            },
-            CoreEventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::IncomingMsgBunch => IncomingMsgBunch,
-            CoreEventType::MsgsNoticed(chat_id) => MsgsNoticed {
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::MsgDelivered { chat_id, msg_id } => MsgDelivered {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::MsgFailed { chat_id, msg_id } => MsgFailed {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::MsgRead { chat_id, msg_id } => MsgRead {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::MsgDeleted { chat_id, msg_id } => MsgDeleted {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::ChatModified(chat_id) => ChatModified {
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::ChatEphemeralTimerModified { chat_id, timer } => {
-                ChatEphemeralTimerModified {
-                    chat_id: chat_id.to_u32(),
-                    timer: timer.to_u32(),
-                }
-            }
-            CoreEventType::ChatDeleted { chat_id } => ChatDeleted {
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::ContactsChanged(contact) => ContactsChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            CoreEventType::LocationChanged(contact) => LocationChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            CoreEventType::ConfigureProgress { progress, comment } => {
-                ConfigureProgress { progress, comment }
-            }
-            CoreEventType::ImexProgress(progress) => ImexProgress { progress },
-            CoreEventType::ImexFileWritten(path) => ImexFileWritten {
-                path: path.to_str().unwrap_or_default().to_owned(),
-            },
-            CoreEventType::SecurejoinInviterProgress {
-                contact_id,
-                progress,
-            } => SecurejoinInviterProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            CoreEventType::SecurejoinJoinerProgress {
-                contact_id,
-                progress,
-            } => SecurejoinJoinerProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            CoreEventType::ConnectivityChanged => ConnectivityChanged,
-            CoreEventType::SelfavatarChanged => SelfavatarChanged,
-            CoreEventType::ConfigSynced { key } => ConfigSynced {
-                key: key.to_string(),
-            },
-            CoreEventType::WebxdcStatusUpdate {
-                msg_id,
-                status_update_serial,
-            } => WebxdcStatusUpdate {
-                msg_id: msg_id.to_u32(),
-                status_update_serial: status_update_serial.to_u32(),
-            },
-            CoreEventType::WebxdcRealtimeData { msg_id, data } => WebxdcRealtimeData {
-                msg_id: msg_id.to_u32(),
-                data,
-            },
-            CoreEventType::WebxdcRealtimeAdvertisementReceived { msg_id } => {
-                WebxdcRealtimeAdvertisementReceived {
-                    msg_id: msg_id.to_u32(),
-                }
-            }
-            CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::AccountsBackgroundFetchDone => AccountsBackgroundFetchDone,
-            CoreEventType::ChatlistItemChanged { chat_id } => ChatlistItemChanged {
-                chat_id: chat_id.map(|id| id.to_u32()),
-            },
-            CoreEventType::ChatlistChanged => ChatlistChanged,
-            CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
-            CoreEventType::AccountsChanged => AccountsChanged,
-            CoreEventType::AccountsItemChanged => AccountsItemChanged,
-            #[allow(unreachable_patterns)]
-            #[cfg(test)]
-            _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/http.rs

@@ -1,29 +0,0 @@
-use deltachat::net::HttpResponse as CoreHttpResponse;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-pub struct HttpResponse {
-    /// base64-encoded response body.
-    blob: String,
-
-    /// MIME type, e.g. "text/plain" or "text/html".
-    mimetype: Option<String>,
-
-    /// Encoding, e.g. "utf-8".
-    encoding: Option<String>,
-}
-
-impl From<CoreHttpResponse> for HttpResponse {
-    fn from(response: CoreHttpResponse) -> Self {
-        use base64::{engine::general_purpose, Engine as _};
-        let blob = general_purpose::STANDARD_NO_PAD.encode(response.blob);
-        let mimetype = response.mimetype;
-        let encoding = response.encoding;
-        HttpResponse {
-            blob,
-            mimetype,
-            encoding,
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/location.rs

@@ -2,7 +2,7 @@ use deltachat::location::Location;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename = "Location", rename_all = "camelCase")]
 pub struct JsonrpcLocation {
     pub location_id: u32,

deltachat-jsonrpc/src/api/types/login_param.rs

@@ -1,203 +0,0 @@
-use anyhow::Result;
-use deltachat::login_param as dc;
-use serde::Deserialize;
-use serde::Serialize;
-use yerpc::TypeDef;
-
-/// Login parameters entered by the user.
-///
-/// Usually it will be enough to only set `addr` and `password`,
-/// and all the other settings will be autoconfigured.
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct EnteredLoginParam {
-    /// Email address.
-    pub addr: String,
-
-    /// Password.
-    pub password: String,
-
-    /// Imap server hostname or IP address.
-    pub imap_server: Option<String>,
-
-    /// Imap server port.
-    pub imap_port: Option<u16>,
-
-    /// Imap socket security.
-    pub imap_security: Option<Socket>,
-
-    /// Imap username.
-    pub imap_user: Option<String>,
-
-    /// SMTP server hostname or IP address.
-    pub smtp_server: Option<String>,
-
-    /// SMTP server port.
-    pub smtp_port: Option<u16>,
-
-    /// SMTP socket security.
-    pub smtp_security: Option<Socket>,
-
-    /// SMTP username.
-    pub smtp_user: Option<String>,
-
-    /// SMTP Password.
-    ///
-    /// Only needs to be specified if different than IMAP password.
-    pub smtp_password: Option<String>,
-
-    /// TLS options: whether to allow invalid certificates and/or
-    /// invalid hostnames.
-    /// Default: Automatic
-    pub certificate_checks: Option<EnteredCertificateChecks>,
-
-    /// If true, login via OAUTH2 (not recommended anymore).
-    /// Default: false
-    pub oauth2: Option<bool>,
-}
-
-impl From<dc::EnteredLoginParam> for EnteredLoginParam {
-    fn from(param: dc::EnteredLoginParam) -> Self {
-        let imap_security: Socket = param.imap.security.into();
-        let smtp_security: Socket = param.smtp.security.into();
-        let certificate_checks: EnteredCertificateChecks = param.certificate_checks.into();
-        Self {
-            addr: param.addr,
-            password: param.imap.password,
-            imap_server: param.imap.server.into_option(),
-            imap_port: param.imap.port.into_option(),
-            imap_security: imap_security.into_option(),
-            imap_user: param.imap.user.into_option(),
-            smtp_server: param.smtp.server.into_option(),
-            smtp_port: param.smtp.port.into_option(),
-            smtp_security: smtp_security.into_option(),
-            smtp_user: param.smtp.user.into_option(),
-            smtp_password: param.smtp.password.into_option(),
-            certificate_checks: certificate_checks.into_option(),
-            oauth2: param.oauth2.into_option(),
-        }
-    }
-}
-
-impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
-    type Error = anyhow::Error;
-
-    fn try_from(param: EnteredLoginParam) -> Result<Self> {
-        Ok(Self {
-            addr: param.addr,
-            imap: dc::EnteredServerLoginParam {
-                server: param.imap_server.unwrap_or_default(),
-                port: param.imap_port.unwrap_or_default(),
-                security: param.imap_security.unwrap_or_default().into(),
-                user: param.imap_user.unwrap_or_default(),
-                password: param.password,
-            },
-            smtp: dc::EnteredServerLoginParam {
-                server: param.smtp_server.unwrap_or_default(),
-                port: param.smtp_port.unwrap_or_default(),
-                security: param.smtp_security.unwrap_or_default().into(),
-                user: param.smtp_user.unwrap_or_default(),
-                password: param.smtp_password.unwrap_or_default(),
-            },
-            certificate_checks: param.certificate_checks.unwrap_or_default().into(),
-            oauth2: param.oauth2.unwrap_or_default(),
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub enum Socket {
-    /// Unspecified socket security, select automatically.
-    #[default]
-    Automatic,
-
-    /// TLS connection.
-    Ssl,
-
-    /// STARTTLS connection.
-    Starttls,
-
-    /// No TLS, plaintext connection.
-    Plain,
-}
-
-impl From<dc::Socket> for Socket {
-    fn from(value: dc::Socket) -> Self {
-        match value {
-            dc::Socket::Automatic => Self::Automatic,
-            dc::Socket::Ssl => Self::Ssl,
-            dc::Socket::Starttls => Self::Starttls,
-            dc::Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-impl From<Socket> for dc::Socket {
-    fn from(value: Socket) -> Self {
-        match value {
-            Socket::Automatic => Self::Automatic,
-            Socket::Ssl => Self::Ssl,
-            Socket::Starttls => Self::Starttls,
-            Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub enum EnteredCertificateChecks {
-    /// `Automatic` means that provider database setting should be taken.
-    /// If there is no provider database setting for certificate checks,
-    /// check certificates strictly.
-    #[default]
-    Automatic,
-
-    /// Ensure that TLS certificate is valid for the server hostname.
-    Strict,
-
-    /// Accept certificates that are expired, self-signed
-    /// or otherwise not valid for the server hostname.
-    AcceptInvalidCertificates,
-}
-
-impl From<dc::EnteredCertificateChecks> for EnteredCertificateChecks {
-    fn from(value: dc::EnteredCertificateChecks) -> Self {
-        match value {
-            dc::EnteredCertificateChecks::Automatic => Self::Automatic,
-            dc::EnteredCertificateChecks::Strict => Self::Strict,
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates => {
-                Self::AcceptInvalidCertificates
-            }
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates2 => {
-                Self::AcceptInvalidCertificates
-            }
-        }
-    }
-}
-
-impl From<EnteredCertificateChecks> for dc::EnteredCertificateChecks {
-    fn from(value: EnteredCertificateChecks) -> Self {
-        match value {
-            EnteredCertificateChecks::Automatic => Self::Automatic,
-            EnteredCertificateChecks::Strict => Self::Strict,
-            EnteredCertificateChecks::AcceptInvalidCertificates => Self::AcceptInvalidCertificates,
-        }
-    }
-}
-
-trait IntoOption<T> {
-    fn into_option(self) -> Option<T>;
-}
-impl<T> IntoOption<T> for T
-where
-    T: Default + std::cmp::PartialEq,
-{
-    fn into_option(self) -> Option<T> {
-        if self == T::default() {
-            None
-        } else {
-            Some(self)
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/message.rs

@@ -1,10 +1,7 @@
-use std::path::Path;
+use anyhow::{anyhow, Result};
-
-use crate::api::VcardContact;
-use anyhow::{Context as _, Result};
 use deltachat::chat::Chat;
 use deltachat::chat::ChatItem;
-use deltachat::chat::ChatVisibility;
+use deltachat::constants::Chattype;
 use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::download;
@@ -13,7 +10,8 @@ use deltachat::message::MsgId;
 use deltachat::message::Viewtype;
 use deltachat::reaction::get_msg_reactions;
 use num_traits::cast::ToPrimitive;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
@@ -21,14 +19,14 @@ use super::contact::ContactObject;
 use super::reactions::JSONRPCReactions;
 use super::webxdc::WebxdcMessageInfo;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase", tag = "kind")]
+#[serde(rename_all = "camelCase", tag = "variant")]
 pub enum MessageLoadResult {
     Message(MessageObject),
     LoadingError { error: String },
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename = "Message", rename_all = "camelCase")]
 pub struct MessageObject {
     id: u32,
@@ -37,13 +35,7 @@ pub struct MessageObject {
     quote: Option<MessageQuote>,
     parent_id: Option<u32>,
 
-    text: String,
+    text: Option<String>,
-
-    is_edited: bool,
-
-    /// Check if a message has a POI location bound to it.
-    /// These locations are also returned by `get_locations` method.
-    /// The UI may decide to display a special icon beside such messages.
     has_location: bool,
     has_html: bool,
     view_type: MessageViewtype,
@@ -70,9 +62,6 @@ pub struct MessageObject {
     /// when is_info is true this describes what type of system message it is
     system_message_type: SystemMessageType,
 
-    /// if is_info is set, this refers to the contact profile that should be opened when the info message is tapped.
-    info_contact_id: Option<u32>,
-
     duration: i32,
     dimensions_height: i32,
     dimensions_width: i32,
@@ -92,20 +81,12 @@ pub struct MessageObject {
 
     webxdc_info: Option<WebxdcMessageInfo>,
 
-    webxdc_href: Option<String>,
-
     download_state: DownloadState,
 
-    original_msg_id: Option<u32>,
-
-    saved_message_id: Option<u32>,
-
     reactions: Option<JSONRPCReactions>,
-
-    vcard_contact: Option<VcardContact>,
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(tag = "kind")]
 enum MessageQuote {
     JustText {
@@ -115,9 +96,6 @@ enum MessageQuote {
     WithMessage {
         text: String,
         message_id: u32,
-        /// The quoted message does not always belong
-        /// to the same chat, e.g. when "Reply Privately" is used.
-        chat_id: u32,
         author_display_name: String,
         author_display_color: String,
         override_sender_name: Option<String>,
@@ -128,17 +106,16 @@ enum MessageQuote {
 }
 
 impl MessageObject {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Option<Self>> {
+    pub async fn from_message_id(context: &Context, message_id: u32) -> Result<Self> {
-        let Some(message) = Message::load_from_db_optional(context, msg_id).await? else {
+        let msg_id = MsgId::new(message_id);
-            return Ok(None);
+        Self::from_msg_id(context, msg_id).await
-        };
+    }
 
-        let sender_contact = Contact::get_by_id(context, message.get_from_id())
+    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-            .await
+        let message = Message::load_from_db(context, msg_id).await?;
-            .context("failed to load sender contact")?;
+
-        let sender = ContactObject::try_from_dc_contact(context, sender_contact)
+        let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
-            .await
+        let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
-            .context("failed to load sender contact object")?;
         let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
         let override_sender_name = message.get_override_sender_name();
 
@@ -155,13 +132,10 @@ impl MessageObject {
         let quote = if let Some(quoted_text) = message.quoted_text() {
             match message.quoted_message(context).await? {
                 Some(quote) => {
-                    let quote_author = Contact::get_by_id(context, quote.get_from_id())
+                    let quote_author = Contact::load_from_db(context, quote.get_from_id()).await?;
-                        .await
-                        .context("failed to load quote author contact")?;
                     Some(MessageQuote::WithMessage {
                         text: quoted_text,
                         message_id: quote.get_id().to_u32(),
-                        chat_id: quote.get_chat_id().to_u32(),
                         author_display_name: quote_author.get_display_name().to_owned(),
                         author_display_color: color_int_to_hex_string(quote_author.get_color()),
                         override_sender_name: quote.get_override_sender_name(),
@@ -186,37 +160,27 @@ impl MessageObject {
             None
         };
 
-        let reactions = get_msg_reactions(context, msg_id)
+        let reactions = get_msg_reactions(context, msg_id).await?;
-            .await
-            .context("failed to load message reactions")?;
         let reactions = if reactions.is_empty() {
             None
         } else {
             Some(reactions.into())
         };
 
-        let vcard_contacts: Vec<VcardContact> = message
+        Ok(MessageObject {
-            .vcard_contacts(context)
-            .await?
-            .into_iter()
-            .map(Into::into)
-            .collect();
-
-        let message_object = MessageObject {
             id: msg_id.to_u32(),
             chat_id: message.get_chat_id().to_u32(),
             from_id: message.get_from_id().to_u32(),
             quote,
             parent_id,
             text: message.get_text(),
-            is_edited: message.is_edited(),
             has_location: message.has_location(),
             has_html: message.has_html(),
             view_type: message.get_viewtype().into(),
             state: message
                 .get_state()
                 .to_u32()
-                .context("state conversion to number failed")?,
+                .ok_or_else(|| anyhow!("state conversion to number failed"))?,
             error: message.error(),
 
             timestamp: message.get_timestamp(),
@@ -231,10 +195,6 @@ impl MessageObject {
             is_forwarded: message.is_forwarded(),
             is_bot: message.is_bot(),
             system_message_type: message.get_info_type().into(),
-            info_contact_id: message
-                .get_info_contact_id(context)
-                .await?
-                .map(|id| id.to_u32()),
 
             duration: message.get_duration(),
             dimensions_height: message.get_height(),
@@ -243,7 +203,7 @@ impl MessageObject {
             videochat_type: match message.get_videochat_type() {
                 Some(vct) => Some(
                     vct.to_u32()
-                        .context("videochat type conversion to number failed")?,
+                        .ok_or_else(|| anyhow!("state conversion to number failed"))?,
                 ),
                 None => None,
             },
@@ -263,31 +223,14 @@ impl MessageObject {
             file_name: message.get_filename(),
             webxdc_info,
 
-            // On a WebxdcInfoMessage this might include a hash holding
-            // information about a specific position or state in a webxdc app
-            webxdc_href: message.get_webxdc_href(),
-
             download_state,
 
-            original_msg_id: message
-                .get_original_msg_id(context)
-                .await?
-                .map(|id| id.to_u32()),
-
-            saved_message_id: message
-                .get_saved_msg_id(context)
-                .await?
-                .map(|id| id.to_u32()),
-
             reactions,
-
+        })
-            vcard_contact: vcard_contacts.first().cloned(),
-        };
-        Ok(Some(message_object))
     }
 }
 
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, Deserialize, TypeDef)]
 #[serde(rename = "Viewtype")]
 pub enum MessageViewtype {
     Unknown,
@@ -303,9 +246,6 @@ pub enum MessageViewtype {
     Gif,
 
     /// Message containing a sticker, similar to image.
-    /// NB: When sending, the message viewtype may be changed to `Image` by some heuristics like
-    /// checking for transparent pixels. Use `Message::force_sticker()` to disable them.
-    ///
     /// If possible, the ui should display the image without borders in a transparent way.
     /// A click on a sticker will offer to install the sticker set in some future.
     Sticker,
@@ -328,11 +268,6 @@ pub enum MessageViewtype {
 
     /// Message is an webxdc instance.
     Webxdc,
-
-    /// Message containing shared contacts represented as a vCard (virtual contact file)
-    /// with email addresses and possibly other fields.
-    /// Use `parse_vcard()` to retrieve them.
-    Vcard,
 }
 
 impl From<Viewtype> for MessageViewtype {
@@ -349,7 +284,6 @@ impl From<Viewtype> for MessageViewtype {
             Viewtype::File => MessageViewtype::File,
             Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
             Viewtype::Webxdc => MessageViewtype::Webxdc,
-            Viewtype::Vcard => MessageViewtype::Vcard,
         }
     }
 }
@@ -368,17 +302,15 @@ impl From<MessageViewtype> for Viewtype {
             MessageViewtype::File => Viewtype::File,
             MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
             MessageViewtype::Webxdc => Viewtype::Webxdc,
-            MessageViewtype::Vcard => Viewtype::Vcard,
         }
     }
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 pub enum DownloadState {
     Done,
     Available,
     Failure,
-    Undecipherable,
     InProgress,
 }
 
@@ -388,13 +320,12 @@ impl From<download::DownloadState> for DownloadState {
             download::DownloadState::Done => DownloadState::Done,
             download::DownloadState::Available => DownloadState::Available,
             download::DownloadState::Failure => DownloadState::Failure,
-            download::DownloadState::Undecipherable => DownloadState::Undecipherable,
             download::DownloadState::InProgress => DownloadState::InProgress,
         }
     }
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 pub enum SystemMessageType {
     Unknown,
     GroupNameChanged,
@@ -405,15 +336,6 @@ pub enum SystemMessageType {
     SecurejoinMessage,
     LocationStreamingEnabled,
     LocationOnly,
-    InvalidUnencryptedMail,
-
-    /// 1:1 chats info message telling that SecureJoin has started and the user should wait for it
-    /// to complete.
-    SecurejoinWait,
-
-    /// 1:1 chats info message telling that SecureJoin is still running, but the user may already
-    /// send messages.
-    SecurejoinWaitTimeout,
 
     /// Chat ephemeral message timer is changed.
     EphemeralTimerChanged,
@@ -433,9 +355,6 @@ pub enum SystemMessageType {
 
     /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
     WebxdcInfoMessage,
-
-    /// This message contains a users iroh node address.
-    IrohNodeAddr,
 }
 
 impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
@@ -457,15 +376,11 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
             SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
             SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
             SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-            SystemMessage::InvalidUnencryptedMail => SystemMessageType::InvalidUnencryptedMail,
-            SystemMessage::IrohNodeAddr => SystemMessageType::IrohNodeAddr,
-            SystemMessage::SecurejoinWait => SystemMessageType::SecurejoinWait,
-            SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
         }
     }
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageNotificationInfo {
     id: u32,
@@ -523,23 +438,14 @@ impl MessageNotificationInfo {
     }
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageSearchResult {
     id: u32,
     author_profile_image: Option<String>,
-    /// if sender name if overridden it will show it as ~alias
     author_name: String,
     author_color: String,
-    author_id: u32,
+    chat_name: Option<String>,
-    chat_id: u32,
-    chat_profile_image: Option<String>,
-    chat_color: String,
-    chat_name: String,
-    chat_type: u32,
-    is_chat_protected: bool,
-    is_chat_contact_request: bool,
-    is_chat_archived: bool,
     message: String,
     timestamp: i64,
 }
@@ -548,45 +454,30 @@ impl MessageSearchResult {
     pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
         let message = Message::load_from_db(context, msg_id).await?;
         let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-        let sender = Contact::get_by_id(context, message.get_from_id()).await?;
+        let sender = Contact::load_from_db(context, message.get_from_id()).await?;
 
         let profile_image = match sender.get_profile_image(context).await? {
             Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
             None => None,
         };
-        let chat_profile_image = match chat.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        let author_name = if let Some(name) = message.get_override_sender_name() {
-            format!("~{name}")
-        } else {
-            sender.get_display_name().to_owned()
-        };
-        let chat_color = color_int_to_hex_string(chat.get_color(context).await?);
 
         Ok(Self {
             id: msg_id.to_u32(),
             author_profile_image: profile_image,
-            author_name,
+            author_name: sender.get_display_name().to_owned(),
             author_color: color_int_to_hex_string(sender.get_color()),
-            author_id: sender.id.to_u32(),
+            chat_name: if chat.get_type() == Chattype::Single {
-            chat_id: chat.id.to_u32(),
+                Some(chat.get_name().to_owned())
-            chat_name: chat.get_name().to_owned(),
+            } else {
-            chat_color,
+                None
-            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
+            },
-            chat_profile_image,
+            message: message.get_text().unwrap_or_default(),
-            is_chat_protected: chat.is_protected(),
-            is_chat_contact_request: chat.is_contact_request(),
-            is_chat_archived: chat.get_visibility() == ChatVisibility::Archived,
-            message: message.get_text(),
             timestamp: message.get_timestamp(),
         })
     }
 }
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase", rename = "MessageListItem", tag = "kind")]
 pub enum JSONRPCMessageListItem {
     Message {
@@ -612,132 +503,14 @@ impl From<ChatItem> for JSONRPCMessageListItem {
     }
 }
 
-#[derive(Deserialize, Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Deserialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageData {
     pub text: Option<String>,
     pub html: Option<String>,
     pub viewtype: Option<MessageViewtype>,
     pub file: Option<String>,
-    pub filename: Option<String>,
     pub location: Option<(f64, f64)>,
     pub override_sender_name: Option<String>,
-    /// Quoted message id. Takes preference over `quoted_text` (see below).
     pub quoted_message_id: Option<u32>,
-    pub quoted_text: Option<String>,
-}
-
-impl MessageData {
-    pub(crate) async fn create_message(self, context: &Context) -> Result<Message> {
-        let mut message = Message::new(if let Some(viewtype) = self.viewtype {
-            viewtype.into()
-        } else if self.file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        message.set_text(self.text.unwrap_or_default());
-        if self.html.is_some() {
-            message.set_html(self.html);
-        }
-        if self.override_sender_name.is_some() {
-            message.set_override_sender_name(self.override_sender_name);
-        }
-        if let Some(file) = self.file {
-            message.set_file_and_deduplicate(
-                context,
-                Path::new(&file),
-                self.filename.as_deref(),
-                None,
-            )?;
-        }
-        if let Some((latitude, longitude)) = self.location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = self.quoted_message_id {
-            let quoted_message = Message::load_from_db(context, MsgId::new(id))
-                .await
-                .context("Failed to load quoted message")?;
-            message
-                .set_quote(context, Some(&quoted_message))
-                .await
-                .context("Failed to set quote")?;
-        } else if let Some(text) = self.quoted_text {
-            let protect = false;
-            message.set_quote_text(Some((text, protect)));
-        }
-        Ok(message)
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageReadReceipt {
-    pub contact_id: u32,
-    pub timestamp: i64,
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageInfo {
-    ephemeral_timer: EphemeralTimer,
-    /// When message is ephemeral this contains the timestamp of the message expiry
-    ephemeral_timestamp: Option<i64>,
-    error: Option<String>,
-    rfc724_mid: String,
-    server_urls: Vec<String>,
-    hop_info: String,
-}
-
-impl MessageInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let ephemeral_timer = message.get_ephemeral_timer().into();
-        let ephemeral_timestamp = match message.get_ephemeral_timer() {
-            deltachat::ephemeral::Timer::Disabled => None,
-            deltachat::ephemeral::Timer::Enabled { .. } => Some(message.get_ephemeral_timestamp()),
-        };
-
-        let server_urls =
-            MsgId::get_info_server_urls(context, message.rfc724_mid().to_owned()).await?;
-
-        let hop_info = msg_id.hop_info(context).await?;
-
-        Ok(Self {
-            ephemeral_timer,
-            ephemeral_timestamp,
-            error: message.error(),
-            rfc724_mid: message.rfc724_mid().to_owned(),
-            server_urls,
-            hop_info,
-        })
-    }
-}
-
-#[derive(
-    Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema,
-)]
-#[serde(rename_all = "camelCase", tag = "kind")]
-pub enum EphemeralTimer {
-    /// Timer is disabled.
-    Disabled,
-
-    /// Timer is enabled.
-    Enabled {
-        /// Timer duration in seconds.
-        ///
-        /// The value cannot be 0.
-        duration: u32,
-    },
-}
-
-impl From<deltachat::ephemeral::Timer> for EphemeralTimer {
-    fn from(value: deltachat::ephemeral::Timer) -> Self {
-        match value {
-            deltachat::ephemeral::Timer::Disabled => EphemeralTimer::Disabled,
-            deltachat::ephemeral::Timer::Enabled { duration } => {
-                EphemeralTimer::Enabled { duration }
-            }
-        }
-    }
 }

deltachat-jsonrpc/src/api/types/mod.rs

@@ -2,10 +2,7 @@ pub mod account;
 pub mod chat;
 pub mod chat_list;
 pub mod contact;
-pub mod events;
-pub mod http;
 pub mod location;
-pub mod login_param;
 pub mod message;
 pub mod provider_info;
 pub mod qr;

deltachat-jsonrpc/src/api/types/provider_info.rs

@@ -3,11 +3,9 @@ use num_traits::cast::ToPrimitive;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct ProviderInfo {
-    /// Unique ID, corresponding to provider database filename.
-    pub id: String,
     pub before_login_hint: String,
     pub overview_page: String,
     pub status: u32, // in reality this is an enum, but for simplicity and because it gets converted into a number anyway, we use an u32 here.
@@ -16,7 +14,6 @@ pub struct ProviderInfo {
 impl ProviderInfo {
     pub fn from_dc_type(provider: Option<&Provider>) -> Option<Self> {
         provider.map(|p| ProviderInfo {
-            id: p.id.to_owned(),
             before_login_hint: p.before_login_hint.to_owned(),
             overview_page: p.overview_page.to_owned(),
             status: p.status.to_u32().unwrap(),

deltachat-jsonrpc/src/api/types/qr.rs

@@ -2,169 +2,81 @@ use deltachat::qr::Qr;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "kind")]
+#[serde(tag = "type")]
 pub enum QrObject {
-    /// Ask the user whether to verify the contact.
-    ///
-    /// If the user agrees, pass this QR code to [`crate::securejoin::join_securejoin`].
     AskVerifyContact {
-        /// ID of the contact.
         contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
         fingerprint: String,
-        /// Invite number.
         invitenumber: String,
-        /// Authentication code.
         authcode: String,
     },
-    /// Ask the user whether to join the group.
     AskVerifyGroup {
-        /// Group name.
         grpname: String,
-        /// Group ID.
         grpid: String,
-        /// ID of the contact.
         contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
         fingerprint: String,
-        /// Invite number.
         invitenumber: String,
-        /// Authentication code.
         authcode: String,
     },
-    /// Contact fingerprint is verified.
-    ///
-    /// Ask the user if they want to start chatting.
     FprOk {
-        /// Contact ID.
         contact_id: u32,
     },
-    /// Scanned fingerprint does not match the last seen fingerprint.
     FprMismatch {
-        /// Contact ID.
         contact_id: Option<u32>,
     },
-    /// The scanned QR code contains a fingerprint but no e-mail address.
     FprWithoutAddr {
-        /// Key fingerprint.
         fingerprint: String,
     },
-    /// Ask the user if they want to create an account on the given domain.
     Account {
-        /// Server domain name.
         domain: String,
     },
-    /// Provides a backup that can be retrieved using iroh-net based backup transfer protocol.
+    Backup {
-    Backup2 {
+        ticket: String,
-        /// Authentication token.
-        auth_token: String,
-        /// Iroh node address.
-        node_addr: String,
     },
-    BackupTooNew {},
-    /// Ask the user if they want to use the given service for video chats.
     WebrtcInstance {
         domain: String,
         instance_pattern: String,
     },
-    /// Ask the user if they want to use the given proxy.
-    ///
-    /// Note that HTTP(S) URLs without a path
-    /// and query parameters are treated as HTTP(S) proxy URL.
-    /// UI may want to still offer to open the URL
-    /// in the browser if QR code contents
-    /// starts with `http://` or `https://`
-    /// and the QR code was not scanned from
-    /// the proxy configuration screen.
-    Proxy {
-        /// Proxy URL.
-        ///
-        /// This is the URL that is going to be added.
-        url: String,
-        /// Host extracted from the URL to display in the UI.
-        host: String,
-        /// Port extracted from the URL to display in the UI.
-        port: u16,
-    },
-    /// Contact address is scanned.
-    ///
-    /// Optionally, a draft message could be provided.
-    /// Ask the user if they want to start chatting.
     Addr {
-        /// Contact ID.
         contact_id: u32,
-        /// Draft message.
         draft: Option<String>,
     },
-    /// URL scanned.
-    ///
-    /// Ask the user if they want to open a browser or copy the URL to clipboard.
     Url {
         url: String,
     },
-    /// Text scanned.
-    ///
-    /// Ask the user if they want to copy the text to clipboard.
     Text {
         text: String,
     },
-    /// Ask the user if they want to withdraw their own QR code.
     WithdrawVerifyContact {
-        /// Contact ID.
         contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
         fingerprint: String,
-        /// Invite number.
         invitenumber: String,
-        /// Authentication code.
         authcode: String,
     },
-    /// Ask the user if they want to withdraw their own group invite QR code.
     WithdrawVerifyGroup {
-        /// Group name.
         grpname: String,
-        /// Group ID.
         grpid: String,
-        /// Contact ID.
         contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
         fingerprint: String,
-        /// Invite number.
         invitenumber: String,
-        /// Authentication code.
         authcode: String,
     },
-    /// Ask the user if they want to revive their own QR code.
     ReviveVerifyContact {
-        /// Contact ID.
         contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
         fingerprint: String,
-        /// Invite number.
         invitenumber: String,
-        /// Authentication code.
         authcode: String,
     },
-    /// Ask the user if they want to revive their own group invite QR code.
     ReviveVerifyGroup {
-        /// Contact ID.
         grpname: String,
-        /// Group ID.
         grpid: String,
-        /// Contact ID.
         contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
         fingerprint: String,
-        /// Invite number.
         invitenumber: String,
-        /// Authentication code.
         authcode: String,
     },
-    /// `dclogin:` scheme parameters.
-    ///
-    /// Ask the user if they want to login with the email address.
     Login {
         address: String,
     },
@@ -217,14 +129,9 @@ impl From<Qr> for QrObject {
             }
             Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
             Qr::Account { domain } => QrObject::Account { domain },
-            Qr::Backup2 {
+            Qr::Backup { ticket } => QrObject::Backup {
-                ref node_addr,
+                ticket: ticket.to_string(),
-                auth_token,
-            } => QrObject::Backup2 {
-                node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
-                auth_token,
             },
-            Qr::BackupTooNew {} => QrObject::BackupTooNew {},
             Qr::WebrtcInstance {
                 domain,
                 instance_pattern,
@@ -232,7 +139,6 @@ impl From<Qr> for QrObject {
                 domain,
                 instance_pattern,
             },
-            Qr::Proxy { url, host, port } => QrObject::Proxy { url, host, port },
             Qr::Addr { contact_id, draft } => {
                 let contact_id = contact_id.to_u32();
                 QrObject::Addr { contact_id, draft }

deltachat-jsonrpc/src/api/types/reactions.rs

@@ -1,37 +1,23 @@
 use std::collections::BTreeMap;
 
-use deltachat::contact::ContactId;
 use deltachat::reaction::Reactions;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-/// A single reaction emoji.
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Reaction", rename_all = "camelCase")]
-pub struct JSONRPCReaction {
-    /// Emoji.
-    emoji: String,
-
-    /// Emoji frequency.
-    count: usize,
-
-    /// True if we reacted with this emoji.
-    is_from_self: bool,
-}
-
 /// Structure representing all reactions to a particular message.
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename = "Reactions", rename_all = "camelCase")]
 pub struct JSONRPCReactions {
     /// Map from a contact to it's reaction to message.
     reactions_by_contact: BTreeMap<u32, Vec<String>>,
-    /// Unique reactions and their count, sorted in descending order.
+    /// Unique reactions and their count
-    reactions: Vec<JSONRPCReaction>,
+    reactions: BTreeMap<String, u32>,
 }
 
 impl From<Reactions> for JSONRPCReactions {
     fn from(reactions: Reactions) -> Self {
         let mut reactions_by_contact: BTreeMap<u32, Vec<String>> = BTreeMap::new();
+        let mut unique_reactions: BTreeMap<String, u32> = BTreeMap::new();
 
         for contact_id in reactions.contacts() {
             let reaction = reactions.get(contact_id);
@@ -44,29 +30,18 @@ impl From<Reactions> for JSONRPCReactions {
                 .map(|emoji| emoji.to_owned())
                 .collect();
             reactions_by_contact.insert(contact_id.to_u32(), emojis.clone());
-        }
+            for emoji in emojis {
-
+                if let Some(x) = unique_reactions.get_mut(&emoji) {
-        let self_reactions = reactions_by_contact.get(&ContactId::SELF.to_u32());
+                    *x += 1;
-
+                } else {
-        let mut reactions_v = Vec::new();
+                    unique_reactions.insert(emoji, 1);
-        for (emoji, count) in reactions.emoji_sorted_by_frequency() {
+                }
-            let is_from_self = if let Some(self_reactions) = self_reactions {
+            }
-                self_reactions.contains(&emoji)
-            } else {
-                false
-            };
-
-            let reaction = JSONRPCReaction {
-                emoji,
-                count,
-                is_from_self,
-            };
-            reactions_v.push(reaction)
         }
 
         JSONRPCReactions {
             reactions_by_contact,
-            reactions: reactions_v,
+            reactions: unique_reactions,
         }
     }
 }

deltachat-jsonrpc/src/api/types/webxdc.rs

@@ -8,7 +8,7 @@ use typescript_type_def::TypeDef;
 
 use super::maybe_empty_string_to_option;
 
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
+#[derive(Serialize, TypeDef)]
 #[serde(rename = "WebxdcMessageInfo", rename_all = "camelCase")]
 pub struct WebxdcMessageInfo {
     /// The name of the app.
@@ -35,14 +35,6 @@ pub struct WebxdcMessageInfo {
     source_code_url: Option<String>,
     /// True if full internet access should be granted to the app.
     internet_access: bool,
-    /// Address to be used for `window.webxdc.selfAddr` in JS land.
-    self_addr: String,
-    /// Milliseconds to wait before calling `sendUpdate()` again since the last call.
-    /// Should be exposed to `window.sendUpdateInterval` in JS land.
-    send_update_interval: usize,
-    /// Maximum number of bytes accepted for a serialized update object.
-    /// Should be exposed to `window.sendUpdateMaxSize` in JS land.
-    send_update_max_size: usize,
 }
 
 impl WebxdcMessageInfo {
@@ -57,11 +49,7 @@ impl WebxdcMessageInfo {
             document,
             summary,
             source_code_url,
-            request_integration: _,
             internet_access,
-            self_addr,
-            send_update_interval,
-            send_update_max_size,
         } = message.get_webxdc_info(context).await?;
 
         Ok(Self {
@@ -71,9 +59,6 @@ impl WebxdcMessageInfo {
             summary: maybe_empty_string_to_option(summary),
             source_code_url: maybe_empty_string_to_option(source_code_url),
             internet_access,
-            self_addr,
-            send_update_interval,
-            send_update_max_size,
         })
     }
 }

deltachat-jsonrpc/src/lib.rs

@@ -1,7 +1,5 @@
-#![recursion_limit = "256"]
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
 pub mod api;
+pub use api::events;
 pub use yerpc;
 
 #[cfg(test)]
@@ -16,11 +14,10 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
         let tmp_dir = TempDir::new().unwrap().path().into();
-        let writable = true;
+        let accounts = Accounts::new(tmp_dir).await?;
-        let accounts = Accounts::new(tmp_dir, writable).await?;
         let api = CommandApi::new(accounts);
 
-        let (sender, receiver) = unbounded::<String>();
+        let (sender, mut receiver) = unbounded::<String>();
 
         let (client, mut rx) = RpcClient::new();
         let session = RpcSession::new(client, api);
@@ -39,17 +36,17 @@ mod tests {
             let request = r#"{"jsonrpc":"2.0","method":"add_account","params":[],"id":1}"#;
             let response = r#"{"jsonrpc":"2.0","id":1,"result":1}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
+            let result = receiver.next().await;
             println!("{result:?}");
-            assert_eq!(result, response.to_owned());
+            assert_eq!(result, Some(response.to_owned()));
         }
         {
             let request = r#"{"jsonrpc":"2.0","method":"get_all_account_ids","params":[],"id":2}"#;
             let response = r#"{"jsonrpc":"2.0","id":2,"result":[1]}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
+            let result = receiver.next().await;
             println!("{result:?}");
-            assert_eq!(result, response.to_owned());
+            assert_eq!(result, Some(response.to_owned()));
         }
 
         Ok(())
@@ -58,11 +55,10 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn test_batch_set_config() -> anyhow::Result<()> {
         let tmp_dir = TempDir::new().unwrap().path().into();
-        let writable = true;
+        let accounts = Accounts::new(tmp_dir).await?;
-        let accounts = Accounts::new(tmp_dir, writable).await?;
         let api = CommandApi::new(accounts);
 
-        let (sender, receiver) = unbounded::<String>();
+        let (sender, mut receiver) = unbounded::<String>();
 
         let (client, mut rx) = RpcClient::new();
         let session = RpcSession::new(client, api);
@@ -81,15 +77,15 @@ mod tests {
             let request = r#"{"jsonrpc":"2.0","method":"add_account","params":[],"id":1}"#;
             let response = r#"{"jsonrpc":"2.0","id":1,"result":1}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
+            let result = receiver.next().await;
-            assert_eq!(result, response.to_owned());
+            assert_eq!(result, Some(response.to_owned()));
         }
         {
-            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":""}]}"#;
+            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":"","socks5_enabled":"0","socks5_host":"","socks5_port":"","socks5_user":"","socks5_password":""}]}"#;
             let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
+            let result = receiver.next().await;
-            assert_eq!(result, response.to_owned());
+            assert_eq!(result, Some(response.to_owned()));
         }
 
         Ok(())

deltachat-jsonrpc/src/webserver.rs

@@ -0,0 +1,55 @@
+use std::net::SocketAddr;
+use std::path::PathBuf;
+
+use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
+use yerpc::axum::handle_ws_rpc;
+use yerpc::{RpcClient, RpcSession};
+
+mod api;
+use api::events::event_to_json_rpc_notification;
+use api::{Accounts, CommandApi};
+
+const DEFAULT_PORT: u16 = 20808;
+
+#[tokio::main(flavor = "multi_thread")]
+async fn main() -> Result<(), std::io::Error> {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+
+    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "./accounts".to_string());
+    let port = std::env::var("DC_PORT")
+        .map(|port| port.parse::<u16>().expect("DC_PORT must be a number"))
+        .unwrap_or(DEFAULT_PORT);
+    log::info!("Starting with accounts directory `{path}`.");
+    let accounts = Accounts::new(PathBuf::from(&path)).await.unwrap();
+    let state = CommandApi::new(accounts);
+
+    let app = Router::new()
+        .route("/ws", get(handler))
+        .layer(Extension(state.clone()));
+
+    tokio::spawn(async move {
+        state.accounts.read().await.start_io().await;
+    });
+
+    let addr = SocketAddr::from(([127, 0, 0, 1], port));
+    log::info!("JSON-RPC WebSocket server listening on {}", addr);
+    axum::Server::bind(&addr)
+        .serve(app.into_make_service())
+        .await
+        .unwrap();
+
+    Ok(())
+}
+
+async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
+    let (client, out_receiver) = RpcClient::new();
+    let session = RpcSession::new(client.clone(), api.clone());
+    tokio::spawn(async move {
+        let events = api.accounts.read().await.get_event_emitter();
+        while let Some(event) = events.recv().await {
+            let event = event_to_json_rpc_notification(event);
+            client.send_notification("event", Some(event)).await.ok();
+        }
+    });
+    handle_ws_rpc(ws, out_receiver, session).await
+}

deltachat-jsonrpc/typescript/example.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>DeltaChat JSON-RPC example</title>
+    <style>
+      body {
+        font-family: monospace;
+        background: black;
+        color: grey;
+      }
+      .grid {
+        display: grid;
+        grid-template-columns: 3fr 1fr;
+        grid-template-areas: "a a" "b c";
+      }
+      .message {
+        color: red;
+      }
+      #header {
+        grid-area: a;
+        color: white;
+        font-size: 1.2rem;
+      }
+      #header a {
+        color: white;
+        font-weight: bold;
+      }
+      #main {
+        grid-area: b;
+        color: green;
+      }
+      #main h2,
+      #main h3 {
+        color: blue;
+      }
+      #side {
+        grid-area: c;
+        color: #777;
+        overflow-y: auto;
+      }
+    </style>
+    <script type="module" src="dist/example.bundle.js"></script>
+  </head>
+  <body>
+    <h1>DeltaChat JSON-RPC example</h1>
+    <div class="grid">
+      <div id="header"></div>
+      <div id="main"></div>
+      <div id="side"><h2>log</h2></div>
+    </div>
+    <p>
+      Tip: open the dev console and use the client with
+      <code>window.client</code>
+    </p>
+  </body>
+</html>

deltachat-jsonrpc/typescript/example/example.ts

@@ -0,0 +1,110 @@
+import { DcEvent, DeltaChat } from "../deltachat.js";
+
+var SELECTED_ACCOUNT = 0;
+
+window.addEventListener("DOMContentLoaded", (_event) => {
+  (window as any).selectDeltaAccount = (id: string) => {
+    SELECTED_ACCOUNT = Number(id);
+    window.dispatchEvent(new Event("account-changed"));
+  };
+  console.log("launch run script...");
+  run().catch((err) => console.error("run failed", err));
+});
+
+async function run() {
+  const $main = document.getElementById("main")!;
+  const $side = document.getElementById("side")!;
+  const $head = document.getElementById("header")!;
+
+  const client = new DeltaChat("ws://localhost:20808/ws");
+
+  (window as any).client = client.rpc;
+
+  client.on("ALL", (accountId, event) => {
+    onIncomingEvent(accountId, event);
+  });
+
+  window.addEventListener("account-changed", async (_event: Event) => {
+    listChatsForSelectedAccount();
+  });
+
+  await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
+
+  async function loadAccountsInHeader() {
+    console.log("load accounts");
+    const accounts = await client.rpc.getAllAccounts();
+    console.log("accounts loaded", accounts);
+    for (const account of accounts) {
+      if (account.type === "Configured") {
+        write(
+          $head,
+          `<a href="#" onclick="selectDeltaAccount(${account.id})">
+          ${account.id}: ${account.addr!}
+          </a>&nbsp;`
+        );
+      } else {
+        write(
+          $head,
+          `<a href="#">
+          ${account.id}: (unconfigured)
+          </a>&nbsp;`
+        );
+      }
+    }
+  }
+
+  async function listChatsForSelectedAccount() {
+    clear($main);
+    const selectedAccount = SELECTED_ACCOUNT;
+    const info = await client.rpc.getAccountInfo(selectedAccount);
+    if (info.type !== "Configured") {
+      return write($main, "Account is not configured");
+    }
+    write($main, `<h2>${info.addr!}</h2>`);
+    const chats = await client.rpc.getChatlistEntries(
+      selectedAccount,
+      0,
+      null,
+      null
+    );
+    for (const [chatId, _messageId] of chats) {
+      const chat = await client.rpc.getFullChatById(selectedAccount, chatId);
+      write($main, `<h3>${chat.name}</h3>`);
+      const messageIds = await client.rpc.getMessageIds(
+        selectedAccount,
+        chatId,
+        false,
+        false
+      );
+      const messages = await client.rpc.getMessages(
+        selectedAccount,
+        messageIds
+      );
+      for (const [_messageId, message] of Object.entries(messages)) {
+        if (message.variant === "message")
+          write($main, `<p>${message.text}</p>`);
+        else write($main, `<p>loading error: ${message.error}</p>`);
+      }
+    }
+  }
+
+  function onIncomingEvent(accountId: number, event: DcEvent) {
+    write(
+      $side,
+      `
+        <p class="message">
+          [<strong>${event.type}</strong> on account ${accountId}]<br>
+          <em>f1:</em> ${JSON.stringify(
+            Object.assign({}, event, { type: undefined })
+          )}
+        </p>`
+    );
+  }
+}
+
+function write(el: HTMLElement, html: string) {
+  el.innerHTML += html;
+}
+function clear(el: HTMLElement) {
+  el.innerHTML = "";
+}

deltachat-jsonrpc/typescript/example/node-add-account.js

@@ -0,0 +1,29 @@
+import { DeltaChat } from "../dist/deltachat.js";
+
+run().catch(console.error);
+
+async function run() {
+  const delta = new DeltaChat("ws://localhost:20808/ws");
+  delta.on("event", (event) => {
+    console.log("event", event.data);
+  });
+
+  const email = process.argv[2];
+  const password = process.argv[3];
+  if (!email || !password)
+    throw new Error(
+      "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
+    );
+  console.log(`creating account for ${email}`);
+  const id = await delta.rpc.addAccount();
+  console.log(`created account id ${id}`);
+  await delta.rpc.setConfig(id, "addr", email);
+  await delta.rpc.setConfig(id, "mail_pw", password);
+  console.log("configuration updated");
+  await delta.rpc.configure(id);
+  console.log("account configured!");
+
+  const accounts = await delta.rpc.getAllAccounts();
+  console.log("accounts", accounts);
+  console.log("waiting for events...");
+}

deltachat-jsonrpc/typescript/example/node-demo.js

@@ -0,0 +1,14 @@
+import { DeltaChat } from "../dist/deltachat.js";
+
+run().catch(console.error);
+
+async function run() {
+  const delta = new DeltaChat();
+  delta.on("event", (event) => {
+    console.log("event", event.data);
+  });
+
+  const accounts = await delta.rpc.getAllAccounts();
+  console.log("accounts", accounts);
+  console.log("waiting for events...");
+}

deltachat-jsonrpc/typescript/package.json

@@ -3,12 +3,13 @@
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.6.2"
+    "yerpc": "^0.4.3"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^9.0.0",
+    "@types/node-fetch": "^2.5.7",
     "@types/ws": "^7.2.4",
     "c8": "^7.10.0",
     "chai": "^4.3.4",
@@ -16,6 +17,7 @@
     "esbuild": "^0.17.9",
     "http-server": "^14.1.1",
     "mocha": "^9.1.1",
+    "node-fetch": "^2.6.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.2",
     "typedoc": "^0.23.2",
@@ -25,23 +27,22 @@
   "exports": {
     ".": {
       "import": "./dist/deltachat.js",
-      "require": "./dist/deltachat.cjs",
+      "require": "./dist/deltachat.cjs"
-      "types": "./dist/deltachat.d.ts"
     }
   },
   "license": "MPL-2.0",
   "main": "dist/deltachat.js",
   "name": "@deltachat/jsonrpc-client",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/chatmail/core.git"
-  },
   "scripts": {
     "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
     "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
     "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
     "build:tsc": "tsc",
     "docs": "typedoc --out docs deltachat.ts",
+    "example": "run-s build example:build example:start",
+    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
+    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
+    "example:start": "http-server .",
     "extract-constants": "node ./scripts/generate-constants.js",
     "generate-bindings": "cargo test",
     "prettier:check": "prettier --check .",
@@ -54,5 +55,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.159.3"
+  "version": "1.111.0"
 }

deltachat-jsonrpc/typescript/src/client.ts

@@ -1,28 +1,34 @@
 import * as T from "../generated/types.js";
-import { EventType } from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { BaseTransport, Request } from "yerpc";
+import { Event } from "../generated/events.js";
+import { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";
 
-type Events = { ALL: (accountId: number, event: EventType) => void } & {
+type DCWireEvent<T extends Event> = {
-  [Property in EventType["kind"]]: (
+  event: T;
+  contextId: number;
+};
+// export type Events = Record<
+//   Event["type"] | "ALL",
+//   (event: DeltaChatEvent<Event>) => void
+// >;
+
+type Events = { ALL: (accountId: number, event: Event) => void } & {
+  [Property in Event["type"]]: (
     accountId: number,
-    event: Extract<EventType, { kind: Property }>
+    event: Extract<Event, { type: Property }>
   ) => void;
 };
 
-type ContextEvents = { ALL: (event: EventType) => void } & {
+type ContextEvents = { ALL: (event: Event) => void } & {
-  [Property in EventType["kind"]]: (
+  [Property in Event["type"]]: (
-    event: Extract<EventType, { kind: Property }>
+    event: Extract<Event, { type: Property }>
   ) => void;
 };
 
-export type DcEvent = EventType;
+export type DcEvent = Event;
-export type DcEventType<T extends EventType["kind"]> = Extract<
+export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>;
-  EventType,
-  { kind: T }
->;
 
 export class BaseDeltaChat<
   Transport extends BaseTransport<any>
@@ -30,34 +36,27 @@ export class BaseDeltaChat<
   rpc: RawClient;
   account?: T.Account;
   private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
-
+  constructor(public transport: Transport) {
-  //@ts-ignore
-  private eventTask: Promise<void>;
-
-  constructor(public transport: Transport, startEventLoop: boolean) {
     super();
     this.rpc = new RawClient(this.transport);
-    if (startEventLoop) {
+    this.transport.on("request", (request: Request) => {
-      this.eventTask = this.eventLoop();
+      const method = request.method;
-    }
+      if (method === "event") {
-  }
+        const event = request.params! as DCWireEvent<Event>;
+        //@ts-ignore
+        this.emit(event.event.type, event.contextId, event.event as any);
+        this.emit("ALL", event.contextId, event.event as any);
 
-  async eventLoop(): Promise<void> {
+        if (this.contextEmitters[event.contextId]) {
-    while (true) {
+          this.contextEmitters[event.contextId].emit(
-      const event = await this.rpc.getNextEvent();
+            event.event.type,
-      //@ts-ignore
+            //@ts-ignore
-      this.emit(event.event.kind, event.contextId, event.event);
+            event.event as any
-      this.emit("ALL", event.contextId, event.event);
+          );
-
+          this.contextEmitters[event.contextId].emit("ALL", event.event);
-      if (this.contextEmitters[event.contextId]) {
+        }
-        this.contextEmitters[event.contextId].emit(
-          event.event.kind,
-          //@ts-ignore
-          event.event as any
-        );
-        this.contextEmitters[event.contextId].emit("ALL", event.event as any);
       }
-    }
+    });
   }
 
   async listAccounts(): Promise<T.Account[]> {
@@ -74,11 +73,33 @@ export class BaseDeltaChat<
   }
 }
 
+export type Opts = {
+  url: string;
+};
+
+export const DEFAULT_OPTS: Opts = {
+  url: "ws://localhost:20808/ws",
+};
+export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
+  opts: Opts;
+  close() {
+    this.transport.close();
+  }
+  constructor(opts?: Opts | string) {
+    if (typeof opts === "string") opts = { url: opts };
+    if (opts) opts = { ...DEFAULT_OPTS, ...opts };
+    else opts = { ...DEFAULT_OPTS };
+    const transport = new WebsocketTransport(opts.url);
+    super(transport);
+    this.opts = opts;
+  }
+}
+
 export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
   close() {}
-  constructor(input: any, output: any, startEventLoop: boolean) {
+  constructor(input: any, output: any) {
     const transport = new StdioTransport(input, output);
-    super(transport, startEventLoop);
+    super(transport);
   }
 }
 

deltachat-jsonrpc/typescript/src/lib.ts

@@ -1,5 +1,6 @@
 export * as RPC from "../generated/jsonrpc.js";
 export * as T from "../generated/types.js";
+export * from "../generated/events.js";
 export { RawClient } from "../generated/client.js";
 export * from "./client.js";
 export * as yerpc from "yerpc";

deltachat-jsonrpc/typescript/test/basic.ts

@@ -12,7 +12,7 @@ describe("basic tests", () => {
 
   before(async () => {
     serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout, true);
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
     // dc.on("ALL", (event) => {
     //console.log("event", event);
     // });
@@ -79,9 +79,6 @@ describe("basic tests", () => {
       accountId = await dc.rpc.addAccount();
     });
     it("should block and unblock contact", async function () {
-      // Cannot send sync messages to self as we do not have a self address.
-      await dc.rpc.setConfig(accountId, "sync_msgs", "0");
-
       const contactId = await dc.rpc.createContact(
         accountId,
         "example@delta.chat",

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,5 +1,5 @@
 import { assert, expect } from "chai";
-import { StdioDeltaChat as DeltaChat, DcEvent, C } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
 import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
 
 const EVENT_TIMEOUT = 20000;
@@ -13,27 +13,27 @@ describe("online tests", function () {
 
   before(async function () {
     this.timeout(60000);
-    if (!process.env.CHATMAIL_DOMAIN) {
+    if (!process.env.DCC_NEW_TMP_EMAIL) {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
-          "CAN NOT RUN COVERAGE correctly: Missing CHATMAIL_DOMAIN environment variable!\n\n",
+          "CAN NOT RUN COVERAGE correctly: Missing DCC_NEW_TMP_EMAIL environment variable!\n\n",
           "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test"
         );
         process.exit(1);
       }
       console.log(
-        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests"
+        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests"
       );
       this.skip();
     }
     serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout, true);
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
 
-    dc.on("ALL", (contextId, { kind }) => {
+    dc.on("ALL", (contextId, { type }) => {
-      if (kind !== "Info") console.log(contextId, kind);
+      if (type !== "Info") console.log(contextId, type);
     });
 
-    account1 = createTempUser(process.env.CHATMAIL_DOMAIN);
+    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
     if (!account1 || !account1.email || !account1.password) {
       console.log(
         "We didn't got back an account from the api, skip integration tests"
@@ -41,7 +41,7 @@ describe("online tests", function () {
       this.skip();
     }
 
-    account2 = createTempUser(process.env.CHATMAIL_DOMAIN);
+    account2 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
     if (!account2 || !account2.email || !account2.password) {
       console.log(
         "We didn't got back an account2 from the api, skip integration tests"
@@ -80,10 +80,16 @@ describe("online tests", function () {
     }
     this.timeout(15000);
 
-    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
+    const contactId = await dc.rpc.createContact(
-    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
+      accountId1,
+      account2.email,
+      null
+    );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
+    const eventPromise = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId2),
+      waitForEvent(dc, "IncomingMsg", accountId2),
+    ]);
 
     await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
     const { chatId: chatIdOnAccountB } = await eventPromise;
@@ -98,20 +104,25 @@ describe("online tests", function () {
     expect(messageList).have.length(1);
     const message = await dc.rpc.getMessage(accountId2, messageList[0]);
     expect(message.text).equal("Hello");
-    expect(message.showPadlock).equal(true);
   });
 
-  it("send and receive text message roundtrip", async function () {
+  it("send and receive text message roundtrip, encrypted on answer onwards", async function () {
     if (!accountsConfigured) {
       this.skip();
     }
     this.timeout(10000);
 
     // send message from A to B
-    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
+    const contactId = await dc.rpc.createContact(
-    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
+      accountId1,
+      account2.email,
+      null
+    );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
+    const eventPromise = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId2),
+      waitForEvent(dc, "IncomingMsg", accountId2),
+    ]);
     dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
     // wait for message from A
     console.log("wait for message from A");
@@ -132,9 +143,12 @@ describe("online tests", function () {
     );
     expect(message.text).equal("Hello2");
     // Send message back from B to A
-    const eventPromise2 = waitForEvent(dc, "IncomingMsg", accountId1);
+    const eventPromise2 = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId1),
+      waitForEvent(dc, "IncomingMsg", accountId1),
+    ]);
     dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
-    // Check if answer arrives at A and if it is encrypted
+    // Check if answer arives at A and if it is encrypted
     await eventPromise2;
 
     const messageId = (
@@ -163,12 +177,12 @@ describe("online tests", function () {
   });
 });
 
-async function waitForEvent<T extends DcEvent["kind"]>(
+async function waitForEvent<T extends DcEvent["type"]>(
   dc: DeltaChat,
   eventType: T,
   accountId: number,
   timeout: number = EVENT_TIMEOUT
-): Promise<Extract<DcEvent, { kind: T }>> {
+): Promise<Extract<DcEvent, { type: T }>> {
   return new Promise((resolve, reject) => {
     const rejectTimeout = setTimeout(
       () => reject(new Error("Timeout reached before event came in")),

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -2,6 +2,7 @@ import { tmpdir } from "os";
 import { join, resolve } from "path";
 import { mkdtemp, rm } from "fs/promises";
 import { spawn, exec } from "child_process";
+import fetch from "node-fetch";
 import { Readable, Writable } from "node:stream";
 
 export type RpcServerHandle = {
@@ -56,14 +57,15 @@ export async function startServer(): Promise<RpcServerHandle> {
   };
 }
 
-export function createTempUser(chatmailDomain: String) {
+export async function createTempUser(url: string) {
-  const charset = "2345789acdefghjkmnpqrstuvwxyz";
+  const response = await fetch(url, {
-  let user = "ci-";
+    method: "POST",
-  for (let i = 0; i < 6; i++) {
+    headers: {
-    user += charset[Math.floor(Math.random() * charset.length)];
+      "cache-control": "no-cache",
-  }
+    },
-  const email = user + "@" + chatmailDomain;
+  });
-  return { email: email, password: user + "$" + user };
+  if (!response.ok) throw new Error("Received invalid response");
+  return response.json();
 }
 
 function getTargetDir(): Promise<string> {

deltachat-jsonrpc/typescript/tsconfig.json

@@ -15,6 +15,6 @@
     "noImplicitAny": true,
     "isolatedModules": true
   },
-  "include": ["*.ts", "test/*.ts"],
+  "include": ["*.ts", "example/*.ts", "test/*.ts"],
   "compileOnSave": false
 }

deltachat-ratelimit/src/lib.rs

@@ -90,11 +90,6 @@ impl Ratelimit {
     pub fn until_can_send(&self) -> Duration {
         self.until_can_send_at(SystemTime::now())
     }
-
-    /// Returns minimum possible update interval in milliseconds.
-    pub fn update_interval(&self) -> usize {
-        (self.window.as_millis() as f64 / self.quota) as usize
-    }
 }
 
 #[cfg(test)]
@@ -107,7 +102,6 @@ mod tests {
 
         let mut ratelimit = Ratelimit::new_at(Duration::new(60, 0), 3.0, now);
         assert!(ratelimit.can_send_at(now));
-        assert_eq!(ratelimit.update_interval(), 20_000);
 
         // Send burst of 3 messages.
         ratelimit.send_at(now);

deltachat-repl/Cargo.toml

@@ -1,21 +1,19 @@
 [package]
 name = "deltachat-repl"
-version = "1.159.3"
+version = "1.111.0"
 license = "MPL-2.0"
 edition = "2021"
-repository = "https://github.com/chatmail/core"
 
 [dependencies]
-anyhow = { workspace = true }
+ansi_term = "0.12.1"
-deltachat = { workspace = true, features = ["internals"]}
+anyhow = "1"
-dirs = "6"
+deltachat = { path = "..", features = ["internals"]}
-log = { workspace = true }
+dirs = "4"
-nu-ansi-term = { workspace = true }
+log = "0.4.16"
-qr2term = "0.3.3"
+pretty_env_logger = "0.4"
-rusqlite = { workspace = true }
+rusqlite = "0.28"
-rustyline = "15"
+rustyline = "11"
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
+tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [features]
 default = ["vendored"]

deltachat-repl/src/cmdline.rs

@@ -3,7 +3,7 @@ extern crate dirs;
 
 use std::path::Path;
 use std::str::FromStr;
-use std::time::Duration;
+use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, ensure, Result};
 use deltachat::chat::{
@@ -18,11 +18,8 @@ use deltachat::imex::*;
 use deltachat::location;
 use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
-use deltachat::mimeparser::SystemMessage;
-use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::qr_code_generator::create_qr_svg;
 use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
@@ -35,6 +32,14 @@ use tokio::fs;
 /// e.g. bitmask 7 triggers actions defined with bits 1, 2 and 4.
 async fn reset_tables(context: &Context, bits: i32) {
     println!("Resetting tables ({bits})...");
+    if 0 != bits & 1 {
+        context
+            .sql()
+            .execute("DELETE FROM jobs;", ())
+            .await
+            .unwrap();
+        println!("(1) Jobs reset.");
+    }
     if 0 != bits & 2 {
         context
             .sql()
@@ -92,7 +97,7 @@ async fn reset_tables(context: &Context, bits: i32) {
     context.emit_msgs_changed_without_ids();
 }
 
-async fn poke_eml_file(context: &Context, filename: &Path) -> Result<()> {
+async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
     let data = read_file(context, filename).await?;
 
     if let Err(err) = receive_imf(context, &data, false).await {
@@ -126,31 +131,29 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
         real_spec = rs.unwrap();
     }
     if let Some(suffix) = get_filesuffix_lc(&real_spec) {
-        if suffix == "eml" && poke_eml_file(context, Path::new(&real_spec)).await.is_ok() {
+        if suffix == "eml" && poke_eml_file(context, &real_spec).await.is_ok() {
             read_cnt += 1
         }
     } else {
         /* import a directory */
         let dir_name = std::path::Path::new(&real_spec);
         let dir = fs::read_dir(dir_name).await;
-        if let Ok(mut dir) = dir {
+        if dir.is_err() {
+            error!(context, "Import: Cannot open directory \"{}\".", &real_spec,);
+            return false;
+        } else {
+            let mut dir = dir.unwrap();
             while let Ok(Some(entry)) = dir.next_entry().await {
                 let name_f = entry.file_name();
                 let name = name_f.to_string_lossy();
                 if name.ends_with(".eml") {
                     let path_plus_name = format!("{}/{}", &real_spec, name);
                     println!("Import: {path_plus_name}");
-                    if poke_eml_file(context, Path::new(&path_plus_name))
+                    if poke_eml_file(context, path_plus_name).await.is_ok() {
-                        .await
-                        .is_ok()
-                    {
                         read_cnt += 1
                     }
                 }
             }
-        } else {
-            error!(context, "Import: Cannot open directory \"{}\".", &real_spec);
-            return false;
         }
     }
     println!("Import: {} items read from \"{}\".", read_cnt, &real_spec);
@@ -184,7 +187,6 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         DownloadState::Available => " [⬇ Download available]",
         DownloadState::InProgress => " [⬇ Download in progress...]️",
         DownloadState::Failure => " [⬇ Download failed]",
-        DownloadState::Undecipherable => " [⬇ Decryption failed]",
     };
 
     let temp2 = timestamp_to_str(msg.get_timestamp());
@@ -197,7 +199,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         if msg.has_location() { "📍" } else { "" },
         &contact_name,
         contact_id,
-        msgtext,
+        msgtext.unwrap_or_default(),
         if msg.has_html() { "[HAS-HTML]️" } else { "" },
         if msg.get_from_id() == ContactId::SELF {
             ""
@@ -208,17 +210,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         } else {
             "[FRESH]"
         },
-        if msg.is_info() {
+        if msg.is_info() { "[INFO]" } else { "" },
-            if msg.get_info_type() == SystemMessage::ChatProtectionEnabled {
-                "[INFO 🛡️]"
-            } else if msg.get_info_type() == SystemMessage::ChatProtectionDisabled {
-                "[INFO 🛡️❌]"
-            } else {
-                "[INFO]"
-            }
-        } else {
-            ""
-        },
         if msg.get_viewtype() == Viewtype::VideochatInvitation {
             format!(
                 "[VIDEOCHAT-INVITATION: {}, type={}]",
@@ -281,8 +273,13 @@ async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()
         let contact = Contact::get_by_id(context, *contact_id).await?;
         let name = contact.get_display_name();
         let addr = contact.get_addr();
-        let verified_str = if contact.is_verified(context).await? {
+        let verified_state = contact.is_verified(context).await?;
-            " √"
+        let verified_str = if VerifiedStatus::Unverified != verified_state {
+            if verified_state == VerifiedStatus::BidirectVerified {
+                " √√"
+            } else {
+                " √"
+            }
         } else {
             ""
         };
@@ -343,6 +340,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  receive-backup <qr>\n\
                  export-keys\n\
                  import-keys\n\
+                 export-setup\n\
                  poke [<eml-file>|<folder>|<addr> <key-file>]\n\
                  reset <flags>\n\
                  stop\n\
@@ -359,7 +357,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  configure\n\
                  connect\n\
                  disconnect\n\
-                 fetch\n\
                  connectivity\n\
                  maybenetwork\n\
                  housekeeping\n\
@@ -398,6 +395,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  unpin <chat-id>\n\
                  mute <chat-id> [<seconds>]\n\
                  unmute <chat-id>\n\
+                 protect <chat-id>\n\
+                 unprotect <chat-id>\n\
                  delchat <chat-id>\n\
                  accept <chat-id>\n\
                  decline <chat-id>\n\
@@ -429,7 +428,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  checkqr <qr-content>\n\
                  joinqr <qr-content>\n\
                  setqr <qr-content>\n\
-                 createqrsvg <qr-content>\n\
                  providerinfo <addr>\n\
                  fileinfo <file>\n\
                  estimatedeletion <seconds>\n\
@@ -492,9 +490,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         }
         "send-backup" => {
             let provider = BackupProvider::prepare(&context).await?;
-            let qr = format_backup(&provider.qr())?;
+            let qr = provider.qr();
-            println!("QR code: {}", qr);
+            println!("QR code: {}", format_backup(&qr)?);
-            qr2term::print_qr(qr.as_str())?;
             provider.await?;
         }
         "receive-backup" => {
@@ -510,6 +507,17 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "import-keys" => {
             imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
         }
+        "export-setup" => {
+            let setup_code = create_setup_code(&context);
+            let file_name = blobdir.join("autocrypt-setup-message.html");
+            let file_content = render_setup_file(&context, &setup_code).await?;
+            fs::write(&file_name, file_content).await?;
+            println!(
+                "Setup message written to: {}\nSetup code: {}",
+                file_name.display(),
+                &setup_code,
+            );
+        }
         "poke" => {
             ensure!(poke_spec(&context, Some(arg1)).await, "Poke failed");
         }
@@ -555,7 +563,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             context.maybe_network().await;
         }
         "housekeeping" => {
-            sql::housekeeping(&context).await.log_err(&context).ok();
+            sql::housekeeping(&context).await.ok_or_log(&context);
         }
         "listchats" | "listarchived" | "chats" => {
             let listflags = if arg0 == "listarchived" {
@@ -638,30 +646,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             println!("{cnt} chats");
             println!("{time_needed:?} to create this list");
         }
-        "start-realtime" => {
-            if arg1.is_empty() {
-                bail!("missing msgid");
-            }
-            let msg_id = MsgId::new(arg1.parse()?);
-            let res = send_webxdc_realtime_advertisement(&context, msg_id).await?;
-
-            if let Some(res) = res {
-                println!("waiting for peer channel join");
-                res.await?;
-            }
-            println!("joined peer channel");
-        }
-        "send-realtime" => {
-            if arg1.is_empty() {
-                bail!("missing msgid");
-            }
-            if arg2.is_empty() {
-                bail!("no message");
-            }
-            let msg_id = MsgId::new(arg1.parse()?);
-            send_webxdc_realtime_data(&context, msg_id, arg2.as_bytes().to_vec()).await?;
-            println!("sent realtime message");
-        }
         "chat" => {
             if sel_chat.is_none() && arg1.is_empty() {
                 bail!("Argument [chat-id] is missing.");
@@ -821,30 +805,15 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         }
         "chatinfo" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
-            let sel_chat_id = sel_chat.as_ref().unwrap().get_id();
 
-            let contacts = chat::get_chat_contacts(&context, sel_chat_id).await?;
+            let contacts =
+                chat::get_chat_contacts(&context, sel_chat.as_ref().unwrap().get_id()).await?;
             println!("Memberlist:");
 
             log_contactlist(&context, &contacts).await?;
-            println!("{} contacts", contacts.len());
-
-            let similar_chats = sel_chat_id.get_similar_chat_ids(&context).await?;
-            if !similar_chats.is_empty() {
-                println!("Similar chats: ");
-                for (similar_chat_id, metric) in similar_chats {
-                    let similar_chat = Chat::load_from_db(&context, similar_chat_id).await?;
-                    println!(
-                        "{} (#{}) {:.1}",
-                        similar_chat.name,
-                        similar_chat_id,
-                        100.0 * metric
-                    );
-                }
-            }
-
             println!(
-                "Location streaming: {}",
+                "{} contacts\nLocation streaming: {}",
+                contacts.len(),
                 location::is_sending_locations_to_chat(
                     &context,
                     Some(sel_chat.as_ref().unwrap().get_id())
@@ -909,7 +878,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             let latitude = arg1.parse()?;
             let longitude = arg2.parse()?;
 
-            let continue_streaming = location::set(&context, latitude, longitude, 0.).await?;
+            let continue_streaming = location::set(&context, latitude, longitude, 0.).await;
             if continue_streaming {
                 println!("Success, streaming should be continued.");
             } else {
@@ -942,8 +911,10 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             } else {
                 Viewtype::File
             });
-            msg.set_file_and_deduplicate(&context, Path::new(arg1), None, None)?;
+            msg.set_file(arg1, None);
-            msg.set_text(arg2.to_string());
+            if !arg2.is_empty() {
+                msg.set_text(Some(arg2.to_string()));
+            }
             chat::send_msg(&context, sel_chat.as_ref().unwrap().get_id(), &mut msg).await?;
         }
         "sendhtml" => {
@@ -955,11 +926,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
 
             let mut msg = Message::new(Viewtype::Text);
             msg.set_html(Some(html.to_string()));
-            msg.set_text(if arg2.is_empty() {
+            msg.set_text(Some(if arg2.is_empty() {
                 path.file_name().unwrap().to_string_lossy().to_string()
             } else {
                 arg2.to_string()
-            });
+            }));
             chat::send_msg(&context, sel_chat.as_ref().unwrap().get_id(), &mut msg).await?;
         }
         "sendsyncmsg" => match context.send_sync_msg().await? {
@@ -972,7 +943,9 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 "Arguments <msg-id> <json status update> expected"
             );
             let msg_id = MsgId::new(arg1.parse()?);
-            context.send_webxdc_status_update(msg_id, arg2).await?;
+            context
+                .send_webxdc_status_update(msg_id, arg2, "this is a webxdc status update")
+                .await?;
         }
         "videochat" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
@@ -1005,7 +978,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             if !arg1.is_empty() {
-                let mut draft = Message::new_text(arg1.to_string());
+                let mut draft = Message::new(Viewtype::Text);
+                draft.set_text(Some(arg1.to_string()));
                 sel_chat
                     .as_ref()
                     .unwrap()
@@ -1028,7 +1002,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 !arg1.is_empty(),
                 "Please specify text to add as device message."
             );
-            let mut msg = Message::new_text(arg1.to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text(Some(arg1.to_string()));
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
         "listmedia" => {
@@ -1083,6 +1058,20 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             };
             chat::set_muted(&context, chat_id, duration).await?;
         }
+        "protect" | "unprotect" => {
+            ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
+            let chat_id = ChatId::new(arg1.parse()?);
+            chat_id
+                .set_protection(
+                    &context,
+                    match arg0 {
+                        "protect" => ProtectionStatus::Protected,
+                        "unprotect" => ProtectionStatus::Unprotected,
+                        _ => unreachable!("arg0={:?}", arg0),
+                    },
+                )
+                .await?;
+        }
         "delchat" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
             let chat_id = ChatId::new(arg1.parse()?);
@@ -1101,7 +1090,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "msginfo" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
             let id = MsgId::new(arg1.parse()?);
-            let res = id.get_info(&context).await?;
+            let res = message::get_msg_info(&context, id).await?;
             println!("{res}");
         }
         "download" => {
@@ -1250,19 +1239,12 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 Err(err) => println!("Cannot set config from QR code: {err:?}"),
             }
         }
-        "createqrsvg" => {
-            ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
-            let svg = create_qr_svg(arg1)?;
-            let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
-            fs::write(&file, svg).await?;
-            println!("{file:#?} written.");
-        }
         "providerinfo" => {
             ensure!(!arg1.is_empty(), "Argument <addr> missing.");
-            let proxy_enabled = context
+            let socks5_enabled = context
-                .get_config_bool(config::Config::ProxyEnabled)
+                .get_config_bool(config::Config::Socks5Enabled)
                 .await?;
-            match provider::get_provider_info(&context, arg1, proxy_enabled).await {
+            match provider::get_provider_info(&context, arg1, socks5_enabled).await {
                 Some(info) => {
                     println!("Information for provider belonging to {arg1}:");
                     println!("status: {}", info.status as u32);
@@ -1281,7 +1263,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "fileinfo" => {
             ensure!(!arg1.is_empty(), "Argument <file> missing.");
 
-            if let Ok(buf) = read_file(&context, Path::new(arg1)).await {
+            if let Ok(buf) = read_file(&context, &arg1).await {
                 let (width, height) = get_filemeta(&buf)?;
                 println!("width={width}, height={height}");
             } else {

deltachat-repl/src/main.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 //! This is a CLI program and a little testing frame.  This file must not be
 //! included when using Delta Chat Core as a library.
 //!
@@ -9,7 +8,11 @@
 extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
+use std::io::{self, Write};
+use std::path::Path;
+use std::process::Command;
 
+use ansi_term::Color;
 use anyhow::{bail, Error};
 use deltachat::chat::ChatId;
 use deltachat::config;
@@ -17,12 +20,12 @@ use deltachat::context::*;
 use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::EventType;
+use deltachat::stock_str::StockStrings;
+use deltachat::{EventType, Events};
 use log::{error, info, warn};
-use nu_ansi_term::Color;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::error::ReadlineError;
-use rustyline::highlight::{CmdKind as HighlightCmdKind, Highlighter, MatchingBracketHighlighter};
+use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
 use rustyline::hint::{Hinter, HistoryHinter};
 use rustyline::validate::Validator;
 use rustyline::{
@@ -30,7 +33,6 @@ use rustyline::{
 };
 use tokio::fs;
 use tokio::runtime::Handle;
-use tracing_subscriber::EnvFilter;
 
 mod cmdline;
 use self::cmdline::*;
@@ -150,7 +152,7 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 13] = [
+const IMEX_COMMANDS: [&str; 14] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
@@ -161,12 +163,13 @@ const IMEX_COMMANDS: [&str; 13] = [
     "receive-backup",
     "export-keys",
     "import-keys",
+    "export-setup",
     "poke",
     "reset",
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 11] = [
+const DB_COMMANDS: [&str; 10] = [
     "info",
     "set",
     "get",
@@ -174,7 +177,6 @@ const DB_COMMANDS: [&str; 11] = [
     "configure",
     "connect",
     "disconnect",
-    "fetch",
     "connectivity",
     "maybenetwork",
     "housekeeping",
@@ -240,13 +242,12 @@ const CONTACT_COMMANDS: [&str; 9] = [
     "unblock",
     "listblocked",
 ];
-const MISC_COMMANDS: [&str; 12] = [
+const MISC_COMMANDS: [&str; 11] = [
     "getqr",
     "getqrsvg",
     "getbadqr",
     "checkqr",
     "joinqr",
-    "createqrsvg",
     "fileinfo",
     "clear",
     "exit",
@@ -298,8 +299,8 @@ impl Highlighter for DcHelper {
         self.highlighter.highlight(line, pos)
     }
 
-    fn highlight_char(&self, line: &str, pos: usize, kind: HighlightCmdKind) -> bool {
+    fn highlight_char(&self, line: &str, pos: usize) -> bool {
-        self.highlighter.highlight_char(line, pos, kind)
+        self.highlighter.highlight_char(line, pos)
     }
 }
 
@@ -311,10 +312,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         println!("Error: Bad arguments, expected [db-name].");
         bail!("No db-name specified");
     }
-    let context = ContextBuilder::new(args[1].clone().into())
+    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;
-        .with_id(1)
-        .open()
-        .await?;
 
     let events = context.get_event_emitter();
     tokio::task::spawn(async move {
@@ -323,7 +321,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         }
     });
 
-    println!("Chatmail is awaiting your commands.");
+    println!("Delta Chat Core is awaiting your commands.");
 
     let config = Config::builder()
         .history_ignore_space(true)
@@ -417,9 +415,6 @@ async fn handle_cmd(
         "disconnect" => {
             ctx.stop_io().await;
         }
-        "fetch" => {
-            ctx.background_fetch().await?;
-        }
         "configure" => {
             ctx.configure().await?;
         }
@@ -449,7 +444,12 @@ async fn handle_cmd(
                     qr.replace_range(12..22, "0000000000")
                 }
                 println!("{qr}");
-                qr2term::print_qr(qr.as_str())?;
+                let output = Command::new("qrencode")
+                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .output()
+                    .expect("failed to execute process");
+                io::stdout().write_all(&output.stdout).unwrap();
+                io::stderr().write_all(&output.stderr).unwrap();
             }
         }
         "getqrsvg" => {
@@ -481,11 +481,7 @@ async fn handle_cmd(
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    tracing_subscriber::fmt()
+    let _ = pretty_env_logger::try_init();
-        .with_env_filter(
-            EnvFilter::from_default_env().add_directive("deltachat_repl=info".parse()?),
-        )
-        .init();
 
     let args = std::env::args().collect();
     start(args).await?;

deltachat-rpc-client/LICENSE

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

deltachat-rpc-client/README.md

@@ -5,28 +5,13 @@ and provides asynchronous interface to it.
 
 ## Getting started
 
-To use Delta Chat RPC client, first build a `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`
+To use Delta Chat RPC client, first build a `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-or download a prebuilt release.
 Install it anywhere in your `PATH`.
 
-[Create a virtual environment](https://docs.python.org/3/library/venv.html)
-if you don't have one already and activate it.
-```
-$ python -m venv env
-$ . env/bin/activate
-```
-
-Install `deltachat-rpc-client` from source:
-```
-$ cd deltachat-rpc-client
-$ pip install .
-```
-
 ## Testing
 
 1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-2. Install tox `pip install -U tox`
+2. Run `PATH="../target/debug:$PATH" tox`.
-3. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.
 
 Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.
 
@@ -38,14 +23,19 @@ $ tox --devenv env
 $ . env/bin/activate
 ```
 
+It is recommended to use IPython, because it supports using `await` directly
+from the REPL.
+
 ```
-$ python
+$ pip install ipython
->>> from deltachat_rpc_client import *
+$ PATH="../target/debug:$PATH" ipython
->>> rpc = Rpc()
+...
->>> rpc.start()
+In [1]: from deltachat_rpc_client import *
->>> dc = DeltaChat(rpc)
+In [2]: rpc = Rpc()
->>> system_info = dc.get_system_info()
+In [3]: await rpc.start()
->>> system_info["level"]
+In [4]: dc = DeltaChat(rpc)
-'awesome'
+In [5]: system_info = await dc.get_system_info()
->>> rpc.close()
+In [6]: system_info["level"]
+Out[6]: 'awesome'
+In [7]: await rpc.close()
 ```

deltachat-rpc-client/examples/echobot.py

@@ -4,6 +4,7 @@
 it will echo back any text send to it, it also will print to console all Delta Chat core events.
 Pass --help to the CLI to see available options.
 """
+import asyncio
 
 from deltachat_rpc_client import events, run_bot_cli
 
@@ -11,15 +12,15 @@ hooks = events.HookCollection()
 
 
 @hooks.on(events.RawEvent)
-def log_event(event):
+async def log_event(event):
     print(event)
 
 
 @hooks.on(events.NewMessage)
-def echo(event):
+async def echo(event):
     snapshot = event.message_snapshot
-    snapshot.chat.send_text(snapshot.text)
+    await snapshot.chat.send_text(snapshot.text)
 
 
 if __name__ == "__main__":
-    run_bot_cli(hooks)
+    asyncio.run(run_bot_cli(hooks))

deltachat-rpc-client/examples/echobot_advanced.py

@@ -3,10 +3,9 @@
 
 it will echo back any message that has non-empty text and also supports the /help command.
 """
-
+import asyncio
 import logging
 import sys
-from threading import Thread
 
 from deltachat_rpc_client import Bot, DeltaChat, EventType, Rpc, events
 
@@ -14,62 +13,62 @@ hooks = events.HookCollection()
 
 
 @hooks.on(events.RawEvent)
-def log_event(event):
+async def log_event(event):
-    if event.kind == EventType.INFO:
+    if event.type == EventType.INFO:
         logging.info(event.msg)
-    elif event.kind == EventType.WARNING:
+    elif event.type == EventType.WARNING:
         logging.warning(event.msg)
 
 
 @hooks.on(events.RawEvent(EventType.ERROR))
-def log_error(event):
+async def log_error(event):
     logging.error(event.msg)
 
 
 @hooks.on(events.MemberListChanged)
-def on_memberlist_changed(event):
+async def on_memberlist_changed(event):
     logging.info("member %s was %s", event.member, "added" if event.member_added else "removed")
 
 
 @hooks.on(events.GroupImageChanged)
-def on_group_image_changed(event):
+async def on_group_image_changed(event):
     logging.info("group image %s", "deleted" if event.image_deleted else "changed")
 
 
 @hooks.on(events.GroupNameChanged)
-def on_group_name_changed(event):
+async def on_group_name_changed(event):
     logging.info("group name changed, old name: %s", event.old_name)
 
 
 @hooks.on(events.NewMessage(func=lambda e: not e.command))
-def echo(event):
+async def echo(event):
     snapshot = event.message_snapshot
     if snapshot.text or snapshot.file:
-        snapshot.chat.send_message(text=snapshot.text, file=snapshot.file)
+        await snapshot.chat.send_message(text=snapshot.text, file=snapshot.file)
 
 
 @hooks.on(events.NewMessage(command="/help"))
-def help_command(event):
+async def help_command(event):
     snapshot = event.message_snapshot
-    snapshot.chat.send_text("Send me any message and I will echo it back")
+    await snapshot.chat.send_text("Send me any message and I will echo it back")
 
 
-def main():
+async def main():
-    with Rpc() as rpc:
+    async with Rpc() as rpc:
         deltachat = DeltaChat(rpc)
-        system_info = deltachat.get_system_info()
+        system_info = await deltachat.get_system_info()
         logging.info("Running deltachat core %s", system_info.deltachat_core_version)
 
-        accounts = deltachat.get_all_accounts()
+        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else deltachat.add_account()
+        account = accounts[0] if accounts else await deltachat.add_account()
 
         bot = Bot(account, hooks)
-        if not bot.is_configured():
+        if not await bot.is_configured():
-            configure_thread = Thread(run=bot.configure, kwargs={"email": sys.argv[1], "password": sys.argv[2]})
+            # Save a reference to avoid garbage collection of the task.
-            configure_thread.start()
+            _configure_task = asyncio.create_task(bot.configure(email=sys.argv[1], password=sys.argv[2]))
-        bot.run_forever()
+        await bot.run_forever()
 
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
-    main()
+    asyncio.run(main())

deltachat-rpc-client/examples/echobot_no_hooks.py

@@ -2,56 +2,56 @@
 """
 Example echo bot without using hooks
 """
-
+import asyncio
 import logging
 import sys
 
-from deltachat_rpc_client import DeltaChat, EventType, Rpc, SpecialContactId
+from deltachat_rpc_client import DeltaChat, EventType, Rpc
 
 
-def main():
+async def main():
-    with Rpc() as rpc:
+    async with Rpc() as rpc:
         deltachat = DeltaChat(rpc)
-        system_info = deltachat.get_system_info()
+        system_info = await deltachat.get_system_info()
         logging.info("Running deltachat core %s", system_info["deltachat_core_version"])
 
-        accounts = deltachat.get_all_accounts()
+        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else deltachat.add_account()
+        account = accounts[0] if accounts else await deltachat.add_account()
 
-        account.set_config("bot", "1")
+        await account.set_config("bot", "1")
-        if not account.is_configured():
+        if not await account.is_configured():
             logging.info("Account is not configured, configuring")
-            account.set_config("addr", sys.argv[1])
+            await account.set_config("addr", sys.argv[1])
-            account.set_config("mail_pw", sys.argv[2])
+            await account.set_config("mail_pw", sys.argv[2])
-            account.configure()
+            await account.configure()
             logging.info("Configured")
         else:
             logging.info("Account is already configured")
-            deltachat.start_io()
+            await deltachat.start_io()
 
-        def process_messages():
+        async def process_messages():
-            for message in account.get_next_messages():
+            for message in await account.get_fresh_messages_in_arrival_order():
-                snapshot = message.get_snapshot()
+                snapshot = await message.get_snapshot()
-                if snapshot.from_id != SpecialContactId.SELF and not snapshot.is_bot and not snapshot.is_info:
+                if not snapshot.is_bot and not snapshot.is_info:
-                    snapshot.chat.send_text(snapshot.text)
+                    await snapshot.chat.send_text(snapshot.text)
-                snapshot.message.mark_seen()
+                await snapshot.message.mark_seen()
 
         # Process old messages.
-        process_messages()
+        await process_messages()
 
         while True:
-            event = account.wait_for_event()
+            event = await account.wait_for_event()
-            if event["kind"] == EventType.INFO:
+            if event["type"] == EventType.INFO:
                 logging.info("%s", event["msg"])
-            elif event["kind"] == EventType.WARNING:
+            elif event["type"] == EventType.WARNING:
                 logging.warning("%s", event["msg"])
-            elif event["kind"] == EventType.ERROR:
+            elif event["type"] == EventType.ERROR:
                 logging.error("%s", event["msg"])
-            elif event["kind"] == EventType.INCOMING_MSG:
+            elif event["type"] == EventType.INCOMING_MSG:
                 logging.info("Got an incoming message")
-                process_messages()
+                await process_messages()
 
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
-    main()
+    asyncio.run(main())

deltachat-rpc-client/pyproject.toml

@@ -1,29 +1,17 @@
 [build-system]
-requires = ["setuptools>=45"]
+requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.159.3"
 description = "Python client for Delta Chat core JSON-RPC interface"
-classifiers = [
+dependencies = [
-    "Development Status :: 5 - Production/Stable",
+    "aiohttp",
-    "Intended Audience :: Developers",
+    "aiodns"
-    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+]
-    "Operating System :: POSIX :: Linux",
+dynamic = [
-    "Operating System :: MacOS :: MacOS X",
+    "version"
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Topic :: Communications :: Chat",
-    "Topic :: Communications :: Email"
 ]
-readme = "README.md"
-requires-python = ">=3.8"
 
 [tool.setuptools.package-data]
 deltachat_rpc_client = [
@@ -37,7 +25,7 @@ deltachat_rpc_client = [
 line-length = 120
 
 [tool.ruff]
-lint.select = [
+select = [
   "E", "W", # pycodestyle
   "F", # Pyflakes
   "N", # pep8-naming
@@ -70,11 +58,3 @@ line-length = 120
 
 [tool.isort]
 profile = "black"
-
-[dependency-groups]
-dev = [
-    "imap-tools",
-    "pytest",
-    "pytest-timeout",
-    "pytest-xdist",
-]

deltachat-rpc-client/src/deltachat_rpc_client/__init__.py

@@ -1,10 +1,9 @@
-"""Delta Chat JSON-RPC high-level API"""
+"""Delta Chat asynchronous high-level API"""
-
 from ._utils import AttrDict, run_bot_cli, run_client_cli
 from .account import Account
 from .chat import Chat
 from .client import Bot, Client
-from .const import EventType, SpecialContactId
+from .const import EventType
 from .contact import Contact
 from .deltachat import DeltaChat
 from .message import Message
@@ -20,7 +19,6 @@ __all__ = [
     "DeltaChat",
     "EventType",
     "Message",
-    "SpecialContactId",
     "Rpc",
     "run_bot_cli",
     "run_client_cli",

deltachat-rpc-client/src/deltachat_rpc_client/_utils.py

@@ -1,8 +1,7 @@
 import argparse
-import os
+import asyncio
 import re
 import sys
-from threading import Thread
 from typing import TYPE_CHECKING, Callable, Iterable, Optional, Tuple, Type, Union
 
 if TYPE_CHECKING:
@@ -44,7 +43,7 @@ class AttrDict(dict):
         super().__setattr__(attr, val)
 
 
-def run_client_cli(
+async def run_client_cli(
     hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
     argv: Optional[list] = None,
     **kwargs,
@@ -55,10 +54,10 @@ def run_client_cli(
     """
     from .client import Client
 
-    _run_cli(Client, hooks, argv, **kwargs)
+    await _run_cli(Client, hooks, argv, **kwargs)
 
 
-def run_bot_cli(
+async def run_bot_cli(
     hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
     argv: Optional[list] = None,
     **kwargs,
@@ -69,10 +68,10 @@ def run_bot_cli(
     """
     from .client import Bot
 
-    _run_cli(Bot, hooks, argv, **kwargs)
+    await _run_cli(Bot, hooks, argv, **kwargs)
 
 
-def _run_cli(
+async def _run_cli(
     client_type: Type["Client"],
     hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
     argv: Optional[list] = None,
@@ -90,28 +89,24 @@ def _run_cli(
         help="accounts folder (default: current working directory)",
         nargs="?",
     )
-    parser.add_argument("--email", action="store", help="email address", default=os.getenv("DELTACHAT_EMAIL"))
+    parser.add_argument("--email", action="store", help="email address")
-    parser.add_argument("--password", action="store", help="password", default=os.getenv("DELTACHAT_PASSWORD"))
+    parser.add_argument("--password", action="store", help="password")
     args = parser.parse_args(argv[1:])
 
-    with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
+    async with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
         deltachat = DeltaChat(rpc)
-        core_version = (deltachat.get_system_info()).deltachat_core_version
+        core_version = (await deltachat.get_system_info()).deltachat_core_version
-        accounts = deltachat.get_all_accounts()
+        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else deltachat.add_account()
+        account = accounts[0] if accounts else await deltachat.add_account()
 
         client = client_type(account, hooks)
         client.logger.debug("Running deltachat core %s", core_version)
-        if not client.is_configured():
+        if not await client.is_configured():
             assert args.email, "Account is not configured and email must be provided"
             assert args.password, "Account is not configured and password must be provided"
-            configure_thread = Thread(
+            # Save a reference to avoid garbage collection of the task.
-                target=client.configure,
+            _configure_task = asyncio.create_task(client.configure(email=args.email, password=args.password))
-                daemon=True,
+        await client.run_forever()
-                kwargs={"email": args.email, "password": args.password},
-            )
-            configure_thread.start()
-        client.run_forever()
 
 
 def extract_addr(text: str) -> str:
@@ -173,33 +168,3 @@ def parse_system_add_remove(text: str) -> Optional[Tuple[str, str, str]]:
             return "removed", addr, addr
 
     return None
-
-
-class futuremethod:  # noqa: N801
-    """Decorator for async methods."""
-
-    def __init__(self, func):
-        self._func = func
-
-    def __get__(self, instance, owner=None):
-        if instance is None:
-            return self
-
-        def future(*args):
-            generator = self._func(instance, *args)
-            res = next(generator)
-
-            def f():
-                try:
-                    generator.send(res())
-                except StopIteration as e:
-                    return e.value
-
-            return f
-
-        def wrapper(*args):
-            f = future(*args)
-            return f()
-
-        wrapper.future = future
-        return wrapper

deltachat-rpc-client/src/deltachat_rpc_client/account.py

@@ -1,12 +1,9 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union
-from warnings import warn
 
-from ._utils import AttrDict, futuremethod
+from ._utils import AttrDict
 from .chat import Chat
-from .const import ChatlistFlag, ContactFlag, EventType, SpecialContactId
+from .const import ChatlistFlag, ContactFlag, SpecialContactId
 from .contact import Contact
 from .message import Message
 
@@ -26,107 +23,63 @@ class Account:
     def _rpc(self) -> "Rpc":
         return self.manager.rpc
 
-    def wait_for_event(self, event_type=None) -> AttrDict:
+    async def wait_for_event(self) -> AttrDict:
         """Wait until the next event and return it."""
-        while True:
+        return AttrDict(await self._rpc.wait_for_event(self.id))
-            next_event = AttrDict(self._rpc.wait_for_event(self.id))
-            if event_type is None or next_event.kind == event_type:
-                return next_event
 
-    def clear_all_events(self):
+    async def remove(self) -> None:
-        """Removes all queued-up events for a given account. Useful for tests."""
-        self._rpc.clear_all_events(self.id)
-
-    def remove(self) -> None:
         """Remove the account."""
-        self._rpc.remove_account(self.id)
+        await self._rpc.remove_account(self.id)
 
-    def clone(self) -> "Account":
+    async def start_io(self) -> None:
-        """Clone given account.
-        This uses backup-transfer via iroh, i.e. the 'Add second device' feature."""
-        future = self._rpc.provide_backup.future(self.id)
-        qr = self._rpc.get_backup_qr(self.id)
-        new_account = self.manager.add_account()
-        new_account._rpc.get_backup(new_account.id, qr)
-        future()
-        return new_account
-
-    def start_io(self) -> None:
         """Start the account I/O."""
-        self._rpc.start_io(self.id)
+        await self._rpc.start_io(self.id)
 
-    def stop_io(self) -> None:
+    async def stop_io(self) -> None:
         """Stop the account I/O."""
-        self._rpc.stop_io(self.id)
+        await self._rpc.stop_io(self.id)
 
-    def get_info(self) -> AttrDict:
+    async def get_info(self) -> AttrDict:
         """Return dictionary of this account configuration parameters."""
-        return AttrDict(self._rpc.get_info(self.id))
+        return AttrDict(await self._rpc.get_info(self.id))
 
-    def get_size(self) -> int:
+    async def get_size(self) -> int:
         """Get the combined filesize of an account in bytes."""
-        return self._rpc.get_account_file_size(self.id)
+        return await self._rpc.get_account_file_size(self.id)
 
-    def is_configured(self) -> bool:
+    async def is_configured(self) -> bool:
         """Return True if this account is configured."""
-        return self._rpc.is_configured(self.id)
+        return await self._rpc.is_configured(self.id)
 
-    def set_config(self, key: str, value: Optional[str] = None) -> None:
+    async def set_config(self, key: str, value: Optional[str] = None) -> None:
         """Set configuration value."""
-        self._rpc.set_config(self.id, key, value)
+        await self._rpc.set_config(self.id, key, value)
 
-    def get_config(self, key: str) -> Optional[str]:
+    async def get_config(self, key: str) -> Optional[str]:
         """Get configuration value."""
-        return self._rpc.get_config(self.id, key)
+        return await self._rpc.get_config(self.id, key)
 
-    def update_config(self, **kwargs) -> None:
+    async def update_config(self, **kwargs) -> None:
         """update config values."""
         for key, value in kwargs.items():
-            self.set_config(key, value)
+            await self.set_config(key, value)
 
-    def set_avatar(self, img_path: Optional[str] = None) -> None:
+    async def set_avatar(self, img_path: Optional[str] = None) -> None:
         """Set self avatar.
 
         Passing None will discard the currently set avatar.
         """
-        self.set_config("selfavatar", img_path)
+        await self.set_config("selfavatar", img_path)
 
-    def get_avatar(self) -> Optional[str]:
+    async def get_avatar(self) -> Optional[str]:
         """Get self avatar."""
-        return self.get_config("selfavatar")
+        return await self.get_config("selfavatar")
 
-    def check_qr(self, qr):
+    async def configure(self) -> None:
-        """Parse QR code contents.
-
-        This function takes the raw text scanned
-        and checks what can be done with it."""
-        return self._rpc.check_qr(self.id, qr)
-
-    def set_config_from_qr(self, qr: str):
-        self._rpc.set_config_from_qr(self.id, qr)
-
-    @futuremethod
-    def configure(self):
         """Configure an account."""
-        yield self._rpc.configure.future(self.id)
+        await self._rpc.configure(self.id)
 
-    @futuremethod
+    async def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
-    def add_or_update_transport(self, params):
-        """Add a new transport."""
-        yield self._rpc.add_or_update_transport.future(self.id, params)
-
-    @futuremethod
-    def list_transports(self):
-        """Returns the list of all email accounts that are used as a transport in the current profile."""
-        transports = yield self._rpc.list_transports.future(self.id)
-        return transports
-
-    def bring_online(self):
-        """Start I/O and wait until IMAP becomes IDLE."""
-        self.start_io()
-        self.wait_for_event(EventType.IMAP_INBOX_IDLE)
-
-    def create_contact(self, obj: Union[int, str, Contact, "Account"], name: Optional[str] = None) -> Contact:
         """Create a new Contact or return an existing one.
 
         Calling this method will always result in the same
@@ -134,77 +87,36 @@ class Account:
         with that e-mail address, it is unblocked and its display
         name is updated if specified.
 
-        :param obj: email-address, contact id or account.
+        :param obj: email-address or contact id.
         :param name: (optional) display name for this contact.
         """
-        if isinstance(obj, Account):
-            vcard = obj.self_contact.make_vcard()
-            [contact] = self.import_vcard(vcard)
-            if name:
-                contact.set_name(name)
-            return contact
         if isinstance(obj, int):
             obj = Contact(self, obj)
         if isinstance(obj, Contact):
-            obj = obj.get_snapshot().address
+            obj = (await obj.get_snapshot()).address
-        return Contact(self, self._rpc.create_contact(self.id, obj, name))
+        return Contact(self, await self._rpc.create_contact(self.id, obj, name))
-
-    def make_vcard(self, contacts: list[Contact]) -> str:
-        """Create vCard with the given contacts."""
-        assert all(contact.account == self for contact in contacts)
-        contact_ids = [contact.id for contact in contacts]
-        return self._rpc.make_vcard(self.id, contact_ids)
-
-    def import_vcard(self, vcard: str) -> list[Contact]:
-        """Import vCard.
-
-        Return created or modified contacts in the order they appear in vCard."""
-        contact_ids = self._rpc.import_vcard_contents(self.id, vcard)
-        return [Contact(self, contact_id) for contact_id in contact_ids]
-
-    def create_chat(self, account: "Account") -> Chat:
-        """Create a 1:1 chat with another account."""
-        return self.create_contact(account).create_chat()
-
-    def get_device_chat(self) -> Chat:
-        """Return device chat."""
-        return self.device_contact.create_chat()
 
     def get_contact_by_id(self, contact_id: int) -> Contact:
         """Return Contact instance for the given contact ID."""
         return Contact(self, contact_id)
 
-    def get_contact_by_addr(self, address: str) -> Optional[Contact]:
+    async def get_contact_by_addr(self, address: str) -> Optional[Contact]:
         """Check if an e-mail address belongs to a known and unblocked contact."""
-        contact_id = self._rpc.lookup_contact_id_by_addr(self.id, address)
+        contact_id = await self._rpc.lookup_contact_id_by_addr(self.id, address)
         return contact_id and Contact(self, contact_id)
 
-    def get_blocked_contacts(self) -> list[AttrDict]:
+    async def get_blocked_contacts(self) -> List[AttrDict]:
         """Return a list with snapshots of all blocked contacts."""
-        contacts = self._rpc.get_blocked_contacts(self.id)
+        contacts = await self._rpc.get_blocked_contacts(self.id)
         return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]
 
-    def get_chat_by_contact(self, contact: Union[int, Contact]) -> Optional[Chat]:
+    async def get_contacts(
-        """Return 1:1 chat for a contact if it exists."""
-        if isinstance(contact, Contact):
-            assert contact.account == self
-            contact_id = contact.id
-        elif isinstance(contact, int):
-            contact_id = contact
-        else:
-            raise ValueError(f"{contact!r} is not a contact")
-        chat_id = self._rpc.get_chat_id_by_contact_id(self.id, contact_id)
-        if chat_id:
-            return Chat(self, chat_id)
-        return None
-
-    def get_contacts(
         self,
         query: Optional[str] = None,
         with_self: bool = False,
         verified_only: bool = False,
         snapshot: bool = False,
-    ) -> Union[list[Contact], list[AttrDict]]:
+    ) -> Union[List[Contact], List[AttrDict]]:
         """Get a filtered list of contacts.
 
         :param query: if a string is specified, only return contacts
@@ -220,9 +132,9 @@ class Account:
             flags |= ContactFlag.ADD_SELF
 
         if snapshot:
-            contacts = self._rpc.get_contacts(self.id, flags, query)
+            contacts = await self._rpc.get_contacts(self.id, flags, query)
             return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]
-        contacts = self._rpc.get_contact_ids(self.id, flags, query)
+        contacts = await self._rpc.get_contact_ids(self.id, flags, query)
         return [Contact(self, contact_id) for contact_id in contacts]
 
     @property
@@ -230,12 +142,7 @@ class Account:
         """This account's identity as a Contact."""
         return Contact(self, SpecialContactId.SELF)
 
-    @property
+    async def get_chatlist(
-    def device_contact(self) -> Chat:
-        """This account's device contact."""
-        return Contact(self, SpecialContactId.DEVICE)
-
-    def get_chatlist(
         self,
         query: Optional[str] = None,
         contact: Optional[Contact] = None,
@@ -244,7 +151,7 @@ class Account:
         no_specials: bool = False,
         alldone_hint: bool = False,
         snapshot: bool = False,
-    ) -> Union[list[Chat], list[AttrDict]]:
+    ) -> Union[List[Chat], List[AttrDict]]:
         """Return list of chats.
 
         :param query: if a string is specified only chats matching this query are returned.
@@ -267,146 +174,72 @@ class Account:
         if alldone_hint:
             flags |= ChatlistFlag.ADD_ALLDONE_HINT
 
-        entries = self._rpc.get_chatlist_entries(self.id, flags, query, contact and contact.id)
+        entries = await self._rpc.get_chatlist_entries(self.id, flags, query, contact and contact.id)
         if not snapshot:
-            return [Chat(self, entry) for entry in entries]
+            return [Chat(self, entry[0]) for entry in entries]
 
-        items = self._rpc.get_chatlist_items_by_entries(self.id, entries)
+        items = await self._rpc.get_chatlist_items_by_entries(self.id, entries)
         chats = []
         for item in items.values():
             item["chat"] = Chat(self, item["id"])
             chats.append(AttrDict(item))
         return chats
 
-    def create_group(self, name: str, protect: bool = False) -> Chat:
+    async def create_group(self, name: str, protect: bool = False) -> Chat:
         """Create a new group chat.
 
         After creation, the group has only self-contact as member and is in unpromoted state.
         """
-        return Chat(self, self._rpc.create_group_chat(self.id, name, protect))
+        return Chat(self, await self._rpc.create_group_chat(self.id, name, protect))
 
     def get_chat_by_id(self, chat_id: int) -> Chat:
         """Return the Chat instance with the given ID."""
         return Chat(self, chat_id)
 
-    def secure_join(self, qrdata: str) -> Chat:
+    async def secure_join(self, qrdata: str) -> Chat:
         """Continue a Setup-Contact or Verified-Group-Invite protocol started on
         another device.
 
         The function returns immediately and the handshake runs in background, sending
         and receiving several messages.
         Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-        See https://securejoin.delta.chat/ for protocol details.
+        See https://countermitm.readthedocs.io/en/latest/new.html for protocol details.
 
         :param qrdata: The text of the scanned QR code.
         """
-        return Chat(self, self._rpc.secure_join(self.id, qrdata))
+        return Chat(self, await self._rpc.secure_join(self.id, qrdata))
 
-    def get_qr_code(self) -> str:
+    async def get_qr_code(self) -> Tuple[str, str]:
-        """Get Setup-Contact QR Code text.
+        """Get Setup-Contact QR Code text and SVG data.
 
-        This data needs to be transferred to another Delta Chat account
+        this data needs to be transferred to another Delta Chat account
         in a second channel, typically used by mobiles with QRcode-show + scan UX.
         """
-        return self._rpc.get_chat_securejoin_qr_code(self.id, None)
+        return await self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
-        """Get Setup-Contact QR code text and SVG."""
-        return self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
 
     def get_message_by_id(self, msg_id: int) -> Message:
         """Return the Message instance with the given ID."""
         return Message(self, msg_id)
 
-    def mark_seen_messages(self, messages: list[Message]) -> None:
+    async def mark_seen_messages(self, messages: List[Message]) -> None:
         """Mark the given set of messages as seen."""
-        self._rpc.markseen_msgs(self.id, [msg.id for msg in messages])
+        await self._rpc.markseen_msgs(self.id, [msg.id for msg in messages])
 
-    def delete_messages(self, messages: list[Message]) -> None:
+    async def delete_messages(self, messages: List[Message]) -> None:
         """Delete messages (local and remote)."""
-        self._rpc.delete_messages(self.id, [msg.id for msg in messages])
+        await self._rpc.delete_messages(self.id, [msg.id for msg in messages])
 
-    def get_fresh_messages(self) -> list[Message]:
+    async def get_fresh_messages(self) -> List[Message]:
         """Return the list of fresh messages, newest messages first.
 
         This call is intended for displaying notifications.
         If you are writing a bot, use `get_fresh_messages_in_arrival_order()` instead,
         to process oldest messages first.
         """
-        fresh_msg_ids = self._rpc.get_fresh_msgs(self.id)
+        fresh_msg_ids = await self._rpc.get_fresh_msgs(self.id)
         return [Message(self, msg_id) for msg_id in fresh_msg_ids]
 
-    def get_next_messages(self) -> list[Message]:
+    async def get_fresh_messages_in_arrival_order(self) -> List[Message]:
-        """Return a list of next messages."""
-        next_msg_ids = self._rpc.get_next_msgs(self.id)
-        return [Message(self, msg_id) for msg_id in next_msg_ids]
-
-    def wait_next_messages(self) -> list[Message]:
-        """Wait for new messages and return a list of them."""
-        next_msg_ids = self._rpc.wait_next_msgs(self.id)
-        return [Message(self, msg_id) for msg_id in next_msg_ids]
-
-    def wait_for_incoming_msg_event(self):
-        """Wait for incoming message event and return it."""
-        return self.wait_for_event(EventType.INCOMING_MSG)
-
-    def wait_for_msgs_changed_event(self):
-        """Wait for messages changed event and return it."""
-        return self.wait_for_event(EventType.MSGS_CHANGED)
-
-    def wait_for_msgs_noticed_event(self):
-        """Wait for messages noticed event and return it."""
-        return self.wait_for_event(EventType.MSGS_NOTICED)
-
-    def wait_for_incoming_msg(self):
-        """Wait for incoming message and return it.
-
-        Consumes all events before the next incoming message event."""
-        return self.get_message_by_id(self.wait_for_incoming_msg_event().msg_id)
-
-    def wait_for_securejoin_inviter_success(self):
-        while True:
-            event = self.wait_for_event()
-            if event["kind"] == "SecurejoinInviterProgress" and event["progress"] == 1000:
-                break
-
-    def wait_for_securejoin_joiner_success(self):
-        while True:
-            event = self.wait_for_event()
-            if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
-                break
-
-    def wait_for_reactions_changed(self):
-        return self.wait_for_event(EventType.REACTIONS_CHANGED)
-
-    def get_fresh_messages_in_arrival_order(self) -> list[Message]:
         """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
-        warn(
+        fresh_msg_ids = sorted(await self._rpc.get_fresh_msgs(self.id))
-            "get_fresh_messages_in_arrival_order is deprecated, use get_next_messages instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        fresh_msg_ids = sorted(self._rpc.get_fresh_msgs(self.id))
         return [Message(self, msg_id) for msg_id in fresh_msg_ids]
-
-    def export_backup(self, path, passphrase: str = "") -> None:
-        """Export backup."""
-        self._rpc.export_backup(self.id, str(path), passphrase)
-
-    def import_backup(self, path, passphrase: str = "") -> None:
-        """Import backup."""
-        self._rpc.import_backup(self.id, str(path), passphrase)
-
-    def export_self_keys(self, path) -> None:
-        """Export keys."""
-        passphrase = ""  # Setting passphrase is currently not supported.
-        self._rpc.export_self_keys(self.id, str(path), passphrase)
-
-    def import_self_keys(self, path) -> None:
-        """Import keys."""
-        passphrase = ""  # Importing passphrase-protected keys is currently not supported.
-        self._rpc.import_self_keys(self.id, str(path), passphrase)
-
-    def initiate_autocrypt_key_transfer(self) -> None:
-        """Send Autocrypt Setup Message."""
-        return self._rpc.initiate_autocrypt_key_transfer(self.id)

deltachat-rpc-client/src/deltachat_rpc_client/chat.py

@@ -1,9 +1,6 @@
-from __future__ import annotations
-
 import calendar
 from dataclasses import dataclass
-from tempfile import NamedTemporaryFile
+from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
-from typing import TYPE_CHECKING, Optional, Union
 
 from ._utils import AttrDict
 from .const import ChatVisibility, ViewType
@@ -28,7 +25,7 @@ class Chat:
     def _rpc(self) -> "Rpc":
         return self.account._rpc
 
-    def delete(self) -> None:
+    async def delete(self) -> None:
         """Delete this chat and all its messages.
 
         Note:
@@ -36,96 +33,85 @@ class Chat:
         - does not delete messages on server
         - the chat or contact is not blocked, new message will arrive
         """
-        self._rpc.delete_chat(self.account.id, self.id)
+        await self._rpc.delete_chat(self.account.id, self.id)
 
-    def block(self) -> None:
+    async def block(self) -> None:
         """Block this chat."""
-        self._rpc.block_chat(self.account.id, self.id)
+        await self._rpc.block_chat(self.account.id, self.id)
 
-    def accept(self) -> None:
+    async def accept(self) -> None:
         """Accept this contact request chat."""
-        self._rpc.accept_chat(self.account.id, self.id)
+        await self._rpc.accept_chat(self.account.id, self.id)
 
-    def leave(self) -> None:
+    async def leave(self) -> None:
         """Leave this chat."""
-        self._rpc.leave_group(self.account.id, self.id)
+        await self._rpc.leave_group(self.account.id, self.id)
 
-    def mute(self, duration: Optional[int] = None) -> None:
+    async def mute(self, duration: Optional[int] = None) -> None:
         """Mute this chat, if a duration is not provided the chat is muted forever.
 
         :param duration: mute duration from now in seconds. Must be greater than zero.
         """
         if duration is not None:
             assert duration > 0, "Invalid duration"
-            dur: dict = {"kind": "Until", "duration": duration}
+            dur: Union[str, dict] = {"Until": duration}
         else:
-            dur = {"kind": "Forever"}
+            dur = "Forever"
-        self._rpc.set_chat_mute_duration(self.account.id, self.id, dur)
+        await self._rpc.set_chat_mute_duration(self.account.id, self.id, dur)
 
-    def unmute(self) -> None:
+    async def unmute(self) -> None:
         """Unmute this chat."""
-        self._rpc.set_chat_mute_duration(self.account.id, self.id, {"kind": "NotMuted"})
+        await self._rpc.set_chat_mute_duration(self.account.id, self.id, "NotMuted")
 
-    def pin(self) -> None:
+    async def pin(self) -> None:
         """Pin this chat."""
-        self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.PINNED)
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.PINNED)
 
-    def unpin(self) -> None:
+    async def unpin(self) -> None:
         """Unpin this chat."""
-        self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.NORMAL)
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.NORMAL)
 
-    def archive(self) -> None:
+    async def archive(self) -> None:
         """Archive this chat."""
-        self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.ARCHIVED)
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.ARCHIVED)
 
-    def unarchive(self) -> None:
+    async def unarchive(self) -> None:
         """Unarchive this chat."""
-        self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.NORMAL)
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.NORMAL)
 
-    def set_name(self, name: str) -> None:
+    async def set_name(self, name: str) -> None:
         """Set name of this chat."""
-        self._rpc.set_chat_name(self.account.id, self.id, name)
+        await self._rpc.set_chat_name(self.account.id, self.id, name)
 
-    def set_ephemeral_timer(self, timer: int) -> None:
+    async def set_ephemeral_timer(self, timer: int) -> None:
-        """Set ephemeral timer of this chat in seconds.
+        """Set ephemeral timer of this chat."""
+        await self._rpc.set_chat_ephemeral_timer(self.account.id, self.id, timer)
 
-        0 means the timer is disabled, use 1 for immediate deletion."""
+    async def get_encryption_info(self) -> str:
-        self._rpc.set_chat_ephemeral_timer(self.account.id, self.id, timer)
-
-    def get_encryption_info(self) -> str:
         """Return encryption info for this chat."""
-        return self._rpc.get_chat_encryption_info(self.account.id, self.id)
+        return await self._rpc.get_chat_encryption_info(self.account.id, self.id)
 
-    def get_qr_code(self) -> str:
+    async def get_qr_code(self) -> Tuple[str, str]:
-        """Get Join-Group QR code text."""
-        return self._rpc.get_chat_securejoin_qr_code(self.account.id, self.id)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
         """Get Join-Group QR code text and SVG data."""
-        return self._rpc.get_chat_securejoin_qr_code_svg(self.account.id, self.id)
+        return await self._rpc.get_chat_securejoin_qr_code_svg(self.account.id, self.id)
 
-    def get_basic_snapshot(self) -> AttrDict:
+    async def get_basic_snapshot(self) -> AttrDict:
         """Get a chat snapshot with basic info about this chat."""
-        info = self._rpc.get_basic_chat_info(self.account.id, self.id)
+        info = await self._rpc.get_basic_chat_info(self.account.id, self.id)
         return AttrDict(chat=self, **info)
 
-    def get_full_snapshot(self) -> AttrDict:
+    async def get_full_snapshot(self) -> AttrDict:
         """Get a full snapshot of this chat."""
-        info = self._rpc.get_full_chat_by_id(self.account.id, self.id)
+        info = await self._rpc.get_full_chat_by_id(self.account.id, self.id)
         return AttrDict(chat=self, **info)
 
-    def can_send(self) -> bool:
+    async def send_message(
-        """Return true if messages can be sent to the chat."""
-        return self._rpc.can_send(self.account.id, self.id)
-
-    def send_message(
         self,
         text: Optional[str] = None,
         html: Optional[str] = None,
         viewtype: Optional[ViewType] = None,
         file: Optional[str] = None,
-        filename: Optional[str] = None,
+        location: Optional[Tuple[float, float]] = None,
-        location: Optional[tuple[float, float]] = None,
         override_sender_name: Optional[str] = None,
         quoted_msg: Optional[Union[int, Message]] = None,
     ) -> Message:
@@ -138,58 +124,51 @@ class Chat:
             "html": html,
             "viewtype": viewtype,
             "file": file,
-            "filename": filename,
             "location": location,
             "overrideSenderName": override_sender_name,
-            "quotedMessageId": quoted_msg,
+            "quotedMsg": quoted_msg,
         }
-        msg_id = self._rpc.send_msg(self.account.id, self.id, draft)
+        msg_id = await self._rpc.send_msg(self.account.id, self.id, draft)
         return Message(self.account, msg_id)
 
-    def send_text(self, text: str) -> Message:
+    async def send_text(self, text: str) -> Message:
         """Send a text message and return the resulting Message instance."""
-        msg_id = self._rpc.misc_send_text_message(self.account.id, self.id, text)
+        msg_id = await self._rpc.misc_send_text_message(self.account.id, self.id, text)
         return Message(self.account, msg_id)
 
-    def send_file(self, path):
+    async def send_videochat_invitation(self) -> Message:
-        """Send a file and return the resulting Message instance."""
-        return self.send_message(file=path)
-
-    def send_videochat_invitation(self) -> Message:
         """Send a videochat invitation and return the resulting Message instance."""
-        msg_id = self._rpc.send_videochat_invitation(self.account.id, self.id)
+        msg_id = await self._rpc.send_videochat_invitation(self.account.id, self.id)
         return Message(self.account, msg_id)
 
-    def send_sticker(self, path: str) -> Message:
+    async def send_sticker(self, path: str) -> Message:
         """Send an sticker and return the resulting Message instance."""
-        msg_id = self._rpc.send_sticker(self.account.id, self.id, path)
+        msg_id = await self._rpc.send_sticker(self.account.id, self.id, path)
         return Message(self.account, msg_id)
 
-    def forward_messages(self, messages: list[Message]) -> None:
+    async def forward_messages(self, messages: List[Message]) -> None:
         """Forward a list of messages to this chat."""
         msg_ids = [msg.id for msg in messages]
-        self._rpc.forward_messages(self.account.id, msg_ids, self.id)
+        await self._rpc.forward_messages(self.account.id, msg_ids, self.id)
 
-    def set_draft(
+    async def set_draft(
         self,
         text: Optional[str] = None,
         file: Optional[str] = None,
-        filename: Optional[str] = None,
         quoted_msg: Optional[int] = None,
-        viewtype: Optional[str] = None,
     ) -> None:
         """Set draft message."""
         if isinstance(quoted_msg, Message):
             quoted_msg = quoted_msg.id
-        self._rpc.misc_set_draft(self.account.id, self.id, text, file, filename, quoted_msg, viewtype)
+        await self._rpc.misc_set_draft(self.account.id, self.id, text, file, quoted_msg)
 
-    def remove_draft(self) -> None:
+    async def remove_draft(self) -> None:
         """Remove draft message."""
-        self._rpc.remove_draft(self.account.id, self.id)
+        await self._rpc.remove_draft(self.account.id, self.id)
 
-    def get_draft(self) -> Optional[AttrDict]:
+    async def get_draft(self) -> Optional[AttrDict]:
         """Get draft message."""
-        snapshot = self._rpc.get_draft(self.account.id, self.id)
+        snapshot = await self._rpc.get_draft(self.account.id, self.id)
         if not snapshot:
             return None
         snapshot = AttrDict(snapshot)
@@ -198,79 +177,74 @@ class Chat:
         snapshot["message"] = Message(self.account, snapshot.id)
         return snapshot
 
-    def get_messages(self, info_only: bool = False, add_daymarker: bool = False) -> list[Message]:
+    async def get_messages(self, info_only: bool = False, add_daymarker: bool = False) -> List[Message]:
         """get the list of messages in this chat."""
-        msgs = self._rpc.get_message_ids(self.account.id, self.id, info_only, add_daymarker)
+        msgs = await self._rpc.get_message_ids(self.account.id, self.id, info_only, add_daymarker)
         return [Message(self.account, msg_id) for msg_id in msgs]
 
-    def get_fresh_message_count(self) -> int:
+    async def get_fresh_message_count(self) -> int:
         """Get number of fresh messages in this chat"""
-        return self._rpc.get_fresh_msg_cnt(self.account.id, self.id)
+        return await self._rpc.get_fresh_msg_cnt(self.account.id, self.id)
 
-    def mark_noticed(self) -> None:
+    async def mark_noticed(self) -> None:
         """Mark all messages in this chat as noticed."""
-        self._rpc.marknoticed_chat(self.account.id, self.id)
+        await self._rpc.marknoticed_chat(self.account.id, self.id)
 
-    def add_contact(self, *contact: Union[int, str, Contact]) -> None:
+    async def add_contact(self, *contact: Union[int, str, Contact]) -> None:
         """Add contacts to this group."""
         for cnt in contact:
             if isinstance(cnt, str):
-                contact_id = self.account.create_contact(cnt).id
+                contact_id = (await self.account.create_contact(cnt)).id
             elif not isinstance(cnt, int):
                 contact_id = cnt.id
             else:
                 contact_id = cnt
-            self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)
+            await self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)
 
-    def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
+    async def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
         """Remove members from this group."""
         for cnt in contact:
             if isinstance(cnt, str):
-                contact_id = self.account.create_contact(cnt).id
+                contact_id = (await self.account.create_contact(cnt)).id
             elif not isinstance(cnt, int):
                 contact_id = cnt.id
             else:
                 contact_id = cnt
-            self._rpc.remove_contact_from_chat(self.account.id, self.id, contact_id)
+            await self._rpc.remove_contact_from_chat(self.account.id, self.id, contact_id)
 
-    def get_contacts(self) -> list[Contact]:
+    async def get_contacts(self) -> List[Contact]:
         """Get the contacts belonging to this chat.
 
         For single/direct chats self-address is not included.
         """
-        contacts = self._rpc.get_chat_contacts(self.account.id, self.id)
+        contacts = await self._rpc.get_chat_contacts(self.account.id, self.id)
         return [Contact(self.account, contact_id) for contact_id in contacts]
 
-    def get_past_contacts(self) -> list[Contact]:
+    async def set_image(self, path: str) -> None:
-        """Get past contacts for this chat."""
-        past_contacts = self._rpc.get_past_chat_contacts(self.account.id, self.id)
-        return [Contact(self.account, contact_id) for contact_id in past_contacts]
-
-    def set_image(self, path: str) -> None:
         """Set profile image of this chat.
 
         :param path: Full path of the image to use as the group image.
         """
-        self._rpc.set_chat_profile_image(self.account.id, self.id, path)
+        await self._rpc.set_chat_profile_image(self.account.id, self.id, path)
 
-    def remove_image(self) -> None:
+    async def remove_image(self) -> None:
         """Remove profile image of this chat."""
-        self._rpc.set_chat_profile_image(self.account.id, self.id, None)
+        await self._rpc.set_chat_profile_image(self.account.id, self.id, None)
 
-    def get_locations(
+    async def get_locations(
         self,
         contact: Optional[Contact] = None,
         timestamp_from: Optional["datetime"] = None,
         timestamp_to: Optional["datetime"] = None,
-    ) -> list[AttrDict]:
+    ) -> List[AttrDict]:
         """Get list of location snapshots for the given contact in the given timespan."""
         time_from = calendar.timegm(timestamp_from.utctimetuple()) if timestamp_from else 0
         time_to = calendar.timegm(timestamp_to.utctimetuple()) if timestamp_to else 0
         contact_id = contact.id if contact else 0
 
-        result = self._rpc.get_locations(self.account.id, self.id, contact_id, time_from, time_to)
+        result = await self._rpc.get_locations(self.account.id, self.id, contact_id, time_from, time_to)
         locations = []
-        contacts: dict[int, Contact] = {}
+        contacts: Dict[int, Contact] = {}
         for loc in result:
             location = AttrDict(loc)
             location["chat"] = self
@@ -278,11 +252,3 @@ class Chat:
             location["message"] = Message(self.account, location.msg_id)
             locations.append(location)
         return locations
-
-    def send_contact(self, contact: Contact):
-        """Send contact to the chat."""
-        vcard = contact.make_vcard()
-        with NamedTemporaryFile(suffix=".vcard") as f:
-            f.write(vcard.encode())
-            f.flush()
-            self._rpc.send_msg(self.account.id, self.id, {"viewtype": ViewType.VCARD, "file": f.name})

deltachat-rpc-client/src/deltachat_rpc_client/client.py

@@ -1,13 +1,15 @@
 """Event loop implementations offering high level event handling/hooking."""
-
+import inspect
-from __future__ import annotations
-
 import logging
 from typing import (
     TYPE_CHECKING,
     Callable,
+    Coroutine,
+    Dict,
     Iterable,
     Optional,
+    Set,
+    Tuple,
     Type,
     Union,
 )
@@ -18,7 +20,7 @@ from ._utils import (
     parse_system_image_changed,
     parse_system_title_changed,
 )
-from .const import COMMAND_PREFIX, EventType, SpecialContactId, SystemMessageType
+from .const import COMMAND_PREFIX, EventType, SystemMessageType
 from .events import (
     EventFilter,
     GroupImageChanged,
@@ -38,16 +40,16 @@ class Client:
     def __init__(
         self,
         account: "Account",
-        hooks: Optional[Iterable[tuple[Callable, Union[type, EventFilter]]]] = None,
+        hooks: Optional[Iterable[Tuple[Callable, Union[type, EventFilter]]]] = None,
         logger: Optional[logging.Logger] = None,
     ) -> None:
         self.account = account
         self.logger = logger or logging
-        self._hooks: dict[type, set[tuple]] = {}
+        self._hooks: Dict[type, Set[tuple]] = {}
         self._should_process_messages = 0
         self.add_hooks(hooks or [])
 
-    def add_hooks(self, hooks: Iterable[tuple[Callable, Union[type, EventFilter]]]) -> None:
+    def add_hooks(self, hooks: Iterable[Tuple[Callable, Union[type, EventFilter]]]) -> None:
         for hook, event in hooks:
             self.add_hook(hook, event)
 
@@ -76,22 +78,22 @@ class Client:
         )
         self._hooks.get(type(event), set()).remove((hook, event))
 
-    def is_configured(self) -> bool:
+    async def is_configured(self) -> bool:
-        return self.account.is_configured()
+        return await self.account.is_configured()
 
-    def configure(self, email: str, password: str, **kwargs) -> None:
+    async def configure(self, email: str, password: str, **kwargs) -> None:
-        self.account.set_config("addr", email)
+        await self.account.set_config("addr", email)
-        self.account.set_config("mail_pw", password)
+        await self.account.set_config("mail_pw", password)
         for key, value in kwargs.items():
-            self.account.set_config(key, value)
+            await self.account.set_config(key, value)
-        self.account.configure()
+        await self.account.configure()
         self.logger.debug("Account configured")
 
-    def run_forever(self) -> None:
+    async def run_forever(self) -> None:
         """Process events forever."""
-        self.run_until(lambda _: False)
+        await self.run_until(lambda _: False)
 
-    def run_until(self, func: Callable[[AttrDict], bool]) -> AttrDict:
+    async def run_until(self, func: Callable[[AttrDict], Union[bool, Coroutine]]) -> AttrDict:
         """Process events until the given callable evaluates to True.
 
         The callable should accept an AttrDict object representing the
@@ -99,37 +101,39 @@ class Client:
         evaluates to True.
         """
         self.logger.debug("Listening to incoming events...")
-        if self.is_configured():
+        if await self.is_configured():
-            self.account.start_io()
+            await self.account.start_io()
-        self._process_messages()  # Process old messages.
+        await self._process_messages()  # Process old messages.
         while True:
-            event = self.account.wait_for_event()
+            event = await self.account.wait_for_event()
-            event["kind"] = EventType(event.kind)
+            event["type"] = EventType(event.type)
             event["account"] = self.account
-            self._on_event(event)
+            await self._on_event(event)
-            if event.kind == EventType.INCOMING_MSG:
+            if event.type == EventType.INCOMING_MSG:
-                self._process_messages()
+                await self._process_messages()
 
             stop = func(event)
+            if inspect.isawaitable(stop):
+                stop = await stop
             if stop:
                 return event
 
-    def _on_event(self, event: AttrDict, filter_type: Type[EventFilter] = RawEvent) -> None:
+    async def _on_event(self, event: AttrDict, filter_type: Type[EventFilter] = RawEvent) -> None:
         for hook, evfilter in self._hooks.get(filter_type, []):
-            if evfilter.filter(event):
+            if await evfilter.filter(event):
                 try:
-                    hook(event)
+                    await hook(event)
                 except Exception as ex:
                     self.logger.exception(ex)
 
-    def _parse_command(self, event: AttrDict) -> None:
+    async def _parse_command(self, event: AttrDict) -> None:
         cmds = [hook[1].command for hook in self._hooks.get(NewMessage, []) if hook[1].command]
         parts = event.message_snapshot.text.split(maxsplit=1)
         payload = parts[1] if len(parts) > 1 else ""
         cmd = parts.pop(0)
 
         if "@" in cmd:
-            suffix = "@" + self.account.self_contact.get_snapshot().address
+            suffix = "@" + (await self.account.self_contact.get_snapshot()).address
             if cmd.endswith(suffix):
                 cmd = cmd[: -len(suffix)]
             else:
@@ -149,32 +153,32 @@ class Client:
 
         event["command"], event["payload"] = cmd, payload
 
-    def _on_new_msg(self, snapshot: AttrDict) -> None:
+    async def _on_new_msg(self, snapshot: AttrDict) -> None:
         event = AttrDict(command="", payload="", message_snapshot=snapshot)
         if not snapshot.is_info and snapshot.text.startswith(COMMAND_PREFIX):
-            self._parse_command(event)
+            await self._parse_command(event)
-        self._on_event(event, NewMessage)
+        await self._on_event(event, NewMessage)
 
-    def _handle_info_msg(self, snapshot: AttrDict) -> None:
+    async def _handle_info_msg(self, snapshot: AttrDict) -> None:
         event = AttrDict(message_snapshot=snapshot)
 
         img_changed = parse_system_image_changed(snapshot.text)
         if img_changed:
             _, event["image_deleted"] = img_changed
-            self._on_event(event, GroupImageChanged)
+            await self._on_event(event, GroupImageChanged)
             return
 
         title_changed = parse_system_title_changed(snapshot.text)
         if title_changed:
             _, event["old_name"] = title_changed
-            self._on_event(event, GroupNameChanged)
+            await self._on_event(event, GroupNameChanged)
             return
 
         members_changed = parse_system_add_remove(snapshot.text)
         if members_changed:
             action, event["member"], _ = members_changed
             event["member_added"] = action == "added"
-            self._on_event(event, MemberListChanged)
+            await self._on_event(event, MemberListChanged)
             return
 
         self.logger.warning(
@@ -183,20 +187,19 @@ class Client:
             snapshot.text,
         )
 
-    def _process_messages(self) -> None:
+    async def _process_messages(self) -> None:
         if self._should_process_messages:
-            for message in self.account.get_next_messages():
+            for message in await self.account.get_fresh_messages_in_arrival_order():
-                snapshot = message.get_snapshot()
+                snapshot = await message.get_snapshot()
-                if snapshot.from_id not in [SpecialContactId.SELF, SpecialContactId.DEVICE]:
+                await self._on_new_msg(snapshot)
-                    self._on_new_msg(snapshot)
                 if snapshot.is_info and snapshot.system_message_type != SystemMessageType.WEBXDC_INFO_MESSAGE:
-                    self._handle_info_msg(snapshot)
+                    await self._handle_info_msg(snapshot)
-                snapshot.message.mark_seen()
+                await snapshot.message.mark_seen()
 
 
 class Bot(Client):
-    """Simple bot implementation that listens to events of a single account."""
+    """Simple bot implementation that listent to events of a single account."""
 
-    def configure(self, email: str, password: str, **kwargs) -> None:
+    async def configure(self, email: str, password: str, **kwargs) -> None:
         kwargs.setdefault("bot", "1")
-        super().configure(email, password, **kwargs)
+        await super().configure(email, password, **kwargs)