ci: increase timeout in test_logged_ac_process_ffi_failure

This test keeps failing on macOS CI,
likely because it does not get enough resources
to finish in 10 seconds.

.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/workflows/ci.yml

@@ -16,28 +16,21 @@ on:
     branches:
       - main
 
-permissions: {}
-
 env:
   RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.90.0
-
-  # Minimum Supported Rust Version
-  MSRV: 1.85.0
 
 jobs:
   lint_rust:
     name: Lint Rust
     runs-on: ubuntu-latest
+    env:
+      RUSTUP_TOOLCHAIN: 1.83.0
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         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 override set $RUST_VERSION
-        shell: bash
+        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
@@ -49,14 +42,25 @@ jobs:
       - name: Check with only default features
         run: cargo check --all-targets
 
+  npm_constants:
+    name: Check if node constants are up to date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - name: Rebuild constants
+        run: npm run build:core:constants
+      - name: Check that constants are not changed
+        run: git diff --exit-code
+
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
           arguments: --all-features --workspace
@@ -67,12 +71,9 @@ jobs:
     name: Check provider database
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
-      - name: Install rustfmt
-        run: rustup component add --toolchain stable-x86_64-unknown-linux-gnu rustfmt
       - name: Check provider database
         run: scripts/update-provider-database.sh
 
@@ -82,10 +83,9 @@ jobs:
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Rustdoc
@@ -97,36 +97,24 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: latest
+            rust: 1.83.0
           - os: windows-latest
-            rust: latest
+            rust: 1.83.0
           - os: macos-latest
-            rust: latest
+            rust: 1.83.0
 
-          # Minimum Supported Rust Version
+          # Minimum Supported Rust Version = 1.77.0
           - os: ubuntu-latest
-            rust: minimum
+            rust: 1.77.0
     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@v5
+      - 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
+        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
+      - run: rustup override set ${{ matrix.rust }}
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -156,16 +144,15 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - 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
+        run: cargo build -p deltachat_ffi --features jsonrpc
 
       - name: Upload C library
         uses: actions/upload-artifact@v4
@@ -181,10 +168,9 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -203,10 +189,9 @@ jobs:
     name: Python lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Install tox
         run: pip install tox
@@ -238,27 +223,26 @@ jobs:
           - os: macos-latest
             python: pypy3.10
 
-          # Minimum Supported Python Version = 3.8
+          # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built. Test it with minimum supported Rust version.
           - os: ubuntu-latest
-            python: 3.8
+            python: 3.7
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Download libdeltachat.a
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.os }}-libdeltachat.a
           path: target/debug
 
       - name: Install python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
@@ -293,19 +277,18 @@ jobs:
           - os: macos-latest
             python: pypy3.10
 
-          # Minimum Supported Python Version = 3.8
+          # Minimum Supported Python Version = 3.7
           - os: ubuntu-latest
-            python: 3.8
+            python: 3.7
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Install python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
@@ -313,7 +296,7 @@ jobs:
         run: pip install tox
 
       - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.os }}-deltachat-rpc-server
           path: target/debug

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

@@ -17,8 +17,6 @@ on:
   release:
     types: [published]
 
-permissions: {}
-
 jobs:
   # Build a version statically linked against musl libc
   # to avoid problems with glibc version incompatibility.
@@ -30,11 +28,11 @@ jobs:
         arch: [aarch64, armv7l, armv6l, i686, x86_64]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
@@ -54,11 +52,11 @@ jobs:
         arch: [win32, win64]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
@@ -79,10 +77,9 @@ jobs:
 
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Setup rust target
         run: rustup target add ${{ matrix.arch }}-apple-darwin
@@ -105,11 +102,11 @@ jobs:
         arch: [arm64-v8a, armeabi-v7a]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
@@ -132,74 +129,74 @@ jobs:
       contents: write
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        uses: actions/download-artifact@v4
         with:
           name: deltachat-rpc-server-armeabi-v7a-android
           path: deltachat-rpc-server-armeabi-v7a-android.d
@@ -224,7 +221,7 @@ jobs:
 
       # Python 3.11 is needed for tomllib used in scripts/wheel-rpc-server.py
       - name: Install python 3.12
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: 3.12
 
@@ -248,10 +245,6 @@ jobs:
           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
@@ -265,9 +258,8 @@ jobs:
         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/*
 
@@ -285,76 +277,75 @@ jobs:
       # Needed to publish the binaries to the release.
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
       - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        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@v5
+        uses: actions/download-artifact@v4
         with:
           name: deltachat-rpc-server-armeabi-v7a-android
           path: deltachat-rpc-server-armeabi-v7a-android.d
@@ -394,14 +385,13 @@ jobs:
         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 }} \
             deltachat-rpc-server/npm-package/*.tgz
 
       # Configure Node.js for publishing.
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: "https://registry.npmjs.org"

.github/workflows/dependabot.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.4.0
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR

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

@@ -4,22 +4,19 @@ on:
   release:
     types: [published]
 
-permissions: {}
-
 jobs:
   pack-module:
     name: "Publish @deltachat/jsonrpc-client"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     permissions:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: "https://registry.npmjs.org"

.github/workflows/jsonrpc.yml

@@ -6,8 +6,6 @@ on:
   pull_request:
     branches: [main]
 
-permissions: {}
-
 env:
   CARGO_TERM_COLOR: always
   RUST_MIN_STACK: "8388608"
@@ -16,12 +14,11 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Use Node.js 18.x
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Add Rust cache
@@ -37,6 +34,9 @@ jobs:
         run: npm run test
         env:
           CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+      - name: make sure websocket server version still builds
+        working-directory: deltachat-jsonrpc
+        run: cargo build --bin deltachat-jsonrpc-server --features webserver
       - name: Run linter
         working-directory: deltachat-jsonrpc/typescript
         run: npm run prettier:check

.github/workflows/nix.yml

@@ -12,18 +12,16 @@ on:
     branches:
       - main
 
-permissions: {}
-
 jobs:
   format:
     name: check flake formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix fmt
 
       # Check that formatting does not change anything.
@@ -55,9 +53,7 @@ jobs:
           - 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
@@ -81,11 +77,11 @@ jobs:
           #- deltachat-rpc-server-x86_64-android
           #- deltachat-rpc-server-x86-android
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix build .#${{ matrix.installable }}
 
   build-macos:
@@ -95,15 +91,14 @@ jobs:
       fail-fast: false
       matrix:
         installable:
-          - deltachat-rpc-server
+          - deltachat-rpc-server-aarch64-darwin
 
           # Fails to bulid
-          # - deltachat-rpc-server-aarch64-darwin
           # - deltachat-rpc-server-x86_64-darwin
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix build .#${{ matrix.installable }}

.github/workflows/node-docs.yml

@@ -0,0 +1,41 @@
+# GitHub Actions workflow to build
+# Node.js bindings documentation
+# and upload it to the web server.
+# Built documentation is available at <https://js.delta.chat/>
+
+name: Generate & upload node.js documentation
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+
+      - name: npm install and generate documentation
+        working-directory: node
+        run: |
+          npm i --ignore-scripts
+          npx typedoc
+          mv docs js
+
+      - name: Upload
+        uses: horochx/deploy-via-scp@1.1.0
+        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,235 @@
+name: "node.js build"
+on:
+  pull_request:
+  push:
+    tags:
+      - "*"
+      - "!py-*"
+
+jobs:
+  prebuild:
+    name: Prebuild
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v4
+        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'
+        working-directory: node
+        run: npm install --verbose
+
+      - name: Build Prebuild
+        working-directory: node
+        run: |
+          npm run prebuildify
+          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
+
+      - name: Upload Prebuild
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.os }}
+          path: node/${{ matrix.os }}.tar.gz
+
+  prebuild-linux:
+    name: Prebuild Linux
+    runs-on: ubuntu-latest
+
+    # Build Linux prebuilds inside a container with old glibc for backwards compatibility.
+    # Debian 10 contained glibc 2.28: https://packages.debian.org/buster/libc6
+    container: debian:10
+    steps:
+      # Working directory is owned by 1001:1001 by default.
+      # Change it to our user.
+      - name: Change working directory owner
+        run: chown root:root .
+
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - run: apt-get update
+
+      # Python is needed for node-gyp
+      - name: Install curl, python and compilers
+        run: apt-get install -y curl build-essential python3
+      - name: Install Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v4
+        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'
+        working-directory: node
+        run: npm install --verbose
+
+      - name: Build Prebuild
+        working-directory: node
+        run: |
+          npm run prebuildify
+          tar -zcvf "linux.tar.gz" -C prebuilds .
+
+      - name: Upload Prebuild
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux
+          path: node/linux.tar.gz
+
+  pack-module:
+    needs: [prebuild, prebuild-linux]
+    name: Package deltachat-node and upload to download.delta.chat
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install tree
+        run: sudo apt install tree
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - 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 Linux prebuild
+        uses: actions/download-artifact@v4
+        with:
+          name: linux
+      - name: Download macOS prebuild
+        uses: actions/download-artifact@v4
+        with:
+          name: macos-latest
+      - name: Download Windows prebuild
+        uses: actions/download-artifact@v4
+        with:
+          name: windows-latest
+      - shell: bash
+        run: |
+          mkdir node/prebuilds
+          tar -xvzf linux.tar.gz -C node/prebuilds
+          tar -xvzf macos-latest.tar.gz -C node/prebuilds
+          tar -xvzf windows-latest.tar.gz -C node/prebuilds
+          tree node/prebuilds
+          rm -f linux.tar.gz macos-latest.tar.gz windows-latest.tar.gz
+      - 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@v4
+        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,68 @@
+# GitHub Actions workflow
+# to test Node.js bindings.
+
+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:
+      - main
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v4
+        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'
+        working-directory: node
+        run: npm install --verbose
+
+      - name: Test
+        timeout-minutes: 10
+        working-directory: node
+        run: npm run test
+        env:
+          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"

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

@@ -5,18 +5,15 @@ on:
   release:
     types: [published]
 
-permissions: {}
-
 jobs:
   build:
     name: Build distribution
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - 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
@@ -42,7 +39,7 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: python-package-distributions
           path: dist/

.github/workflows/repl.yml

@@ -7,18 +7,16 @@ name: Build Windows REPL .exe
 on:
   workflow_dispatch:
 
-permissions: {}
-
 jobs:
   build_repl:
     name: Build REPL example
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Build
         run: nix build .#deltachat-repl-win64
       - name: Upload binary

.github/workflows/upload-docs.yml

@@ -6,17 +6,14 @@ on:
       - main
       - build_jsonrpc_docs_ci
 
-permissions: {}
-
 jobs:
   build-rs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat --no-deps --document-private-items
@@ -31,12 +28,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - 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
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Build Python documentation
         run: nix build .#python-docs
       - name: Upload to py.delta.chat
@@ -50,12 +47,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - 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
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Build C documentation
         run: nix build .#docs
       - name: Upload to c.delta.chat
@@ -72,13 +69,12 @@ jobs:
         working-directory: ./deltachat-jsonrpc/typescript
 
     steps:
-      - uses: actions/checkout@v5
+      - 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@v5
+        uses: actions/setup-node@v4
         with:
           node-version: '18'
       - name: npm install

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

@@ -9,17 +9,14 @@ on:
     branches:
       - main
 
-permissions: {}
-
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat_ffi --no-deps

.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@v5
-        with:
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
-
-      - 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,7 @@
-target/
+/target
 **/*.rs.bk
 /build
 /dist
-/fuzz/fuzz_targets/corpus/
-/fuzz/fuzz_targets/crashes/
 
 # ignore vi temporaries
 *~
@@ -53,4 +51,3 @@ result
 # direnv
 .envrc
 .direnv
-.aider*

CMakeLists.txt

@@ -27,7 +27,7 @@ add_custom_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 --target-dir=${CMAKE_BINARY_DIR}/target --release --features jsonrpc
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
 )
 

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Bug reports
 
-If you found a bug, [report it on GitHub](https://github.com/chatmail/core/issues).
+If you found a bug, [report it on GitHub](https://github.com/deltachat/deltachat-core-rust/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
@@ -67,7 +67,7 @@ If you want to contribute a code, follow this guide.
    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).
+4. [**Open a Pull Request**](https://github.com/deltachat/deltachat-core-rust/pulls).
 
    Refer to the corresponding issue.
 
@@ -116,7 +116,7 @@ For other ways to contribute, refer to the [website](https://delta.chat/en/contr
 
 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>
+on the contributing page: <https://github.com/deltachat/deltachat-core-rust/contribute>
 
 [Conventional Commits]: https://www.conventionalcommits.org/
 [git-cliff]: https://git-cliff.org/

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "deltachat"
-version = "2.16.0"
-edition = "2024"
+version = "1.152.2"
+edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.85"
-repository = "https://github.com/chatmail/core"
+rust-version = "1.77"
+repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [profile.dev]
 debug = 0
@@ -18,9 +18,6 @@ opt-level = 1
 debug = 1
 opt-level = 0
 
-[profile.fuzz]
-inherits = "test"
-
 # Always optimize dependencies.
 # This does not apply to crates in the workspace.
 # <https://doc.rust-lang.org/cargo/reference/profiles.html#overrides>
@@ -44,86 +41,86 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = { workspace = true }
 async-broadcast = "0.7.2"
 async-channel = { workspace = true }
-async-imap = { version = "0.11.1", default-features = false, features = ["runtime-tokio", "compress"] }
+async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.10.2", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
 base64 = { workspace = true }
-blake3 = "1.8.2"
-brotli = { version = "8", default-features=false, features = ["std"] }
+brotli = { version = "7", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-colorutils-rs = { version = "0.7.5", default-features = false }
-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"
 fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "0.25.2"
-http-body-util = "0.1.3"
+hickory-resolver = "=0.25.0-alpha.2"
+http-body-util = "0.1.2"
 humansize = "2"
 hyper = "1"
-hyper-util = "0.1.16"
-image = { version = "0.25.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.35", default-features = false, features = ["net"] }
-iroh = { version = "0.35", default-features = false }
+hyper-util = "0.1.10"
+image = { version = "0.25.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh-gossip = { version = "0.28.1", default-features = false, features = ["net"] }
+iroh-net = { version = "0.28.1", default-features = false }
 kamadak-exif = "0.6.1"
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = { workspace = true }
-mail-builder = { version = "0.4.4", default-features = false }
-mailparse = { workspace = true }
+mailparse = "0.15"
 mime = "0.3.17"
-num_cpus = "1.17"
+num_cpus = "1.16"
 num-derive = "0.4"
 num-traits = { workspace = true }
-parking_lot = "0.12.4"
+once_cell = { workspace = true }
+parking_lot = "0.12"
 percent-encoding = "2.3"
-pgp = { version = "0.17.0", default-features = false }
+pgp = { version = "0.14.2", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
 quick-xml = "0.37"
+quoted_printable = "0.5"
 rand = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
-rustls-pki-types = "1.12.0"
-rustls = { version = "0.23.22", default-features = false }
+rust-hsluv = "0.1"
+rustls-pki-types = "1.10.1"
+rustls = { version = "0.23.19", default-features = false }
 sanitize-filename = { workspace = true }
-sdp = "0.8.0"
 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.15.1"
-strum = "0.27"
-strum_macros = "0.27"
+shadowsocks = { version = "1.21.0", default-features = false, features = ["aead-cipher-2022"] }
+smallvec = "1.13.2"
+strum = "0.26"
+strum_macros = "0.26"
 tagger = "4.3.4"
-textwrap = "0.16.2"
+textwrap = "0.16.1"
 thiserror = { workspace = true }
-tokio-io-timeout = "1.2.1"
-tokio-rustls = { version = "0.26.2", default-features = false }
+tokio-io-timeout = "1.2.0"
+tokio-rustls = { version = "0.26.1", default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-toml = "0.9"
-tracing = "0.1.41"
+toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-webpki-roots = "0.26.8"
+webpki-roots = "0.26.7"
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
-criterion = { version = "0.7.0", features = ["async_tokio"] }
+criterion = { version = "0.5.1", features = ["async_tokio"] }
 futures-lite = { workspace = true }
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
 pretty_assertions = "1.4.1"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = { workspace = true }
-testdir = "0.9.3"
+testdir = "0.9.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 
 [workspace]
@@ -137,7 +134,6 @@ members = [
   "deltachat-time",
   "format-flowed",
   "deltachat-contact-tools",
-  "fuzz",
 ]
 
 [[bench]]
@@ -161,10 +157,6 @@ harness = false
 name = "get_chat_msgs"
 harness = false
 
-[[bench]]
-name = "marknoticed_chat"
-harness = false
-
 [[bench]]
 name = "get_chatlist"
 harness = false
@@ -175,38 +167,37 @@ harness = false
 
 [workspace.dependencies]
 anyhow = "1"
-async-channel = "2.5.0"
+async-channel = "2.3.1"
 base64 = "0.22"
-chrono = { version = "0.4.42", default-features = false }
+chrono = { version = "0.4.39", 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.1"
+futures-lite = "2.5.0"
 libc = "0.2"
 log = "0.4"
-mailparse = "0.16.1"
-nu-ansi-term = "0.50"
+nu-ansi-term = "0.46"
 num-traits = "0.2"
+once_cell = "1.20.2"
 rand = "0.8"
 regex = "1.10"
-rusqlite = "0.36"
+rusqlite = "0.32"
 sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
-tempfile = "3.23.0"
-thiserror = "2"
+tempfile = "3.14.0"
+thiserror = "1"
 tokio = "1"
-tokio-util = "0.7.16"
+tokio-util = "0.7.13"
 tracing-subscriber = "0.3"
-yerpc = "0.6.4"
+yerpc = "0.6.2"
 
 [features]
 default = ["vendored"]
 internals = []
 vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl",
-  "async-native-tls/vendored"
+  "rusqlite/bundled-sqlcipher-vendored-openssl"
 ]
 
 [lints.rust]

README.md

@@ -1,41 +1,19 @@
 <p align="center">
-<img alt="Chatmail logo" src="https://github.com/user-attachments/assets/25742da7-a837-48cd-a503-b303af55f10d" width="300" style="float:middle;" />
+  <img alt="Delta Chat Logo" height="200px" src="https://raw.githubusercontent.com/deltachat/deltachat-pages/master/assets/blog/rust-delta.png">
 </p>
 
 <p align="center">
-  <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 href="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml">
+    <img alt="Rust CI" src="https://github.com/deltachat/deltachat-core-rust/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 href="https://deps.rs/repo/github/deltachat/deltachat-core-rust">
+    <img alt="dependency status" src="https://deps.rs/repo/github/deltachat/deltachat-core-rust/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). 
-
+<p align="center">
+The core library for Delta Chat, written in Rust
+</p>
 
 ## Installing Rust and Cargo
 
@@ -49,12 +27,12 @@ $ 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
+$ cargo run --locked -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
 ```
@@ -62,13 +40,13 @@ $ cargo install --locked --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
@@ -80,43 +58,37 @@ Connect to your mail server (if already configured):
 > connect
 ```
 
-Export your public key to a vCard file:
-
-```
-> make-vcard my.vcard 1
-```
-
-Create contacts by address or vCard file:
+Create a contact:
 
 ```
 > addcontact yourfriends@email.org
-> import-vcard key-contact.vcard
+Command executed successfully.
 ```
 
 List contacts:
 
 ```
 > listcontacts
-Contact#Contact#11: key-contact@email.org <key-contact@email.org>
-Contact#Contact#Self: Me √ <your@email.org>
-2 key contacts.
-Contact#Contact#10: yourfriends@email.org <yourfriends@email.org>
-1 address contacts.
+Contact#10: <name unset> <yourfriends@email.org>
+Contact#1: Me √√ <your@email.org>
 ```
 
 Create a chat with your friend and send a message:
 
 ```
 > createchat 10
-Single#Chat#12 created successfully.
-> chat 12
-Selecting chat Chat#12
-Single#Chat#12: yourfriends@email.org [yourfriends@email.org] Icon: profile-db-blobs/4138c52e5bc1c576cda7dd44d088c07.png
-0 messages.
-81.252µs to create this list, 123.625µs to mark all messages as noticed.
+Single#10 created successfully.
+> chat 10
+Single#10: yourfriends@email.org [yourfriends@email.org]
 > send hi
+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:
 
 ```
@@ -132,7 +104,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
@@ -173,7 +145,7 @@ $ cargo install cargo-bolero
 Run fuzzing tests with
 ```sh
 $ cd fuzz
-$ cargo bolero test fuzz_mailparse -s NONE
+$ cargo bolero test fuzz_mailparse --release=false -s NONE
 ```
 
 Corpus is created at `fuzz/fuzz_targets/corpus`,
@@ -181,6 +153,11 @@ you can add initial inputs there.
 For `fuzz_mailparse` target corpus can be populated with
 `../test-data/message/*.eml`.
 
+To run with AFL instead of libFuzzer:
+```sh
+$ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
+```
+
 ## Features
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
@@ -188,16 +165,20 @@ For `fuzz_mailparse` target corpus can be populated with
 ## Update Provider Data
 
 To add the updates from the
-[provider-db](https://github.com/chatmail/provider-db) to the core,
-check line `REV=` inside `./scripts/update-provider-database.sh`
-and then run the script.
+[provider-db](https://github.com/deltachat/provider-db) to the core, run:
+
+```
+./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 JSON-RPC: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\]
+  - over CFFI[^1]: \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat/)\]
 - **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/)\]

RELEASE.md

@@ -2,12 +2,12 @@
 
 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).
+1. Resolve all [blocker issues](https://github.com/deltachat/deltachat-core-rust/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`
+  `[1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.2...v1.116.0`
 
 4. Update the version by running `scripts/set_core_version.py 1.116.0`.
 

STYLE.md

@@ -78,52 +78,12 @@ All errors should be handled in one of these ways:
 - With `.log_err().ok()`.
 - Bubbled up with `?`.
 
-When working with [async streams](https://docs.rs/futures/0.3.31/futures/stream/index.html),
-prefer [`try_next`](https://docs.rs/futures/0.3.31/futures/stream/trait.TryStreamExt.html#method.try_next) over `next()`, e.g. do
-```
-while let Some(event) = stream.try_next().await? {
-    todo!();
-}
-```
-instead of
-```
-while let Some(event_res) = stream.next().await {
-    todo!();
-}
-```
-as it allows bubbling up the error early with `?`
-with no way to accidentally skip error processing
-with early `continue` or `break`.
-Some streams reading from a connection
-return infinite number of `Some(Err(_))`
-items when connection breaks and not processing
-errors may result in infinite loop.
-
 `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`.
 
-`unwrap` and `expect` are not used in the library
-because panics are difficult to debug on user devices.
-However, in the tests `.expect` may be used.
-Follow
-<https://doc.rust-lang.org/core/error/index.html#common-message-styles>
-for `.expect` message style.
-
-## BTreeMap vs HashMap
-
-Prefer [BTreeMap](https://doc.rust-lang.org/std/collections/struct.BTreeMap.html)
-over [HashMap](https://doc.rust-lang.org/std/collections/struct.HashMap.html)
-and [BTreeSet](https://doc.rust-lang.org/std/collections/struct.BTreeSet.html)
-over [HashSet](https://doc.rust-lang.org/std/collections/struct.HashSet.html)
-as iterating over these structures returns items in deterministic order.
-
-Non-deterministic code may result in difficult to reproduce bugs,
-flaky tests, regression tests that miss bugs
-or different behavior on different devices when processing the same messages.
-
 ## Logging
 
 For logging, use `info!`, `warn!` and `error!` macros.
@@ -136,17 +96,3 @@ Format anyhow errors with `{:#}` to print all the contexts like this:
 ```
 error!(context, "Failed to set selfavatar timestamp: {err:#}.");
 ```
-
-## Documentation comments
-
-All public modules, methods and fields should be documented.
-This is checked by [`missing_docs`](https://doc.rust-lang.org/rustdoc/lints.html#missing_docs) lint.
-
-Private items do not have to be documented,
-but CI uses `cargo doc --document-private-items`
-to build the documentation,
-so it is preferred that new items
-are documented.
-
-Follow Rust guidelines for the documentation comments:
-<https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#summary-sentence>

assets/icon-unencrypted.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="480"
-   viewBox="0 -960 9600 9600"
-   width="480"
-   fill="#ffffff"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="icon-email.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.99091847"
-     inkscape:cx="263.392"
-     inkscape:cy="177.613"
-     inkscape:window-width="1884"
-     inkscape:window-height="1052"
-     inkscape:window-x="36"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <rect
-     style="fill:#8c8c8c;fill-opacity:1;stroke:none;stroke-width:680.523;stroke-dasharray:none;paint-order:markers fill stroke"
-     id="rect1"
-     width="9951.9541"
-     height="9767.4756"
-     x="-71.697792"
-     y="-1012.83"
-     ry="0.43547946" />
-  <path
-     d="m 2948.0033,5553.6941 q -130.7292,0 -228.7761,-96.3953 -98.0468,-96.3953 -98.0468,-224.9223 V 2447.6234 q 0,-128.527 98.0468,-224.9223 98.0469,-96.3953 228.7761,-96.3953 h 3703.9934 q 130.7292,0 228.776,96.3953 98.0469,96.3953 98.0469,224.9223 v 2784.7531 q 0,128.527 -98.0469,224.9223 -98.0468,96.3953 -228.776,96.3953 z M 4800,3936.3952 2948.0033,2742.1646 V 5232.3765 H 6651.9967 V 2742.1646 Z m 0,-321.3176 1830.2085,-1167.4541 h -3654.97 z m -1851.9967,-872.913 v -294.5412 2784.7531 z"
-     id="path1"
-     style="stroke-width:5.40098" />
-</svg>

assets/self-reporting-bot.vcf

@@ -1,7 +0,0 @@
-BEGIN:VCARD
-VERSION:4.0
-EMAIL:self_reporting@testrun.org
-FN:Statistics bot
-KEY:data:application/pgp-keys;base64,xjMEZbfBlBYJKwYBBAHaRw8BAQdABpLWS2PUIGGo4pslVt4R8sylP5wZihmhf1DTDr3oCMPNHDxzZWxmX3JlcG9ydGluZ0B0ZXN0cnVuLm9yZz7CiwQQFggAMwIZAQUCZbfBlAIbAwQLCQgHBhUICQoLAgMWAgEWIQTS2i16sHeYTckGn284K3M5Z4oohAAKCRA4K3M5Z4oohD8dAQCQV7CoH6UP4PD+NqI4kW5tbbqdh2AnDROg60qotmLExAEAxDfd3QHAK9f8b9qQUbLmHIztCLxhEuVbWPBEYeVW0gvOOARlt8GUEgorBgEEAZdVAQUBAQdAMBUhYoAAcI625vGZqnM5maPX4sGJ7qvJxPAFILPy6AcDAQgHwngEGBYIACAFAmW3wZQCGwwWIQTS2i16sHeYTckGn284K3M5Z4oohAAKCRA4K3M5Z4oohPwCAQCvzk1ObIkj2GqsuIfaULlgdnfdZY8LNary425CEfHZDQD5AblXVrlMO1frdlc/Vo9z3pEeCrfYdD7ITD3/OeVoiQ4=
-REV:20250412T195751Z
-END:VCARD

benches/contacts.rs

@@ -1,11 +1,9 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
-
-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;
 use tempfile::tempdir;
 
 async fn address_book_benchmark(n: u32, read_count: u32) {

benches/create_account.rs

@@ -1,8 +1,7 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::PathBuf;
 
-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
 use tempfile::tempdir;
 

benches/get_chat_msgs.rs

@@ -1,13 +1,12 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;
 
-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;
 
 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
     let id = 100;

benches/get_chatlist.rs

@@ -1,12 +1,11 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;
 
-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;
 
 async fn get_chat_list_benchmark(context: &Context) {
     Chatlist::try_load(context, 0, None, None).await.unwrap();

benches/marknoticed_chat.rs

@@ -1,95 +0,0 @@
-#![recursion_limit = "256"]
-use std::hint::black_box;
-use std::path::Path;
-
-use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
-use deltachat::Events;
-use deltachat::chat::{self, ChatId};
-use deltachat::chatlist::Chatlist;
-use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-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,15 +1,14 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::PathBuf;
 
-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::{
-    Events,
     config::Config,
     context::Context,
-    imex::{ImexMode, imex},
+    imex::{imex, ImexMode},
     receive_imf::receive_imf,
     stock_str::StockStrings,
+    Events,
 };
 use tempfile::tempdir;
 

benches/search_msgs.rs

@@ -1,11 +1,10 @@
 #![recursion_limit = "256"]
-use std::hint::black_box;
 use std::path::Path;
 
-use criterion::{Criterion, criterion_group, criterion_main};
-use deltachat::Events;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
+use deltachat::Events;
 
 async fn search_benchmark(dbfile: impl AsRef<Path>) {
     let id = 100;

benches/send_events.rs

@@ -1,17 +1,17 @@
 #![recursion_limit = "256"]
-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{criterion_group, criterion_main, Criterion};
 
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
-use deltachat::{Event, EventType, Events};
+use deltachat::{info, Event, EventType, Events};
 use tempfile::tempdir;
 
 async fn send_events_benchmark(context: &Context) {
     let emitter = context.get_event_emitter();
     for _i in 0..1_000_000 {
-        context.emit_event(EventType::Info("interesting event...".to_string()));
+        info!(context, "interesting event...");
     }
-    context.emit_event(EventType::Info("DONE".to_string()));
+    info!(context, "DONE");
 
     loop {
         match emitter.recv().await.unwrap() {

cliff.toml

@@ -11,7 +11,7 @@ filter_unconventional = false
 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
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/deltachat/deltachat-core-rust/pull/${2}))"}, # replace pull request / issue numbers
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
@@ -82,11 +82,11 @@ footer = """
     {% if release.version -%}
         {% if release.previous.version -%}
             [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/chatmail/core\
+                https://github.com/deltachat/deltachat-core-rust\
                     /compare/{{ release.previous.version }}..{{ release.version }}
         {% endif -%}
     {% else -%}
-        [unreleased]: https://github.com/chatmail/core\
+        [unreleased]: https://github.com/deltachat/deltachat-core-rust\
             /compare/{{ release.previous.version }}..HEAD
     {% endif -%}
 {% endfor %}

deltachat-contact-tools/Cargo.toml

@@ -9,6 +9,7 @@ license = "MPL-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
+once_cell = { 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"] }

deltachat-contact-tools/src/lib.rs

@@ -29,14 +29,203 @@
 
 use std::fmt;
 use std::ops::Deref;
-use std::sync::LazyLock;
 
 use anyhow::bail;
+use anyhow::Context as _;
 use anyhow::Result;
+use chrono::{DateTime, NaiveDateTime};
+use once_cell::sync::Lazy;
 use regex::Regex;
 
-mod vcard;
-pub use vcard::{make_vcard, parse_vcard, VcardContact};
+#[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\n\
+             VERSION:4.0\n\
+             EMAIL:{addr}\n\
+             FN:{display_name}\n"
+        );
+        if let Some(key) = &c.key {
+            res += &format!("KEY:data:application/pgp-keys;base64,{key}\n");
+        }
+        if let Some(profile_image) = &c.profile_image {
+            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\n");
+        }
+        if let Some(timestamp) = format_timestamp(c) {
+            res += &format!("REV:{timestamp}\n");
+        }
+        res += "END:VCARD\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
+        }
+    }
+    fn vcard_property<'a>(s: &'a str, property: &str) -> Option<&'a str> {
+        let remainder = remove_prefix(s, 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 (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;
+        }
+        Some(value)
+    }
+    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: Lazy<Regex> = Lazy::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(email) = vcard_property(line, "email") {
+                addr.get_or_insert(email);
+            } else if let Some(name) = vcard_property(line, "fn") {
+                display_name.get_or_insert(name);
+            } else if let Some(k) = remove_prefix(line, "KEY;PGP;ENCODING=BASE64:")
+                .or_else(|| remove_prefix(line, "KEY;TYPE=PGP;ENCODING=b:"))
+                .or_else(|| remove_prefix(line, "KEY:data:application/pgp-keys;base64,"))
+                .or_else(|| remove_prefix(line, "KEY;PREF=1:data:application/pgp-keys;base64,"))
+            {
+                key.get_or_insert(k);
+            } else if let Some(p) = remove_prefix(line, "PHOTO;JPEG;ENCODING=BASE64:")
+                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;JPEG:"))
+                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=b:"))
+                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=b;TYPE=JPEG:"))
+                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;TYPE=JPEG:"))
+                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=BASE64:"))
+                .or_else(|| remove_prefix(line, "PHOTO:data:image/jpeg;base64,"))
+            {
+                photo.get_or_insert(p);
+            } else if let Some(rev) = vcard_property(line, "rev") {
+                datetime.get_or_insert(rev);
+            } else if line.eq_ignore_ascii_case("END:VCARD") {
+                break;
+            }
+        }
+
+        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),
+        });
+    }
+
+    contacts
+}
 
 /// Valid contact address.
 #[derive(Debug, Clone)]
@@ -76,7 +265,7 @@ impl ContactAddress {
 
 /// Allow converting [`ContactAddress`] to an SQLite type.
 impl rusqlite::types::ToSql for ContactAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
+    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)
@@ -88,8 +277,7 @@ impl rusqlite::types::ToSql for ContactAddress {
 /// - 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());
+    static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
     let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
         (
             if name.is_empty() {
@@ -282,7 +470,7 @@ impl EmailAddress {
 }
 
 impl rusqlite::types::ToSql for EmailAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
+    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)
@@ -291,8 +479,124 @@ impl rusqlite::types::ToSql for EmailAddress {
 
 #[cfg(test)]
 mod tests {
+    use chrono::TimeZone;
+
     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_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\n\
+             VERSION:4.0\n\
+             EMAIL:alice@example.org\n\
+             FN:Alice Wonderland\n\
+             KEY:data:application/pgp-keys;base64,[base64-data]\n\
+             PHOTO:data:image/jpeg;base64,image in Base64\n\
+             REV:20240418T184242Z\n\
+             END:VCARD\n",
+            "BEGIN:VCARD\n\
+             VERSION:4.0\n\
+             EMAIL:bob@example.com\n\
+             FN:bob@example.com\n\
+             REV:19700101T000000Z\n\
+             END:VCARD\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_contact_address() -> Result<()> {
         let alice_addr = "alice@example.org";
@@ -339,6 +643,112 @@ mod tests {
         assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
     }
 
+    #[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);
+    }
+
     #[test]
     fn test_sanitize_name() {
         assert_eq!(&sanitize_name(" hello world   "), "hello world");

deltachat-contact-tools/src/vcard.rs

@@ -1,247 +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 biography, stored in the vcard property `note`
-    pub biography: 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())
-    }
-
-    fn escape(s: &str) -> String {
-        s.replace(',', "\\,")
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        // Mustn't contain ',', but it's easier to escape than to error out.
-        let addr = escape(&c.addr);
-        let display_name = escape(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(biography) = &c.biography {
-            res += &format!("NOTE:{}\r\n", escape(biography));
-        }
-        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, raw value) tuple.
-    fn vcard_property_raw<'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))
-    }
-    /// Returns (parameters, unescaped value) tuple.
-    fn vcard_property<'a>(line: &'a str, property: &str) -> Option<(&'a str, String)> {
-        let (params, value) = vcard_property_raw(line, property)?;
-        // Some fields can't contain commas, but unescape them everywhere for safety.
-        Some((params, value.replace("\\,", ",")))
-    }
-    fn base64_key(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property_raw(line, "key")?;
-        if params.eq_ignore_ascii_case("PGP;ENCODING=BASE64")
-            || params.eq_ignore_ascii_case("TYPE=PGP;ENCODING=b")
-        {
-            return Some(value);
-        }
-        remove_prefix(value, "data:application/pgp-keys;base64\\,")
-            // Old Delta Chat format.
-            .or_else(|| remove_prefix(value, "data:application/pgp-keys;base64,"))
-    }
-    fn base64_photo(line: &str) -> Option<&str> {
-        let (params, value) = vcard_property_raw(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);
-        }
-        remove_prefix(value, "data:image/jpeg;base64\\,")
-            // Old Delta Chat format.
-            .or_else(|| remove_prefix(value, "data:image/jpeg;base64,"))
-    }
-    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 biography = 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, bio)) = vcard_property(line, "note") {
-                biography.get_or_insert(bio);
-            } 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_default(),
-                    &addr.unwrap_or_default(),
-                );
-
-                contacts.push(VcardContact {
-                    authname,
-                    addr,
-                    key: key.map(|s| s.to_string()),
-                    profile_image: photo.map(|s| s.to_string()),
-                    biography,
-                    timestamp: datetime
-                        .as_deref()
-                        .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,278 +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()),
-            biography: Some("Hi, I'm Alice".to_string()),
-            timestamp: Ok(1713465762),
-        },
-        VcardContact {
-            addr: "bob@example.com".to_string(),
-            authname: "".to_string(),
-            key: None,
-            profile_image: None,
-            biography: 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\
-             NOTE:Hi\\, I'm Alice\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.
-/// This also tests unescaped commas in PHOTO and KEY (old Delta Chat format).
-#[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 = "2.16.0"
+version = "1.152.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { workspace = true, default-features = false }
-deltachat-jsonrpc = { workspace = true }
+deltachat-jsonrpc = { workspace = true, optional = true }
 libc = { workspace = true }
 human-panic = { version = "2", default-features = false }
 num-traits = { workspace = true }
@@ -24,9 +24,11 @@ tokio = { workspace = true, features = ["rt-multi-thread"] }
 anyhow = { workspace = true }
 thiserror = { workspace = true }
 rand = { workspace = true }
+once_cell = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose"] }
 
 [features]
 default = ["vendored"]
 vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
+jsonrpc = ["dep:deltachat-jsonrpc"]
 

deltachat-ffi/DoxygenLayout.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doxygenlayout version="2.0">
-  <!-- Generated by doxygen 1.13.2 -->
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.20 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title=""/>
@@ -12,16 +11,10 @@
     </tab>
     <tab type="topics" visible="yes" title="Constants" intro="Here is a list of constants:"/>
     <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="" intro="">
-      <tab type="modulelist" visible="yes" title="" intro=""/>
-      <tab type="modulemembers" visible="yes" title="" intro=""/>
-    </tab>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>
     </tab>
-    <tab type="concepts" visible="yes" title="">
-    </tab>
     <tab type="interfaces" visible="yes" title="">
       <tab type="interfacelist" visible="yes" title="" intro=""/>
       <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
@@ -42,228 +35,4 @@
     </tab>
     <tab type="examples" visible="yes" title="" intro=""/>
   </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_HEADERFILE"/>
-    <inheritancegraph visible="yes"/>
-    <collaborationgraph visible="yes"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes visible="yes" title=""/>
-      <services visible="yes" title=""/>
-      <interfaces visible="yes" title=""/>
-      <publicslots visible="yes" title=""/>
-      <signals visible="yes" title=""/>
-      <publicmethods visible="yes" title=""/>
-      <publicstaticmethods visible="yes" title=""/>
-      <publicattributes visible="yes" title=""/>
-      <publicstaticattributes visible="yes" title=""/>
-      <protectedtypes visible="yes" title=""/>
-      <protectedslots visible="yes" title=""/>
-      <protectedmethods visible="yes" title=""/>
-      <protectedstaticmethods visible="yes" title=""/>
-      <protectedattributes visible="yes" title=""/>
-      <protectedstaticattributes visible="yes" title=""/>
-      <packagetypes visible="yes" title=""/>
-      <packagemethods visible="yes" title=""/>
-      <packagestaticmethods visible="yes" title=""/>
-      <packageattributes visible="yes" title=""/>
-      <packagestaticattributes visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <events visible="yes" title=""/>
-      <privatetypes visible="yes" title=""/>
-      <privateslots visible="yes" title=""/>
-      <privatemethods visible="yes" title=""/>
-      <privatestaticmethods visible="yes" title=""/>
-      <privateattributes visible="yes" title=""/>
-      <privatestaticattributes visible="yes" title=""/>
-      <friends visible="yes" title=""/>
-      <related visible="yes" title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <inlineclasses visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <services visible="yes" title=""/>
-      <interfaces visible="yes" title=""/>
-      <constructors visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <related visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <events visible="yes" title=""/>
-    </memberdef>
-    <allmemberslink visible="yes"/>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <interfaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <concepts visible="yes" title=""/>
-      <structs visible="yes" title=""/>
-      <exceptions visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <membergroups visible="yes" visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <inlineclasses visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a concept page -->
-  <concept>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_HEADERFILE"/>
-    <definition visible="yes" title=""/>
-    <detaileddescription visible="yes" title=""/>
-    <authorsection visible="yes"/>
-  </concept>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="yes"/>
-    <includedbygraph visible="yes"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <interfaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <structs visible="yes" title=""/>
-      <exceptions visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <concepts visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <membergroups visible="yes" visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <inlineclasses visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="yes"/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <modules visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <concepts visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <enumvalues visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <signals visible="yes" title=""/>
-      <publicslots visible="yes" title=""/>
-      <protectedslots visible="yes" title=""/>
-      <privateslots visible="yes" title=""/>
-      <events visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <friends visible="yes" title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses visible="yes" title=""/>
-      <defines visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <sequences visible="yes" title=""/>
-      <dictionaries visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <enumvalues visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <signals visible="yes" title=""/>
-      <publicslots visible="yes" title=""/>
-      <protectedslots visible="yes" title=""/>
-      <privateslots visible="yes" title=""/>
-      <events visible="yes" title=""/>
-      <properties visible="yes" title=""/>
-      <friends visible="yes" title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a C++20 module page -->
-  <module>
-    <briefdescription visible="yes"/>
-    <exportedmodules visible="yes"/>
-    <memberdecl>
-      <concepts visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <enums visible="yes" title=""/>
-      <typedefs visible="yes" title=""/>
-      <functions visible="yes" title=""/>
-      <variables visible="yes" title=""/>
-      <membergroups visible="yes" title=""/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-    <memberdecl>
-      <files visible="yes"/>
-    </memberdecl>
-  </module>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription visible="yes" title=""/>
-  </directory>
 </doxygenlayout>

deltachat-ffi/src/lot.rs

@@ -34,7 +34,7 @@ pub enum Meaning {
 }
 
 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<'_, str>> {
+    pub fn get_text1(&self) -> Option<Cow<str>> {
         match self {
             Self::Summary(summary) => match &summary.prefix {
                 None => None,
@@ -50,7 +50,6 @@ impl Lot {
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
                 Qr::Account { domain } => Some(Cow::Borrowed(domain)),
                 Qr::Backup2 { .. } => None,
-                Qr::BackupTooNew { .. } => None,
                 Qr::WebrtcInstance { domain, .. } => Some(Cow::Borrowed(domain)),
                 Qr::Proxy { host, port, .. } => Some(Cow::Owned(format!("{host}:{port}"))),
                 Qr::Addr { draft, .. } => draft.as_deref().map(Cow::Borrowed),
@@ -66,7 +65,7 @@ impl Lot {
         }
     }
 
-    pub fn get_text2(&self) -> Option<Cow<'_, str>> {
+    pub fn get_text2(&self) -> Option<Cow<str>> {
         match self {
             Self::Summary(summary) => Some(summary.truncated_text(160)),
             Self::Qr(_) => None,
@@ -104,7 +103,6 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
                 Qr::Backup2 { .. } => LotState::QrBackup2,
-                Qr::BackupTooNew { .. } => LotState::QrBackupTooNew,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                 Qr::Proxy { .. } => LotState::QrProxy,
                 Qr::Addr { .. } => LotState::QrAddr,
@@ -131,7 +129,6 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
                 Qr::Backup2 { .. } => Default::default(),
-                Qr::BackupTooNew { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
                 Qr::Proxy { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
@@ -181,9 +178,9 @@ pub enum LotState {
     /// text1=domain
     QrAccount = 250,
 
-    QrBackup2 = 252,
+    QrBackup = 251,
 
-    QrBackupTooNew = 255,
+    QrBackup2 = 252,
 
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,

deltachat-jsonrpc/Cargo.toml

@@ -1,19 +1,28 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "2.16.0"
+version = "1.152.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
+default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"
+
+[[bin]]
+name = "deltachat-jsonrpc-server"
+path = "src/webserver.rs"
+required-features = ["webserver"]
 
 [dependencies]
 anyhow = { workspace = true }
 deltachat = { workspace = true }
 deltachat-contact-tools = { workspace = true }
 num-traits = { workspace = true }
-schemars = "0.8.22"
+schemars = "0.8.21"
 serde = { workspace = true, features = ["derive"] }
+tempfile = { workspace = true }
+log = { workspace = true }
 async-channel = { workspace = true }
+futures = { workspace = true }
 serde_json = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.13", features = ["json_value"] }
@@ -22,12 +31,15 @@ sanitize-filename = { workspace = true }
 walkdir = "2.5.0"
 base64 = { workspace = true }
 
+# optional dependencies
+axum = { version = "0.7", optional = true, features = ["ws"] }
+env_logger = { version = "0.11.6", optional = true }
+
 [dev-dependencies]
 tokio = { workspace = true, 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.
-* 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.
+* 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). 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 `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
 
 ```
-CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
+CHATMAIL_DOMAIN=chat.example.org 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.rs

@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::str;
 use std::sync::Arc;
 use std::time::Duration;
@@ -7,8 +7,6 @@ use std::{collections::HashMap, str::FromStr};
 
 use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
-use deltachat::blob::BlobObject;
-use deltachat::calls::ice_servers;
 use deltachat::chat::{
     self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
     marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
@@ -20,11 +18,10 @@ use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
-use deltachat::imex;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
     leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -37,10 +34,10 @@ use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::EventEmitter;
+use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
-use types::login_param::EnteredLoginParam;
 use walkdir::WalkDir;
 use yerpc::rpc;
 
@@ -48,7 +45,6 @@ pub mod types;
 
 use num_traits::FromPrimitive;
 use types::account::Account;
-use types::calls::JsonrpcCallInfo;
 use types::chat::FullChat;
 use types::contact::{ContactObject, VcardContact};
 use types::events::Event;
@@ -93,8 +89,7 @@ pub struct CommandApi {
 
     /// Receiver side of the event channel.
     ///
-    /// Events from it can be received by calling
-    /// [`CommandApi::get_next_event`] method.
+    /// Events from it can be received by calling `get_next_event` method.
     event_emitter: Arc<EventEmitter>,
 
     states: Arc<Mutex<BTreeMap<u32, AccountState>>>,
@@ -176,15 +171,7 @@ impl CommandApi {
         get_info()
     }
 
-    /// Get the next event, and remove it from the event queue.
-    ///
-    /// If no events have happened since the last `get_next_event`
-    /// (i.e. if the event queue is empty), the response will be returned
-    /// only when a new event fires.
-    ///
-    /// Note that if you are using the `BaseDeltaChat` JavaScript class
-    /// or the `Rpc` Python class, this function will be invoked
-    /// by those classes internally and should not be used manually.
+    /// Get the next event.
     async fn get_next_event(&self) -> Result<Event> {
         self.event_emitter
             .recv()
@@ -225,30 +212,23 @@ impl CommandApi {
         self.accounts.read().await.get_all()
     }
 
-    /// Select account in account manager, this saves the last used account to accounts.toml
+    /// Select account id for internally selected state.
+    /// TODO: Likely this is deprecated as all methods take an account id now.
     async fn select_account(&self, id: u32) -> Result<()> {
         self.accounts.write().await.select_account(id).await
     }
 
-    /// Get the selected account from the account manager (on startup it is read from accounts.toml)
+    /// Get the selected account id of the internal state..
+    /// TODO: Likely this is deprecated as all methods take an account id now.
     async fn get_selected_account_id(&self) -> Option<u32> {
         self.accounts.read().await.get_selected_account_id()
     }
 
-    /// Set the order of accounts.
-    /// The provided list should contain all account IDs in the desired order.
-    /// If an account ID is missing from the list, it will be appended at the end.
-    /// If the list contains non-existent account IDs, they will be ignored.
-    async fn set_accounts_order(&self, order: Vec<u32>) -> Result<()> {
-        self.accounts.write().await.set_accounts_order(order).await
-    }
-
     /// Get a list of all configured accounts.
     async fn get_all_accounts(&self) -> Result<Vec<Account>> {
         let mut accounts = Vec::new();
-        let accounts_lock = self.accounts.read().await;
-        for id in accounts_lock.get_all() {
-            let context_option = accounts_lock.get_account(id);
+        for id in self.accounts.read().await.get_all() {
+            let context_option = self.accounts.read().await.get_account(id);
             if let Some(ctx) = context_option {
                 accounts.push(Account::from_context(&ctx, id).await?)
             }
@@ -346,12 +326,8 @@ impl CommandApi {
             .get_config_bool(deltachat::config::Config::ProxyEnabled)
             .await?;
 
-        let provider_info = get_provider_info(
-            &ctx,
-            email.split('@').next_back().unwrap_or(""),
-            proxy_enabled,
-        )
-        .await;
+        let provider_info =
+            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), proxy_enabled).await;
         Ok(ProviderInfo::from_dc_type(provider_info))
     }
 
@@ -367,33 +343,11 @@ impl CommandApi {
         ctx.get_info().await
     }
 
-    /// Get the blob dir.
     async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
     }
 
-    /// If there was an error while the account was opened
-    /// and migrated to the current version,
-    /// then this function returns it.
-    ///
-    /// This function is useful because the key-contacts migration could fail due to bugs
-    /// and then the account will not work properly.
-    ///
-    /// After opening an account, the UI should call this function
-    /// and show the error string if one is returned.
-    async fn get_migration_error(&self, account_id: u32) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx.get_migration_error())
-    }
-
-    /// Copy file to blob dir.
-    async fn copy_to_blob_dir(&self, account_id: u32, path: String) -> Result<PathBuf> {
-        let ctx = self.get_context(account_id).await?;
-        let file = Path::new(&path);
-        Ok(BlobObject::create_and_deduplicate(&ctx, file, file)?.to_abs_path())
-    }
-
     async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.draft_self_report().await?.to_u32())
@@ -470,9 +424,6 @@ impl CommandApi {
 
     /// Configures this account with the currently set parameters.
     /// Setup the credential config before calling this.
-    ///
-    /// Deprecated as of 2025-02; use `add_transport_from_qr()`
-    /// or `add_or_update_transport()` instead.
     async fn configure(&self, account_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         ctx.stop_io().await;
@@ -487,78 +438,6 @@ impl CommandApi {
         Ok(())
     }
 
-    /// Configures a new email account using the provided parameters
-    /// and adds it as a transport.
-    ///
-    /// If the email address is the same as an existing transport,
-    /// then this existing account will be reconfigured instead of a new one being added.
-    ///
-    /// This function stops and starts IO as needed.
-    ///
-    /// Usually it will be enough to only set `addr` and `password`,
-    /// and all the other settings will be autoconfigured.
-    ///
-    /// During configuration, ConfigureProgress events are emitted;
-    /// they indicate a successful configuration as well as errors
-    /// and may be used to create a progress bar.
-    /// This function will return after configuration is finished.
-    ///
-    /// If configuration is successful,
-    /// the working server parameters will be saved
-    /// and used for connecting to the server.
-    /// The parameters entered by the user will be saved separately
-    /// so that they can be prefilled when the user opens the server-configuration screen again.
-    ///
-    /// See also:
-    /// - [Self::is_configured()] to check whether there is
-    ///   at least one working transport.
-    /// - [Self::add_transport_from_qr()] to add a transport
-    ///   from a server encoded in a QR code.
-    /// - [Self::list_transports()] to get a list of all configured transports.
-    /// - [Self::delete_transport()] to remove a transport.
-    async fn add_or_update_transport(
-        &self,
-        account_id: u32,
-        param: EnteredLoginParam,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.add_or_update_transport(&mut param.try_into()?).await
-    }
-
-    /// Deprecated 2025-04. Alias for [Self::add_or_update_transport()].
-    async fn add_transport(&self, account_id: u32, param: EnteredLoginParam) -> Result<()> {
-        self.add_or_update_transport(account_id, param).await
-    }
-
-    /// Adds a new email account as a transport
-    /// using the server encoded in the QR code.
-    /// See [Self::add_or_update_transport].
-    async fn add_transport_from_qr(&self, account_id: u32, qr: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.add_transport_from_qr(&qr).await
-    }
-
-    /// Returns the list of all email accounts that are used as a transport in the current profile.
-    /// Use [Self::add_or_update_transport()] to add or change a transport
-    /// and [Self::delete_transport()] to delete a transport.
-    async fn list_transports(&self, account_id: u32) -> Result<Vec<EnteredLoginParam>> {
-        let ctx = self.get_context(account_id).await?;
-        let res = ctx
-            .list_transports()
-            .await?
-            .into_iter()
-            .map(|t| t.into())
-            .collect();
-        Ok(res)
-    }
-
-    /// Removes the transport with the specified email address
-    /// (i.e. [EnteredLoginParam::addr]).
-    async fn delete_transport(&self, account_id: u32, addr: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.delete_transport(&addr).await
-    }
-
     /// Signal an ongoing process to stop.
     async fn stop_ongoing_process(&self, account_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
@@ -945,7 +824,7 @@ impl CommandApi {
     ///   explicitly as it may happen that oneself gets removed from a still existing
     ///   group
     ///
-    /// - for broadcast channels, all recipients are returned, DC_CONTACT_ID_SELF is not included
+    /// - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
     ///
     /// - for mailing lists, the behavior is not documented currently, we will decide on that later.
     ///   for now, the UI should not show the list for mailing lists.
@@ -957,14 +836,7 @@ impl CommandApi {
         Ok(contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>())
     }
 
-    /// Returns contact IDs of the past chat members.
-    async fn get_past_chat_contacts(&self, account_id: u32, chat_id: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts = chat::get_past_chat_contacts(&ctx, ChatId::new(chat_id)).await?;
-        Ok(contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>())
-    }
-
-    /// Create a new encrypted group chat (with key-contacts).
+    /// Create a new group chat.
     ///
     /// After creation,
     /// the group has one member with the ID DC_CONTACT_ID_SELF
@@ -982,52 +854,30 @@ impl CommandApi {
     ///
     /// @param protect If set to 1 the function creates group with protection initially enabled.
     ///     Only verified members are allowed in these groups
+    ///     and end-to-end-encryption is always enabled.
     async fn create_group_chat(&self, account_id: u32, name: String, protect: bool) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         let protect = match protect {
             true => ProtectionStatus::Protected,
             false => ProtectionStatus::Unprotected,
         };
-        chat::create_group_ex(&ctx, Some(protect), &name)
+        chat::create_group_chat(&ctx, protect, &name)
             .await
             .map(|id| id.to_u32())
     }
 
-    /// Create a new unencrypted group chat.
+    /// Create a new broadcast list.
     ///
-    /// Same as [`Self::create_group_chat`], but the chat is unencrypted and can only have
-    /// address-contacts.
-    async fn create_group_chat_unencrypted(&self, account_id: u32, name: String) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        chat::create_group_ex(&ctx, None, &name)
-            .await
-            .map(|id| id.to_u32())
-    }
-
-    /// Deprecated 2025-07 in favor of create_broadcast().
-    async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
-        self.create_broadcast(account_id, "Channel".to_string())
-            .await
-    }
-
-    /// Create a new **broadcast channel**
-    /// (called "Channel" in the UI).
-    ///
-    /// Broadcast channels are similar to groups on the sending device,
+    /// Broadcast lists are similar to groups on the sending device,
     /// however, recipients get the messages in a read-only chat
-    /// and will not see who the other members are.
+    /// and will see who the other members are.
     ///
-    /// Called `broadcast` here rather than `channel`,
-    /// because the word "channel" already appears a lot in the code,
-    /// which would make it hard to grep for it.
-    ///
-    /// After creation, the chat contains no recipients and is in _unpromoted_ state;
-    /// see [`CommandApi::create_group_chat`] for more information on the unpromoted state.
-    ///
-    /// Returns the created chat's id.
-    async fn create_broadcast(&self, account_id: u32, chat_name: String) -> Result<u32> {
+    /// For historical reasons, this function does not take a name directly,
+    /// instead you have to set the name using dc_set_chat_name()
+    /// after creating the broadcast list.
+    async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
-        chat::create_broadcast(&ctx, chat_name)
+        chat::create_broadcast_list(&ctx)
             .await
             .map(|id| id.to_u32())
     }
@@ -1143,12 +993,6 @@ impl CommandApi {
         marknoticed_chat(&ctx, ChatId::new(chat_id)).await
     }
 
-    /// Returns the message that is immediately followed by the last seen
-    /// message.
-    /// From the point of view of the user this is effectively
-    /// "first unread", but in reality in the database a seen message
-    /// _can_ be followed by a fresh (unseen) message
-    /// if that message has not been individually marked as seen.
     async fn get_first_unread_message_of_chat(
         &self,
         account_id: u32,
@@ -1237,11 +1081,6 @@ impl CommandApi {
         markseen_msgs(&ctx, msg_ids.into_iter().map(MsgId::new).collect()).await
     }
 
-    /// Returns all messages of a particular chat.
-    ///
-    /// * `add_daymarker` - If `true`, add day markers as `DC_MSG_ID_DAYMARKER` to the result,
-    ///   e.g. [1234, 1237, 9, 1239]. The day marker timestamp is the midnight one for the
-    ///   corresponding (following) day in the local timezone.
     async fn get_message_ids(
         &self,
         account_id: u32,
@@ -1352,15 +1191,7 @@ impl CommandApi {
     async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs_ex(&ctx, &msgs, false).await
-    }
-
-    /// Delete messages. The messages are deleted on the current device,
-    /// on the IMAP server and also for all chat members
-    async fn delete_messages_for_all(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs_ex(&ctx, &msgs, true).await
+        delete_msgs(&ctx, &msgs).await
     }
 
     /// Get an informational text for a single message. The text is multiline and may
@@ -1460,12 +1291,6 @@ impl CommandApi {
         Ok(results)
     }
 
-    async fn save_msgs(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let message_ids: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        chat::save_msgs(&ctx, &message_ids).await
-    }
-
     // ---------------------------------------------
     //  contact
     // ---------------------------------------------
@@ -1484,14 +1309,7 @@ impl CommandApi {
 
     /// Add a single contact as a result of an explicit user action.
     ///
-    /// This will always create or look up an address-contact,
-    /// i.e. a contact identified by an email address,
-    /// with all messages sent to and from this contact being unencrypted.
-    /// If the user just clicked on an email address,
-    /// you should first check [`Self::lookup_contact_id_by_addr`]/`lookupContactIdByAddr.`,
-    /// and only if there is no contact yet, call this function here.
-    ///
-    /// Returns contact id of the created or existing contact.
+    /// Returns contact id of the created or existing contact
     async fn create_contact(
         &self,
         account_id: u32,
@@ -1543,14 +1361,6 @@ impl CommandApi {
         Ok(contacts)
     }
 
-    /// Returns ids of known and unblocked contacts.
-    ///
-    /// By default, key-contacts are listed.
-    ///
-    /// * `list_flags` - A combination of flags:
-    ///   - `DC_GCL_ADD_SELF` - Add SELF unless filtered by other parameters.
-    ///   - `DC_GCL_ADDRESS` - List address-contacts instead of key-contacts.
-    /// * `query` - A string to filter the list.
     async fn get_contact_ids(
         &self,
         account_id: u32,
@@ -1562,10 +1372,8 @@ impl CommandApi {
         Ok(contacts.into_iter().map(|c| c.to_u32()).collect())
     }
 
-    /// Returns known and unblocked contacts.
-    ///
-    /// Formerly called `getContacts2` in Desktop.
-    /// See [`Self::get_contact_ids`] for parameters and more info.
+    /// Get a list of contacts.
+    /// (formerly called getContacts2 in desktop)
     async fn get_contacts(
         &self,
         account_id: u32,
@@ -1616,7 +1424,15 @@ impl CommandApi {
         Ok(())
     }
 
-    /// Sets display name for existing contact.
+    /// Resets contact encryption.
+    async fn reset_contact_encryption(&self, account_id: u32, contact_id: u32) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let contact_id = ContactId::new(contact_id);
+
+        contact_id.reset_encryption(&ctx).await?;
+        Ok(())
+    }
+
     async fn change_contact_name(
         &self,
         account_id: u32,
@@ -1625,7 +1441,9 @@ impl CommandApi {
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         let contact_id = ContactId::new(contact_id);
-        contact_id.set_name(&ctx, &name).await?;
+        let contact = Contact::get_by_id(&ctx, contact_id).await?;
+        let addr = contact.get_addr();
+        Contact::create(&ctx, &name, addr).await?;
         Ok(())
     }
 
@@ -1641,19 +1459,9 @@ impl CommandApi {
         Contact::get_encrinfo(&ctx, ContactId::new(contact_id)).await
     }
 
-    /// Looks up a known and unblocked contact with a given e-mail address.
+    /// Check if an e-mail address belongs to a known and unblocked contact.
     /// To get a list of all known and unblocked contacts, use contacts_get_contacts().
     ///
-    /// **POTENTIAL SECURITY ISSUE**: If there are multiple contacts with this address
-    /// (e.g. an address-contact and a key-contact),
-    /// this looks up the most recently seen contact,
-    /// i.e. which contact is returned depends on which contact last sent a message.
-    /// If the user just clicked on a mailto: link, then this is the best thing you can do.
-    /// But **DO NOT** internally represent contacts by their email address
-    /// and do not use this function to look them up;
-    /// otherwise this function will sometimes look up the wrong contact.
-    /// Instead, you should internally represent contacts by their ids.
-    ///
     /// To validate an e-mail address independently of the contact database
     /// use check_email_validity().
     async fn lookup_contact_id_by_addr(
@@ -1690,18 +1498,6 @@ impl CommandApi {
             .collect())
     }
 
-    /// Imports contacts from a vCard.
-    ///
-    /// Returns the ids of created/modified contacts in the order they appear in the vCard.
-    async fn import_vcard_contents(&self, account_id: u32, vcard: String) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(deltachat::contact::import_vcard(&ctx, &vcard)
-            .await?
-            .into_iter()
-            .map(|c| c.to_u32())
-            .collect())
-    }
-
     /// Returns a vCard containing contacts with the given ids.
     async fn make_vcard(&self, account_id: u32, contacts: Vec<u32>) -> Result<String> {
         let ctx = self.get_context(account_id).await?;
@@ -1919,7 +1715,7 @@ impl CommandApi {
     /// If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
     async fn get_connectivity(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
-        Ok(ctx.get_connectivity() as u32)
+        Ok(ctx.get_connectivity().await as u32)
     }
 
     /// Get an overview of the current connectivity, and possibly more statistics.
@@ -1994,19 +1790,16 @@ impl CommandApi {
         instance_msg_id: u32,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        if let Some(fut) =
-            send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?
-        {
-            tokio::spawn(fut);
+        let fut = send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?;
+        if let Some(fut) = fut {
+            tokio::spawn(async move {
+                fut.await.ok();
+                info!(ctx, "send_webxdc_realtime_advertisement done")
+            });
         }
         Ok(())
     }
 
-    /// Leaves the gossip of the webxdc with the given message id.
-    ///
-    /// NB: When this is called before closing a webxdc app in UIs, it must be guaranteed that
-    /// `send_webxdc_realtime_*()` functions aren't called for the given `instance_message_id`
-    /// anymore until the app is open again.
     async fn leave_webxdc_realtime(&self, account_id: u32, instance_message_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         leave_webxdc_realtime(&ctx, MsgId::new(instance_message_id)).await
@@ -2038,9 +1831,13 @@ impl CommandApi {
 
     /// Get href from a WebxdcInfoMessage which might include a hash holding
     /// information about a specific position or state in a webxdc app (optional)
-    async fn get_webxdc_href(&self, account_id: u32, info_msg_id: u32) -> Result<Option<String>> {
+    async fn get_webxdc_href(
+        &self,
+        account_id: u32,
+        instance_msg_id: u32,
+    ) -> Result<Option<String>> {
         let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(info_msg_id)).await?;
+        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
         Ok(message.get_webxdc_href())
     }
 
@@ -2084,53 +1881,6 @@ impl CommandApi {
             .map(|msg_id| msg_id.to_u32()))
     }
 
-    /// Starts an outgoing call.
-    async fn place_outgoing_call(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        place_call_info: String,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let msg_id = ctx
-            .place_outgoing_call(ChatId::new(chat_id), place_call_info)
-            .await?;
-        Ok(msg_id.to_u32())
-    }
-
-    /// Accepts an incoming call.
-    async fn accept_incoming_call(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        accept_call_info: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.accept_incoming_call(MsgId::new(msg_id), accept_call_info)
-            .await?;
-        Ok(())
-    }
-
-    /// Ends incoming or outgoing call.
-    async fn end_call(&self, account_id: u32, msg_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.end_call(MsgId::new(msg_id)).await?;
-        Ok(())
-    }
-
-    /// Returns information about the call.
-    async fn call_info(&self, account_id: u32, msg_id: u32) -> Result<JsonrpcCallInfo> {
-        let ctx = self.get_context(account_id).await?;
-        let call_info = JsonrpcCallInfo::from_msg_id(&ctx, MsgId::new(msg_id)).await?;
-        Ok(call_info)
-    }
-
-    /// Returns JSON with ICE servers, to be used for WebRTC video calls.
-    async fn ice_servers(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        ice_servers(&ctx).await
-    }
-
     /// Makes an HTTP GET request and returns a response.
     ///
     /// `url` is the HTTP or HTTPS URL.
@@ -2180,7 +1930,7 @@ impl CommandApi {
         let ctx = self.get_context(account_id).await?;
 
         let mut msg = Message::new(Viewtype::Sticker);
-        msg.set_file_and_deduplicate(&ctx, Path::new(&sticker_path), None, None)?;
+        msg.set_file(&sticker_path, None);
 
         // JSON-rpc does not need heuristics to turn [Viewtype::Sticker] into [Viewtype::Image]
         msg.force_sticker();
@@ -2234,16 +1984,6 @@ impl CommandApi {
         Ok(msg_id)
     }
 
-    async fn send_edit_request(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        new_text: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        chat::send_edit_request(&ctx, MsgId::new(msg_id), new_text).await
-    }
-
     /// Checks if messages can be sent to a given chat.
     async fn can_send(&self, account_id: u32, chat_id: u32) -> Result<bool> {
         let ctx = self.get_context(account_id).await?;
@@ -2410,45 +2150,12 @@ impl CommandApi {
 
     // mimics the old desktop call, will get replaced with something better in the composer rewrite,
     // the better version will just be sending the current draft, though there will be probably something similar with more options to this for the corner cases like setting a marker on the map
-    /// Send a message to a chat.
-    ///
-    /// This function returns after the message has been placed in the sending queue.
-    /// This does not imply that the message was really sent out yet.
-    /// However, from your view, you're done with the message.
-    /// Sooner or later it will find its way.
-    ///
-    /// **Attaching files:**
-    ///
-    /// Pass the file path in the `file` parameter.
-    /// If `file` is not in the blob directory yet,
-    /// it will be copied into the blob directory.
-    /// If you want, you can delete the file immediately after this function returns.
-    ///
-    /// You can also write the attachment directly into the blob directory
-    /// and then pass the path as the `file` parameter;
-    /// this will prevent an unnecessary copying of the file.
-    ///
-    /// In `filename`, you can pass the original name of the file,
-    /// which will then be shown in the UI.
-    /// in this case the current name of `file` on the filesystem will be ignored.
-    ///
-    /// In order to deduplicate files that contain the same data,
-    /// the file will be named `<hash>.<extension>`, e.g. `ce940175885d7b78f7b7e9f1396611f.jpg`.
-    ///
-    /// NOTE:
-    /// - This function will rename the file. To get the new file path, call `get_file()`.
-    /// - The file must not be modified after this function was called.
-    /// - Images etc. will NOT be recoded.
-    ///   In order to recode images,
-    ///   use `misc_set_draft` and pass `Image` as the viewtype.
-    #[expect(clippy::too_many_arguments)]
     async fn misc_send_msg(
         &self,
         account_id: u32,
         chat_id: u32,
         text: Option<String>,
         file: Option<String>,
-        filename: Option<String>,
         location: Option<(f64, f64)>,
         quoted_message_id: Option<u32>,
     ) -> Result<(u32, MessageObject)> {
@@ -2460,7 +2167,7 @@ impl CommandApi {
         });
         message.set_text(text.unwrap_or_default());
         if let Some(file) = file {
-            message.set_file_and_deduplicate(&ctx, Path::new(&file), filename.as_deref(), None)?;
+            message.set_file(file, None);
         }
         if let Some((latitude, longitude)) = location {
             message.set_location(latitude, longitude);
@@ -2488,14 +2195,12 @@ impl CommandApi {
     // the better version should support:
     // - changing viewtype to enable/disable compression
     // - keeping same message id as long as attachment does not change for webxdc messages
-    #[expect(clippy::too_many_arguments)]
     async fn misc_set_draft(
         &self,
         account_id: u32,
         chat_id: u32,
         text: Option<String>,
         file: Option<String>,
-        filename: Option<String>,
         quoted_message_id: Option<u32>,
         view_type: Option<MessageViewtype>,
     ) -> Result<()> {
@@ -2512,7 +2217,7 @@ impl CommandApi {
         ));
         draft.set_text(text.unwrap_or_default());
         if let Some(file) = file {
-            draft.set_file_and_deduplicate(&ctx, Path::new(&file), filename.as_deref(), None)?;
+            draft.set_file(file, None);
         }
         if let Some(id) = quoted_message_id {
             draft

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

@@ -1,95 +0,0 @@
-use anyhow::Result;
-
-use deltachat::calls::{call_state, sdp_has_video, CallState};
-use deltachat::context::Context;
-use deltachat::message::MsgId;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "CallInfo", rename_all = "camelCase")]
-pub struct JsonrpcCallInfo {
-    /// SDP offer.
-    ///
-    /// Can be used to manually answer the call
-    /// even if incoming call event was missed.
-    pub sdp_offer: String,
-
-    /// True if SDP offer has a video.
-    pub has_video: bool,
-
-    /// Call state.
-    ///
-    /// For example, if the call is accepted, active, cancelled, declined etc.
-    pub state: JsonrpcCallState,
-}
-
-impl JsonrpcCallInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<JsonrpcCallInfo> {
-        let call_info = context.load_call_by_id(msg_id).await?;
-        let sdp_offer = call_info.place_call_info.clone();
-        let has_video = sdp_has_video(&sdp_offer).unwrap_or_default();
-        let state = JsonrpcCallState::from_msg_id(context, msg_id).await?;
-
-        Ok(JsonrpcCallInfo {
-            sdp_offer,
-            has_video,
-            state,
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "CallState", tag = "kind")]
-pub enum JsonrpcCallState {
-    /// Fresh incoming or outgoing call that is still ringing.
-    ///
-    /// There is no separate state for outgoing call
-    /// that has been dialled but not ringing on the other side yet
-    /// as we don't know whether the other side received our call.
-    Alerting,
-
-    /// Active call.
-    Active,
-
-    /// Completed call that was once active
-    /// and then was terminated for any reason.
-    Completed {
-        /// Call duration in seconds.
-        duration: i64,
-    },
-
-    /// Incoming call that was not picked up within a timeout
-    /// or was explicitly ended by the caller before we picked up.
-    Missed,
-
-    /// Incoming call that was explicitly ended on our side
-    /// before picking up or outgoing call
-    /// that was declined before the timeout.
-    Declined,
-
-    /// Outgoing call that has been cancelled on our side
-    /// before receiving a response.
-    ///
-    /// Incoming calls cannot be cancelled,
-    /// on the receiver side cancelled calls
-    /// usually result in missed calls.
-    Cancelled,
-}
-
-impl JsonrpcCallState {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<JsonrpcCallState> {
-        let call_state = call_state(context, msg_id).await?;
-
-        let jsonrpc_call_state = match call_state {
-            CallState::Alerting => JsonrpcCallState::Alerting,
-            CallState::Active => JsonrpcCallState::Active,
-            CallState::Completed { duration } => JsonrpcCallState::Completed { duration },
-            CallState::Missed => JsonrpcCallState::Missed,
-            CallState::Declined => JsonrpcCallState::Declined,
-            CallState::Cancelled => JsonrpcCallState::Cancelled,
-        };
-
-        Ok(jsonrpc_call_state)
-    }
-}

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

@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, Context as _, 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};
@@ -21,39 +21,15 @@ pub struct FullChat {
 
     /// True if the chat is protected.
     ///
-    /// Only verified contacts
-    /// as determined by [`ContactObject::is_verified`] / `Contact.isVerified`
-    /// can be added to protected chats.
-    ///
-    /// Protected chats are created using [`create_group_chat`] / `createGroupChat()`
-    /// by setting the 'protect' parameter to true.
-    ///
-    /// [`create_group_chat`]: crate::api::CommandApi::create_group_chat
+    /// 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,
-
-    /// True if the chat is encrypted.
-    /// This means that all messages in the chat are encrypted,
-    /// and all contacts in the chat are "key-contacts",
-    /// i.e. identified by the PGP key fingerprint.
-    ///
-    /// False if the chat is unencrypted.
-    /// This means that all messages in the chat are unencrypted,
-    /// and all contacts in the chat are "address-contacts",
-    /// i.e. identified by the email address.
-    /// The UI should mark this chat e.g. with a mail-letter icon.
-    ///
-    /// Unencrypted groups are called "ad-hoc groups"
-    /// and the user can't add/remove members,
-    /// create a QR invite code,
-    /// or set an avatar.
-    /// These options should therefore be disabled in the UI.
-    ///
-    /// Note that it can happen that an encrypted chat
-    /// contains unencrypted messages that were received in core <= v1.159.*
-    /// and vice versa.
-    ///
-    /// See also `is_key_contact` on `Contact`.
-    is_encrypted: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
     pinned: bool,
@@ -63,15 +39,11 @@ pub struct FullChat {
     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,
@@ -87,7 +59,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());
 
@@ -132,7 +103,6 @@ impl FullChat {
             id: chat_id,
             name: chat.name.clone(),
             is_protected: chat.is_protected(),
-            is_encrypted: chat.is_encrypted(context).await?,
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
             pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
@@ -141,10 +111,10 @@ impl FullChat {
             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(),
@@ -183,30 +153,6 @@ pub struct BasicChat {
     /// in the contact profile
     /// if 1:1 chat with this contact exists and is protected.
     is_protected: bool,
-
-    /// True if the chat is encrypted.
-    /// This means that all messages in the chat are encrypted,
-    /// and all contacts in the chat are "key-contacts",
-    /// i.e. identified by the PGP key fingerprint.
-    ///
-    /// False if the chat is unencrypted.
-    /// This means that all messages in the chat are unencrypted,
-    /// and all contacts in the chat are "address-contacts",
-    /// i.e. identified by the email address.
-    /// The UI should mark this chat e.g. with a mail-letter icon.
-    ///
-    /// Unencrypted groups are called "ad-hoc groups"
-    /// and the user can't add/remove members,
-    /// create a QR invite code,
-    /// or set an avatar.
-    /// These options should therefore be disabled in the UI.
-    ///
-    /// Note that it can happen that an encrypted chat
-    /// contains unencrypted messages that were received in core <= v1.159.*
-    /// and vice versa.
-    ///
-    /// See also `is_key_contact` on `Contact`.
-    is_encrypted: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
     pinned: bool,
@@ -215,7 +161,7 @@ pub struct BasicChat {
     is_self_talk: bool,
     color: String,
     is_contact_request: bool,
-
+    is_protection_broken: bool,
     is_device_chat: bool,
     is_muted: bool,
 }
@@ -235,7 +181,6 @@ impl BasicChat {
             id: chat_id,
             name: chat.name.clone(),
             is_protected: chat.is_protected(),
-            is_encrypted: chat.is_encrypted(context).await?,
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
             pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
@@ -244,6 +189,7 @@ impl BasicChat {
             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(),
         })

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

@@ -23,7 +23,6 @@ pub enum ChatListItemFetchResult {
         name: String,
         avatar_path: Option<String>,
         color: String,
-        chat_type: u32,
         last_updated: Option<i64>,
         summary_text1: String,
         summary_text2: String,
@@ -31,31 +30,6 @@ pub enum ChatListItemFetchResult {
         /// showing preview if last chat message is image
         summary_preview_image: Option<String>,
         is_protected: bool,
-
-        /// True if the chat is encrypted.
-        /// This means that all messages in the chat are encrypted,
-        /// and all contacts in the chat are "key-contacts",
-        /// i.e. identified by the PGP key fingerprint.
-        ///
-        /// False if the chat is unencrypted.
-        /// This means that all messages in the chat are unencrypted,
-        /// and all contacts in the chat are "address-contacts",
-        /// i.e. identified by the email address.
-        /// The UI should mark this chat e.g. with a mail-letter icon.
-        ///
-        /// Unencrypted groups are called "ad-hoc groups"
-        /// and the user can't add/remove members,
-        /// create a QR invite code,
-        /// or set an avatar.
-        /// These options should therefore be disabled in the UI.
-        ///
-        /// Note that it can happen that an encrypted chat
-        /// contains unencrypted messages that were received in core <= v1.159.*
-        /// and vice versa.
-        ///
-        /// See also `is_key_contact` on `Contact`.
-        is_encrypted: bool,
-        /// deprecated 2025-07, use chat_type instead
         is_group: bool,
         fresh_message_counter: usize,
         is_self_talk: bool,
@@ -66,6 +40,8 @@ pub enum ChatListItemFetchResult {
         is_pinned: bool,
         is_muted: bool,
         is_contact_request: bool,
+        /// true when chat is a broadcastlist
+        is_broadcast: bool,
         /// contact id if this is a dm chat (for view profile entry in context menu)
         dm_chat_contact: Option<u32>,
         was_seen_recently: bool,
@@ -155,14 +131,12 @@ pub(crate) async fn get_chat_list_item_by_id(
         name: chat.get_name().to_owned(),
         avatar_path,
         color,
-        chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
         last_updated,
         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_encrypted: chat.is_encrypted(ctx).await?,
         is_group: chat.get_type() == Chattype::Group,
         fresh_message_counter,
         is_self_talk: chat.is_self_talk(),
@@ -173,6 +147,7 @@ pub(crate) async fn get_chat_list_item_by_id(
         is_pinned: visibility == ChatVisibility::Pinned,
         is_muted: chat.is_muted(),
         is_contact_request: chat.is_contact_request(),
+        is_broadcast: chat.get_type() == Chattype::Broadcast,
         dm_chat_contact,
         was_seen_recently,
         last_message_type: message_type,

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

@@ -19,48 +19,29 @@ pub struct ContactObject {
     profile_image: Option<String>, // BLOBS
     name_and_addr: String,
     is_blocked: bool,
-
-    /// Is the contact a key contact.
-    is_key_contact: bool,
-
-    /// Is encryption available for this contact.
-    ///
-    /// This can only be true for key-contacts.
-    /// However, it is possible to have a key-contact
-    /// for which encryption is not available because we don't have a key yet,
-    /// e.g. if we just scanned the fingerprint from a QR code.
     e2ee_avail: bool,
 
-    /// True if the contact
-    /// can be added to protected chats
-    /// because SELF and contact have verified their fingerprints in both directions.
+    /// True if the contact can be added to verified groups.
     ///
-    /// See [`Self::verifier_id`]/`Contact.verifierId` for a guidance how to display these information.
+    /// 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 contact ID that verified a contact.
+    /// True if the contact profile title should have a green checkmark.
     ///
-    /// As verifier may be unknown,
-    /// use [`Self::is_verified`]/`Contact.isVerified` to check if a contact can be added to a protected chat.
+    /// 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.
     ///
-    /// UI should display the information in the contact's profile as follows:
-    ///
-    /// - If `verifierId` != 0,
-    ///   display text "Introduced by ..."
-    ///   with the name and address of the contact
-    ///   formatted by `name_and_addr`/`nameAndAddr`.
-    ///   Prefix the text by a green checkmark.
-    ///
-    /// - If `verifierId` == 0 and `isVerified` != 0,
-    ///   display "Introduced" prefixed by a green checkmark.
-    ///
-    /// - if `verifierId` == 0 and `isVerified` == 0,
-    ///   display nothing
-    ///
-    /// This contains the contact ID of the verifier.
-    /// If it is `DC_CONTACT_ID_SELF`, we verified the contact ourself.
-    /// If it is None/Null, we don't have verifier information or
-    /// the contact is not verified.
+    /// 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
@@ -81,11 +62,11 @@ impl ContactObject {
             None => None,
         };
         let is_verified = contact.is_verified(context).await?;
+        let is_profile_verified = contact.is_profile_verified(context).await?;
 
         let verifier_id = contact
             .get_verifier_id(context)
             .await?
-            .flatten()
             .map(|contact_id| contact_id.to_u32());
 
         Ok(ContactObject {
@@ -99,9 +80,9 @@ impl ContactObject {
             profile_image, //BLOBS
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
-            is_key_contact: contact.is_key_contact(),
             e2ee_avail: contact.e2ee_avail(context).await?,
             is_verified,
+            is_profile_verified,
             verifier_id,
             last_seen: contact.last_seen(),
             was_seen_recently: contact.was_seen_recently(),

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

@@ -1,5 +1,4 @@
 use deltachat::{Event as CoreEvent, EventType as CoreEventType};
-use num_traits::ToPrimitive;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
@@ -85,78 +84,44 @@ pub enum EventType {
     /// - 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 {
-        /// 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,
-    },
+    MsgsChanged { chat_id: u32, 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.
+    /// Incoming reaction, should be notified.
     #[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
+    /// 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 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,
-    },
+    IncomingMsg { chat_id: u32, 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,
@@ -172,59 +137,24 @@ pub enum EventType {
     /// 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,
-    },
+    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 {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that could not be sent.
-        msg_id: u32,
-    },
+    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 {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
+    MsgRead { chat_id: u32, msg_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.
+    /// A single message is deleted.
     #[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,
-    },
+    MsgDeleted { 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().
     ///
@@ -235,35 +165,21 @@ pub enum EventType {
 
     /// 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,
-    },
+    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 {
-        /// If set, this is the contact_id of an added contact that should be selected.
-        contact_id: Option<u32>,
-    },
+    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 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>,
-    },
+    LocationChanged { contact_id: Option<u32> },
 
     /// Inform about the configuration progress started by configure().
     ConfigureProgress {
@@ -278,11 +194,10 @@ pub enum EventType {
 
     /// 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 {
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-    },
+    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().
@@ -294,42 +209,31 @@ pub enum EventType {
     #[serde(rename_all = "camelCase")]
     ImexFileWritten { path: String },
 
-    /// Progress event sent when SecureJoin protocol has finished
-    /// from the view of the inviter (Alice, the person who shows the QR code).
+    /// 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 {
-        /// ID of the contact that wants to join.
-        contact_id: u32,
-
-        /// The type of the joined chat.
-        /// This can take the same values
-        /// as `BasicChat.chatType` ([`crate::api::types::chat::BasicChat::chat_type`]).
-        chat_type: u32,
-        /// ID of the chat in case of success.
-        chat_id: u32,
-
-        /// Progress, always 1000.
-        progress: usize,
-    },
+    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 {
-        /// 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,
-    },
+    SecurejoinJoinerProgress { contact_id: u32, progress: usize },
 
     /// The connectivity to the server changed.
     /// This means that you should refresh the connectivity view
@@ -350,37 +254,22 @@ pub enum EventType {
 
     #[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>,
-    },
+    WebxdcRealtimeData { msg_id: u32, 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,
-    },
+    WebxdcRealtimeAdvertisementReceived { 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,
-    },
+    WebxdcInstanceDeleted { 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
@@ -396,10 +285,7 @@ pub enum EventType {
     /// 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>,
-    },
+    ChatlistItemChanged { 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)
     ///
@@ -416,49 +302,7 @@ pub enum EventType {
     AccountsItemChanged,
 
     /// Inform than some events have been skipped due to event channel overflow.
-    EventChannelOverflow {
-        /// Number of events skipped.
-        n: u64,
-    },
-
-    /// Incoming call.
-    IncomingCall {
-        /// ID of the info message referring to the call.
-        msg_id: u32,
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-        /// User-defined info as passed to place_outgoing_call()
-        place_call_info: String,
-        /// True if incoming call is a video call.
-        has_video: bool,
-    },
-
-    /// Incoming call accepted.
-    /// This is esp. interesting to stop ringing on other devices.
-    IncomingCallAccepted {
-        /// ID of the info message referring to the call.
-        msg_id: u32,
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-    },
-
-    /// Outgoing call accepted.
-    OutgoingCallAccepted {
-        /// ID of the info message referring to the call.
-        msg_id: u32,
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-        /// User-defined info passed to dc_accept_incoming_call(
-        accept_call_info: String,
-    },
-
-    /// Call ended.
-    CallEnded {
-        /// ID of the info message referring to the call.
-        msg_id: u32,
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-    },
+    EventChannelOverflow { n: u64 },
 }
 
 impl From<CoreEventType> for EventType {
@@ -491,12 +335,10 @@ impl From<CoreEventType> for EventType {
                 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(),
@@ -547,9 +389,6 @@ impl From<CoreEventType> for EventType {
                     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()),
             },
@@ -565,13 +404,9 @@ impl From<CoreEventType> for EventType {
             },
             CoreEventType::SecurejoinInviterProgress {
                 contact_id,
-                chat_type,
-                chat_id,
                 progress,
             } => SecurejoinInviterProgress {
                 contact_id: contact_id.to_u32(),
-                chat_type: chat_type.to_u32().unwrap_or(0),
-                chat_id: chat_id.to_u32(),
                 progress,
             },
             CoreEventType::SecurejoinJoinerProgress {
@@ -613,34 +448,6 @@ impl From<CoreEventType> for EventType {
             CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
             CoreEventType::AccountsChanged => AccountsChanged,
             CoreEventType::AccountsItemChanged => AccountsItemChanged,
-            CoreEventType::IncomingCall {
-                msg_id,
-                chat_id,
-                place_call_info,
-                has_video,
-            } => IncomingCall {
-                msg_id: msg_id.to_u32(),
-                chat_id: chat_id.to_u32(),
-                place_call_info,
-                has_video,
-            },
-            CoreEventType::IncomingCallAccepted { msg_id, chat_id } => IncomingCallAccepted {
-                msg_id: msg_id.to_u32(),
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::OutgoingCallAccepted {
-                msg_id,
-                chat_id,
-                accept_call_info,
-            } => OutgoingCallAccepted {
-                msg_id: msg_id.to_u32(),
-                chat_id: chat_id.to_u32(),
-                accept_call_info,
-            },
-            CoreEventType::CallEnded { msg_id, chat_id } => CallEnded {
-                msg_id: msg_id.to_u32(),
-                chat_id: chat_id.to_u32(),
-            },
             #[allow(unreachable_patterns)]
             #[cfg(test)]
             _ => unreachable!("This is just to silence a rust_analyzer false-positive"),

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,5 +1,3 @@
-use std::path::Path;
-
 use crate::api::VcardContact;
 use anyhow::{Context as _, Result};
 use deltachat::chat::Chat;
@@ -19,10 +17,10 @@ use typescript_type_def::TypeDef;
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 use super::reactions::JSONRPCReactions;
+use super::webxdc::WebxdcMessageInfo;
 
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase", tag = "kind")]
-#[expect(clippy::large_enum_variant)]
 pub enum MessageLoadResult {
     Message(MessageObject),
     LoadingError { error: String },
@@ -39,8 +37,6 @@ pub struct MessageObject {
 
     text: 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.
@@ -59,13 +55,6 @@ pub struct MessageObject {
 
     // summary - use/create another function if you need it
     subject: String,
-
-    /// True if the message was correctly encrypted&signed, false otherwise.
-    /// Historically, UIs showed a small padlock on the message then.
-    ///
-    /// Today, the UIs should instead show a small email-icon on the message
-    /// if `show_padlock` is `false`,
-    /// and nothing if it is `true`.
     show_padlock: bool,
     is_setupmessage: bool,
     is_info: bool,
@@ -77,9 +66,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,
@@ -97,14 +83,12 @@ pub struct MessageObject {
     file_bytes: u64,
     file_name: Option<String>,
 
+    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>,
@@ -120,9 +104,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>,
@@ -147,6 +128,12 @@ impl MessageObject {
         let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
         let override_sender_name = message.get_override_sender_name();
 
+        let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
+            Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?)
+        } else {
+            None
+        };
+
         let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
 
         let download_state = message.download_state().into();
@@ -160,7 +147,6 @@ impl MessageObject {
                     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(),
@@ -208,7 +194,6 @@ impl MessageObject {
             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(),
@@ -230,10 +215,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(),
@@ -260,6 +241,7 @@ impl MessageObject {
             file_mime: message.get_filemime(),
             file_bytes,
             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
@@ -267,16 +249,6 @@ impl MessageObject {
 
             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(),
@@ -324,9 +296,6 @@ pub enum MessageViewtype {
     /// Message is an invitation to a videochat.
     VideochatInvitation,
 
-    /// Message is a call.
-    Call,
-
     /// Message is an webxdc instance.
     Webxdc,
 
@@ -349,7 +318,6 @@ impl From<Viewtype> for MessageViewtype {
             Viewtype::Video => MessageViewtype::Video,
             Viewtype::File => MessageViewtype::File,
             Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
-            Viewtype::Call => MessageViewtype::Call,
             Viewtype::Webxdc => MessageViewtype::Webxdc,
             Viewtype::Vcard => MessageViewtype::Vcard,
         }
@@ -369,7 +337,6 @@ impl From<MessageViewtype> for Viewtype {
             MessageViewtype::Video => Viewtype::Video,
             MessageViewtype::File => Viewtype::File,
             MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
-            MessageViewtype::Call => Viewtype::Call,
             MessageViewtype::Webxdc => Viewtype::Webxdc,
             MessageViewtype::Vcard => Viewtype::Vcard,
         }
@@ -421,9 +388,6 @@ pub enum SystemMessageType {
     /// Chat ephemeral message timer is changed.
     EphemeralTimerChanged,
 
-    // Chat is e2ee
-    ChatE2ee,
-
     // Chat protection state changed
     ChatProtectionEnabled,
     ChatProtectionDisabled,
@@ -442,9 +406,6 @@ pub enum SystemMessageType {
 
     /// This message contains a users iroh node address.
     IrohNodeAddr,
-
-    CallAccepted,
-    CallEnded,
 }
 
 impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
@@ -461,7 +422,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
             SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
             SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
             SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
-            SystemMessage::ChatE2ee => SystemMessageType::ChatE2ee,
             SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
             SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
             SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
@@ -471,8 +431,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
             SystemMessage::IrohNodeAddr => SystemMessageType::IrohNodeAddr,
             SystemMessage::SecurejoinWait => SystemMessageType::SecurejoinWait,
             SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
-            SystemMessage::CallAccepted => SystemMessageType::CallAccepted,
-            SystemMessage::CallEnded => SystemMessageType::CallEnded,
         }
     }
 }
@@ -631,7 +589,6 @@ pub struct MessageData {
     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).
@@ -656,12 +613,7 @@ impl MessageData {
             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,
-            )?;
+            message.set_file(file, None);
         }
         if let Some((latitude, longitude)) = self.location {
             message.set_location(latitude, longitude);
@@ -692,6 +644,7 @@ pub struct MessageReadReceipt {
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageInfo {
+    rawtext: String,
     ephemeral_timer: EphemeralTimer,
     /// When message is ephemeral this contains the timestamp of the message expiry
     ephemeral_timestamp: Option<i64>,
@@ -704,6 +657,7 @@ pub struct MessageInfo {
 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 rawtext = msg_id.rawtext(context).await?;
         let ephemeral_timer = message.get_ephemeral_timer().into();
         let ephemeral_timestamp = match message.get_ephemeral_timer() {
             deltachat::ephemeral::Timer::Disabled => None,
@@ -716,6 +670,7 @@ impl MessageInfo {
         let hop_info = msg_id.hop_info(context).await?;
 
         Ok(Self {
+            rawtext,
             ephemeral_timer,
             ephemeral_timestamp,
             error: message.error(),

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

@@ -1,12 +1,10 @@
 pub mod account;
-pub mod calls;
 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/qr.rs

@@ -63,7 +63,6 @@ pub enum QrObject {
         /// Iroh node address.
         node_addr: String,
     },
-    BackupTooNew {},
     /// Ask the user if they want to use the given service for video chats.
     WebrtcInstance {
         domain: String,
@@ -101,15 +100,11 @@ pub enum QrObject {
     /// URL scanned.
     ///
     /// Ask the user if they want to open a browser or copy the URL to clipboard.
-    Url {
-        url: String,
-    },
+    Url { url: String },
     /// Text scanned.
     ///
     /// Ask the user if they want to copy the text to clipboard.
-    Text {
-        text: String,
-    },
+    Text { text: String },
     /// Ask the user if they want to withdraw their own QR code.
     WithdrawVerifyContact {
         /// Contact ID.
@@ -165,9 +160,7 @@ pub enum QrObject {
     /// `dclogin:` scheme parameters.
     ///
     /// Ask the user if they want to login with the email address.
-    Login {
-        address: String,
-    },
+    Login { address: String },
 }
 
 impl From<Qr> for QrObject {
@@ -224,7 +217,6 @@ impl From<Qr> for QrObject {
                 node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
                 auth_token,
             },
-            Qr::BackupTooNew {} => QrObject::BackupTooNew {},
             Qr::WebrtcInstance {
                 domain,
                 instance_pattern,

deltachat-jsonrpc/src/webserver.rs

@@ -0,0 +1,47 @@
+#![recursion_limit = "256"]
+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::{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 writable = true;
+    let accounts = Accounts::new(PathBuf::from(&path), writable).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.write().await.start_io().await;
+    });
+
+    let addr = SocketAddr::from(([127, 0, 0, 1], port));
+    log::info!("JSON-RPC WebSocket server listening on {}", addr);
+    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+    axum::serve(listener, app).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());
+    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,109 @@
+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.kind === "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.kind !== "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 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.kind === "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.kind}</strong> on account ${accountId}]<br>
+          <em>f1:</em> ${JSON.stringify(
+            Object.assign({}, event, { kind: 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

@@ -2,24 +2,24 @@
   "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
-    "isomorphic-ws": "^5.0.0",
+    "isomorphic-ws": "^4.0.1",
     "yerpc": "^0.6.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.10",
-    "@types/chai-as-promised": "^7.1.8",
-    "@types/mocha": "^10.0.4",
-    "@types/ws": "^8.5.9",
-    "c8": "^8.0.1",
+    "@types/chai": "^4.2.21",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/mocha": "^9.0.0",
+    "@types/ws": "^7.2.4",
+    "c8": "^7.10.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.25.5",
+    "esbuild": "^0.17.9",
     "http-server": "^14.1.1",
-    "mocha": "^10.2.0",
+    "mocha": "^9.1.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.5.3",
-    "typedoc": "^0.28.5",
-    "typescript": "^5.8.3",
+    "prettier": "^2.6.2",
+    "typedoc": "^0.23.2",
+    "typescript": "^4.5.5",
     "ws": "^8.5.0"
   },
   "exports": {
@@ -34,7 +34,7 @@
   "name": "@deltachat/jsonrpc-client",
   "repository": {
     "type": "git",
-    "url": "https://github.com/chatmail/core.git"
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
   },
   "scripts": {
     "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
@@ -42,6 +42,10 @@
     "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 +58,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "2.16.0"
+  "version": "1.152.2"
 }

deltachat-jsonrpc/typescript/report_api_coverage.mjs

@@ -5,24 +5,24 @@ const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
 const jsonCoverage =
   json[Object.keys(json).find((k) => k.includes(generatedFile))];
 const fnMap = Object.keys(jsonCoverage.fnMap).map(
-  (key) => jsonCoverage.fnMap[key],
+  (key) => jsonCoverage.fnMap[key]
 );
 const htmlCoverage = readFileSync(
   "./coverage/" + generatedFile + ".html",
-  "utf8",
+  "utf8"
 );
 const uncoveredLines = htmlCoverage
   .split("\n")
   .filter((line) => line.includes(`"function not covered"`));
 const uncoveredFunctions = uncoveredLines.map(
-  (line) => />([\w_]+)\(/.exec(line)[1],
+  (line) => />([\w_]+)\(/.exec(line)[1]
 );
 console.log(
   "\nUncovered api functions:\n" +
     uncoveredFunctions
       .map((uF) => fnMap.find(({ name }) => name === uF))
       .map(
-        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`,
+        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`
       )
-      .join("\n"),
+      .join("\n")
 );

deltachat-jsonrpc/typescript/scripts/generate-constants.js

@@ -24,7 +24,7 @@ while (null != (match = regex.exec(header_data))) {
 
 const constants = data
   .filter(
-    ({ key }) => key.toUpperCase()[0] === key[0], // check if define name is uppercase
+    ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
   )
   .sort((lhs, rhs) => {
     if (lhs.key < rhs.key) return -1;
@@ -50,5 +50,5 @@ const constants = data
 
 writeFileSync(
   resolve(__dirname, "../generated/constants.ts"),
-  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`,
+  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`
 );

deltachat-jsonrpc/typescript/src/client.ts

@@ -2,19 +2,19 @@ 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 { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";
 
 type Events = { ALL: (accountId: number, event: EventType) => void } & {
   [Property in EventType["kind"]]: (
     accountId: number,
-    event: Extract<EventType, { kind: Property }>,
+    event: Extract<EventType, { kind: Property }>
   ) => void;
 };
 
 type ContextEvents = { ALL: (event: EventType) => void } & {
   [Property in EventType["kind"]]: (
-    event: Extract<EventType, { kind: Property }>,
+    event: Extract<EventType, { kind: Property }>
   ) => void;
 };
 
@@ -25,18 +25,16 @@ export type DcEventType<T extends EventType["kind"]> = Extract<
 >;
 
 export class BaseDeltaChat<
-  Transport extends BaseTransport<any>,
+  Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
   rpc: RawClient;
+  account?: T.Account;
   private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
 
   //@ts-ignore
   private eventTask: Promise<void>;
 
-  constructor(
-    public transport: Transport,
-    startEventLoop: boolean,
-  ) {
+  constructor(public transport: Transport, startEventLoop: boolean) {
     super();
     this.rpc = new RawClient(this.transport);
     if (startEventLoop) {
@@ -55,7 +53,7 @@ export class BaseDeltaChat<
         this.contextEmitters[event.contextId].emit(
           event.event.kind,
           //@ts-ignore
-          event.event as any,
+          event.event as any
         );
         this.contextEmitters[event.contextId].emit("ALL", event.event as any);
       }
@@ -76,6 +74,34 @@ export class BaseDeltaChat<
   }
 }
 
+export type Opts = {
+  url: string;
+  startEventLoop: boolean;
+};
+
+export const DEFAULT_OPTS: Opts = {
+  url: "ws://localhost:20808/ws",
+  startEventLoop: true,
+};
+export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
+  opts: Opts;
+  close() {
+    this.transport.close();
+  }
+  constructor(opts?: Opts | string) {
+    if (typeof opts === "string") {
+      opts = { ...DEFAULT_OPTS, url: opts };
+    } else if (opts) {
+      opts = { ...DEFAULT_OPTS, ...opts };
+    } else {
+      opts = { ...DEFAULT_OPTS };
+    }
+    const transport = new WebsocketTransport(opts.url);
+    super(transport, opts.startEventLoop);
+    this.opts = opts;
+  }
+}
+
 export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
   close() {}
   constructor(input: any, output: any, startEventLoop: boolean) {
@@ -85,10 +111,7 @@ export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
 }
 
 export class StdioTransport extends BaseTransport {
-  constructor(
-    public input: any,
-    public output: any,
-  ) {
+  constructor(public input: any, public output: any) {
     super();
 
     var buffer = "";

deltachat-jsonrpc/typescript/test/basic.ts

@@ -1,3 +1,4 @@
+import { strictEqual } from "assert";
 import chai, { assert, expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
@@ -31,14 +32,14 @@ describe("basic tests", () => {
 
     expect(
       await Promise.all(
-        validAddresses.map((email) => dc.rpc.checkEmailValidity(email)),
-      ),
+        validAddresses.map((email) => dc.rpc.checkEmailValidity(email))
+      )
     ).to.not.contain(false);
 
     expect(
       await Promise.all(
-        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email)),
-      ),
+        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email))
+      )
     ).to.not.contain(true);
   });
 
@@ -84,7 +85,7 @@ describe("basic tests", () => {
       const contactId = await dc.rpc.createContact(
         accountId,
         "example@delta.chat",
-        null,
+        null
       );
       expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
         .false;
@@ -126,7 +127,7 @@ describe("basic tests", () => {
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
         accountId,
-        Object.keys(config),
+        Object.keys(config)
       );
       expect(retrieved).to.deep.equal(config);
     });
@@ -138,7 +139,7 @@ describe("basic tests", () => {
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
         accountId,
-        Object.keys(config),
+        Object.keys(config)
       );
       expect(retrieved).to.deep.equal(config);
     });
@@ -152,7 +153,7 @@ describe("basic tests", () => {
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
         accountId,
-        Object.keys(config),
+        Object.keys(config)
       );
       expect(retrieved).to.deep.equal(config);
     });

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;
@@ -17,12 +17,12 @@ describe("online tests", function () {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
           "CAN NOT RUN COVERAGE correctly: Missing CHATMAIL_DOMAIN 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",
+          "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 CHATMAIL_DOMAIN environment variable!, skip integration tests"
       );
       this.skip();
     }
@@ -36,7 +36,7 @@ describe("online tests", function () {
     account1 = createTempUser(process.env.CHATMAIL_DOMAIN);
     if (!account1 || !account1.email || !account1.password) {
       console.log(
-        "We didn't got back an account from the api, skip integration tests",
+        "We didn't got back an account from the api, skip integration tests"
       );
       this.skip();
     }
@@ -44,7 +44,7 @@ describe("online tests", function () {
     account2 = createTempUser(process.env.CHATMAIL_DOMAIN);
     if (!account2 || !account2.email || !account2.password) {
       console.log(
-        "We didn't got back an account2 from the api, skip integration tests",
+        "We didn't got back an account2 from the api, skip integration tests"
       );
       this.skip();
     }
@@ -80,8 +80,11 @@ describe("online tests", function () {
     }
     this.timeout(15000);
 
-    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
-    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
+    const contactId = await dc.rpc.createContact(
+      accountId1,
+      account2.email,
+      null
+    );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
 
@@ -92,26 +95,26 @@ describe("online tests", function () {
       accountId2,
       chatIdOnAccountB,
       false,
-      false,
+      false
     );
 
-    // There are 2 messages in the chat:
-    // 'Messages are end-to-end encrypted' (info message) and 'Hello'
-    expect(messageList).have.length(2);
-    const message = await dc.rpc.getMessage(accountId2, messageList[1]);
+    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.importVcardContents(accountId1, vcard))[0];
+    const contactId = await dc.rpc.createContact(
+      accountId1,
+      account2.email,
+      null
+    );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
     dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
@@ -126,11 +129,11 @@ describe("online tests", function () {
       accountId2,
       chatIdOnAccountB,
       false,
-      false,
+      false
     );
     const message = await dc.rpc.getMessage(
       accountId2,
-      messageList.reverse()[0],
+      messageList.reverse()[0]
     );
     expect(message.text).equal("Hello2");
     // Send message back from B to A
@@ -152,7 +155,7 @@ describe("online tests", function () {
     const info = await dc.rpc.getProviderInfo(acc, "example.com");
     expect(info).to.be.not.null;
     expect(info?.overviewPage).to.equal(
-      "https://providers.delta.chat/example-com",
+      "https://providers.delta.chat/example-com"
     );
     expect(info?.status).to.equal(3);
   });
@@ -169,12 +172,12 @@ async function waitForEvent<T extends DcEvent["kind"]>(
   dc: DeltaChat,
   eventType: T,
   accountId: number,
-  timeout: number = EVENT_TIMEOUT,
+  timeout: number = EVENT_TIMEOUT
 ): Promise<Extract<DcEvent, { kind: T }>> {
   return new Promise((resolve, reject) => {
     const rejectTimeout = setTimeout(
       () => reject(new Error("Timeout reached before event came in")),
-      timeout,
+      timeout
     );
     const callback = (contextId: number, event: DcEvent) => {
       if (contextId == accountId) {

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -14,7 +14,7 @@ export async function startServer(): Promise<RpcServerHandle> {
   const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
 
   const pathToServerBinary = resolve(
-    join(await getTargetDir(), "debug/deltachat-rpc-server"),
+    join(await getTargetDir(), "debug/deltachat-rpc-server")
   );
 
   const server = spawn(pathToServerBinary, {
@@ -29,7 +29,7 @@ export async function startServer(): Promise<RpcServerHandle> {
     throw new Error(
       "Failed to start server executable " +
         pathToServerBinary +
-        ", make sure you built it first.",
+        ", make sure you built it first."
     );
   });
   let shouldClose = false;
@@ -83,7 +83,7 @@ function getTargetDir(): Promise<string> {
             reject(error);
           }
         }
-      },
+      }
     );
   });
 }

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-repl/Cargo.toml

@@ -1,19 +1,19 @@
 [package]
 name = "deltachat-repl"
-version = "2.16.0"
+version = "1.152.2"
 license = "MPL-2.0"
 edition = "2021"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [dependencies]
 anyhow = { workspace = true }
 deltachat = { workspace = true, features = ["internals"]}
-dirs = "6"
+dirs = "5"
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
 qr2term = "0.3.3"
 rusqlite = { workspace = true }
-rustyline = "16"
+rustyline = "14"
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 

deltachat-repl/src/cmdline.rs

@@ -20,6 +20,7 @@ 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;
@@ -34,6 +35,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 & 2 {
+        context
+            .sql()
+            .execute("DELETE FROM acpeerstates;", ())
+            .await
+            .unwrap();
+        println!("(2) Peerstates reset.");
+    }
     if 0 != bits & 4 {
         context
             .sql()
@@ -83,11 +92,11 @@ 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 {
-        eprintln!("receive_imf errored: {err:?}");
+        println!("receive_imf errored: {err:?}");
     }
     Ok(())
 }
@@ -111,13 +120,13 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
     } else {
         let rs = context.sql().get_raw_config("import_spec").await.unwrap();
         if rs.is_none() {
-            eprintln!("Import: No file or folder given.");
+            error!(context, "Import: No file or folder given.");
             return false;
         }
         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 {
@@ -131,16 +140,13 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
                 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))
-                        .await
-                        .is_ok()
-                    {
+                    if poke_eml_file(context, path_plus_name).await.is_ok() {
                         read_cnt += 1
                     }
                 }
             }
         } else {
-            eprintln!("Import: Cannot open directory \"{}\".", &real_spec);
+            error!(context, "Import: Cannot open directory \"{}\".", &real_spec);
             return false;
         }
     }
@@ -268,7 +274,7 @@ async fn log_msglist(context: &Context, msglist: &[MsgId]) -> Result<()> {
 
 async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()> {
     for contact_id in contacts {
-        let line2 = "".to_string();
+        let mut line2 = "".to_string();
         let contact = Contact::get_by_id(context, *contact_id).await?;
         let name = contact.get_display_name();
         let addr = contact.get_addr();
@@ -287,6 +293,15 @@ async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()
             verified_str,
             if !addr.is_empty() { addr } else { "addr unset" }
         );
+        let peerstate = Peerstate::from_addr(context, addr)
+            .await
+            .expect("peerstate error");
+        if peerstate.is_some() && *contact_id != ContactId::SELF {
+            line2 = format!(
+                ", prefer-encrypt={}",
+                peerstate.as_ref().unwrap().prefer_encrypt
+            );
+        }
 
         println!("Contact#{}: {}{}", *contact_id, line, line2);
     }
@@ -324,7 +339,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  send-backup\n\
                  receive-backup <qr>\n\
                  export-keys\n\
-                 import-keys <key-file>\n\
+                 import-keys\n\
                  poke [<eml-file>|<folder>|<addr> <key-file>]\n\
                  reset <flags>\n\
                  stop\n\
@@ -333,6 +348,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             _ => println!(
                 "==========================Database commands==\n\
                  info\n\
+                 open <file to open or create>\n\
+                 close\n\
                  set <configuration-key> [<value>]\n\
                  get <configuration-key>\n\
                  oauth2\n\
@@ -347,24 +364,21 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  ==============================Chat commands==\n\
                  listchats [<query>]\n\
                  listarchived\n\
-                 start-realtime <msg-id>\n\
-                 send-realtime <msg-id> <data>\n\
                  chat [<chat-id>|0]\n\
                  createchat <contact-id>\n\
                  creategroup <name>\n\
-                 createbroadcast <name>\n\
+                 createbroadcast\n\
                  createprotected <name>\n\
                  addmember <contact-id>\n\
                  removemember <contact-id>\n\
                  groupname <name>\n\
-                 groupimage <image>\n\
+                 groupimage [<file>]\n\
                  chatinfo\n\
                  sendlocations <seconds>\n\
                  setlocation <lat> <lng>\n\
                  dellocations\n\
                  getlocations [<contact-id>]\n\
                  send <text>\n\
-                 sendempty\n\
                  sendimage <file> [<text>]\n\
                  sendsticker <file> [<text>]\n\
                  sendfile <file> [<text>]\n\
@@ -383,7 +397,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  unmute <chat-id>\n\
                  delchat <chat-id>\n\
                  accept <chat-id>\n\
-                 blockchat <chat-id>\n\
+                 decline <chat-id>\n\
                  ===========================Message commands==\n\
                  listmsgs <query>\n\
                  msginfo <msg-id>\n\
@@ -397,14 +411,14 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  react <msg-id> [<reaction>]\n\
                  ===========================Contact commands==\n\
                  listcontacts [<query>]\n\
+                 listverified [<query>]\n\
                  addcontact [<name>] <addr>\n\
                  contactinfo <contact-id>\n\
                  delcontact <contact-id>\n\
+                 cleanupcontacts\n\
                  block <contact-id>\n\
                  unblock <contact-id>\n\
                  listblocked\n\
-                 import-vcard <file>\n\
-                 make-vcard <file> <contact-id> [contact-id ...]\n\
                  ======================================Misc.==\n\
                  getqr [<chat-id>]\n\
                  getqrsvg [<chat-id>]\n\
@@ -476,7 +490,7 @@ 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())?;
-            println!("QR code: {qr}");
+            println!("QR code: {}", qr);
             qr2term::print_qr(qr.as_str())?;
             provider.await?;
         }
@@ -491,17 +505,13 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             println!("Exported to {}.", dir.to_string_lossy());
         }
         "import-keys" => {
-            ensure!(!arg1.is_empty(), "Argument <key-file> missing.");
             imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
         }
         "poke" => {
             ensure!(poke_spec(&context, Some(arg1)).await, "Poke failed");
         }
         "reset" => {
-            ensure!(
-                !arg1.is_empty(),
-                "Argument <bits> missing: 4=private keys, 8=rest but server config"
-            );
+            ensure!(!arg1.is_empty(), "Argument <bits> missing: 1=jobs, 2=peerstates, 4=private keys, 8=rest but server config");
             let bits: i32 = arg1.parse()?;
             ensure!(bits < 16, "<bits> must be lower than 16.");
             reset_tables(&context, bits).await;
@@ -623,7 +633,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 println!("Location streaming enabled.");
             }
             println!("{cnt} chats");
-            eprintln!("{time_needed:?} to create this list");
+            println!("{time_needed:?} to create this list");
         }
         "start-realtime" => {
             if arg1.is_empty() {
@@ -733,7 +743,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             chat::marknoticed_chat(&context, sel_chat.get_id()).await?;
             let time_noticed_needed = time_noticed_start.elapsed().unwrap_or_default();
 
-            eprintln!(
+            println!(
                 "{time_needed:?} to create this list, {time_noticed_needed:?} to mark all messages as noticed."
             );
         }
@@ -752,8 +762,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             println!("Group#{chat_id} created successfully.");
         }
         "createbroadcast" => {
-            ensure!(!arg1.is_empty(), "Argument <name> missing.");
-            let chat_id = chat::create_broadcast(&context, arg1.to_string()).await?;
+            let chat_id = chat::create_broadcast_list(&context).await?;
 
             println!("Broadcast#{chat_id} created successfully.");
         }
@@ -930,7 +939,7 @@ 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());
             chat::send_msg(&context, sel_chat.as_ref().unwrap().get_id(), &mut msg).await?;
         }
@@ -987,7 +996,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 },
                 query,
             );
-            eprintln!("{time_needed:?} to create this list");
+            println!("{time_needed:?} to create this list");
         }
         "draft" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
@@ -1150,13 +1159,19 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             let reaction = arg2;
             send_reaction(&context, msg_id, reaction).await?;
         }
-        "listcontacts" | "contacts" => {
-            let contacts = Contact::get_all(&context, DC_GCL_ADD_SELF, Some(arg1)).await?;
+        "listcontacts" | "contacts" | "listverified" => {
+            let contacts = Contact::get_all(
+                &context,
+                if arg0 == "listverified" {
+                    DC_GCL_VERIFIED_ONLY | DC_GCL_ADD_SELF
+                } else {
+                    DC_GCL_ADD_SELF
+                },
+                Some(arg1),
+            )
+            .await?;
             log_contactlist(&context, &contacts).await?;
-            println!("{} key contacts.", contacts.len());
-            let addrcontacts = Contact::get_all(&context, DC_GCL_ADDRESS, Some(arg1)).await?;
-            log_contactlist(&context, &addrcontacts).await?;
-            println!("{} address contacts.", addrcontacts.len());
+            println!("{} contacts.", contacts.len());
         }
         "addcontact" => {
             ensure!(!arg1.is_empty(), "Arguments [<name>] <addr> expected.");
@@ -1220,24 +1235,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             log_contactlist(&context, &contacts).await?;
             println!("{} blocked contacts.", contacts.len());
         }
-        "import-vcard" => {
-            ensure!(!arg1.is_empty(), "Argument <file> missing.");
-            let vcard_content = fs::read_to_string(&arg1.to_string()).await?;
-            let contacts = import_vcard(&context, &vcard_content).await?;
-            println!("vCard contacts imported:");
-            log_contactlist(&context, &contacts).await?;
-        }
-        "make-vcard" => {
-            ensure!(!arg1.is_empty(), "Argument <file> missing.");
-            ensure!(!arg2.is_empty(), "Argument <contact-id> missing.");
-            let mut contact_ids = vec![];
-            for x in arg2.split_whitespace() {
-                contact_ids.push(ContactId::new(x.parse()?))
-            }
-            let vcard_content = make_vcard(&context, &contact_ids).await?;
-            fs::write(&arg1.to_string(), vcard_content).await?;
-            println!("vCard written to: {arg1}");
-        }
         "checkqr" => {
             ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
             let qr = check_qr(&context, arg1).await?;
@@ -1247,7 +1244,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
             match set_config_from_qr(&context, arg1).await {
                 Ok(()) => println!("Config set from QR code, you can now call 'configure'"),
-                Err(err) => eprintln!("Cannot set config from QR code: {err:?}"),
+                Err(err) => println!("Cannot set config from QR code: {err:?}"),
             }
         }
         "createqrsvg" => {
@@ -1281,7 +1278,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

@@ -5,6 +5,7 @@
 //! Usage:  cargo run --example repl --release -- <databasefile>
 //! All further options can be set using the set-command (type ? for help).
 
+#[macro_use]
 extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
@@ -21,7 +22,7 @@ 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::{
@@ -40,25 +41,25 @@ fn receive_event(event: EventType) {
     match event {
         EventType::Info(msg) => {
             /* do not show the event as this would fill the screen */
-            info!("{msg}");
+            info!("{}", msg);
         }
         EventType::SmtpConnected(msg) => {
-            info!("[SMTP_CONNECTED] {msg}");
+            info!("[SMTP_CONNECTED] {}", msg);
         }
         EventType::ImapConnected(msg) => {
-            info!("[IMAP_CONNECTED] {msg}");
+            info!("[IMAP_CONNECTED] {}", msg);
         }
         EventType::SmtpMessageSent(msg) => {
-            info!("[SMTP_MESSAGE_SENT] {msg}");
+            info!("[SMTP_MESSAGE_SENT] {}", msg);
         }
         EventType::Warning(msg) => {
-            warn!("{msg}");
+            warn!("{}", msg);
         }
         EventType::Error(msg) => {
-            error!("{msg}");
+            error!("{}", msg);
         }
         EventType::ErrorSelfNotInGroup(msg) => {
-            error!("[SELF_NOT_IN_GROUP] {msg}");
+            error!("[SELF_NOT_IN_GROUP] {}", msg);
         }
         EventType::MsgsChanged { chat_id, msg_id } => {
             info!(
@@ -123,7 +124,7 @@ fn receive_event(event: EventType) {
             );
         }
         _ => {
-            info!("Received {event:?}");
+            info!("Received {:?}", event);
         }
     }
 }
@@ -179,11 +180,9 @@ const DB_COMMANDS: [&str; 11] = [
     "housekeeping",
 ];
 
-const CHAT_COMMANDS: [&str; 39] = [
+const CHAT_COMMANDS: [&str; 36] = [
     "listchats",
     "listarchived",
-    "start-realtime",
-    "send-realtime",
     "chat",
     "createchat",
     "creategroup",
@@ -199,16 +198,13 @@ const CHAT_COMMANDS: [&str; 39] = [
     "dellocations",
     "getlocations",
     "send",
-    "sendempty",
     "sendimage",
-    "sendsticker",
     "sendfile",
     "sendhtml",
     "sendsyncmsg",
     "sendupdate",
     "videochat",
     "draft",
-    "devicemsg",
     "listmedia",
     "archive",
     "unarchive",
@@ -216,48 +212,47 @@ const CHAT_COMMANDS: [&str; 39] = [
     "unpin",
     "mute",
     "unmute",
+    "protect",
+    "unprotect",
     "delchat",
     "accept",
     "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 10] = [
+const MESSAGE_COMMANDS: [&str; 9] = [
     "listmsgs",
     "msginfo",
-    "download",
-    "html",
     "listfresh",
     "forward",
     "resend",
     "markseen",
     "delmsg",
+    "download",
     "react",
 ];
 const CONTACT_COMMANDS: [&str; 9] = [
     "listcontacts",
+    "listverified",
     "addcontact",
     "contactinfo",
     "delcontact",
+    "cleanupcontacts",
     "block",
     "unblock",
     "listblocked",
-    "import-vcard",
-    "make-vcard",
 ];
-const MISC_COMMANDS: [&str; 14] = [
+const MISC_COMMANDS: [&str; 12] = [
     "getqr",
     "getqrsvg",
     "getbadqr",
     "checkqr",
     "joinqr",
-    "setqr",
     "createqrsvg",
-    "providerinfo",
     "fileinfo",
-    "estimatedeletion",
     "clear",
     "exit",
     "quit",
     "help",
+    "estimatedeletion",
 ];
 
 impl Hinter for DcHelper {
@@ -303,8 +298,8 @@ impl Highlighter for DcHelper {
         self.highlighter.highlight(line, pos)
     }
 
-    fn highlight_char(&self, line: &str, pos: usize, kind: HighlightCmdKind) -> bool {
-        self.highlighter.highlight_char(line, pos, kind)
+    fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool {
+        self.highlighter.highlight_char(line, pos, forced)
     }
 }
 
@@ -313,7 +308,7 @@ impl Validator for DcHelper {}
 
 async fn start(args: Vec<String>) -> Result<(), Error> {
     if args.len() < 2 {
-        eprintln!("Error: Bad arguments, expected [db-name].");
+        println!("Error: Bad arguments, expected [db-name].");
         bail!("No db-name specified");
     }
     let context = ContextBuilder::new(args[1].clone().into())
@@ -328,7 +323,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)
@@ -368,7 +363,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                                 false
                             }
                             Err(err) => {
-                                eprintln!("Error: {err:#}");
+                                println!("Error: {err:#}");
                                 true
                             }
                         }
@@ -383,7 +378,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                     break;
                 }
                 Err(err) => {
-                    eprintln!("Error: {err:#}");
+                    println!("Error: {err:#}");
                     break;
                 }
             }

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "2.16.0"
+version = "1.152.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -13,6 +13,7 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -23,7 +24,6 @@ classifiers = [
     "Topic :: Communications :: Email"
 ]
 readme = "README.md"
-requires-python = ">=3.8"
 
 [tool.setuptools.package-data]
 deltachat_rpc_client = [
@@ -66,18 +66,7 @@ lint.select = [
 
   "RUF006" # asyncio-dangling-task
 ]
-lint.ignore = [
-  "PLC0415" # `import` should be at the top-level of a file
-]
 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,4 +1,4 @@
-"""Delta Chat JSON-RPC high-level API."""
+"""Delta Chat JSON-RPC high-level API"""
 
 from ._utils import AttrDict, run_bot_cli, run_client_cli
 from .account import Account

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

@@ -1,5 +1,4 @@
 import argparse
-import os
 import re
 import sys
 from threading import Thread
@@ -90,8 +89,8 @@ 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("--password", action="store", help="password", default=os.getenv("DELTACHAT_PASSWORD"))
+    parser.add_argument("--email", action="store", help="email address")
+    parser.add_argument("--password", action="store", help="password")
     args = parser.parse_args(argv[1:])
 
     with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
@@ -115,7 +114,7 @@ def _run_cli(
 
 
 def extract_addr(text: str) -> str:
-    """Extract email address from the given text."""
+    """extract email address from the given text."""
     match = re.match(r".*\((.+@.+)\)", text)
     if match:
         text = match.group(1)
@@ -124,7 +123,7 @@ def extract_addr(text: str) -> str:
 
 
 def parse_system_image_changed(text: str) -> Optional[Tuple[str, bool]]:
-    """Return image changed/deleted info from parsing the given system message text."""
+    """return image changed/deleted info from parsing the given system message text."""
     text = text.lower()
     match = re.match(r"group image (changed|deleted) by (.+).", text)
     if match:
@@ -143,7 +142,7 @@ def parse_system_title_changed(text: str) -> Optional[Tuple[str, str]]:
 
 
 def parse_system_add_remove(text: str) -> Optional[Tuple[str, str, str]]:
-    """Return add/remove info from parsing the given system message text.
+    """return add/remove info from parsing the given system message text.
 
     returns a (action, affected, actor) tuple.
     """

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

@@ -1,8 +1,5 @@
-"""Account module."""
-
 from __future__ import annotations
 
-import json
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional, Union
 from warnings import warn
@@ -29,36 +26,18 @@ class Account:
     def _rpc(self) -> "Rpc":
         return self.manager.rpc
 
-    def wait_for_event(self, event_type=None) -> AttrDict:
+    def wait_for_event(self) -> AttrDict:
         """Wait until the next event and return it."""
-        while True:
-            next_event = AttrDict(self._rpc.wait_for_event(self.id))
-            if event_type is None or next_event.kind == event_type:
-                return next_event
+        return AttrDict(self._rpc.wait_for_event(self.id))
 
     def clear_all_events(self):
-        """Remove all queued-up events for a given account.
-
-        Useful for tests.
-        """
+        """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)
 
-    def clone(self) -> "Account":
-        """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)
@@ -88,7 +67,7 @@ class Account:
         return self._rpc.get_config(self.id, key)
 
     def update_config(self, **kwargs) -> None:
-        """Update config values."""
+        """update config values."""
         for key, value in kwargs.items():
             self.set_config(key, value)
 
@@ -104,15 +83,9 @@ class Account:
         return self.get_config("selfavatar")
 
     def check_qr(self, qr):
-        """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):
-        """Set configuration values from a QR code."""
         self._rpc.set_config_from_qr(self.id, qr)
 
     @futuremethod
@@ -120,23 +93,15 @@ class Account:
         """Configure an account."""
         yield self._rpc.configure.future(self.id)
 
-    @futuremethod
-    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):
-        """Return 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)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.IMAP_INBOX_IDLE:
+                break
 
-    def create_contact(self, obj: Union[int, str, Contact, "Account"], name: Optional[str] = None) -> Contact:
+    def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
         """Create a new Contact or return an existing one.
 
         Calling this method will always result in the same
@@ -144,63 +109,26 @@ 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
         return Contact(self, 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()
+        addr = account.get_config("addr")
+        contact = self.create_contact(addr)
+        return 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]:
-        """Looks up a known and unblocked contact with a given e-mail address.
-        To get a list of all known and unblocked contacts, use contacts_get_contacts().
-
-        **POTENTIAL SECURITY ISSUE**: If there are multiple contacts with this address
-        (e.g. an address-contact and a key-contact),
-        this looks up the most recently seen contact,
-        i.e. which contact is returned depends on which contact last sent a message.
-        If the user just clicked on a mailto: link, then this is the best thing you can do.
-        But **DO NOT** internally represent contacts by their email address
-        and do not use this function to look them up;
-        otherwise this function will sometimes look up the wrong contact.
-        Instead, you should internally represent contacts by their ids.
-
-        To validate an e-mail address independently of the contact database
-        use check_email_validity()."""
+        """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)
         return contact_id and Contact(self, contact_id)
 
@@ -226,8 +154,8 @@ class Account:
     def get_contacts(
         self,
         query: Optional[str] = None,
-        *,
         with_self: bool = False,
+        verified_only: bool = False,
         snapshot: bool = False,
     ) -> Union[list[Contact], list[AttrDict]]:
         """Get a filtered list of contacts.
@@ -235,9 +163,12 @@ class Account:
         :param query: if a string is specified, only return contacts
                       whose name or e-mail matches query.
         :param with_self: if True the self-contact is also included if it matches the query.
+        :param only_verified: if True only return verified contacts.
         :param snapshot: If True return a list of contact snapshots instead of Contact instances.
         """
         flags = 0
+        if verified_only:
+            flags |= ContactFlag.VERIFIED_ONLY
         if with_self:
             flags |= ContactFlag.ADD_SELF
 
@@ -249,14 +180,9 @@ class Account:
 
     @property
     def self_contact(self) -> Contact:
-        """Account's identity as a Contact."""
+        """This account's identity as a Contact."""
         return Contact(self, SpecialContactId.SELF)
 
-    @property
-    def device_contact(self) -> Chat:
-        """Account's device contact."""
-        return Contact(self, SpecialContactId.DEVICE)
-
     def get_chatlist(
         self,
         query: Optional[str] = None,
@@ -303,52 +229,17 @@ class Account:
     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 one member (see `SpecialContactId.SELF`)
-        and is in _unpromoted_ state.
-        This means, you can add or remove members, change the name,
-        the group image and so on without messages being sent to all group members.
-
-        This changes as soon as the first message is sent to the group members
-        and the group becomes _promoted_.
-        After that, all changes are synced with all group members
-        by sending status message.
-
-        To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of a chat
-        (see `get_full_snapshot()` / `get_basic_snapshot()`).
-        This may be useful if you want to show some help for just created groups.
-
-        :param protect: If set to 1 the function creates group with protection initially enabled.
-                        Only verified members are allowed in these groups
-                        and end-to-end-encryption is always enabled.
+        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))
 
-    def create_broadcast(self, name: str) -> Chat:
-        """Create a new **broadcast channel**
-        (called "Channel" in the UI).
-
-        Broadcast channels are similar to groups on the sending device,
-        however, recipients get the messages in a read-only chat
-        and will not see who the other members are.
-
-        Called `broadcast` here rather than `channel`,
-        because the word "channel" already appears a lot in the code,
-        which would make it hard to grep for it.
-
-        After creation, the chat contains no recipients and is in _unpromoted_ state;
-        see `create_group()` for more information on the unpromoted state.
-
-        Returns the created chat.
-        """
-        return Chat(self, self._rpc.create_broadcast(self.id, name))
-
     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:
-        """Continue a Setup-Contact or Verified-Group-Invite protocol started on another device.
+        """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.
@@ -405,40 +296,34 @@ class Account:
 
     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)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.INCOMING_MSG:
+                return event
 
     def wait_for_incoming_msg(self):
         """Wait for incoming message and return it.
 
-        Consumes all events before the next incoming message event.
-        """
+        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):
-        """Wait until SecureJoin process finishes successfully on the inviter side."""
         while True:
             event = self.wait_for_event()
             if event["kind"] == "SecurejoinInviterProgress" and event["progress"] == 1000:
                 break
 
     def wait_for_securejoin_joiner_success(self):
-        """Wait until SecureJoin process finishes successfully on the joiner side."""
         while True:
             event = self.wait_for_event()
             if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
                 break
 
     def wait_for_reactions_changed(self):
-        """Wait for reaction change event."""
-        return self.wait_for_event(EventType.REACTIONS_CHANGED)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.REACTIONS_CHANGED:
+                return event
 
     def get_fresh_messages_in_arrival_order(self) -> list[Message]:
         """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
@@ -467,12 +352,3 @@ class Account:
         """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)
-
-    def ice_servers(self) -> list:
-        """Return ICE servers for WebRTC configuration."""
-        ice_servers_json = self._rpc.ice_servers(self.id)
-        return json.loads(ice_servers_json)

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

@@ -1,5 +1,3 @@
-"""Chat module."""
-
 from __future__ import annotations
 
 import calendar
@@ -91,8 +89,7 @@ class Chat:
     def set_ephemeral_timer(self, timer: int) -> None:
         """Set ephemeral timer of this chat in seconds.
 
-        0 means the timer is disabled, use 1 for immediate deletion.
-        """
+        0 means the timer is disabled, use 1 for immediate deletion."""
         self._rpc.set_chat_ephemeral_timer(self.account.id, self.id, timer)
 
     def get_encryption_info(self) -> str:
@@ -127,7 +124,6 @@ class Chat:
         html: Optional[str] = None,
         viewtype: Optional[ViewType] = None,
         file: Optional[str] = None,
-        filename: Optional[str] = None,
         location: Optional[tuple[float, float]] = None,
         override_sender_name: Optional[str] = None,
         quoted_msg: Optional[Union[int, Message]] = None,
@@ -141,7 +137,6 @@ class Chat:
             "html": html,
             "viewtype": viewtype,
             "file": file,
-            "filename": filename,
             "location": location,
             "overrideSenderName": override_sender_name,
             "quotedMessageId": quoted_msg,
@@ -168,11 +163,6 @@ class Chat:
         msg_id = self._rpc.send_sticker(self.account.id, self.id, path)
         return Message(self.account, msg_id)
 
-    def resend_messages(self, messages: list[Message]) -> None:
-        """Resend a list of messages to this chat."""
-        msg_ids = [msg.id for msg in messages]
-        self._rpc.resend_messages(self.account.id, msg_ids)
-
     def forward_messages(self, messages: list[Message]) -> None:
         """Forward a list of messages to this chat."""
         msg_ids = [msg.id for msg in messages]
@@ -182,14 +172,13 @@ class Chat:
         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)
+        self._rpc.misc_set_draft(self.account.id, self.id, text, file, quoted_msg, viewtype)
 
     def remove_draft(self) -> None:
         """Remove draft message."""
@@ -207,12 +196,12 @@ class Chat:
         return snapshot
 
     def get_messages(self, info_only: bool = False, add_daymarker: bool = False) -> list[Message]:
-        """Get the list of messages in this chat."""
+        """get the list of messages in this chat."""
         msgs = 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:
-        """Get number of fresh messages in this chat."""
+        """Get number of fresh messages in this chat"""
         return self._rpc.get_fresh_msg_cnt(self.account.id, self.id)
 
     def mark_noticed(self) -> None:
@@ -249,11 +238,6 @@ class Chat:
         contacts = 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]:
-        """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.
 
@@ -294,8 +278,3 @@ class Chat:
             f.write(vcard.encode())
             f.flush()
             self._rpc.send_msg(self.account.id, self.id, {"viewtype": ViewType.VCARD, "file": f.name})
-
-    def place_outgoing_call(self, place_call_info: str) -> Message:
-        """Starts an outgoing call."""
-        msg_id = self._rpc.place_outgoing_call(self.account.id, self.id, place_call_info)
-        return Message(self.account, msg_id)

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

@@ -48,7 +48,6 @@ class Client:
         self.add_hooks(hooks or [])
 
     def add_hooks(self, hooks: Iterable[tuple[Callable, Union[type, EventFilter]]]) -> None:
-        """Register multiple hooks."""
         for hook, event in hooks:
             self.add_hook(hook, event)
 
@@ -78,11 +77,9 @@ class Client:
         self._hooks.get(type(event), set()).remove((hook, event))
 
     def is_configured(self) -> bool:
-        """Return True if the client is configured."""
         return self.account.is_configured()
 
     def configure(self, email: str, password: str, **kwargs) -> None:
-        """Configure the client."""
         self.account.set_config("addr", email)
         self.account.set_config("mail_pw", password)
         for key, value in kwargs.items():
@@ -201,6 +198,5 @@ class Bot(Client):
     """Simple bot implementation that listens to events of a single account."""
 
     def configure(self, email: str, password: str, **kwargs) -> None:
-        """Configure the bot."""
         kwargs.setdefault("bot", "1")
         super().configure(email, password, **kwargs)

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

@@ -1,20 +1,14 @@
-"""Constants module."""
-
 from enum import Enum, IntEnum
 
 COMMAND_PREFIX = "/"
 
 
 class ContactFlag(IntEnum):
-    """Bit flags for get_contacts() method."""
-
+    VERIFIED_ONLY = 0x01
     ADD_SELF = 0x02
-    ADDRESS = 0x04
 
 
 class ChatlistFlag(IntEnum):
-    """Bit flags for get_chatlist() method."""
-
     ARCHIVED_ONLY = 0x01
     NO_SPECIALS = 0x02
     ADD_ALLDONE_HINT = 0x04
@@ -22,8 +16,6 @@ class ChatlistFlag(IntEnum):
 
 
 class SpecialContactId(IntEnum):
-    """Special contact IDs."""
-
     SELF = 1
     INFO = 2  # centered messages as "member added", used in all chats
     DEVICE = 5  #  messages "update info" in the device-chat
@@ -31,7 +23,7 @@ class SpecialContactId(IntEnum):
 
 
 class EventType(str, Enum):
-    """Core event types."""
+    """Core event types"""
 
     INFO = "Info"
     SMTP_CONNECTED = "SmtpConnected"
@@ -56,7 +48,6 @@ class EventType(str, Enum):
     MSG_READ = "MsgRead"
     MSG_DELETED = "MsgDeleted"
     CHAT_MODIFIED = "ChatModified"
-    CHAT_DELETED = "ChatDeleted"
     CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
     CONTACTS_CHANGED = "ContactsChanged"
     LOCATION_CHANGED = "LocationChanged"
@@ -73,17 +64,13 @@ class EventType(str, Enum):
     CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
     ACCOUNTS_CHANGED = "AccountsChanged"
     ACCOUNTS_ITEM_CHANGED = "AccountsItemChanged"
-    INCOMING_CALL = "IncomingCall"
-    INCOMING_CALL_ACCEPTED = "IncomingCallAccepted"
-    OUTGOING_CALL_ACCEPTED = "OutgoingCallAccepted"
-    CALL_ENDED = "CallEnded"
     CONFIG_SYNCED = "ConfigSynced"
     WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
     WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED = "WebxdcRealtimeAdvertisementReceived"
 
 
 class ChatId(IntEnum):
-    """Special chat IDs."""
+    """Special chat ids"""
 
     TRASH = 3
     ARCHIVED_LINK = 6
@@ -92,47 +79,17 @@ class ChatId(IntEnum):
 
 
 class ChatType(IntEnum):
-    """Chat type."""
+    """Chat types"""
 
     UNDEFINED = 0
-
     SINGLE = 100
-    """1:1 chat, i.e. a direct chat with a single contact"""
-
     GROUP = 120
-
     MAILINGLIST = 140
-
-    OUT_BROADCAST = 160
-    """Outgoing broadcast channel, called "Channel" in the UI.
-
-    The user can send into this channel,
-    and all recipients will receive messages
-    in an `IN_BROADCAST`.
-
-    Called `broadcast` here rather than `channel`,
-    because the word "channel" already appears a lot in the code,
-    which would make it hard to grep for it.
-    """
-
-    IN_BROADCAST = 165
-    """Incoming broadcast channel, called "Channel" in the UI.
-
-    This channel is read-only,
-    and we do not know who the other recipients are.
-
-    This is similar to a `MAILINGLIST`,
-    with the main difference being that
-    `IN_BROADCAST`s are encrypted.
-
-    Called `broadcast` here rather than `channel`,
-    because the word "channel" already appears a lot in the code,
-    which would make it hard to grep for it.
-    """
+    BROADCAST = 160
 
 
 class ChatVisibility(str, Enum):
-    """Chat visibility types."""
+    """Chat visibility types"""
 
     NORMAL = "Normal"
     ARCHIVED = "Archived"
@@ -140,7 +97,7 @@ class ChatVisibility(str, Enum):
 
 
 class DownloadState(str, Enum):
-    """Message download state."""
+    """Message download state"""
 
     DONE = "Done"
     AVAILABLE = "Available"
@@ -201,14 +158,14 @@ class MessageState(IntEnum):
 
 
 class MessageId(IntEnum):
-    """Special message IDs."""
+    """Special message ids"""
 
     DAYMARKER = 9
     LAST_SPECIAL = 9
 
 
 class CertificateChecks(IntEnum):
-    """Certificate checks mode."""
+    """Certificate checks mode"""
 
     AUTOMATIC = 0
     STRICT = 1
@@ -216,7 +173,7 @@ class CertificateChecks(IntEnum):
 
 
 class Connectivity(IntEnum):
-    """Connectivity states."""
+    """Connectivity states"""
 
     NOT_CONNECTED = 1000
     CONNECTING = 2000
@@ -225,7 +182,7 @@ class Connectivity(IntEnum):
 
 
 class KeyGenType(IntEnum):
-    """Type of the key to generate."""
+    """Type of the key to generate"""
 
     DEFAULT = 0
     RSA2048 = 1
@@ -235,21 +192,21 @@ class KeyGenType(IntEnum):
 
 # "Lp" means "login parameters"
 class LpAuthFlag(IntEnum):
-    """Authorization flags."""
+    """Authorization flags"""
 
     OAUTH2 = 0x2
     NORMAL = 0x4
 
 
 class MediaQuality(IntEnum):
-    """Media quality setting."""
+    """Media quality setting"""
 
     BALANCED = 0
     WORSE = 1
 
 
 class ProviderStatus(IntEnum):
-    """Provider status according to manual testing."""
+    """Provider status according to manual testing"""
 
     OK = 1
     PREPARATION = 2
@@ -257,7 +214,7 @@ class ProviderStatus(IntEnum):
 
 
 class PushNotifyState(IntEnum):
-    """Push notifications state."""
+    """Push notifications state"""
 
     NOT_CONNECTED = 0
     HEARTBEAT = 1
@@ -265,7 +222,7 @@ class PushNotifyState(IntEnum):
 
 
 class ShowEmails(IntEnum):
-    """Show emails mode."""
+    """Show emails mode"""
 
     OFF = 0
     ACCEPTED_CONTACTS = 1
@@ -273,7 +230,7 @@ class ShowEmails(IntEnum):
 
 
 class SocketSecurity(IntEnum):
-    """Socket security."""
+    """Socket security"""
 
     AUTOMATIC = 0
     SSL = 1
@@ -282,7 +239,7 @@ class SocketSecurity(IntEnum):
 
 
 class VideochatType(IntEnum):
-    """Video chat URL type."""
+    """Video chat URL type"""
 
     UNKNOWN = 0
     BASICWEBRTC = 1

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

@@ -1,5 +1,3 @@
-"""Contact module."""
-
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
@@ -13,7 +11,8 @@ if TYPE_CHECKING:
 
 @dataclass
 class Contact:
-    """Contact API.
+    """
+    Contact API.
 
     Essentially a wrapper for RPC, account ID and a contact ID.
     """
@@ -37,14 +36,17 @@ class Contact:
         """Delete contact."""
         self._rpc.delete_contact(self.account.id, self.id)
 
+    def reset_encryption(self) -> None:
+        """Reset contact encryption."""
+        self._rpc.reset_contact_encryption(self.account.id, self.id)
+
     def set_name(self, name: str) -> None:
         """Change the name of this contact."""
         self._rpc.change_contact_name(self.account.id, self.id, name)
 
     def get_encryption_info(self) -> str:
-        """Get a multi-line encryption info.
-
-        Encryption info contains your fingerprint and the fingerprint of the contact.
+        """Get a multi-line encryption info, containing your fingerprint and
+        the fingerprint of the contact.
         """
         return self._rpc.get_contact_encryption_info(self.account.id, self.id)
 
@@ -64,5 +66,4 @@ class Contact:
         )
 
     def make_vcard(self) -> str:
-        """Make a vCard for the contact."""
-        return self.account.make_vcard([self])
+        return self._rpc.make_vcard(self.account.id, [self.id])

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

@@ -1,5 +1,3 @@
-"""Account manager module."""
-
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
@@ -12,13 +10,12 @@ if TYPE_CHECKING:
 
 
 class DeltaChat:
-    """Delta Chat accounts manager.
-
+    """
+    Delta Chat accounts manager.
     This is the root of the object oriented API.
     """
 
     def __init__(self, rpc: "Rpc") -> None:
-        """Initialize account manager."""
         self.rpc = rpc
 
     def add_account(self) -> Account:
@@ -40,7 +37,9 @@ class DeltaChat:
         self.rpc.stop_io_for_all_accounts()
 
     def maybe_network(self) -> None:
-        """Indicate that the network conditions might have changed."""
+        """Indicate that the network likely has come back or just that the network
+        conditions might have changed.
+        """
         self.rpc.maybe_network()
 
     def get_system_info(self) -> AttrDict:

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

@@ -36,7 +36,7 @@ class EventFilter(ABC):
 
     @abstractmethod
     def __hash__(self) -> int:
-        """Object's unique hash."""
+        """Object's unique hash"""
 
     @abstractmethod
     def __eq__(self, other) -> bool:
@@ -52,7 +52,9 @@ class EventFilter(ABC):
 
     @abstractmethod
     def filter(self, event):
-        """Return True-like value if the event passed the filter."""
+        """Return True-like value if the event passed the filter and should be
+        used, or False-like value otherwise.
+        """
 
 
 class RawEvent(EventFilter):
@@ -80,17 +82,31 @@ class RawEvent(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
-        """Filter an event.
-
-        Return true if the event should be processed.
-        """
         if self.types and event.kind not in self.types:
             return False
         return self._call_func(event)
 
 
 class NewMessage(EventFilter):
-    """Matches whenever a new message arrives."""
+    """Matches whenever a new message arrives.
+
+    Warning: registering a handler for this event will cause the messages
+    to be marked as read. Its usage is mainly intended for bots.
+
+    :param pattern: if set, this Pattern will be used to filter the message by its text
+                    content.
+    :param command: If set, only match messages with the given command (ex. /help).
+                    Setting this property implies `is_info==False`.
+    :param is_bot: If set to True only match messages sent by bots, if set to None
+                   match messages from bots and users. If omitted or set to False
+                   only messages from users will be matched.
+    :param is_info: If set to True only match info/system messages, if set to False
+                    only match messages that are not info/system messages. If omitted
+                    info/system messages as well as normal messages will be matched.
+    :param func: A Callable function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
 
     def __init__(
         self,
@@ -105,25 +121,6 @@ class NewMessage(EventFilter):
         is_info: Optional[bool] = None,
         func: Optional[Callable[["AttrDict"], bool]] = None,
     ) -> None:
-        """Initialize a new message filter.
-
-        Warning: registering a handler for this event will cause the messages
-        to be marked as read. Its usage is mainly intended for bots.
-
-        :param pattern: if set, this Pattern will be used to filter the message by its text
-                    content.
-        :param command: If set, only match messages with the given command (ex. /help).
-                    Setting this property implies `is_info==False`.
-        :param is_bot: If set to True only match messages sent by bots, if set to None
-                   match messages from bots and users. If omitted or set to False
-                   only messages from users will be matched.
-        :param is_info: If set to True only match info/system messages, if set to False
-                    only match messages that are not info/system messages. If omitted
-                    info/system messages as well as normal messages will be matched.
-        :param func: A Callable function that should accept the event as input
-                 parameter, and return a bool value indicating whether the event
-                 should be dispatched or not.
-        """
         super().__init__(func=func)
         self.is_bot = is_bot
         self.is_info = is_info
@@ -162,7 +159,6 @@ class NewMessage(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
-        """Return true if if the event is a new message event."""
         if self.is_bot is not None and self.is_bot != event.message_snapshot.is_bot:
             return False
         if self.is_info is not None and self.is_info != event.message_snapshot.is_info:
@@ -203,7 +199,6 @@ class MemberListChanged(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
-        """Return true if if the event is a member addition event."""
         if self.added is not None and self.added != event.member_added:
             return False
         return self._call_func(event)
@@ -236,7 +231,6 @@ class GroupImageChanged(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
-        """Return True if event is matched."""
         if self.deleted is not None and self.deleted != event.image_deleted:
             return False
         return self._call_func(event)
@@ -262,12 +256,13 @@ class GroupNameChanged(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
-        """Return True if event is matched."""
         return self._call_func(event)
 
 
 class HookCollection:
-    """Helper class to collect event hooks that can later be added to a Delta Chat client."""
+    """
+    Helper class to collect event hooks that can later be added to a Delta Chat client.
+    """
 
     def __init__(self) -> None:
         self._hooks: set[tuple[Callable, Union[type, EventFilter]]] = set()

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

@@ -1,8 +1,6 @@
-"""Message module."""
-
 import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 from ._utils import AttrDict, futuremethod
 from .const import EventType
@@ -39,11 +37,6 @@ class Message:
         snapshot["message"] = self
         return snapshot
 
-    def get_read_receipts(self) -> List[AttrDict]:
-        """Get message read receipts."""
-        read_receipts = self._rpc.get_message_read_receipts(self.account.id, self.id)
-        return [AttrDict(read_receipt) for read_receipt in read_receipts]
-
     def get_reactions(self) -> Optional[AttrDict]:
         """Get message reactions."""
         reactions = self._rpc.get_message_reactions(self.account.id, self.id)
@@ -52,7 +45,6 @@ class Message:
         return None
 
     def get_sender_contact(self) -> Contact:
-        """Return sender contact."""
         from_id = self.get_snapshot().from_id
         return self.account.get_contact_by_id(from_id)
 
@@ -60,14 +52,6 @@ class Message:
         """Mark the message as seen."""
         self._rpc.markseen_msgs(self.account.id, [self.id])
 
-    def continue_autocrypt_key_transfer(self, setup_code: str) -> None:
-        """Continue the Autocrypt Setup Message key transfer.
-
-        This function can be called on received Autocrypt Setup Message
-        to import the key encrypted with the provided setup code.
-        """
-        self._rpc.continue_autocrypt_key_transfer(self.account.id, self.id, setup_code)
-
     def send_webxdc_status_update(self, update: Union[dict, str], description: str) -> None:
         """Send a webxdc status update. This message must be a webxdc."""
         if not isinstance(update, str):
@@ -75,15 +59,9 @@ class Message:
         self._rpc.send_webxdc_status_update(self.account.id, self.id, update, description)
 
     def get_webxdc_status_updates(self, last_known_serial: int = 0) -> list:
-        """Return a list of Webxdc status updates for Webxdc instance message."""
         return json.loads(self._rpc.get_webxdc_status_updates(self.account.id, self.id, last_known_serial))
 
-    def get_info(self) -> str:
-        """Return message info."""
-        return self._rpc.get_message_info(self.account.id, self.id)
-
     def get_webxdc_info(self) -> dict:
-        """Get info from a Webxdc message in JSON format."""
         return self._rpc.get_webxdc_info(self.account.id, self.id)
 
     def wait_until_delivered(self) -> None:
@@ -95,22 +73,8 @@ class Message:
 
     @futuremethod
     def send_webxdc_realtime_advertisement(self):
-        """Send an advertisement to join the realtime channel."""
         yield self._rpc.send_webxdc_realtime_advertisement.future(self.account.id, self.id)
 
     @futuremethod
     def send_webxdc_realtime_data(self, data) -> None:
-        """Send data to the realtime channel."""
         yield self._rpc.send_webxdc_realtime_data.future(self.account.id, self.id, list(data))
-
-    def accept_incoming_call(self, accept_call_info):
-        """Accepts an incoming call."""
-        self._rpc.accept_incoming_call(self.account.id, self.id, accept_call_info)
-
-    def end_call(self):
-        """Ends incoming or outgoing call."""
-        self._rpc.end_call(self.account.id, self.id)
-
-    def get_call_info(self) -> AttrDict:
-        """Return information about the call."""
-        return AttrDict(self._rpc.call_info(self.account.id, self.id))

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

@@ -1,74 +1,65 @@
-"""Pytest plugin module."""
-
 from __future__ import annotations
 
 import os
 import random
 from typing import AsyncGenerator, Optional
 
-import py
 import pytest
 
 from . import Account, AttrDict, Bot, Chat, Client, DeltaChat, EventType, Message
 from ._utils import futuremethod
 from .rpc import Rpc
 
-E2EE_INFO_MSGS = 1
-"""
-The number of info messages added to new e2ee chats.
-Currently this is "End-to-end encryption available".
-"""
+
+def get_temp_credentials() -> dict:
+    domain = os.getenv("CHATMAIL_DOMAIN")
+    username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
+    password = f"{username}${username}"
+    addr = f"{username}@{domain}"
+    return {"email": addr, "password": password}
 
 
 class ACFactory:
-    """Test account factory."""
-
     def __init__(self, deltachat: DeltaChat) -> None:
         self.deltachat = deltachat
 
     def get_unconfigured_account(self) -> Account:
-        """Create a new unconfigured account."""
         account = self.deltachat.add_account()
         account.set_config("verified_one_on_one_chats", "1")
         return account
 
     def get_unconfigured_bot(self) -> Bot:
-        """Create a new unconfigured bot."""
         return Bot(self.get_unconfigured_account())
 
-    def get_credentials(self) -> (str, str):
-        """Generate new credentials for chatmail account."""
-        domain = os.getenv("CHATMAIL_DOMAIN")
-        username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
-        return f"{username}@{domain}", f"{username}${username}"
+    def new_preconfigured_account(self) -> Account:
+        """Make a new account with configuration options set, but configuration not started."""
+        credentials = get_temp_credentials()
+        account = self.get_unconfigured_account()
+        account.set_config("addr", credentials["email"])
+        account.set_config("mail_pw", credentials["password"])
+        assert not account.is_configured()
+        return account
 
     @futuremethod
     def new_configured_account(self):
-        """Create a new configured account."""
-        addr, password = self.get_credentials()
-        account = self.get_unconfigured_account()
-        params = {"addr": addr, "password": password}
-        yield account.add_or_update_transport.future(params)
-
+        account = self.new_preconfigured_account()
+        yield account.configure.future()
         assert account.is_configured()
         return account
 
     def new_configured_bot(self) -> Bot:
-        """Create a new configured bot."""
-        addr, password = self.get_credentials()
+        credentials = get_temp_credentials()
         bot = self.get_unconfigured_bot()
-        bot.configure(addr, password)
+        bot.configure(credentials["email"], credentials["password"])
         return bot
 
     @futuremethod
     def get_online_account(self):
-        """Create a new account and start I/O."""
         account = yield self.new_configured_account.future()
         account.bring_online()
         return account
 
     def get_online_accounts(self, num: int) -> list[Account]:
-        """Create multiple online accounts."""
         futures = [self.get_online_account.future() for _ in range(num)]
         return [f() for f in futures]
 
@@ -83,10 +74,6 @@ class ACFactory:
         return ac_clone
 
     def get_accepted_chat(self, ac1: Account, ac2: Account) -> Chat:
-        """Create a new 1:1 chat between ac1 and ac2 accepted on both sides.
-
-        Returned chat is a chat with ac2 from ac1 point of view.
-        """
         ac2.create_chat(ac1)
         return ac1.create_chat(ac2)
 
@@ -98,10 +85,9 @@ class ACFactory:
         file: Optional[str] = None,
         group: Optional[str] = None,
     ) -> Message:
-        """Send a message."""
         if not from_account:
             from_account = (self.get_online_accounts(1))[0]
-        to_contact = from_account.create_contact(to_account)
+        to_contact = from_account.create_contact(to_account.get_config("addr"))
         if group:
             to_chat = from_account.create_group(group)
             to_chat.add_contact(to_contact)
@@ -117,7 +103,6 @@ class ACFactory:
         file: Optional[str] = None,
         group: Optional[str] = None,
     ) -> AttrDict:
-        """Send a message and wait until recipient processes it."""
         self.send_message(
             to_account=to_client.account,
             from_account=from_account,
@@ -131,7 +116,6 @@ class ACFactory:
 
 @pytest.fixture
 def rpc(tmp_path) -> AsyncGenerator:
-    """RPC client fixture."""
     rpc_server = Rpc(accounts_dir=str(tmp_path / "accounts"))
     with rpc_server:
         yield rpc_server
@@ -139,52 +123,4 @@ def rpc(tmp_path) -> AsyncGenerator:
 
 @pytest.fixture
 def acfactory(rpc) -> AsyncGenerator:
-    """Return account factory fixture."""
     return ACFactory(DeltaChat(rpc))
-
-
-@pytest.fixture
-def data():
-    """Test data."""
-
-    class Data:
-        def __init__(self) -> None:
-            for path in reversed(py.path.local(__file__).parts()):
-                datadir = path.join("test-data")
-                if datadir.isdir():
-                    self.path = datadir
-                    return
-            raise Exception("Data path cannot be found")
-
-        def get_path(self, bn):
-            """Return path of file or None if it doesn't exist."""
-            fn = os.path.join(self.path, *bn.split("/"))
-            assert os.path.exists(fn)
-            return fn
-
-        def read_path(self, bn, mode="r"):
-            fn = self.get_path(bn)
-            if fn is not None:
-                with open(fn, mode) as f:
-                    return f.read()
-            return None
-
-    return Data()
-
-
-@pytest.fixture
-def log():
-    """Log printer fixture."""
-
-    class Printer:
-        def section(self, msg: str) -> None:
-            print()
-            print("=" * 10, msg, "=" * 10)
-
-        def step(self, msg: str) -> None:
-            print("-" * 5, "step " + msg, "-" * 5)
-
-        def indent(self, msg: str) -> None:
-            print("  " + msg)
-
-    return Printer()

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

@@ -1,5 +1,3 @@
-"""JSON-RPC client module."""
-
 from __future__ import annotations
 
 import itertools
@@ -14,19 +12,16 @@ from typing import Any, Iterator, Optional
 
 
 class JsonRpcError(Exception):
-    """JSON-RPC error."""
+    pass
 
 
 class RpcFuture:
-    """RPC future waiting for RPC call result."""
-
     def __init__(self, rpc: "Rpc", request_id: int, event: Event):
         self.rpc = rpc
         self.request_id = request_id
         self.event = event
 
     def __call__(self):
-        """Wait for the future to return the result."""
         self.event.wait()
         response = self.rpc.request_results.pop(self.request_id)
         if "error" in response:
@@ -37,19 +32,17 @@ class RpcFuture:
 
 
 class RpcMethod:
-    """RPC method."""
-
     def __init__(self, rpc: "Rpc", name: str):
         self.rpc = rpc
         self.name = name
 
     def __call__(self, *args) -> Any:
-        """Call JSON-RPC method synchronously."""
+        """Synchronously calls JSON-RPC method."""
         future = self.future(*args)
         return future()
 
     def future(self, *args) -> Any:
-        """Call JSON-RPC method asynchronously."""
+        """Asynchronously calls JSON-RPC method."""
         request_id = next(self.rpc.id_iterator)
         request = {
             "jsonrpc": "2.0",
@@ -65,13 +58,8 @@ class RpcMethod:
 
 
 class Rpc:
-    """RPC client."""
-
     def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
-        """Initialize RPC client.
-
-        The given arguments will be passed to subprocess.Popen().
-        """
+        """The given arguments will be passed to subprocess.Popen()"""
         if accounts_dir:
             kwargs["env"] = {
                 **kwargs.get("env", os.environ),
@@ -93,7 +81,6 @@ class Rpc:
         self.events_thread: Thread
 
     def start(self) -> None:
-        """Start RPC server subprocess."""
         if sys.version_info >= (3, 11):
             self.process = subprocess.Popen(
                 "deltachat-rpc-server",
@@ -143,9 +130,11 @@ class Rpc:
         self.close()
 
     def reader_loop(self) -> None:
-        """Process JSON-RPC responses from the RPC server process output."""
         try:
-            while line := self.process.stdout.readline():
+            while True:
+                line = self.process.stdout.readline()
+                if not line:  # EOF
+                    break
                 response = json.loads(line)
                 if "id" in response:
                     response_id = response["id"]
@@ -161,7 +150,10 @@ class Rpc:
     def writer_loop(self) -> None:
         """Writer loop ensuring only a single thread writes requests."""
         try:
-            while request := self.request_queue.get():
+            while True:
+                request = self.request_queue.get()
+                if not request:
+                    break
                 data = (json.dumps(request) + "\n").encode()
                 self.process.stdin.write(data)
                 self.process.stdin.flush()
@@ -171,13 +163,12 @@ class Rpc:
             logging.exception("Exception in the writer loop")
 
     def get_queue(self, account_id: int) -> Queue:
-        """Get event queue corresponding to the given account ID."""
         if account_id not in self.event_queues:
             self.event_queues[account_id] = Queue()
         return self.event_queues[account_id]
 
     def events_loop(self) -> None:
-        """Request new events and distributes them between queues."""
+        """Requests new events and distributes them between queues."""
         try:
             while True:
                 if self.closing:
@@ -193,12 +184,12 @@ class Rpc:
             logging.exception("Exception in the event loop")
 
     def wait_for_event(self, account_id: int) -> Optional[dict]:
-        """Wait for the next event from the given account and returns it."""
+        """Waits for the next event from the given account and returns it."""
         queue = self.get_queue(account_id)
         return queue.get()
 
     def clear_all_events(self, account_id: int):
-        """Remove all queued-up events for a given account. Useful for tests."""
+        """Removes all queued-up events for a given account. Useful for tests."""
         queue = self.get_queue(account_id)
         try:
             while True:

deltachat-rpc-client/tests/test_account_events.py

@@ -13,11 +13,10 @@ def test_event_on_configuration(acfactory: ACFactory) -> None:
     Test if ACCOUNTS_ITEM_CHANGED event is emitted on configure
     """
 
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
+    account = acfactory.new_preconfigured_account()
     account.clear_all_events()
     assert not account.is_configured()
-    future = account.add_or_update_transport.future({"addr": addr, "password": password})
+    future = account.configure.future()
     while True:
         event = account.wait_for_event()
         if event.kind == EventType.ACCOUNTS_ITEM_CHANGED:

deltachat-rpc-client/tests/test_calls.py

@@ -1,86 +0,0 @@
-from deltachat_rpc_client import EventType, Message
-
-
-def test_calls(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    place_call_info = "offer"
-    accept_call_info = "answer"
-
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
-    outgoing_call_message = alice_chat_bob.place_outgoing_call(place_call_info)
-    assert outgoing_call_message.get_call_info().state.kind == "Alerting"
-
-    incoming_call_event = bob.wait_for_event(EventType.INCOMING_CALL)
-    assert incoming_call_event.place_call_info == place_call_info
-    assert not incoming_call_event.has_video  # Cannot be parsed as SDP, so false by default
-    incoming_call_message = Message(bob, incoming_call_event.msg_id)
-    assert incoming_call_message.get_call_info().state.kind == "Alerting"
-    assert not incoming_call_message.get_call_info().has_video
-
-    incoming_call_message.accept_incoming_call(accept_call_info)
-    assert incoming_call_message.get_call_info().sdp_offer == place_call_info
-    assert incoming_call_message.get_call_info().state.kind == "Active"
-    outgoing_call_accepted_event = alice.wait_for_event(EventType.OUTGOING_CALL_ACCEPTED)
-    assert outgoing_call_accepted_event.accept_call_info == accept_call_info
-    assert outgoing_call_message.get_call_info().state.kind == "Active"
-
-    outgoing_call_message.end_call()
-    assert outgoing_call_message.get_call_info().state.kind == "Completed"
-
-    end_call_event = bob.wait_for_event(EventType.CALL_ENDED)
-    assert end_call_event.msg_id == outgoing_call_message.id
-    assert incoming_call_message.get_call_info().state.kind == "Completed"
-
-
-def test_video_call(acfactory) -> None:
-    # Example from <https://datatracker.ietf.org/doc/rfc9143/>
-    # with `s= ` replaced with `s=-`.
-    #
-    # `s=` cannot be empty according to RFC 3264,
-    # so it is more clear as `s=-`.
-    place_call_info = """v=0\r
-o=alice 2890844526 2890844526 IN IP6 2001:db8::3\r
-s=-\r
-c=IN IP6 2001:db8::3\r
-t=0 0\r
-a=group:BUNDLE foo bar\r
-\r
-m=audio 10000 RTP/AVP 0 8 97\r
-b=AS:200\r
-a=mid:foo\r
-a=rtcp-mux\r
-a=rtpmap:0 PCMU/8000\r
-a=rtpmap:8 PCMA/8000\r
-a=rtpmap:97 iLBC/8000\r
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid\r
-\r
-m=video 10002 RTP/AVP 31 32\r
-b=AS:1000\r
-a=mid:bar\r
-a=rtcp-mux\r
-a=rtpmap:31 H261/90000\r
-a=rtpmap:32 MPV/90000\r
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid\r
-"""
-
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
-    alice_chat_bob.place_outgoing_call(place_call_info)
-
-    incoming_call_event = bob.wait_for_event(EventType.INCOMING_CALL)
-    assert incoming_call_event.place_call_info == place_call_info
-    assert incoming_call_event.has_video
-
-    incoming_call_message = Message(bob, incoming_call_event.msg_id)
-    assert incoming_call_message.get_call_info().has_video
-
-
-def test_ice_servers(acfactory) -> None:
-    alice = acfactory.get_online_account()
-
-    ice_servers = alice.ice_servers()
-    assert len(ice_servers) == 1

deltachat-rpc-client/tests/test_chatlist_events.py

@@ -48,7 +48,8 @@ def test_delivery_status(acfactory: ACFactory) -> None:
     """
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
 
     alice.clear_all_events()
@@ -118,7 +119,8 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
     """
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("hi")
 
@@ -148,13 +150,18 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
 def get_multi_account_test_setup(acfactory: ACFactory) -> [Account, Account, Account]:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("hi")
 
     bob.wait_for_incoming_msg_event()
 
-    alice_second_device = alice.clone()
+    alice_second_device: Account = acfactory.get_unconfigured_account()
+
+    alice._rpc.provide_backup.future(alice.id)
+    backup_code = alice._rpc.get_backup_qr(alice.id)
+    alice_second_device._rpc.get_backup(alice_second_device.id, backup_code)
     alice_second_device.start_io()
     alice.clear_all_events()
     alice_second_device.clear_all_events()

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -175,11 +175,17 @@ def test_no_duplicate_messages(acfactory, path_to_webxdc):
 
     threading.Thread(target=thread_run, daemon=True).start()
 
-    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
-    n = int(bytes(event.data).decode())
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            n = int(bytes(event.data).decode())
+            break
 
-    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
-    assert int(bytes(event.data).decode()) > n
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            assert int(bytes(event.data).decode()) > n
+            break
 
 
 def test_no_reordering(acfactory, path_to_webxdc):
@@ -223,5 +229,8 @@ def test_advertisement_after_chatting(acfactory, path_to_webxdc):
     ac2_hello_msg_snapshot.chat.accept()
 
     ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    event = ac1.wait_for_event(EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED)
-    assert event.msg_id == ac1_webxdc_msg.id
+    while 1:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED:
+            assert event.msg_id == ac1_webxdc_msg.id
+            break

deltachat-rpc-client/tests/test_key_transfer.py

@@ -1,53 +0,0 @@
-import pytest
-
-from deltachat_rpc_client import EventType
-from deltachat_rpc_client.rpc import JsonRpcError
-
-
-def wait_for_autocrypt_setup_message(account):
-    while True:
-        event = account.wait_for_event()
-        if event.kind == EventType.MSGS_CHANGED and event.msg_id != 0:
-            msg_id = event.msg_id
-            msg = account.get_message_by_id(msg_id)
-            if msg.get_snapshot().is_setupmessage:
-                return msg
-
-
-def test_autocrypt_setup_message_key_transfer(acfactory):
-    alice1 = acfactory.get_online_account()
-
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.set_config("addr", alice1.get_config("addr"))
-    alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
-    alice2.configure()
-    alice2.bring_online()
-
-    setup_code = alice1.initiate_autocrypt_key_transfer()
-    msg = wait_for_autocrypt_setup_message(alice2)
-
-    # Test that entering wrong code returns an error.
-    with pytest.raises(JsonRpcError):
-        msg.continue_autocrypt_key_transfer("7037-0673-6287-3013-4095-7956-5617-6806-6756")
-
-    msg.continue_autocrypt_key_transfer(setup_code)
-
-
-def test_ac_setup_message_twice(acfactory):
-    alice1 = acfactory.get_online_account()
-
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.set_config("addr", alice1.get_config("addr"))
-    alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
-    alice2.configure()
-    alice2.bring_online()
-
-    # Send the first Autocrypt Setup Message and ignore it.
-    _setup_code = alice1.initiate_autocrypt_key_transfer()
-    wait_for_autocrypt_setup_message(alice2)
-
-    # Send the second Autocrypt Setup Message and import it.
-    setup_code = alice1.initiate_autocrypt_key_transfer()
-    msg = wait_for_autocrypt_setup_message(alice2)
-
-    msg.continue_autocrypt_key_transfer(setup_code)

deltachat-rpc-client/tests/test_multidevice.py

@@ -1,113 +0,0 @@
-from imap_tools import AND
-
-from deltachat_rpc_client import EventType
-from deltachat_rpc_client.const import MessageState
-
-
-def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.bring_online()
-
-    log.section("send out message without bcc to ourselves")
-    ac1.set_config("bcc_self", "0")
-    chat = ac1.create_chat(ac2)
-    self_addr = ac1.get_config("addr")
-    other_addr = ac2.get_config("addr")
-
-    msg_out = chat.send_text("message1")
-    assert not msg_out.get_snapshot().is_forwarded
-
-    # wait for send out (no BCC)
-    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
-    assert ac1.get_config("bcc_self") == "0"
-
-    assert self_addr not in ev.msg
-    assert other_addr in ev.msg
-
-    log.section("ac1: setting bcc_self=1")
-    ac1.set_config("bcc_self", "1")
-
-    log.section("send out message with bcc to ourselves")
-    msg_out = chat.send_text("message2")
-
-    # wait for send out (BCC)
-    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
-    assert ac1.get_config("bcc_self") == "1"
-
-    # Second client receives only second message, but not the first.
-    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
-    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == "Messages are end-to-end encrypted."
-
-    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
-    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == msg_out.get_snapshot().text
-
-    # now make sure we are sending message to ourselves too
-    assert self_addr in ev.msg
-    assert self_addr in ev.msg
-
-    # BCC-self messages are marked as seen by the sender device.
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.INFO and event.msg.endswith("Marked messages 1 in folder INBOX as seen."):
-            break
-
-    # Check that the message is marked as seen on IMAP.
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.connect()
-    ac1_direct_imap.select_folder("Inbox")
-    assert len(list(ac1_direct_imap.conn.fetch(AND(seen=True)))) == 1
-
-
-def test_multidevice_sync_seen(acfactory, log):
-    """Test that message marked as seen on one device is marked as seen on another."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.bring_online()
-
-    ac1.set_config("bcc_self", "1")
-    ac1_clone.set_config("bcc_self", "1")
-
-    ac1_chat = ac1.create_chat(ac2)
-    ac1_clone_chat = ac1_clone.create_chat(ac2)
-    ac2_chat = ac2.create_chat(ac1)
-
-    log.section("Send a message from ac2 to ac1 and check that it's 'fresh'")
-    ac2_chat.send_text("Hi")
-    ac1_message = ac1.wait_for_incoming_msg()
-    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
-    assert ac1_chat.get_fresh_message_count() == 1
-    assert ac1_clone_chat.get_fresh_message_count() == 1
-    assert ac1_message.get_snapshot().state == MessageState.IN_FRESH
-    assert ac1_clone_message.get_snapshot().state == MessageState.IN_FRESH
-
-    log.section("ac1 marks message as seen on the first device")
-    ac1.mark_seen_messages([ac1_message])
-    assert ac1_message.get_snapshot().state == MessageState.IN_SEEN
-
-    log.section("ac1 clone detects that message is marked as seen")
-    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
-    assert ev.chat_id == ac1_clone_chat.id
-
-    log.section("Send an ephemeral message from ac2 to ac1")
-    ac2_chat.set_ephemeral_timer(60)
-    ac1.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
-    ac1.wait_for_incoming_msg()
-    ac1_clone.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
-    ac1_clone.wait_for_incoming_msg()
-
-    ac2_chat.send_text("Foobar")
-    ac1_message = ac1.wait_for_incoming_msg()
-    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
-    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
-    assert "Expires: " not in ac1_clone_message.get_info()
-    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
-    assert "Expires: " not in ac1_clone_message.get_info()
-
-    ac1_message.mark_seen()
-    assert "Expires: " in ac1_message.get_info()
-    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
-    assert ev.chat_id == ac1_clone_chat.id
-    assert ac1_clone_message.get_snapshot().state == MessageState.IN_SEEN
-    # Test that the timer is started on the second device after synchronizing the seen status.
-    assert "Expires: " in ac1_clone_message.get_info()

deltachat-rpc-client/tests/test_securejoin.py

@@ -1,9 +1,9 @@
 import logging
+import time
 
 import pytest
 
 from deltachat_rpc_client import Chat, EventType, SpecialContactId
-from deltachat_rpc_client.rpc import JsonRpcError
 
 
 def test_qr_setup_contact(acfactory, tmp_path) -> None:
@@ -15,32 +15,28 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
     alice.wait_for_securejoin_inviter_success()
 
     # Test that Alice verified Bob's profile.
-    alice_contact_bob = alice.create_contact(bob)
+    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
     alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
     assert alice_contact_bob_snapshot.is_verified
 
     bob.wait_for_securejoin_joiner_success()
 
     # Test that Bob verified Alice's profile.
-    bob_contact_alice = bob.create_contact(alice)
+    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert bob_contact_alice_snapshot.is_verified
 
-    # Test that if Bob imports a key,
-    # backwards verification is not lost
-    # because default key is not changed.
+    # Test that if Bob changes the key, backwards verification is lost.
     logging.info("Bob 2 is created")
     bob2 = acfactory.new_configured_account()
     bob2.export_self_keys(tmp_path)
 
-    logging.info("Bob tries to import a key")
-    # Importing a second key is not allowed.
-    with pytest.raises(JsonRpcError):
-        bob.import_self_keys(tmp_path)
+    logging.info("Bob imports a key")
+    bob.import_self_keys(tmp_path)
 
-    assert bob.get_config("key_id") == "1"
+    assert bob.get_config("key_id") == "2"
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
-    assert bob_contact_alice_snapshot.is_verified
+    assert not bob_contact_alice_snapshot.is_verified
 
 
 def test_qr_setup_contact_svg(acfactory) -> None:
@@ -59,12 +55,15 @@ def test_qr_setup_contact_svg(acfactory) -> None:
 
 
 @pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect):
+def test_qr_securejoin(acfactory, protect, tmp_path):
     alice, bob, fiona = acfactory.get_online_accounts(3)
 
     # Setup second device for Alice
     # to test observing securejoin protocol.
-    alice2 = alice.clone()
+    alice.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.import_backup(files[0])
 
     logging.info("Alice creates a group")
     alice_chat = alice.create_group("Group", protect=protect)
@@ -75,24 +74,30 @@ def test_qr_securejoin(acfactory, protect):
     bob.secure_join(qr_code)
 
     # Alice deletes "vg-request".
-    alice.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
+    while True:
+        event = alice.wait_for_event()
+        if event["kind"] == "ImapMessageDeleted":
+            break
     alice.wait_for_securejoin_inviter_success()
     # Bob deletes "vg-auth-required", Alice deletes "vg-request-with-auth".
     for ac in [alice, bob]:
-        ac.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
+        while True:
+            event = ac.wait_for_event()
+            if event["kind"] == "ImapMessageDeleted":
+                break
     bob.wait_for_securejoin_joiner_success()
 
     # Test that Alice verified Bob's profile.
-    alice_contact_bob = alice.create_contact(bob)
+    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
     alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
     assert alice_contact_bob_snapshot.is_verified
 
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
+    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
     assert snapshot.chat.get_basic_snapshot().is_protected == protect
 
     # Test that Bob verified Alice's profile.
-    bob_contact_alice = bob.create_contact(alice)
+    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert bob_contact_alice_snapshot.is_verified
 
@@ -100,7 +105,7 @@ def test_qr_securejoin(acfactory, protect):
     # Alice observes securejoin protocol and verifies Bob on second device.
     alice2.start_io()
     alice2.wait_for_securejoin_inviter_success()
-    alice2_contact_bob = alice2.create_contact(bob)
+    alice2_contact_bob = alice2.get_contact_by_addr(bob.get_config("addr"))
     alice2_contact_bob_snapshot = alice2_contact_bob.get_snapshot()
     assert alice2_contact_bob_snapshot.is_verified
 
@@ -116,7 +121,8 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
     """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
@@ -153,8 +159,11 @@ def test_qr_readreceipt(acfactory) -> None:
     logging.info("Alice creates a verified group")
     group = alice.create_group("Group", protect=True)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_contact_charlie = alice.create_contact(charlie, "Charlie")
+    bob_addr = bob.get_config("addr")
+    charlie_addr = charlie.get_config("addr")
+
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_charlie = alice.create_contact(charlie_addr, "Charlie")
 
     group.add_contact(alice_contact_bob)
     group.add_contact(alice_contact_charlie)
@@ -181,7 +190,7 @@ def test_qr_readreceipt(acfactory) -> None:
     charlie_snapshot = charlie_message.get_snapshot()
     assert charlie_snapshot.text == "Hi from Bob!"
 
-    bob_contact_charlie = bob.create_contact(charlie, "Charlie")
+    bob_contact_charlie = bob.create_contact(charlie_addr, "Charlie")
     assert not bob.get_chat_by_contact(bob_contact_charlie)
 
     logging.info("Charlie reads Bob's message")
@@ -212,8 +221,8 @@ def test_setup_contact_resetup(acfactory) -> None:
     bob.wait_for_securejoin_joiner_success()
 
 
-def test_verified_group_member_added_recovery(acfactory) -> None:
-    """Tests verified group recovery by reverifying then removing and adding a member back."""
+def test_verified_group_recovery(acfactory) -> None:
+    """Tests verified group recovery by reverifying a member and sending a message in a group."""
     ac1, ac2, ac3 = acfactory.get_online_accounts(3)
 
     logging.info("ac1 creates verified group")
@@ -226,7 +235,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     ac2.wait_for_securejoin_joiner_success()
 
     # ac1 has ac2 directly verified.
-    ac1_contact_ac2 = ac1.create_contact(ac2)
+    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
     assert ac1_contact_ac2.get_snapshot().verifier_id == SpecialContactId.SELF
 
     logging.info("ac3 joins verified group")
@@ -234,8 +243,6 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     ac3.wait_for_securejoin_joiner_success()
     ac3.wait_for_incoming_msg_event()  # Member added
 
-    ac3_contact_ac2_old = ac3.create_contact(ac2)
-
     logging.info("ac2 logs in on a new device")
     ac2 = acfactory.resetup_account(ac2)
 
@@ -248,10 +255,85 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     assert len(ac3_chat.get_contacts()) == 3
     ac3_chat.send_text("Hi!")
 
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Hi!"
+
+    msg_id = ac2.wait_for_incoming_msg_event().msg_id
+    message = ac2.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    assert snapshot.text == "Hi!"
+
+    # ac1 contact is verified for ac2 because ac3 gossiped ac1 key in the "Hi!" message.
+    ac1_contact = ac2.get_contact_by_addr(ac1.get_config("addr"))
+    assert ac1_contact.get_snapshot().is_verified
+
+    # ac2 can write messages to the group.
+    snapshot.chat.send_text("Works again!")
+
+    snapshot = ac3.get_message_by_id(ac3.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Works again!"
+
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Works again!"
+
+    ac1_chat_messages = snapshot.chat.get_messages()
+    ac2_addr = ac2.get_config("addr")
+    assert ac1_chat_messages[-2].get_snapshot().text == f"Changed setup for {ac2_addr}"
+
+    # ac2 is now verified by ac3 for ac1
+    ac1_contact_ac3 = ac1.get_contact_by_addr(ac3.get_config("addr"))
+    assert ac1_contact_ac2.get_snapshot().verifier_id == ac1_contact_ac3.id
+
+
+def test_verified_group_member_added_recovery(acfactory) -> None:
+    """Tests verified group recovery by reverifiying than removing and adding a member back."""
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+
+    logging.info("ac1 creates verified group")
+    chat = ac1.create_group("Verified group", protect=True)
+    assert chat.get_basic_snapshot().is_protected
+
+    logging.info("ac2 joins verified group")
+    qr_code = chat.get_qr_code()
+    ac2.secure_join(qr_code)
+    ac2.wait_for_securejoin_joiner_success()
+
+    # ac1 has ac2 directly verified.
+    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
+    assert ac1_contact_ac2.get_snapshot().verifier_id == SpecialContactId.SELF
+
+    logging.info("ac3 joins verified group")
+    ac3_chat = ac3.secure_join(qr_code)
+    ac3.wait_for_securejoin_joiner_success()
+    ac3.wait_for_incoming_msg_event()  # Member added
+
+    logging.info("ac2 logs in on a new device")
+    ac2 = acfactory.resetup_account(ac2)
+
+    logging.info("ac2 reverifies with ac3")
+    qr_code = ac3.get_qr_code()
+    ac2.secure_join(qr_code)
+    ac2.wait_for_securejoin_joiner_success()
+
+    logging.info("ac3 sends a message to the group")
+    assert len(ac3_chat.get_contacts()) == 3
+    ac3_chat.send_text("Hi!")
+
+    msg_id = ac2.wait_for_incoming_msg_event().msg_id
+    message = ac2.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    logging.info("Received message %s", snapshot.text)
+    assert snapshot.text == "Hi!"
+
     ac1.wait_for_incoming_msg_event()  # Hi!
 
-    ac3_contact_ac2 = ac3.create_contact(ac2)
-    ac3_chat.remove_contact(ac3_contact_ac2_old)
+    ac3_contact_ac2 = ac3.get_contact_by_addr(ac2.get_config("addr"))
+    ac3_chat.remove_contact(ac3_contact_ac2)
+
+    msg_id = ac2.wait_for_incoming_msg_event().msg_id
+    message = ac2.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    assert "removed" in snapshot.text
 
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
     assert "removed" in snapshot.text
@@ -280,16 +362,19 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
     assert snapshot.text == "Works again!"
 
-    ac1_contact_ac2 = ac1.create_contact(ac2)
-    ac1_contact_ac3 = ac1.create_contact(ac3)
+    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
     ac1_contact_ac2_snapshot = ac1_contact_ac2.get_snapshot()
     assert ac1_contact_ac2_snapshot.is_verified
-    assert ac1_contact_ac2_snapshot.verifier_id == ac1_contact_ac3.id
+    assert ac1_contact_ac2_snapshot.verifier_id == ac1.get_contact_by_addr(ac3.get_config("addr")).id
+
+    # ac2 is now verified by ac3 for ac1
+    ac1_contact_ac3 = ac1.get_contact_by_addr(ac3.get_config("addr"))
+    assert ac1_contact_ac2.get_snapshot().verifier_id == ac1_contact_ac3.id
 
 
 def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
     """Regression test for
-    issue <https://github.com/chatmail/core/issues/4894>.
+    issue <https://github.com/deltachat/deltachat-core-rust/issues/4894>.
     """
     ac1, ac2, ac3, ac4 = acfactory.get_online_accounts(4)
 
@@ -323,12 +408,12 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
     logging.info("ac2 now has pending bobstate but ac1 is shutoff")
 
     # we meanwhile expect ac3/ac2 verification started in the beginning to have completed
-    assert ac3.create_contact(ac2).get_snapshot().is_verified
-    assert ac2.create_contact(ac3).get_snapshot().is_verified
+    assert ac3.get_contact_by_addr(ac2.get_config("addr")).get_snapshot().is_verified
+    assert ac2.get_contact_by_addr(ac3.get_config("addr")).get_snapshot().is_verified
 
     logging.info("ac3: create a verified group VG with ac2")
     vg = ac3.create_group("ac3-created", protect=True)
-    vg.add_contact(ac3.create_contact(ac2))
+    vg.add_contact(ac3.get_contact_by_addr(ac2.get_config("addr")))
 
     # ensure ac2 receives message in VG
     vg.send_text("hello")
@@ -366,7 +451,7 @@ def test_qr_new_group_unblocked(acfactory):
     ac1.wait_for_securejoin_inviter_success()
 
     ac1_new_chat = ac1.create_group("Another group")
-    ac1_new_chat.add_contact(ac1.create_contact(ac2))
+    ac1_new_chat.add_contact(ac1.get_contact_by_addr(ac2.get_config("addr")))
     # Receive "Member added" message.
     ac2.wait_for_incoming_msg_event()
 
@@ -376,12 +461,12 @@ def test_qr_new_group_unblocked(acfactory):
     assert ac2_msg.chat.get_basic_snapshot().is_contact_request
 
 
-@pytest.mark.skip(reason="AEAP is disabled for now")
 def test_aeap_flow_verified(acfactory):
     """Test that a new address is added to a contact when it changes its address."""
     ac1, ac2 = acfactory.get_online_accounts(2)
 
-    addr, password = acfactory.get_credentials()
+    # ac1new is only used to get a new address.
+    ac1new = acfactory.new_preconfigured_account()
 
     logging.info("ac1: create verified-group QR, ac2 scans and joins")
     chat = ac1.create_group("hello", protect=True)
@@ -401,8 +486,8 @@ def test_aeap_flow_verified(acfactory):
     assert msg_in_1.text == msg_out.text
 
     logging.info("changing email account")
-    ac1.set_config("addr", addr)
-    ac1.set_config("mail_pw", password)
+    ac1.set_config("addr", ac1new.get_config("addr"))
+    ac1.set_config("mail_pw", ac1new.get_config("mail_pw"))
     ac1.stop_io()
     ac1.configure()
     ac1.start_io()
@@ -415,9 +500,11 @@ def test_aeap_flow_verified(acfactory):
     msg_in_2_snapshot = msg_in_2.get_snapshot()
     assert msg_in_2_snapshot.text == msg_out.text
     assert msg_in_2_snapshot.chat.id == msg_in_1.chat.id
-    assert msg_in_2.get_sender_contact().get_snapshot().address == addr
+    assert msg_in_2.get_sender_contact().get_snapshot().address == ac1new.get_config("addr")
     assert len(msg_in_2_snapshot.chat.get_contacts()) == 2
-    assert addr in [contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()]
+    assert ac1new.get_config("addr") in [
+        contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()
+    ]
 
 
 def test_gossip_verification(acfactory) -> None:
@@ -433,9 +520,9 @@ def test_gossip_verification(acfactory) -> None:
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
-    bob_contact_alice = bob.create_contact(alice, "Alice")
-    bob_contact_carol = bob.create_contact(carol, "Carol")
-    carol_contact_alice = carol.create_contact(alice, "Alice")
+    bob_contact_alice = bob.create_contact(alice.get_config("addr"), "Alice")
+    bob_contact_carol = bob.create_contact(carol.get_config("addr"), "Carol")
+    carol_contact_alice = carol.create_contact(alice.get_config("addr"), "Alice")
 
     logging.info("Bob creates an Autocrypt group")
     bob_group_chat = bob.create_group("Autocrypt Group")
@@ -486,7 +573,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
 
     # ac1 waits for member added message and creates a QR code.
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me added by {}.".format(ac3.get_config("addr"))
+    assert snapshot.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
     ac1_qr_code = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
@@ -495,13 +582,35 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     ac2.wait_for_securejoin_joiner_success()
 
     # ac1 is verified for ac2.
-    ac2_contact_ac1 = ac2.create_contact(ac1, "")
+    ac2_contact_ac1 = ac2.create_contact(ac1.get_config("addr"), "")
     assert ac2_contact_ac1.get_snapshot().is_verified
 
     # ac1 resetups the account.
     ac1 = acfactory.resetup_account(ac1)
-    ac2_contact_ac1 = ac2.create_contact(ac1, "")
-    assert not ac2_contact_ac1.get_snapshot().is_verified
+
+    # Loop sending message from ac1 to ac2
+    # until ac2 accepts new ac1 key.
+    #
+    # This may not happen immediately because resetup of ac1
+    # rewinds "smeared timestamp" so Date: header for messages
+    # sent by new ac1 are in the past compared to the last Date:
+    # header sent by old ac1.
+    while True:
+        # ac1 sends a message to ac2.
+        ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
+        ac1_chat_ac2 = ac1_contact_ac2.create_chat()
+        ac1_chat_ac2.send_text("Hello!")
+
+        # ac2 receives a message.
+        snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
+        assert snapshot.text == "Hello!"
+        logging.info("ac2 received Hello!")
+
+        # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
+        logging.info("ac2 addr={}, ac1 addr={}".format(ac2.get_config("addr"), ac1.get_config("addr")))
+        if not ac2_contact_ac1.get_snapshot().is_verified:
+            break
+        time.sleep(1)
 
     # ac1 goes offline.
     ac1.remove()
@@ -544,14 +653,12 @@ def test_withdraw_securejoin_qr(acfactory):
     bob_chat = bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
-    alice.clear_all_events()
-
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
+    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
     assert snapshot.chat.get_basic_snapshot().is_protected
     bob_chat.leave()
 
-    snapshot = alice.get_message_by_id(alice.wait_for_msgs_changed_event().msg_id).get_snapshot()
+    snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot()
     assert snapshot.text == "Group left by {}.".format(bob.get_config("addr"))
 
     logging.info("Alice withdraws QR code.")

deltachat-rpc-client/tests/test_something.py

@@ -11,8 +11,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from deltachat_rpc_client import Contact, EventType, Message, events
-from deltachat_rpc_client.const import ChatType, DownloadState, MessageState
-from deltachat_rpc_client.pytestplugin import E2EE_INFO_MSGS
+from deltachat_rpc_client.const import DownloadState, MessageState
 from deltachat_rpc_client.rpc import JsonRpcError
 
 
@@ -62,102 +61,61 @@ def test_acfactory(acfactory) -> None:
 
 
 def test_configure_starttls(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr,
-            "password": password,
-            "imapSecurity": "starttls",
-            "smtpSecurity": "starttls",
-        },
-    )
+    account = acfactory.new_preconfigured_account()
+
+    # Use STARTTLS
+    account.set_config("mail_security", "2")
+    account.set_config("send_security", "2")
+    account.configure()
     assert account.is_configured()
 
 
-def test_lowercase_address(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    addr_upper = addr.upper()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr_upper,
-            "password": password,
-        },
-    )
-    assert account.is_configured()
-    assert addr_upper != addr
-    assert account.get_config("configured_addr") == addr
-    assert account.list_transports()[0]["addr"] == addr
-
-    for param in [
-        account.get_info()["used_account_settings"],
-        account.get_info()["entered_account_settings"],
-    ]:
-        assert addr in param
-        assert addr_upper not in param
-
-
 def test_configure_ip(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    ip_address = socket.gethostbyname(addr.rsplit("@")[-1])
+    account = acfactory.new_preconfigured_account()
 
+    domain = account.get_config("addr").rsplit("@")[-1]
+    ip_address = socket.gethostbyname(domain)
+
+    # This should fail TLS check.
+    account.set_config("mail_server", ip_address)
     with pytest.raises(JsonRpcError):
-        account.add_or_update_transport(
-            {
-                "addr": addr,
-                "password": password,
-                # This should fail TLS check.
-                "imapServer": ip_address,
-            },
-        )
+        account.configure()
 
 
 def test_configure_alternative_port(acfactory) -> None:
     """Test that configuration with alternative port 443 works."""
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr,
-            "password": password,
-            "imapPort": 443,
-            "smtpPort": 443,
-        },
-    )
-    assert account.is_configured()
+    account = acfactory.new_preconfigured_account()
+
+    account.set_config("mail_port", "443")
+    account.set_config("send_port", "443")
+
+    account.configure()
 
 
-def test_list_transports(acfactory) -> None:
-    addr, password = acfactory.get_credentials()
-    account = acfactory.get_unconfigured_account()
-    account.add_or_update_transport(
-        {
-            "addr": addr,
-            "password": password,
-            "imapUser": addr,
-        },
-    )
-    transports = account.list_transports()
-    assert len(transports) == 1
-    params = transports[0]
-    assert params["addr"] == addr
-    assert params["password"] == password
-    assert params["imapUser"] == addr
+def test_configure_username(acfactory) -> None:
+    account = acfactory.new_preconfigured_account()
+
+    addr = account.get_config("addr")
+    account.set_config("mail_user", addr)
+    account.configure()
+
+    assert account.get_config("configured_mail_user") == addr
 
 
 def test_account(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
     bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
 
     message = bob.get_message_by_id(msg_id)
     snapshot = message.get_snapshot()
@@ -171,10 +129,7 @@ def test_account(acfactory) -> None:
     assert alice.get_size()
     assert alice.is_configured()
     assert not alice.get_avatar()
-    # get_contact_by_addr() can lookup a key contact by address:
-    bob_contact = alice.get_contact_by_addr(bob_addr).get_snapshot()
-    assert bob_contact.display_name == "Bob"
-    assert bob_contact.is_key_contact
+    assert alice.get_contact_by_addr(bob_addr) == alice_contact_bob
     assert alice.get_contacts()
     assert alice.get_contacts(snapshot=True)
     assert alice.self_contact
@@ -219,7 +174,8 @@ def test_account(acfactory) -> None:
 def test_chat(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
@@ -252,7 +208,6 @@ def test_chat(acfactory) -> None:
     bob_chat_alice.get_encryption_info()
 
     group = alice.create_group("test group")
-    to_resend = group.send_text("will be resent")
     group.add_contact(alice_contact_bob)
     group.get_qr_code()
 
@@ -264,7 +219,6 @@ def test_chat(acfactory) -> None:
 
     msg = group.send_message(text="hi")
     assert (msg.get_snapshot()).text == "hi"
-    group.resend_messages([to_resend])
     group.forward_messages([msg])
 
     group.set_draft(text="test draft")
@@ -277,9 +231,7 @@ def test_chat(acfactory) -> None:
     group.get_fresh_message_count()
     group.mark_noticed()
     assert group.get_contacts()
-    assert group.get_past_contacts() == []
-    group.remove_contact(alice_contact_bob)
-    assert len(group.get_past_contacts()) == 1
+    group.remove_contact(alice_chat_bob)
     group.get_locations()
 
 
@@ -287,12 +239,13 @@ def test_contact(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
     bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
 
     assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id)
     assert repr(alice_contact_bob)
     alice_contact_bob.block()
     alice_contact_bob.unblock()
+    alice_contact_bob.reset_encryption()
     alice_contact_bob.set_name("new name")
     alice_contact_bob.get_encryption_info()
     snapshot = alice_contact_bob.get_snapshot()
@@ -303,7 +256,8 @@ def test_contact(acfactory) -> None:
 def test_message(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
@@ -331,120 +285,28 @@ def test_message(acfactory) -> None:
     assert reactions == snapshot.reactions
 
 
-def test_receive_imf_failure(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
-
-    bob.set_config("fail_on_receiving_full_msg", "1")
-    alice_chat_bob.send_text("Hello!")
-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
-    message = bob.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.chat_id == chat_id
-    assert snapshot.download_state == DownloadState.AVAILABLE
-    assert snapshot.error is not None
-    assert snapshot.show_padlock
-
-    # The failed message doesn't break the IMAP loop.
-    bob.set_config("fail_on_receiving_full_msg", "0")
-    alice_chat_bob.send_text("Hello again!")
-    event = bob.wait_for_incoming_msg_event()
-    assert event.chat_id == chat_id
-    msg_id = event.msg_id
-    message1 = bob.get_message_by_id(msg_id)
-    snapshot = message1.get_snapshot()
-    assert snapshot.chat_id == chat_id
-    assert snapshot.download_state == DownloadState.DONE
-    assert snapshot.error is None
-
-    # The failed message can be re-downloaded later.
-    bob._rpc.download_full_message(bob.id, message.id)
-    event = bob.wait_for_event(EventType.MSGS_CHANGED)
-    message = bob.get_message_by_id(event.msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.download_state == DownloadState.IN_PROGRESS
-    event = bob.wait_for_event(EventType.MSGS_CHANGED)
-    assert event.chat_id == chat_id
-    msg_id = event.msg_id
-    message = bob.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.chat_id == chat_id
-    assert snapshot.download_state == DownloadState.DONE
-    assert snapshot.error is None
-    assert snapshot.text == "Hello!"
-
-
-def test_selfavatar_sync(acfactory, data, log) -> None:
-    alice = acfactory.get_online_account()
-
-    log.section("Alice adds a second device")
-    alice2 = alice.clone()
-
-    log.section("Second device goes online")
-    alice2.start_io()
-
-    log.section("First device changes avatar")
-    image = data.get_path("image/avatar1000x1000.jpg")
-    alice.set_config("selfavatar", image)
-    avatar_config = alice.get_config("selfavatar")
-    avatar_hash = os.path.basename(avatar_config)
-    print("Info: avatar hash is ", avatar_hash)
-
-    log.section("First device receives avatar change")
-    alice2.wait_for_event(EventType.SELFAVATAR_CHANGED)
-    avatar_config2 = alice2.get_config("selfavatar")
-    avatar_hash2 = os.path.basename(avatar_config2)
-    print("Info: avatar hash on second device is ", avatar_hash2)
-    assert avatar_hash == avatar_hash2
-    assert avatar_config != avatar_config2
-
-
-def test_reaction_seen_on_another_dev(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-    alice2 = alice.clone()
-    alice2.start_io()
-
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
-    alice_chat_bob.send_text("Hello!")
-
-    event = bob.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-
-    message = bob.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    snapshot.chat.accept()
-    message.send_reaction("😎")
-    for a in [alice, alice2]:
-        a.wait_for_event(EventType.INCOMING_REACTION)
-
-    alice2.clear_all_events()
-    alice_chat_bob.mark_noticed()
-    chat_id = alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id
-    alice2_chat_bob = alice2.create_chat(bob)
-    assert chat_id == alice2_chat_bob.id
-
-
 def test_is_bot(acfactory) -> None:
     """Test that we can recognize messages submitted by bots."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
 
     # Alice becomes a bot.
     alice.set_config("bot", "1")
     alice_chat_bob.send_text("Hello!")
 
-    event = bob.wait_for_incoming_msg_event()
-    message = bob.get_message_by_id(event.msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.chat_id == event.chat_id
-    assert snapshot.text == "Hello!"
-    assert snapshot.is_bot
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            msg_id = event.msg_id
+            message = bob.get_message_by_id(msg_id)
+            snapshot = message.get_snapshot()
+            assert snapshot.chat_id == event.chat_id
+            assert snapshot.text == "Hello!"
+            assert snapshot.is_bot
+            break
 
 
 def test_bot(acfactory) -> None:
@@ -491,11 +353,9 @@ def test_wait_next_messages(acfactory) -> None:
     alice = acfactory.new_configured_account()
 
     # Create a bot account so it does not receive device messages in the beginning.
-    addr, password = acfactory.get_credentials()
-    bot = acfactory.get_unconfigured_account()
+    bot = acfactory.new_preconfigured_account()
     bot.set_config("bot", "1")
-    bot.add_or_update_transport({"addr": addr, "password": password})
-    assert bot.is_configured()
+    bot.configure()
 
     # There are no old messages and the call returns immediately.
     assert not bot.wait_next_messages()
@@ -504,17 +364,14 @@ def test_wait_next_messages(acfactory) -> None:
         # Bot starts waiting for messages.
         next_messages_task = executor.submit(bot.wait_next_messages)
 
-        alice_contact_bot = alice.create_contact(bot, "Bot")
+        bot_addr = bot.get_config("addr")
+        alice_contact_bot = alice.create_contact(bot_addr, "Bot")
         alice_chat_bot = alice_contact_bot.create_chat()
         alice_chat_bot.send_text("Hello!")
 
         next_messages = next_messages_task.result()
-
-        if len(next_messages) == E2EE_INFO_MSGS:
-            next_messages += bot.wait_next_messages()
-
-        assert len(next_messages) == 1 + E2EE_INFO_MSGS
-        snapshot = next_messages[0 + E2EE_INFO_MSGS].get_snapshot()
+        assert len(next_messages) == 1
+        snapshot = next_messages[0].get_snapshot()
         assert snapshot.text == "Hello!"
 
 
@@ -532,7 +389,9 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
 def test_import_export_keys(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_chat_bob = alice.create_chat(bob)
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello Bob!")
 
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
@@ -582,7 +441,9 @@ def test_provider_info(rpc) -> None:
 def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
 
     # Bob creates chat manually so chat with Alice is accepted.
     alice_chat_bob = alice_contact_bob.create_chat()
@@ -606,7 +467,10 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
 
     # Alice reads Bob's message.
     message.mark_seen()
-    bob.wait_for_event(EventType.MSG_READ)
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.MSG_READ:
+            break
 
     # Bob sends a message to Alice, it should also be encrypted.
     bob_chat_alice.send_text("Hi Alice!")
@@ -678,13 +542,9 @@ def test_reactions_for_a_reordering_move(acfactory, direct_imap):
     messages they refer to and thus dropped.
     """
     (ac1,) = acfactory.get_online_accounts(1)
-
-    addr, password = acfactory.get_credentials()
-    ac2 = acfactory.get_unconfigured_account()
-    ac2.add_or_update_transport({"addr": addr, "password": password})
+    ac2 = acfactory.new_preconfigured_account()
+    ac2.configure()
     ac2.set_config("mvbox_move", "1")
-    assert ac2.is_configured()
-
     ac2.bring_online()
     chat1 = acfactory.get_accepted_chat(ac1, ac2)
     ac2.stop_io()
@@ -728,7 +588,9 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
         chat.send_text("Hello Alice!")
         assert alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot().text == "Hello Alice!"
 
-        contact = alice.create_contact(account)
+        contact_addr = account.get_config("addr")
+        contact = alice.create_contact(contact_addr, "")
+
         alice_group.add_contact(contact)
 
     if n_accounts == 2:
@@ -759,7 +621,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
             assert snapshot.chat == bob_chat_alice
 
 
-def test_markseen_contact_request(acfactory):
+def test_markseen_contact_request(acfactory, tmp_path):
     """
     Test that seen status is synchronized for contact request messages
     even though read receipt is not sent.
@@ -767,7 +629,10 @@ def test_markseen_contact_request(acfactory):
     alice, bob = acfactory.get_online_accounts(2)
 
     # Bob sets up a second device.
-    bob2 = bob.clone()
+    bob.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    bob2 = acfactory.get_unconfigured_account()
+    bob2.import_backup(files[0])
     bob2.start_io()
 
     alice_chat_bob = alice.create_chat(bob)
@@ -778,30 +643,13 @@ def test_markseen_contact_request(acfactory):
     assert message2.get_snapshot().state == MessageState.IN_FRESH
 
     message.mark_seen()
-    bob2.wait_for_event(EventType.MSGS_NOTICED)
+    while True:
+        event = bob2.wait_for_event()
+        if event.kind == EventType.MSGS_NOTICED:
+            break
     assert message2.get_snapshot().state == MessageState.IN_SEEN
 
 
-def test_read_receipt(acfactory):
-    """
-    Test sending a read receipt and ensure it is attributed to the correct contact.
-    """
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_contact_bob = alice.create_contact(bob)
-    bob.create_chat(alice)  # Accept the chat
-
-    alice_chat_bob.send_text("Hello Bob!")
-    msg = bob.wait_for_incoming_msg()
-    msg.mark_seen()
-
-    read_msg = alice.get_message_by_id(alice.wait_for_event(EventType.MSG_READ).msg_id)
-    read_receipts = read_msg.get_read_receipts()
-    assert len(read_receipts) == 1
-    assert read_receipts[0].contact_id == alice_contact_bob.id
-
-
 def test_get_http_response(acfactory):
     alice = acfactory.new_configured_account()
     http_response = alice._rpc.get_http_response(alice.id, "https://example.org")
@@ -811,11 +659,12 @@ def test_get_http_response(acfactory):
 
 def test_configured_imap_certificate_checks(acfactory):
     alice = acfactory.new_configured_account()
+    configured_certificate_checks = alice.get_config("configured_imap_certificate_checks")
 
     # Certificate checks should be configured (not None)
-    assert "cert_automatic" in alice.get_info().used_account_settings
+    assert configured_certificate_checks
 
-    # "cert_old_automatic" is the value old Delta Chat core versions used
+    # 0 is the value old Delta Chat core versions used
     # to mean user entered "imap_certificate_checks=0" (Automatic)
     # and configuration failed to use strict TLS checks
     # so it switched strict TLS checks off.
@@ -826,132 +675,4 @@ def test_configured_imap_certificate_checks(acfactory):
     #
     # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
     # This test is a regression test to prevent this happening again.
-    assert "cert_old_automatic" not in alice.get_info().used_account_settings
-
-
-def test_no_old_msg_is_fresh(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.start_io()
-
-    ac1.create_chat(ac2)
-    ac1_clone_chat = ac1_clone.create_chat(ac2)
-
-    ac1.get_device_chat().mark_noticed()
-
-    logging.info("Send a first message from ac2 to ac1 and check that it's 'fresh'")
-    first_msg = ac2.create_chat(ac1).send_text("Hi")
-    ac1.wait_for_incoming_msg_event()
-    assert ac1.create_chat(ac2).get_fresh_message_count() == 1
-    assert len(list(ac1.get_fresh_messages())) == 1
-
-    ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
-
-    logging.info("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
-    ac1_clone_chat.send_text("Hi back")
-    ev = ac1.wait_for_msgs_noticed_event()
-
-    assert ev.chat_id == first_msg.get_snapshot().chat_id
-    assert ac1.create_chat(ac2).get_fresh_message_count() == 0
-    assert len(list(ac1.get_fresh_messages())) == 0
-
-
-def test_rename_synchronization(acfactory):
-    """Test synchronization of contact renaming."""
-    alice, bob = acfactory.get_online_accounts(2)
-    alice2 = alice.clone()
-    alice2.bring_online()
-
-    bob.set_config("displayname", "Bob")
-    bob.create_chat(alice).send_text("Hello!")
-    alice_msg = alice.wait_for_incoming_msg().get_snapshot()
-    alice2_msg = alice2.wait_for_incoming_msg().get_snapshot()
-
-    assert alice2_msg.sender.get_snapshot().display_name == "Bob"
-    alice_msg.sender.set_name("Bobby")
-    alice2.wait_for_event(EventType.CONTACTS_CHANGED)
-    assert alice2_msg.sender.get_snapshot().display_name == "Bobby"
-
-
-def test_rename_group(acfactory):
-    """Test renaming the group."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_group = alice.create_group("Test group")
-    alice_contact_bob = alice.create_contact(bob)
-    alice_group.add_contact(alice_contact_bob)
-    alice_group.send_text("Hello!")
-
-    bob_msg = bob.wait_for_incoming_msg()
-    bob_chat = bob_msg.get_snapshot().chat
-    assert bob_chat.get_basic_snapshot().name == "Test group"
-
-    for name in ["Baz", "Foo bar", "Xyzzy"]:
-        alice_group.set_name(name)
-        bob.wait_for_incoming_msg_event()
-        assert bob_chat.get_basic_snapshot().name == name
-
-
-def test_get_all_accounts_deadlock(rpc):
-    """Regression test for get_all_accounts deadlock."""
-    for _ in range(100):
-        all_accounts = rpc.get_all_accounts.future()
-        rpc.add_account()
-        all_accounts()
-
-
-def test_delete_deltachat_folder(acfactory, direct_imap):
-    """Test that DeltaChat folder is recreated if user deletes it manually."""
-    ac1 = acfactory.new_configured_account()
-    ac1.set_config("mvbox_move", "1")
-    ac1.bring_online()
-
-    ac1_direct_imap = direct_imap(ac1)
-    ac1_direct_imap.conn.folder.delete("DeltaChat")
-    assert "DeltaChat" not in ac1_direct_imap.list_folders()
-
-    # Wait until new folder is created and UIDVALIDITY is updated.
-    while True:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
-            break
-
-    ac2 = acfactory.get_online_account()
-    ac2.create_chat(ac1).send_text("hello")
-    msg = ac1.wait_for_incoming_msg().get_snapshot()
-    assert msg.text == "hello"
-
-    assert "DeltaChat" in ac1_direct_imap.list_folders()
-
-
-def test_broadcast(acfactory):
-    alice, bob = acfactory.get_online_accounts(2)
-
-    alice_chat = alice.create_broadcast("My great channel")
-    snapshot = alice_chat.get_basic_snapshot()
-    assert snapshot.name == "My great channel"
-    assert snapshot.is_unpromoted
-    assert snapshot.is_encrypted
-    assert snapshot.chat_type == ChatType.OUT_BROADCAST
-
-    alice_contact_bob = alice.create_contact(bob, "Bob")
-    alice_chat.add_contact(alice_contact_bob)
-
-    alice_msg = alice_chat.send_message(text="hello").get_snapshot()
-    assert alice_msg.text == "hello"
-    assert alice_msg.show_padlock
-
-    bob_msg = bob.wait_for_incoming_msg().get_snapshot()
-    assert bob_msg.text == "hello"
-    assert bob_msg.show_padlock
-    assert bob_msg.error is None
-
-    bob_chat = bob.get_chat_by_id(bob_msg.chat_id)
-    bob_chat_snapshot = bob_chat.get_basic_snapshot()
-    assert bob_chat_snapshot.name == "My great channel"
-    assert not bob_chat_snapshot.is_unpromoted
-    assert bob_chat_snapshot.is_encrypted
-    assert bob_chat_snapshot.chat_type == ChatType.IN_BROADCAST
-    assert bob_chat_snapshot.is_contact_request
-
-    assert not bob_chat.can_send()
+    assert configured_certificate_checks != "0"

deltachat-rpc-client/tests/test_vcard.py

@@ -1,7 +1,8 @@
 def test_vcard(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_contact_charlie = alice.create_contact("charlie@example.org", "Charlie")
 
     alice_chat_bob = alice_contact_bob.create_chat()

deltachat-rpc-client/tests/test_webxdc.py

@@ -1,13 +1,20 @@
+from deltachat_rpc_client import EventType
+
+
 def test_webxdc(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
 
-    event = bob.wait_for_incoming_msg_event()
-    bob_chat_alice = bob.get_chat_by_id(event.chat_id)
-    message = bob.get_message_by_id(event.msg_id)
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            bob_chat_alice = bob.get_chat_by_id(event.chat_id)
+            message = bob.get_message_by_id(event.msg_id)
+            break
 
     webxdc_info = message.get_webxdc_info()
     assert webxdc_info == {
@@ -44,7 +51,8 @@ def test_webxdc(acfactory) -> None:
 def test_webxdc_insert_lots_of_updates(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    alice_contact_bob = alice.create_contact(bob, "Bob")
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     message = alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
 

deltachat-rpc-client/tox.ini

@@ -12,8 +12,11 @@ setenv =
     RUST_MIN_STACK=8388608
 passenv =
     CHATMAIL_DOMAIN
-dependency_groups =
-    dev
+deps =
+    pytest
+    pytest-timeout
+    pytest-xdist
+    imap-tools
 
 [testenv:lint]
 skipsdist = True
@@ -21,7 +24,7 @@ skip_install = True
 deps =
     ruff
 commands =
-    ruff format --diff src/ examples/ tests/
+    ruff format --quiet --diff src/ examples/ tests/
     ruff check src/ examples/ tests/
 
 [pytest]

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "2.16.0"
+version = "1.152.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"