ci: update to Python 3.13

.github/dependabot.yml

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

.github/workflows/ci.yml

@@ -16,8 +16,6 @@ on:
     branches:
       - main
 
-permissions: {}
-
 env:
   RUSTFLAGS: -Dwarnings
 
@@ -26,12 +24,11 @@ jobs:
     name: Lint Rust
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.84.1
+      RUSTUP_TOOLCHAIN: 1.78.0
     steps:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Install rustfmt and clippy
         run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
       - name: Cache rust cargo artifacts
@@ -40,10 +37,20 @@ jobs:
         run: cargo fmt --all -- --check
       - name: Run clippy
         run: scripts/clippy.sh
-      - name: Check with all features
+      - name: Check
         run: cargo check --workspace --all-targets --all-features
-      - 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
@@ -52,8 +59,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@v2
+      - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           arguments: --all-features --workspace
           command: check
@@ -66,7 +72,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Check provider database
         run: scripts/update-provider-database.sh
 
@@ -79,7 +84,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Rustdoc
@@ -91,21 +95,20 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.84.1
+            rust: 1.78.0
           - os: windows-latest
-            rust: 1.84.1
+            rust: 1.78.0
           - os: macos-latest
-            rust: 1.84.1
+            rust: 1.78.0
 
-          # Minimum Supported Rust Version = 1.81.0
+          # Minimum Supported Rust Version = 1.77.0
           - os: ubuntu-latest
-            rust: 1.81.0
+            rust: 1.77.0
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Install Rust ${{ matrix.rust }}
         run: rustup toolchain install --profile minimal ${{ matrix.rust }}
@@ -142,13 +145,12 @@ jobs:
       - 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
@@ -167,7 +169,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -189,7 +190,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Install tox
         run: pip install tox
@@ -209,7 +209,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Currently used Rust version.
+          # Currently used Python version.
           - os: ubuntu-latest
             python: 3.13
           - os: macos-latest
@@ -221,18 +221,17 @@ 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@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Download libdeltachat.a
         uses: actions/download-artifact@v4
@@ -244,13 +243,14 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true
 
       - name: Install tox
         run: pip install tox
 
       - name: Run python tests
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
           DCC_RS_TARGET: debug
           DCC_RS_DEV: ${{ github.workspace }}
         working-directory: python
@@ -276,21 +276,21 @@ 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@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Install python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true
 
       - name: Install tox
         run: pip install tox
@@ -316,6 +316,6 @@ jobs:
 
       - name: Run deltachat-rpc-client tests
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
         working-directory: deltachat-rpc-client
         run: tox -e py

.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.
@@ -33,7 +31,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
@@ -58,7 +55,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
@@ -84,7 +80,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - name: Setup rust target
         run: rustup target add ${{ matrix.arch }}-apple-darwin
@@ -110,7 +105,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
@@ -138,7 +132,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
@@ -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/*
 
@@ -288,7 +280,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -394,9 +385,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 }} \
             deltachat-rpc-server/npm-package/*.tgz
 

.github/workflows/dependabot.yml

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

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

@@ -4,8 +4,6 @@ on:
   release:
     types: [published]
 
-permissions: {}
-
 jobs:
   pack-module:
     name: "Publish @deltachat/jsonrpc-client"
@@ -17,7 +15,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
 
       - uses: actions/setup-node@v4
         with:

.github/workflows/jsonrpc.yml

@@ -6,8 +6,6 @@ on:
   pull_request:
     branches: [main]
 
-permissions: {}
-
 env:
   CARGO_TERM_COLOR: always
   RUST_MIN_STACK: "8388608"
@@ -19,7 +17,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
       - name: Use Node.js 18.x
         uses: actions/setup-node@v4
         with:
@@ -36,7 +33,7 @@ jobs:
         working-directory: deltachat-jsonrpc/typescript
         run: npm run test
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
       - name: make sure websocket server version still builds
         working-directory: deltachat-jsonrpc
         run: cargo build --bin deltachat-jsonrpc-server --features webserver

.github/workflows/nix.yml

@@ -1,109 +0,0 @@
-name: Test Nix flake
-
-on:
-  pull_request:
-    paths:
-      - flake.nix
-      - flake.lock
-  push:
-    paths:
-      - flake.nix
-      - flake.lock
-    branches:
-      - main
-
-permissions: {}
-
-jobs:
-  format:
-    name: check flake formatting
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: nix fmt
-
-      # Check that formatting does not change anything.
-      - run: git diff --exit-code
-
-  build:
-    name: nix build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        installable:
-          # Ensure `nix develop` will work.
-          - devShells.x86_64-linux.default
-
-          - deltachat-python
-          - deltachat-repl
-          - deltachat-repl-aarch64-linux
-          - deltachat-repl-arm64-v8a-android
-          - deltachat-repl-armeabi-v7a-android
-          - deltachat-repl-armv6l-linux
-          - deltachat-repl-armv7l-linux
-          - deltachat-repl-i686-linux
-          - deltachat-repl-win32
-          - deltachat-repl-win64
-          - deltachat-repl-x86_64-linux
-          - deltachat-rpc-client
-          - deltachat-rpc-server
-          - deltachat-rpc-server-aarch64-linux
-          - deltachat-rpc-server-aarch64-linux-wheel
-          - deltachat-rpc-server-arm64-v8a-android
-          - deltachat-rpc-server-armeabi-v7a-android
-          - deltachat-rpc-server-armv6l-linux
-          - deltachat-rpc-server-armv6l-linux-wheel
-          - deltachat-rpc-server-armv7l-linux
-          - deltachat-rpc-server-armv7l-linux-wheel
-          - deltachat-rpc-server-i686-linux
-          - deltachat-rpc-server-i686-linux-wheel
-          - deltachat-rpc-server-source
-          - deltachat-rpc-server-win32
-          - deltachat-rpc-server-win32-wheel
-          - deltachat-rpc-server-win64
-          - deltachat-rpc-server-win64-wheel
-          - deltachat-rpc-server-x86_64-linux
-          - deltachat-rpc-server-x86_64-linux-wheel
-          - docs
-          - libdeltachat
-          - python-docs
-
-          # Fails to build
-          #- deltachat-repl-x86_64-android
-          #- deltachat-repl-x86-android
-          #- deltachat-rpc-server-x86_64-android
-          #- deltachat-rpc-server-x86-android
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: nix build .#${{ matrix.installable }}
-
-  build-macos:
-    name: nix build on macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        installable:
-          - deltachat-rpc-server-aarch64-darwin
-
-          # Fails to bulid
-          # - deltachat-rpc-server-x86_64-darwin
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - 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@v1.0.1
+        with:
+          user: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          host: "delta.chat"
+          port: 22
+          local: "node/js"
+          remote: "/var/www/html/"

.github/workflows/node-package.yml

@@ -0,0 +1,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: ${{ secrets.CHATMAIL_DOMAIN }}
+          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"

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

@@ -5,8 +5,6 @@ on:
   release:
     types: [published]
 
-permissions: {}
-
 jobs:
   build:
     name: Build distribution
@@ -16,7 +14,6 @@ jobs:
       - 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

.github/workflows/repl.yml

@@ -7,8 +7,6 @@ name: Build Windows REPL .exe
 on:
   workflow_dispatch:
 
-permissions: {}
-
 jobs:
   build_repl:
     name: Build REPL example
@@ -17,7 +15,6 @@ jobs:
       - 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

.github/workflows/upload-docs.yml

@@ -6,8 +6,6 @@ on:
       - main
       - build_jsonrpc_docs_ci
 
-permissions: {}
-
 jobs:
   build-rs:
     runs-on: ubuntu-latest
@@ -16,7 +14,6 @@ jobs:
       - 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
@@ -34,7 +31,6 @@ jobs:
       - 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
@@ -54,7 +50,6 @@ jobs:
       - 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
@@ -77,10 +72,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-          persist-credentials: false
           fetch-depth: 0 # Fetch history to calculate VCS version number.
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
         with:
           node-version: '18'
       - name: npm install

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

@@ -9,8 +9,6 @@ on:
     branches:
       - main
 
-permissions: {}
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -19,7 +17,6 @@ jobs:
       - 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@v4
-        with:
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v5
-
-      - name: Run zizmor
-        run: uvx zizmor --format sarif . > results.sarif
-
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: results.sarif
-          category: zizmor

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 --no-default-features --features jsonrpc
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
 )
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# Contributing to Delta Chat
+# Contributing guidelines
 
-## Bug reports
+## Reporting bugs
 
 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
@@ -9,114 +9,118 @@ If the bug you found is specific to
 [Desktop](https://github.com/deltachat/deltachat-desktop/issues),
 report it to the corresponding repository.
 
-## Feature proposals
+## Proposing features
 
 If you have a feature request, create a new topic on the [forum](https://support.delta.chat/).
 
-## Code contributions
+## Contributing code
 
-If you want to contribute a code, follow this guide.
+If you want to contribute a code, [open a Pull Request](https://github.com/deltachat/deltachat-core-rust/pulls).
 
-1. **Select an issue to work on.**
-
-   If you have an write access to the repository, assign the issue to yourself.
-   Otherwise state in the comment that you are going to work on the issue
-   to avoid duplicate work.
-
-   If the issue does not exist yet, create it first.
-
-2. **Write the code.**
-
-   Follow the [coding conventions](STYLE.md) when writing the code.
-
-3. **Commit the code.**
-
-   If you have write access to the repository,
-   push a branch named `<username>/<feature>`
-   so it is clear who is responsible for the branch,
-   and open a PR proposing to merge the change.
-   Otherwise fork the repository and create a branch in your fork.
-
-   Commit messages follow the [Conventional Commits] notation.
-   We use [git-cliff] to generate the changelog from commit messages before the release.
-
-   With **`git cliff --unreleased`**, you can check how the changelog entry for your commit will look.
-
-   The following prefix types are used:
-   - `feat`: Features, e.g. "feat: Pause IO for BackupProvider". If you are unsure what's the category of your commit, you can often just use `feat`.
-   - `fix`: Bug fixes, e.g. "fix: delete `smtp` rows when message sending is cancelled"
-   - `api`: API changes, e.g. "api(rust): add `get_msg_read_receipts(context, msg_id)`"
-   - `refactor`: Refactorings, e.g. "refactor: iterate over `msg_ids` without `.iter()`"
-   - `perf`: Performance improvements, e.g. "perf: improve SQLite performance with `PRAGMA synchronous=normal`"
-   - `test`: Test changes and improvements to the testing framework.
-   - `build`: Build system and tool configuration changes, e.g. "build(git-cliff): put "ci" commits into "CI" section of changelog"
-   - `ci`: CI configuration changes, e.g. "ci: limit artifact retention time for `libdeltachat.a` to 1 day"
-   - `docs`: Documentation changes, e.g. "docs: add contributing guidelines"
-   - `chore`: miscellaneous tasks, e.g. "chore: add `.DS_Store` to `.gitignore`"
-
-   Release preparation commits are marked as "chore(release): prepare for X.Y.Z"
-   as described in [releasing guide](RELEASE.md).
-
-   Use a `!` to mark breaking changes, e.g. "api!: Remove `dc_chat_can_send`".
-
-   Alternatively, breaking changes can go into the commit description, e.g.:
-
-   ```
-   fix: Fix race condition and db corruption when a message was received during backup
-
-   BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
-   ```
-
-4. [**Open a Pull Request**](https://github.com/deltachat/deltachat-core-rust/pulls).
-
-   Refer to the corresponding issue.
-
-   If you intend to squash merge the PR from the web interface,
-   make sure the PR title follows the conventional commits notation
-   as it will end up being a commit title.
-   Otherwise make sure each commit title follows the conventional commit notation.
-
-5. **Make sure all CI checks succeed.**
-
-   CI runs the tests and checks code formatting.
-
-   While it is running, self-review your PR to make sure all the changes you expect are there
-   and there are no accidentally committed unrelated changes and files.
-
-   Push the necessary fixup commits or force-push to your branch if needed.
-
-6. **Ask for review.**
-
-   Use built-in GitHub feature to request a review from suggested reviewers.
-
-   If you do not have write access to the repository, ask for review in the comments.
-
-7. **Merge the PR.**
-
-   Once a PR has an approval and passes CI, it can be merged.
-
-   PRs from a branch created in the main repository,
-   i.e. authored by those who have write access, are merged by their authors.
-
-   This is to ensure that PRs are merged as intended by the author,
-   e.g. as a squash merge, by rebasing from the web interface or manually from the command line.
-
-   If you have multiple changes in one PR, do a rebase merge.
-   Otherwise, you should usually do a squash merge.
-
-   If PR author does not have write access to the repository,
-   maintainers who reviewed the PR can merge it.
-
-   If you do not have access to the repository and created a PR from a fork,
-   ask the maintainers to merge the PR and say how it should be merged.
-
-## Other ways to contribute
-
-For other ways to contribute, refer to the [website](https://delta.chat/en/contribute).
+If you have write access to the repository,
+push a branch named `<username>/<feature>`
+so it is clear who is responsible for the branch,
+and open a PR proposing to merge the change.
+Otherwise fork the repository and create a branch in your fork.
 
 You can find the list of good first issues
 and a link to this guide
 on the contributing page: <https://github.com/deltachat/deltachat-core-rust/contribute>
 
+### Coding conventions
+
+We format the code using `rustfmt`. Run `cargo fmt` prior to committing the code.
+Run `scripts/clippy.sh` to check the code for common mistakes with [Clippy].
+
+Commit messages follow the [Conventional Commits] notation.
+We use [git-cliff] to generate the changelog from commit messages before the release.
+
+With **`git cliff --unreleased`**, you can check how the changelog entry for your commit will look.
+
+The following prefix types are used:
+- `feat`: Features, e.g. "feat: Pause IO for BackupProvider". If you are unsure what's the category of your commit, you can often just use `feat`.
+- `fix`: Bug fixes, e.g. "fix: delete `smtp` rows when message sending is cancelled"
+- `api`: API changes, e.g. "api(rust): add `get_msg_read_receipts(context, msg_id)`"
+- `refactor`: Refactorings, e.g. "refactor: iterate over `msg_ids` without `.iter()`"
+- `perf`: Performance improvements, e.g. "perf: improve SQLite performance with `PRAGMA synchronous=normal`"
+- `test`: Test changes and improvements to the testing framework.
+- `build`: Build system and tool configuration changes, e.g. "build(git-cliff): put "ci" commits into "CI" section of changelog"
+- `ci`: CI configuration changes, e.g. "ci: limit artifact retention time for `libdeltachat.a` to 1 day"
+- `docs`: Documentation changes, e.g. "docs: add contributing guidelines"
+- `chore`: miscellaneous tasks, e.g. "chore: add `.DS_Store` to `.gitignore`"
+
+Release preparation commits are marked as "chore(release): prepare for vX.Y.Z".
+
+If you intend to squash merge the PR from the web interface,
+make sure the PR title follows the conventional commits notation
+as it will end up being a commit title.
+Otherwise make sure each commit title follows the conventional commit notation.
+
+#### Breaking Changes
+
+Use a `!` to mark breaking changes, e.g. "api!: Remove `dc_chat_can_send`".
+
+Alternatively, breaking changes can go into the commit description, e.g.:
+
+```
+fix: Fix race condition and db corruption when a message was received during backup
+
+BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
+```
+
+#### Multiple Changes in one PR
+
+If you have multiple changes in one PR, create multiple conventional commits, and then do a rebase merge. Otherwise, you should usually do a squash merge.
+
+[Clippy]: https://doc.rust-lang.org/clippy/
 [Conventional Commits]: https://www.conventionalcommits.org/
 [git-cliff]: https://git-cliff.org/
+
+### Errors
+
+Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.
+When using [`Context`](https://docs.rs/anyhow/latest/anyhow/trait.Context.html),
+capitalize it but do not add a full stop as the contexts will be separated by `:`.
+For example:
+```
+.with_context(|| format!("Unable to trash message {msg_id}"))
+```
+
+All errors should be handled in one of these ways:
+- With `if let Err() =` (incl. logging them into `warn!()`/`err!()`).
+- With `.log_err().ok()`.
+- Bubbled up with `?`.
+
+`backtrace` feature is enabled for `anyhow` crate
+and `debug = 1` option is set in the test profile.
+This allows to run `RUST_BACKTRACE=1 cargo test`
+and get a backtrace with line numbers in resultified tests
+which return `anyhow::Result`.
+
+### Logging
+
+For logging, use `info!`, `warn!` and `error!` macros.
+Log messages should be capitalized and have a full stop in the end. For example:
+```
+info!(context, "Ignoring addition of {added_addr:?} to {chat_id}.");
+```
+
+Format anyhow errors with `{:#}` to print all the contexts like this:
+```
+error!(context, "Failed to set selfavatar timestamp: {err:#}.");
+```
+
+### Reviewing
+
+Once a PR has an approval and passes CI, it can be merged.
+
+PRs from a branch created in the main repository, i.e. authored by those who have write access, are merged by their authors.
+This is to ensure that PRs are merged as intended by the author,
+e.g. as a squash merge, by rebasing from the web interface or manually from the command line.
+
+If you do not have access to the repository and created a PR from a fork,
+ask the maintainers to merge the PR and say how it should be merged.
+
+## Other ways to contribute
+
+For other ways to contribute, refer to the [website](https://delta.chat/en/contribute).

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.155.6"
+version = "1.140.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.81"
+rust-version = "1.77"
 repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [profile.dev]
@@ -34,96 +34,87 @@ strip = true
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
 deltachat-time = { path = "./deltachat-time" }
-deltachat-contact-tools = { workspace = true }
+deltachat-contact-tools = { path = "./deltachat-contact-tools" }
 format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }
 
 anyhow = { workspace = true }
-async-broadcast = "0.7.2"
-async-channel = { workspace = true }
-async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
+async-broadcast = "0.7.0"
+async-channel = "2.2.1"
+async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", 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 }
-brotli = { version = "7", default-features=false, features = ["std"] }
-bytes = "1"
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-data-encoding = "2.7.0"
+async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
+async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
+backtrace = "0.3"
+base64 = "0.22"
+brotli = { version = "6", default-features=false, features = ["std"] }
+chrono = { workspace = true }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-encoded-words = "0.2"
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
-fast-socks5 = "0.10"
+fast-socks5 = "0.9"
 fd-lock = "4"
-futures-lite = { workspace = true }
-futures = { workspace = true }
+futures = "0.3"
+futures-lite = "2.3.0"
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.4"
-http-body-util = "0.1.2"
+hickory-resolver = "0.24"
 humansize = "2"
-hyper = "1"
-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.32", default-features = false, features = ["net"] }
-iroh = { version = "0.32", default-features = false }
-kamadak-exif = "0.6.1"
+image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh_old = { version = "0.4.2", default-features = false, package = "iroh"}
+iroh-net = "0.17.0"
+iroh-gossip = { version = "0.17.0", features = ["net"] }
+quinn = "0.10.0"
+kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-libc = { workspace = true }
-mailparse = "0.16"
+libc = "0.2"
+mailparse = "0.15"
 mime = "0.3.17"
 num_cpus = "1.16"
 num-derive = "0.4"
-num-traits = { workspace = true }
+num-traits = "0.2"
 once_cell = { workspace = true }
-parking_lot = "0.12"
 percent-encoding = "2.3"
-pgp = { version = "0.15.0", default-features = false }
-pin-project = "1"
+parking_lot = "0.12"
+pgp = { version = "0.11", default-features = false }
 qrcodegen = "1.7.0"
-quick-xml = "0.37"
+quick-xml = "0.31"
 quoted_printable = "0.5"
-rand = { workspace = true }
+rand = "0.8"
 regex = { workspace = true }
+reqwest = { version = "0.11.27", features = ["json"] }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.11.0"
-rustls = { version = "0.23.22", default-features = false }
-sanitize-filename = { workspace = true }
-serde_json = { workspace = true }
-serde_urlencoded = "0.7.1"
-serde = { workspace = true, features = ["derive"] }
+sanitize-filename = "0.5"
+serde_json = "1"
+serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
 smallvec = "1.13.2"
 strum = "0.26"
 strum_macros = "0.26"
 tagger = "4.3.4"
 textwrap = "0.16.1"
-thiserror = { workspace = true }
+thiserror = "1"
+tokio = { version = "1.37.0", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.1", default-features = false }
-tokio-stream = { version = "0.1.17", features = ["fs"] }
+tokio-stream = { version = "0.1.15", 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"] }
+tokio-util = "0.7.9"
 toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-webpki-roots = "0.26.8"
-blake3 = "1.5.5"
 
 [dev-dependencies]
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
+ansi_term = "0.12.0"
+anyhow = { version = "1", features = ["backtrace"] } # Enable `backtrace` feature in tests.
 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"
+futures-lite = "2.3.0"
+log = "0.4"
 proptest = { version = "1", default-features = false, features = ["std"] }
-tempfile = { workspace = true }
-testdir = "0.9.3"
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+tempfile = "3"
+testdir = "0.9.0"
+tokio = { version = "1.37.0", features = ["parking_lot", "rt-multi-thread", "macros"] }
+pretty_assertions = "1.3.0"
 
 [workspace]
 members = [
@@ -152,7 +143,6 @@ harness = false
 
 [[bench]]
 name = "receive_emails"
-required-features = ["internals"]
 harness = false
 
 [[bench]]
@@ -169,38 +159,16 @@ harness = false
 
 [workspace.dependencies]
 anyhow = "1"
-async-channel = "2.3.1"
-base64 = "0.22"
-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.0"
-libc = "0.2"
-log = "0.4"
-nu-ansi-term = "0.46"
-num-traits = "0.2"
-once_cell = "1.20.2"
-rand = "0.8"
+once_cell = "1.18.0"
 regex = "1.10"
-rusqlite = "0.32"
-sanitize-filename = "0.5"
-serde = "1.0"
-serde_json = "1"
-tempfile = "3.14.0"
-thiserror = "2"
-tokio = "1"
-tokio-util = "0.7.13"
-tracing-subscriber = "0.3"
-yerpc = "0.6.2"
+rusqlite = "0.31"
+chrono = { version = "0.4.38", default-features=false, features = ["alloc", "clock", "std"] }
 
 [features]
 default = ["vendored"]
 internals = []
 vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl"
+  "async-native-tls/vendored",
+  "rusqlite/bundled-sqlcipher-vendored-openssl",
+  "reqwest/native-tls-vendored"
 ]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }

README.md

@@ -30,13 +30,13 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ cargo run --locked -p deltachat-repl -- ~/deltachat-db
+$ cargo run -p deltachat-repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
 Optionally, install `deltachat-repl` binary with
 ```
-$ cargo install --locked --path deltachat-repl/
+$ cargo install --path deltachat-repl/
 ```
 and run as
 ```
@@ -161,6 +161,7 @@ $ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
 ## Features
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
+- `nightly`: Enable nightly only performance and security related features.
 
 ## Update Provider Data
 
@@ -176,7 +177,9 @@ To add the updates from the
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **JS**: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\]
+- **Node.js** 
+  - over cffi: \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+  - over jsonrpc built with napi.rs (experimental): \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
 - **Go**
   - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\]

RELEASE.md

@@ -14,8 +14,8 @@ For example, to release version 1.116.0 of the core, do the following steps.
 5. Commit the changes as `chore(release): prepare for 1.116.0`.
    Optionally, use a separate branch like `prep-1.116.0` for this commit and open a PR for review.
 
-6. Tag the release: `git tag --annotate v1.116.0`.
+6. Tag the release: `git tag -a v1.116.0`.
 
 7. Push the release tag: `git push origin v1.116.0`.
 
-8. Create a GitHub release: `gh release create v1.116.0 --notes ''`.
+8. Create a GitHub release: `gh release create v1.116.0 -n ''`.

STYLE.md

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

assets/qr_overlay_delta.svg-part

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

benches/receive_emails.rs

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

contrib/proxy.py

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

deltachat-contact-tools/Cargo.toml

@@ -12,7 +12,7 @@ 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"] }
+chrono = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.

deltachat-contact-tools/src/lib.rs

@@ -15,16 +15,14 @@
     clippy::explicit_into_iter_loop,
     clippy::cloned_instead_of_copied
 )]
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
+#![cfg_attr(not(test), warn(clippy::indexing_slicing))]
 #![allow(
     clippy::match_bool,
     clippy::mixed_read_write_in_expression,
     clippy::bool_assert_comparison,
     clippy::manual_split_once,
     clippy::format_push_string,
-    clippy::bool_to_int_with_if,
-    clippy::manual_range_contains
+    clippy::bool_to_int_with_if
 )]
 
 use std::fmt;
@@ -37,6 +35,10 @@ use chrono::{DateTime, NaiveDateTime};
 use once_cell::sync::Lazy;
 use regex::Regex;
 
+// TODOs to clean up:
+// - Check if sanitizing is done correctly everywhere
+// - Apply lints everywhere (https://doc.rust-lang.org/cargo/reference/workspaces.html#the-lints-table)
+
 #[derive(Debug)]
 /// A Contact, as represented in a VCard.
 pub struct VcardContact {
@@ -78,21 +80,21 @@ pub fn make_vcard(contacts: &[VcardContact]) -> String {
         let addr = &c.addr;
         let display_name = c.display_name();
         res += &format!(
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:{addr}\r\n\
-             FN:{display_name}\r\n"
+            "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}\r\n");
+            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}\r\n");
+            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\n");
         }
         if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\r\n");
+            res += &format!("REV:{timestamp}\n");
         }
-        res += "END:VCARD\r\n";
+        res += "END:VCARD\n";
     }
     res
 }
@@ -113,9 +115,7 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
         // 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.
+        // TODO this doesn't handle the case where there are quotes around a colon
         let (params, value) = remainder.split_once(':')?;
         // In the example from above, `params` is now `;TYPE=work`
         // and `value` is now `alice@example.com`
@@ -175,15 +175,7 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
         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;
-            }
-
+        for line in lines.by_ref() {
             if let Some(email) = vcard_property(line, "email") {
                 addr.get_or_insert(email);
             } else if let Some(name) = vcard_property(line, "fn") {
@@ -191,7 +183,6 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
             } 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:")
@@ -206,21 +197,22 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
             } else if let Some(rev) = vcard_property(line, "rev") {
                 datetime.get_or_insert(rev);
             } else if line.eq_ignore_ascii_case("END:VCARD") {
-                let (authname, addr) =
-                    sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
-
-                contacts.push(VcardContact {
-                    authname,
-                    addr,
-                    key: key.map(|s| s.to_string()),
-                    profile_image: photo.map(|s| s.to_string()),
-                    timestamp: datetime
-                        .context("No timestamp in vcard")
-                        .and_then(parse_datetime),
-                });
                 break;
             }
         }
+
+        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
@@ -271,27 +263,27 @@ impl rusqlite::types::ToSql for ContactAddress {
     }
 }
 
-/// Takes a name and an address and sanitizes them:
-/// - Extracts a name from the addr if the addr is in form "Alice <alice@example.org>"
-/// - Removes special characters from the name, see [`sanitize_name()`]
-/// - Removes the name if it is equal to the address by setting it to ""
+/// Make the name and address
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     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() {
-                captures.get(1).map_or("", |m| m.as_str())
+                strip_rtlo_characters(captures.get(1).map_or("", |m| m.as_str()))
             } else {
-                name
+                strip_rtlo_characters(name)
             },
             captures
                 .get(2)
                 .map_or("".to_string(), |m| m.as_str().to_string()),
         )
     } else {
-        (name, addr.to_string())
+        (
+            strip_rtlo_characters(&normalize_name(name)),
+            addr.to_string(),
+        )
     };
-    let mut name = sanitize_name(name);
+    let mut name = normalize_name(&name);
 
     // If the 'display name' is just the address, remove it:
     // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
@@ -303,77 +295,31 @@ pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     (name, addr)
 }
 
-/// Sanitizes a name.
+/// Normalize a name.
 ///
-/// - Removes newlines and trims the string
-/// - Removes quotes (come from some bad MUA implementations)
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_name(name: &str) -> String {
-    let name = sanitize_single_line(name);
-
-    match name.as_bytes() {
-        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => name
-            .get(1..name.len() - 1)
-            .map_or("".to_string(), |s| s.trim().to_string()),
-        _ => name.to_string(),
+/// - Remove quotes (come from some bad MUA implementations)
+/// - Trims the resulting string
+///
+/// Typically, this function is not needed as it is called implicitly by `Contact::add_address_book`.
+pub fn normalize_name(full_name: &str) -> String {
+    let full_name = full_name.trim();
+    if full_name.is_empty() {
+        return full_name.into();
     }
-}
 
-/// Sanitizes user input
-///
-/// - Removes newlines and trims the string
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_single_line(input: &str) -> String {
-    sanitize_bidi_characters(input.replace(['\n', '\r'], " ").trim())
+    match full_name.as_bytes() {
+        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => full_name
+            .get(1..full_name.len() - 1)
+            .map_or("".to_string(), |s| s.trim().to_string()),
+        _ => full_name.to_string(),
+    }
 }
 
 const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}'];
-const ISOLATE_CHARACTERS: [char; 3] = ['\u{2066}', '\u{2067}', '\u{2068}'];
-const POP_ISOLATE_CHARACTER: char = '\u{2069}';
-/// Some control unicode characters can influence whether adjacent text is shown from
-/// left to right or from right to left.
-///
-/// Since user input is not supposed to influence how adjacent text looks,
-/// this function removes some of these characters.
-///
-/// Also see https://github.com/deltachat/deltachat-core-rust/issues/3479.
-pub fn sanitize_bidi_characters(input_str: &str) -> String {
-    // RTLO_CHARACTERS are apparently rarely used in practice.
-    // They can impact all following text, so, better remove them all:
-    let input_str = input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "");
-
-    // If the ISOLATE characters are not ended with a POP DIRECTIONAL ISOLATE character,
-    // we regard the input as potentially malicious and simply remove all ISOLATE characters.
-    // See https://en.wikipedia.org/wiki/Bidirectional_text#Unicode_bidi_support
-    // and https://www.w3.org/International/questions/qa-bidi-unicode-controls.en
-    // for an explanation about ISOLATE characters.
-    fn isolate_characters_are_valid(input_str: &str) -> bool {
-        let mut isolate_character_nesting: i32 = 0;
-        for char in input_str.chars() {
-            if ISOLATE_CHARACTERS.contains(&char) {
-                isolate_character_nesting += 1;
-            } else if char == POP_ISOLATE_CHARACTER {
-                isolate_character_nesting -= 1;
-            }
-
-            // According to Wikipedia, 125 levels are allowed:
-            // https://en.wikipedia.org/wiki/Unicode_control_characters
-            // (although, in practice, we could also significantly lower this number)
-            if isolate_character_nesting < 0 || isolate_character_nesting > 125 {
-                return false;
-            }
-        }
-        isolate_character_nesting == 0
-    }
-
-    if isolate_characters_are_valid(&input_str) {
-        input_str
-    } else {
-        input_str.replace(
-            |char| ISOLATE_CHARACTERS.contains(&char) || POP_ISOLATE_CHARACTER == char,
-            "",
-        )
-    }
+/// This method strips all occurrences of the RTLO Unicode character.
+/// [Why is this needed](https://github.com/deltachat/deltachat-core-rust/issues/3479)?
+pub fn strip_rtlo_characters(input_str: &str) -> String {
+    input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "")
 }
 
 /// Returns false if addr is an invalid address, otherwise true.
@@ -539,30 +485,6 @@ END:VCARD",
         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 = [
@@ -582,20 +504,20 @@ END:VCARD\r
             },
         ];
         let items = [
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:alice@example.org\r\n\
-             FN:Alice Wonderland\r\n\
-             KEY:data:application/pgp-keys;base64,[base64-data]\r\n\
-             PHOTO:data:image/jpeg;base64,image in Base64\r\n\
-             REV:20240418T184242Z\r\n\
-             END:VCARD\r\n",
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:bob@example.com\r\n\
-             FN:bob@example.com\r\n\
-             REV:19700101T000000Z\r\n\
-             END:VCARD\r\n",
+            "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() {
@@ -746,89 +668,4 @@ END:VCARD
             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");
-        assert_eq!(&sanitize_name("<"), "<");
-        assert_eq!(&sanitize_name(">"), ">");
-        assert_eq!(&sanitize_name("'"), "'");
-        assert_eq!(&sanitize_name("\""), "\"");
-    }
-
-    #[test]
-    fn test_sanitize_single_line() {
-        assert_eq!(sanitize_single_line("Hi\naiae "), "Hi aiae");
-        assert_eq!(sanitize_single_line("\r\nahte\n\r"), "ahte");
-    }
-
-    #[test]
-    fn test_sanitize_bidi_characters() {
-        // Legit inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat\u{2069}"),
-            "Tes\u{2067}ting Delta Chat\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"),
-            "Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"),
-            "Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"
-        );
-
-        // Potentially-malicious inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{202C}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Testing Delta Chat\u{2069}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2069}ting Delta Chat\u{2067}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2068}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-    }
 }

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.155.6"
+version = "1.140.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -14,20 +14,21 @@ name = "deltachat"
 crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
-deltachat = { workspace = true, default-features = false }
-deltachat-jsonrpc = { workspace = true }
-libc = { workspace = true }
+deltachat = { path = "../", default-features = false }
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
+libc = "0.2"
 human-panic = { version = "2", default-features = false }
-num-traits = { workspace = true }
-serde_json = { workspace = true }
-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"] }
+num-traits = "0.2"
+serde_json = "1.0"
+tokio = { version = "1.37.0", features = ["rt-multi-thread"] }
+anyhow = "1"
+thiserror = "1"
+rand = "0.8"
+once_cell = "1.18.0"
+yerpc = { version = "0.5.1", features = ["anyhow_expose"] }
 
 [features]
 default = ["vendored"]
-vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
+vendored = ["deltachat/vendored"]
+jsonrpc = ["dep:deltachat-jsonrpc"]
 

deltachat-ffi/deltachat.h

@@ -403,10 +403,13 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `send_port`    = SMTP-port, guessed if left out
  * - `send_security`= SMTP-socket, one of @ref DC_SOCKET, defaults to #DC_SOCKET_AUTO
  * - `server_flags` = IMAP-/SMTP-flags as a combination of @ref DC_LP flags, guessed if left out
- * - `proxy_enabled` = Proxy enabled. Disabled by default.
- * - `proxy_url` = Proxy URL. May contain multiple URLs separated by newline, but only the first one is used.
+ * - `socks5_enabled` = SOCKS5 enabled
+ * - `socks5_host` = SOCKS5 proxy server host
+ * - `socks5_port` = SOCKS5 proxy server port
+ * - `socks5_user` = SOCKS5 proxy username
+ * - `socks5_password` = SOCKS5 proxy password
  * - `imap_certificate_checks` = how to check IMAP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
- * - `smtp_certificate_checks` = deprecated option, should be set to the same value as `imap_certificate_checks` but ignored by the new core
+ * - `smtp_certificate_checks` = how to check SMTP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
  * - `displayname`  = Own name to use when sending messages. MUAs are allowed to spread this way e.g. using CC, defaults to empty
  * - `selfstatus`   = Own status to display, e.g. in e-mail footers, defaults to empty
  * - `selfavatar`   = File containing avatar. Will immediately be copied to the 
@@ -417,10 +420,9 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    and also recoded to a reasonable size.
  * - `e2ee_enabled` = 0=no end-to-end-encryption, 1=prefer end-to-end-encryption (default)
  * - `mdns_enabled` = 0=do not send or request read receipts,
- *                    1=send and request read receipts
- *                    default=send and request read receipts, only send but not request if `bot` is set
- * - `bcc_self`     = 0=do not send a copy of outgoing messages to self,
- *                    1=send a copy of outgoing messages to self (default).
+ *                    1=send and request read receipts (default)
+ * - `bcc_self`     = 0=do not send a copy of outgoing messages to self (default),
+ *                    1=send a copy of outgoing messages to self.
  *                    Sending messages to self is needed for a proper multi-account setup,
  *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
  * - `sentbox_watch`= 1=watch `Sent`-folder for changes,
@@ -479,9 +481,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `bot`          = Set to "1" if this is a bot.
  *                    Prevents adding the "Device messages" and "Saved messages" chats,
  *                    adds Auto-Submitted header to outgoing messages,
- *                    accepts contact requests automatically (calling dc_accept_chat() is not needed),
- *                    does not cut large incoming text messages,
- *                    handles existing messages the same way as new ones if `fetch_existing_msgs=1`.
+ *                    accepts contact requests automatically (calling dc_accept_chat() is not needed for bots)
+ *                    and does not cut large incoming text messages.
  * - `last_msg_id` = database ID of the last message processed by the bot.
  *                   This ID and IDs below it are guaranteed not to be returned
  *                   by dc_get_next_msgs() and dc_wait_next_msgs().
@@ -492,8 +493,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                   For most bots calling `dc_markseen_msgs()` is the
  *                   recommended way to update this value
  *                   even for self-sent messages.
- * - `fetch_existing_msgs` = 0=do not fetch existing messages on configure (default),
- *                    1=fetch most recent existing messages on configure.
+ * - `fetch_existing_msgs` = 1=fetch most recent existing messages on configure (default),
+ *                    0=do not fetch existing messages on configure.
  *                    In both cases, existing recipients are added to the contact database.
  * - `disable_idle` = 1=disable IMAP IDLE even if the server supports it,
  *                    0=use IMAP IDLE if the server supports it.
@@ -506,11 +507,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    to not mess up with non-delivery-reports or read-receipts.
  *                    0=no limit (default).
  *                    Changes affect future messages only.
- * - `protect_autocrypt` = Enable Header Protection for Autocrypt header.
- *                    This is an experimental option not compatible to other MUAs
- *                    and older Delta Chat versions.
- *                    1 = enable.
- *                    0 = disable (default).
  * - `gossip_period` = How often to gossip Autocrypt keys in chats with multiple recipients, in
  *                    seconds. 2 days by default.
  *                    This is not supposed to be changed by UIs and only used for testing.
@@ -522,21 +518,14 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    1=After the key changed, `dc_chat_can_send()` returns false and `dc_chat_is_protection_broken()` returns true
  *                    until `dc_accept_chat()` is called.
  * - `is_chatmail` = 1 if the the server is a chatmail server, 0 otherwise.
- * - `is_muted`     = Whether a context is muted by the user.
- *                    Muted contexts should not sound, vibrate or show notifications.
- *                    In contrast to `dc_set_chat_mute_duration()`,
- *                    fresh message and badge counters are not changed by this setting,
- *                    but should be tuned down where appropriate.
- * - `private_tag`  = Optional tag as "Work", "Family".
- *                    Meant to help profile owner to differ between profiles with similar names.
  * - `ui.*`         = All keys prefixed by `ui.` can be used by the user-interfaces for system-specific purposes.
  *                    The prefix should be followed by the system and maybe subsystem,
  *                    e.g. `ui.desktop.foo`, `ui.desktop.linux.bar`, `ui.android.foo`, `ui.dc40.bar`, `ui.bot.simplebot.baz`.
  *                    These keys go to backups and allow easy per-account settings when using @ref dc_accounts_t,
  *                    however, are not handled by the core otherwise.
  * - `webxdc_realtime_enabled` = Whether the realtime APIs should be enabled.
- *                               0 = WebXDC realtime API is disabled and behaves as noop.
- *                               1 = WebXDC realtime API is enabled (default).
+ *                               0 = WebXDC realtime API is disabled and behaves as noop (default).
+ *                               1 = WebXDC realtime API is enabled.
  *
  * If you want to retrieve a value, use dc_get_config().
  *
@@ -722,6 +711,12 @@ char*           dc_get_connectivity_html     (dc_context_t* context);
 int              dc_get_push_state           (dc_context_t* context);
 
 
+/**
+ * Only used by the python tests.
+ */
+int             dc_all_work_done             (dc_context_t* context);
+
+
 // connect
 
 /**
@@ -865,10 +860,13 @@ void            dc_maybe_network             (dc_context_t* context);
  *
  * @memberof dc_context_t
  * @param context The context as created by dc_context_new().
+ * @param addr The e-mail address of the user. This must match the
+ *    configured_addr setting of the context as well as the UID of the key.
+ * @param public_data Ignored, actual public key is extracted from secret_data.
  * @param secret_data ASCII armored secret key.
  * @return 1 on success, 0 on failure.
  */
-int             dc_preconfigure_keypair        (dc_context_t* context, const char *secret_data);
+int             dc_preconfigure_keypair        (dc_context_t* context, const char *addr, const char *public_data, const char *secret_data);
 
 
 // handle chatlists
@@ -963,6 +961,54 @@ uint32_t        dc_create_chat_by_contact_id (dc_context_t* context, uint32_t co
 uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t contact_id);
 
 
+/**
+ * Prepare a message for sending.
+ *
+ * Call this function if the file to be sent is still in creation.
+ * Once you're done with creating the file, call dc_send_msg() as usual
+ * and the message will really be sent.
+ *
+ * This is useful as the user can already send the next messages while
+ * e.g. the recoding of a video is not yet finished. Or the user can even forward
+ * the message with the file being still in creation to other groups.
+ *
+ * Files being sent with the increation-method must be placed in the
+ * blob directory, see dc_get_blobdir().
+ * If the increation-method is not used - which is probably the normal case -
+ * dc_send_msg() copies the file to the blob directory if it is not yet there.
+ * To distinguish the two cases, msg->state must be set properly. The easiest
+ * way to ensure this is to re-use the same object for both calls.
+ *
+ * Example:
+ * ~~~
+ * char* blobdir = dc_get_blobdir(context);
+ * char* file_to_send = mprintf("%s/%s", blobdir, "send.mp4")
+ *
+ * dc_msg_t* msg = dc_msg_new(context, DC_MSG_VIDEO);
+ * dc_msg_set_file(msg, file_to_send, NULL);
+ * dc_prepare_msg(context, chat_id, msg);
+ *
+ * // ... create the file ...
+ *
+ * dc_send_msg(context, chat_id, msg);
+ *
+ * dc_msg_unref(msg);
+ * free(file_to_send);
+ * dc_str_unref(file_to_send);
+ * ~~~
+ *
+ * @memberof dc_context_t
+ * @param context The context object as returned from dc_context_new().
+ * @param chat_id The chat ID to send the message to.
+ * @param msg The message object to send to the chat defined by the chat ID.
+ *     On success, msg_id and state of the object are set up,
+ *     The function does not take ownership of the object,
+ *     so you have to free it using dc_msg_unref() as usual.
+ * @return The ID of the message that is being prepared.
+ */
+uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t chat_id, dc_msg_t* msg);
+
+
 /**
  * Send a message defined by a dc_msg_t object to a chat.
  *
@@ -987,11 +1033,13 @@ uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t co
  * If that fails, is not possible, or the image is already small enough, the image is sent as original.
  * If you want images to be always sent as the original file, use the #DC_MSG_FILE type.
  *
- * Videos and other file types are currently not recoded by the library.
+ * Videos and other file types are currently not recoded by the library,
+ * with dc_prepare_msg(), however, you can do that from the UI.
  *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
  * @param chat_id The chat ID to send the message to.
+ *     If dc_prepare_msg() was called before, this parameter can be 0.
  * @param msg The message object to send to the chat defined by the chat ID.
  *     On success, msg_id of the object is set up,
  *     The function does not take ownership of the object,
@@ -1008,6 +1056,7 @@ uint32_t        dc_send_msg                  (dc_context_t* context, uint32_t ch
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
  * @param chat_id The chat ID to send the message to.
+ *     If dc_prepare_msg() was called before, this parameter can be 0.
  * @param msg The message object to send to the chat defined by the chat ID.
  *     On success, msg_id of the object is set up,
  *     The function does not take ownership of the object,
@@ -1097,14 +1146,9 @@ uint32_t dc_send_videochat_invitation (dc_context_t* context, uint32_t chat_id);
  * @memberof dc_context_t
  * @param context The context object.
  * @param msg_id The ID of the message with the webxdc instance.
- * @param json program-readable data, this is created in JS land as:
- *     - `payload`: any JS object or primitive.
- *     - `info`: optional informational message. Will be shown in chat and may be added as system notification.
- *       note that also users that are not notified explicitly get the `info` or `summary` update shown in the chat.
- *     - `document`: optional document name. shown eg. in title bar.
- *     - `summary`: optional summary. shown beside app icon.
- *     - `notify`: optional array of other users `selfAddr` to be notified e.g. by a sound about `info` or `summary`.
- * @param descr Deprecated, set to NULL
+ * @param json program-readable data, the actual payload
+ * @param descr The user-visible description of JSON data,
+ *     in case of a chess game, e.g. the move.
  * @return 1=success, 0=error
  */
 int dc_send_webxdc_status_update (dc_context_t* context, uint32_t msg_id, const char* json, const char* descr);
@@ -1502,6 +1546,30 @@ void            dc_marknoticed_chat          (dc_context_t* context, uint32_t ch
 dc_array_t*     dc_get_chat_media            (dc_context_t* context, uint32_t chat_id, int msg_type, int msg_type2, int msg_type3);
 
 
+/**
+ * Search next/previous message based on a given message and a list of types.
+ * Typically used to implement the "next" and "previous" buttons
+ * in a gallery or in a media player.
+ *
+ * @deprecated Deprecated 2023-10-03, use dc_get_chat_media() and navigate the returned array instead.
+ * @memberof dc_context_t
+ * @param context The context object as returned from dc_context_new().
+ * @param msg_id The ID of the current message from which the next or previous message should be searched.
+ * @param dir 1=get the next message, -1=get the previous one.
+ * @param msg_type The message type to search for.
+ *     If 0, the message type from curr_msg_id is used.
+ * @param msg_type2 Alternative message type to search for. 0 to skip.
+ * @param msg_type3 Alternative message type to search for. 0 to skip.
+ * @return Returns the message ID that should be played next.
+ *     The returned message is in the same chat as the given one
+ *     and has one of the given types.
+ *     Typically, this result is passed again to dc_get_next_media()
+ *     later on the next swipe.
+ *     If there is not next/previous message, the function returns 0.
+ */
+uint32_t        dc_get_next_media            (dc_context_t* context, uint32_t msg_id, int dir, int msg_type, int msg_type2, int msg_type3);
+
+
 /**
  * Set chat visibility to pinned, archived or normal.
  *
@@ -1974,36 +2042,6 @@ void            dc_delete_msgs               (dc_context_t* context, const uint3
 void            dc_forward_msgs              (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt, uint32_t chat_id);
 
 
-/**
- * Save a copy of messages in "Saved Messages".
- *
- * In contrast to forwarding messages,
- * information as author, date and origin are preserved.
- * The action completes locally, so "Saved Messages" do not show sending errors in case one is offline.
- * Still, a sync message is emitted, so that other devices will save the same message,
- * as long as not deleted before.
- *
- * To check if a message was saved, use dc_msg_get_saved_msg_id(),
- * UI may show an indicator and offer an "Unsave" instead of a "Save" button then.
- *
- * The other way round, from inside the "Saved Messages" chat,
- * UI may show the indicator and "Unsave" button checking dc_msg_get_original_msg_id()
- * and offer a button to go the original message.
- *
- * "Unsave" is done by deleting the saved message.
- * Webxdc updates are not copied on purpose.
- *
- * For performance reasons, esp. when saving lots of messages,
- * UI should call this function from a background thread.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_ids An array of uint32_t containing all message IDs that should be saved.
- * @param msg_cnt The number of messages IDs in the msg_ids array.
- */
-void            dc_save_msgs                 (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt);
-
-
 /**
  * Resend messages and make information available for newly added chat members.
  * Resending sends out the original message, however, recipients and webxdc-status may differ.
@@ -2460,9 +2498,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_WITHOUT_ADDR       230 // test1=formatted fingerprint
 #define         DC_QR_ACCOUNT                250 // text1=domain
 #define         DC_QR_BACKUP                 251
-#define         DC_QR_BACKUP2                252
 #define         DC_QR_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
-#define         DC_QR_PROXY                  271 // text1=address (e.g. "127.0.0.1:9050")
 #define         DC_QR_ADDR                   320 // id=contact
 #define         DC_QR_TEXT                   330 // text1=text
 #define         DC_QR_URL                    332 // text1=URL
@@ -2508,7 +2544,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   if so, call dc_set_config_from_qr() and then dc_configure().
  *
  * - DC_QR_BACKUP:
- * - DC_QR_BACKUP2:
  *   ask the user if they want to set up a new device.
  *   If so, pass the qr-code to dc_receive_backup().
  *
@@ -2516,12 +2551,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to use the given service for video chats;
  *   if so, call dc_set_config_from_qr().
  *
- * - DC_QR_PROXY with dc_lot_t::text1=address:
- *   ask the user if they want to use the given proxy.
- *   if so, call dc_set_config_from_qr() and restart I/O.
- *   On success, dc_get_config(context, "proxy_url")
- *   will contain the new proxy in normalized form as the first element.
- *
  * - DC_QR_ADDR with dc_lot_t::id=Contact ID:
  *   e-mail address scanned, optionally, a draft message could be set in
  *   dc_lot_t::text1 in which case dc_lot_t::text1_meaning will be DC_TEXT1_DRAFT;
@@ -2570,15 +2599,13 @@ dc_lot_t*       dc_check_qr                  (dc_context_t* context, const char*
 
 /**
  * Get QR code text that will offer an Setup-Contact or Verified-Group invitation.
+ * The QR code is compatible to the OPENPGP4FPR format
+ * so that a basic fingerprint comparison also works e.g. with OpenKeychain.
  *
  * The scanning device will pass the scanned content to dc_check_qr() then;
  * if dc_check_qr() returns DC_QR_ASK_VERIFYCONTACT or DC_QR_ASK_VERIFYGROUP
  * an out-of-band-verification can be joined using dc_join_securejoin()
  *
- * The returned text will also work as a normal https:-link,
- * so that the QR code is useful also without Delta Chat being installed
- * or can be passed to contacts through other channels.
- *
  * @memberof dc_context_t
  * @param context The context object.
  * @param chat_id If set to a group-chat-id,
@@ -2598,7 +2625,6 @@ char*           dc_get_securejoin_qr         (dc_context_t* context, uint32_t ch
  * Get QR code image from the QR code text generated by dc_get_securejoin_qr().
  * See dc_get_securejoin_qr() for details about the contained QR code.
  *
- * @deprecated 2024-10 use dc_create_qr_svg(dc_get_securejoin_qr()) instead.
  * @memberof dc_context_t
  * @param context The context object.
  * @param chat_id group-chat-id for secure-join or 0 for setup-contact,
@@ -2779,22 +2805,6 @@ dc_array_t* dc_get_locations                (dc_context_t* context, uint32_t cha
 void        dc_delete_all_locations         (dc_context_t* context);
 
 
-// misc
-
-/**
- * Create a QR code from any input data.
- *
- * The QR code is returned as a square SVG image.
- *
- * @memberof dc_context_t
- * @param payload The content for the QR code.
- * @return SVG image with the QR code.
- *     On errors, an empty string is returned.
- *     The returned string must be released using dc_str_unref() after usage.
- */
-char*           dc_create_qr_svg             (const char* payload);
-
-
 /**
  * Get last error string.
  *
@@ -2883,7 +2893,6 @@ char* dc_backup_provider_get_qr (const dc_backup_provider_t* backup_provider);
  * This works like dc_backup_provider_qr() but returns the text of a rendered
  * SVG image containing the QR code.
  *
- * @deprecated 2024-10 use dc_create_qr_svg(dc_backup_provider_get_qr()) instead.
  * @memberof dc_backup_provider_t
  * @param backup_provider The backup provider object as created by
  *    dc_backup_provider_new().
@@ -2923,7 +2932,7 @@ void dc_backup_provider_unref (dc_backup_provider_t* backup_provider);
  * Gets a backup offered by a dc_backup_provider_t object on another device.
  *
  * This function is called on a device that scanned the QR code offered by
- * dc_backup_provider_get_qr().  Typically this is a
+ * dc_backup_sender_qr() or dc_backup_sender_qr_svg().  Typically this is a
  * different device than that which provides the backup.
  *
  * This call will block while the backup is being transferred and only
@@ -3964,7 +3973,7 @@ int             dc_msg_get_viewtype           (const dc_msg_t* msg);
  *
  * Outgoing message states:
  * - @ref DC_STATE_OUT_PREPARING - For files which need time to be prepared before they can be sent,
- *   the message enters this state before @ref DC_STATE_OUT_PENDING. Deprecated.
+ *   the message enters this state before @ref DC_STATE_OUT_PENDING.
  * - @ref DC_STATE_OUT_DRAFT - Message saved as draft using dc_set_draft()
  * - @ref DC_STATE_OUT_PENDING - The user has pressed the "send" button but the
  *   message is not yet sent and is pending in some way. Maybe we're offline (no checkmark).
@@ -4174,13 +4183,9 @@ char*             dc_msg_get_webxdc_blob      (const dc_msg_t* msg, const char*
  *   defaults to an empty string.
  *   Implementations may offer an menu or a button to open this URL.
  * - internet_access:
- *   true if the Webxdc should get internet access;
- *   this is the case i.e. for experimental maps integration.
- * - self_addr: address to be used for `window.webxdc.selfAddr` in JS land.
- * - send_update_interval: Milliseconds to wait before calling `sendUpdate()` again since the last call.
- *   Should be exposed to `webxdc.sendUpdateInterval` in JS land.
- * - send_update_max_size: Maximum number of bytes accepted for a serialized update object.
- *   Should be exposed to `webxdc.sendUpdateMaxSize` in JS land.
+ *   true if the Webxdc should get full internet access, including Webrtc.
+ *   currently, this is only true for encrypted Webxdc's in the self chat
+ *   that have requested internet access in the manifest.
  *
  * @memberof dc_msg_t
  * @param msg The webxdc instance.
@@ -4466,7 +4471,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
  * - DC_INFO_INVALID_UNENCRYPTED_MAIL (13) - Info-message for "Provider requires end-to-end encryption which is not setup yet",
  *   the UI should change the corresponding string using #DC_STR_INVALID_UNENCRYPTED_MAIL
  *   and also offer a way to fix the encryption, eg. by a button offering a QR scan
- * - DC_INFO_WEBXDC_INFO_MESSAGE (32) - Info-message created by webxdc app sending `update.info`
  *
  * Even when you display an icon,
  * you should still display the text of the informational message using dc_msg_get_text()
@@ -4496,23 +4500,19 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 #define         DC_INFO_INVALID_UNENCRYPTED_MAIL  13
 #define         DC_INFO_WEBXDC_INFO_MESSAGE       32
 
-
 /**
- * Get link attached to an webxdc info message.
- * The info message needs to be of type DC_INFO_WEBXDC_INFO_MESSAGE.
+ * Check if a message is still in creation. A message is in creation between
+ * the calls to dc_prepare_msg() and dc_send_msg().
  *
- * Typically, this is used to set `document.location.href` in JS land.
- *
- * Webxdc apps can define the link by setting `update.href` when sending and update,
- * see dc_send_webxdc_status_update().
+ * Typically, this is used for videos that are recoded by the UI before
+ * they can be sent.
  *
  * @memberof dc_msg_t
- * @param msg The info message object.
- *     Not: the webxdc instance.
- * @return The link to be set to `document.location.href` in JS land.
- *     Returns NULL if there is no link attached to the info message and on errors.
+ * @param msg The message object.
+ * @return 1=message is still in creation (dc_send_msg() was not called yet),
+ *     0=message no longer in creation.
  */
-char*           dc_msg_get_webxdc_href        (const dc_msg_t* msg);
+int             dc_msg_is_increation          (const dc_msg_t* msg);
 
 
 /**
@@ -4665,7 +4665,7 @@ int dc_msg_has_html (dc_msg_t* msg);
   *                                     If the download fails or succeeds,
   *                                     the event @ref DC_EVENT_MSGS_CHANGED is emitted.
   *
-  * - @ref DC_DOWNLOAD_UNDECIPHERABLE - The message does not need any further download action.
+  * - @ref DC_DOWNLOAD_UNDECIPHERABLE - The message does not need any futher download action.
   *                                     It was fully downloaded, but we failed to decrypt it.
   * - @ref DC_DOWNLOAD_FAILURE        - Download error, the user may start over calling dc_download_full_msg() again.
   *
@@ -4752,36 +4752,10 @@ void            dc_msg_set_override_sender_name(dc_msg_t* msg, const char* name)
  * @param file If the message object is used in dc_send_msg() later,
  *     this must be the full path of the image file to send.
  * @param filemime The MIME type of the file. NULL if you don't know or don't care.
- * @deprecated 2025-01-21 Use dc_msg_set_file_and_deduplicate instead
  */
 void            dc_msg_set_file               (dc_msg_t* msg, const char* file, const char* filemime);
 
 
-/**
- * Sets the file associated with a message.
- *
- * If `name` is non-null, it is used as the file name
- * and the actual current name of the file is ignored.
- *
- * If the source file is already in the blobdir, it will be renamed,
- * otherwise it will be copied to the blobdir first.
- *
- * 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.
- *
- * @memberof dc_msg_t
- * @param msg The message object. Must not be NULL.
- * @param file The path of the file to attach. Must not be NULL.
- * @param name The original filename of the attachment. If NULL, the current name of `file` will be used instead.
- * @param filemime The MIME type of the file. NULL if you don't know or don't care.
- */
-void            dc_msg_set_file_and_deduplicate(dc_msg_t* msg, const char* file, const char* name, const char* filemime);
-
-
 /**
  * Set the dimensions associated with message object.
  * Typically this is the width and the height of an image or video associated using dc_msg_set_file().
@@ -4924,35 +4898,6 @@ dc_msg_t*       dc_msg_get_quoted_msg         (const dc_msg_t* msg);
 dc_msg_t*       dc_msg_get_parent             (const dc_msg_t* msg);
 
 
-/**
- * Get original message ID for a saved message from the "Saved Messages" chat.
- *
- * Can be used by UI to show a button to go the original message
- * and an option to "Unsave" the message.
- *
- * @memberof dc_msg_t
- * @param msg The message object. Usually, this refers to a a message inside "Saved Messages".
- * @return The message ID of the original message.
- *     0 if the given message object is not a "Saved Message"
- *     or if the original message does no longer exist.
- */
-uint32_t        dc_msg_get_original_msg_id    (const dc_msg_t* msg);
-
-
-/**
- * Check if a message was saved and return its ID inside "Saved Messages".
- *
- * Deleting the returned message will un-save the message.
- * The state "is saved" can be used to show some icon to indicate that a message was saved.
- *
- * @memberof dc_msg_t
- * @param msg The message object. Usually, this refers to a a message outside "Saved Messages".
- * @return The message ID inside "Saved Messages", if any.
- *     0 if the given message object is not saved.
- */
-uint32_t        dc_msg_get_saved_msg_id     (const dc_msg_t* msg);
-
-
 /**
  * Force the message to be sent in plain text.
  *
@@ -5478,8 +5423,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 /**
  * Message containing a sticker, similar to image.
- * NB: When sending, the message viewtype may be changed to `Image` by some heuristics like checking
- * for transparent pixels.
  * If possible, the UI should display the image without borders in a transparent way.
  * A click on a sticker will offer to install the sticker set in some future.
  */
@@ -5584,8 +5527,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 /**
  * Outgoing message being prepared. See dc_msg_get_state() for details.
- *
- * @deprecated 2024-12-07
  */
 #define         DC_STATE_OUT_PREPARING       18
 
@@ -5759,14 +5700,8 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_CERTCK_STRICT 1
 
 /**
- * Accept certificates that are expired, self-signed
- * or not valid for the server hostname.
- */
-#define DC_CERTCK_ACCEPT_INVALID 2
-
-/**
- * For API compatibility only: Treat this as DC_CERTCK_ACCEPT_INVALID on reading.
- * Must not be written.
+ * Accept invalid certificates, including self-signed ones
+ * or having incorrect hostname.
  */
 #define DC_CERTCK_ACCEPT_INVALID_CERTIFICATES 3
 
@@ -5806,23 +5741,6 @@ void dc_jsonrpc_unref(dc_jsonrpc_instance_t* jsonrpc_instance);
  * returns immediately and once the result is ready it can be retrieved via dc_jsonrpc_next_response()
  * the jsonrpc specification defines an invocation id that can then be used to match request and response.
  *
- * An overview of JSON-RPC calls is available at
- * <https://js.jsonrpc.delta.chat/classes/RawClient.html>.
- * Note that the page describes only the rough methods.
- * Calling convention, casing etc. does vary, this is a known flaw,
- * and at some point we will get to improve that :)
- *
- * Also, note that most calls are more high-level than this CFFI, require more database calls and are slower.
- * They're more suitable for an environment that is totally async and/or cannot use CFFI, which might not be true for native apps.
- *
- * Notable exceptions that exist only as JSON-RPC and probably never get a CFFI counterpart:
- * - getMessageReactions(), sendReaction()
- * - getHttpResponse()
- * - draftSelfReport()
- * - getAccountFileSize()
- * - importVcard(), parseVcard(), makeVcard()
- * - sendWebxdcRealtimeData, sendWebxdcRealtimeAdvertisement(), leaveWebxdcRealtime()
- *
  * @memberof dc_jsonrpc_instance_t
  * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
  * @param request JSON-RPC request as string
@@ -5843,8 +5761,6 @@ char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);
 /**
  * Make a JSON-RPC call and return a response.
  *
- * See dc_jsonrpc_request() for an overview of possible calls and for more information.
- *
  * @memberof dc_jsonrpc_instance_t
  * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
  * @param input JSON-RPC request.
@@ -5940,26 +5856,15 @@ int dc_event_get_data2_int(dc_event_t* event);
 
 /**
  * Get data associated with an event object.
- * The meaning of the data depends on the event ID returned as @ref DC_EVENT constants.
+ * The meaning of the data depends on the event ID
+ * returned as @ref DC_EVENT constants by dc_event_get_id().
+ * See also dc_event_get_data1_int() and dc_event_get_data2_int().
  *
  * @memberof dc_event_t
  * @param event Event object as returned from dc_get_next_event().
- * @return "data1" string or NULL.
- *     The meaning depends on the event type associated with this event.
- *     Must be freed using dc_str_unref().
- */
-char* dc_event_get_data1_str(dc_event_t* event);
-
-
-/**
- * Get data associated with an event object.
- * The meaning of the data depends on the event ID returned as @ref DC_EVENT constants.
- *
- * @memberof dc_event_t
- * @param event Event object as returned from dc_get_next_event().
- * @return "data2" string or NULL.
- *     The meaning depends on the event type associated with this event.
- *     Must be freed using dc_str_unref().
+ * @return "data2" as a string or NULL.
+ *     the meaning depends on the event type associated with this event.
+ *     Once you're done with the string, you have to unref it using dc_unref_str().
  */
 char* dc_event_get_data2_str(dc_event_t* event);
 
@@ -6142,50 +6047,12 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_REACTIONS_CHANGED        2001
 
 
-/**
- * A reaction to one's own sent message received.
- * Typically, the UI will show a notification for that.
- *
- * In addition to this event, DC_EVENT_REACTIONS_CHANGED is emitted.
- *
- * @param data1 (int) contact_id ID of the contact sending this reaction.
- * @param data2 (int) msg_id + (char*) reaction.
- *      ID of the message for which a reaction was received in dc_event_get_data2_int(),
- *      and the reaction as dc_event_get_data2_str().
- *      string must be passed to dc_str_unref() afterwards.
- */
-#define DC_EVENT_INCOMING_REACTION        2002
-
-
-
-/**
- * A webxdc wants an info message or a changed summary to be notified.
- *
- * @param data1 (int) contact_id ID _and_ (char*) href.
- *      - dc_event_get_data1_int() returns contact_id of the sending contact.
- *      - dc_event_get_data1_str() returns the href as set to `update.href`.
- * @param data2 (int) msg_id _and_ (char*) text_to_notify.
- *      - dc_event_get_data2_int() returns the msg_id,
- *        referring to the webxdc-info-message, if there is any.
- *        Sometimes no webxdc-info-message is added to the chat
- *        and yet a notification is sent; in this case the msg_id
- *        of the webxdc instance is returned.
- *      - dc_event_get_data2_str() returns text_to_notify,
- *        the text that shall be shown in the notification.
- *        string must be passed to dc_str_unref() afterwards.
- */
-#define DC_EVENT_INCOMING_WEBXDC_NOTIFY   2003
-
-
 /**
  * There is a fresh message. Typically, the user will show an notification
  * when receiving this message.
  *
  * There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
  *
- * If the message is a webxdc info message,
- * dc_msg_get_parent() returns the webxdc instance the notification belongs to.
- *
  * @param data1 (int) chat_id
  * @param data2 (int) msg_id
  */
@@ -6397,7 +6264,7 @@ void dc_event_unref(dc_event_t* event);
 
 
 /**
- * Webxdc status update received.
+ * webxdc status update received.
  * To get the received status update, use dc_get_webxdc_status_updates() with
  * `serial` set to the last known update
  * (in case of special bots, `status_update_serial` from `data2`
@@ -6432,15 +6299,6 @@ void dc_event_unref(dc_event_t* event);
 
 #define DC_EVENT_WEBXDC_REALTIME_DATA             2150
 
-/**
- * Advertisement for ephemeral peer channel communication received.
- * This can be used by bots to initiate peer-to-peer communication from their side.
- * @param data1 (int) msg_id
- * @param data2 0
- */
-
-#define DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT    2151
-
 /**
  * Tells that the Background fetch was completed (or timed out).
  *
@@ -6469,25 +6327,6 @@ void dc_event_unref(dc_event_t* event);
 
 #define DC_EVENT_CHATLIST_ITEM_CHANGED         2301
 
-/**
- * Inform that the list of accounts has changed (an account removed or added or (not yet implemented) the account order changes)
- *
- * This event is only emitted by the account manager.
- */
-
-#define DC_EVENT_ACCOUNTS_CHANGED              2302
-
-/**
- * Inform that an account property that might be shown in the account list changed, namely:
- * - is_configured (see dc_is_configured())
- * - displayname
- * - selfavatar
- * - private_tag
- * 
- * This event is emitted from the account whose property changed.
- */
-
-#define DC_EVENT_ACCOUNTS_ITEM_CHANGED         2303
 
 /**
  * Inform that some events have been skipped due to event channel overflow.
@@ -6803,16 +6642,12 @@ void dc_event_unref(dc_event_t* event);
 /// "Message opened"
 ///
 /// Used in subjects of outgoing read receipts.
-///
-/// @deprecated Deprecated 2024-07-26
 #define DC_STR_READRCPT                   31
 
 /// "The message '%1$s' you sent was displayed on the screen of the recipient."
 ///
 /// Used as message text of outgoing read receipts.
 /// - %1$s will be replaced by the subject of the displayed message
-///
-/// @deprecated Deprecated 2024-06-23
 #define DC_STR_READRCPT_MAILBODY          32
 
 /// @deprecated Deprecated, this string is no longer needed.
@@ -6935,7 +6770,7 @@ void dc_event_unref(dc_event_t* event);
 
 /// "Failed to send message to %1$s."
 ///
-/// Unused. Was used in group chat status messages.
+/// Used in status messages.
 /// - %1$s will be replaced by the name of the contact the message cannot be sent to
 #define DC_STR_FAILED_SENDING_TO          74
 
@@ -7531,7 +7366,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used as info message.
 #define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191
 
-/// "Contact". Deprecated, currently unused.
+/// "Contact"
 #define DC_STR_CONTACT 200
 
 /**

deltachat-ffi/src/lib.rs

@@ -30,13 +30,11 @@ use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::imex::BackupProvider;
 use deltachat::key::preconfigure_keypair;
 use deltachat::message::MsgId;
-use deltachat::qr_code_generator::{create_qr_svg, generate_backup_qr, get_securejoin_qr_svg};
+use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
-use deltachat_jsonrpc::api::CommandApi;
-use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
 use num_traits::{FromPrimitive, ToPrimitive};
 use once_cell::sync::Lazy;
 use rand::Rng;
@@ -415,6 +413,16 @@ pub unsafe extern "C" fn dc_get_push_state(context: *const dc_context_t) -> libc
     block_on(ctx.push_state()) as libc::c_int
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_all_work_done(context: *mut dc_context_t) -> libc::c_int {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_all_work_done()");
+        return 0;
+    }
+    let ctx = &*context;
+    block_on(async move { ctx.all_work_done().await as libc::c_int })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_oauth2_url(
     context: *mut dc_context_t,
@@ -533,8 +541,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::ErrorSelfNotInGroup(_) => 410,
         EventType::MsgsChanged { .. } => 2000,
         EventType::ReactionsChanged { .. } => 2001,
-        EventType::IncomingReaction { .. } => 2002,
-        EventType::IncomingWebxdcNotify { .. } => 2003,
         EventType::IncomingMsg { .. } => 2005,
         EventType::IncomingMsgBunch { .. } => 2006,
         EventType::MsgsNoticed { .. } => 2008,
@@ -557,16 +563,10 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::WebxdcStatusUpdate { .. } => 2120,
         EventType::WebxdcInstanceDeleted { .. } => 2121,
         EventType::WebxdcRealtimeData { .. } => 2150,
-        EventType::WebxdcRealtimeAdvertisementReceived { .. } => 2151,
         EventType::AccountsBackgroundFetchDone => 2200,
         EventType::ChatlistChanged => 2300,
         EventType::ChatlistItemChanged { .. } => 2301,
-        EventType::AccountsChanged => 2302,
-        EventType::AccountsItemChanged => 2303,
         EventType::EventChannelOverflow { .. } => 2400,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -595,12 +595,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::ConfigSynced { .. }
         | EventType::IncomingMsgBunch { .. }
         | EventType::ErrorSelfNotInGroup(_)
-        | EventType::AccountsBackgroundFetchDone
-        | EventType::ChatlistChanged
-        | EventType::AccountsChanged
-        | EventType::AccountsItemChanged => 0,
-        EventType::IncomingReaction { contact_id, .. }
-        | EventType::IncomingWebxdcNotify { contact_id, .. } => contact_id.to_u32() as libc::c_int,
+        | EventType::AccountsBackgroundFetchDone => 0,
+        EventType::ChatlistChanged => 0,
         EventType::MsgsChanged { chat_id, .. }
         | EventType::ReactionsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
@@ -625,15 +621,11 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         }
         EventType::WebxdcRealtimeData { msg_id, .. }
         | EventType::WebxdcStatusUpdate { msg_id, .. }
-        | EventType::WebxdcRealtimeAdvertisementReceived { msg_id }
         | EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
         EventType::ChatlistItemChanged { chat_id } => {
             chat_id.unwrap_or_default().to_u32() as libc::c_int
         }
         EventType::EventChannelOverflow { n } => *n as libc::c_int,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -672,16 +664,11 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatlistChanged
         | EventType::ChatlistItemChanged { .. }
-        | EventType::AccountsChanged
-        | EventType::AccountsItemChanged
         | EventType::ConfigSynced { .. }
         | EventType::ChatModified(_)
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
         | EventType::EventChannelOverflow { .. } => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::ReactionsChanged { msg_id, .. }
-        | EventType::IncomingReaction { msg_id, .. }
-        | EventType::IncomingWebxdcNotify { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
         | EventType::MsgDelivered { msg_id, .. }
         | EventType::MsgFailed { msg_id, .. }
@@ -695,30 +682,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
             ..
         } => status_update_serial.to_u32() as libc::c_int,
         EventType::WebxdcRealtimeData { data, .. } => data.len() as libc::c_int,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_event_get_data1_str(event: *mut dc_event_t) -> *mut libc::c_char {
-    if event.is_null() {
-        eprintln!("ignoring careless call to dc_event_get_data1_str()");
-        return ptr::null_mut();
-    }
-
-    let event = &(*event).typ;
-
-    match event {
-        EventType::IncomingWebxdcNotify { href, .. } => {
-            if let Some(href) = href {
-                href.to_c_string().unwrap_or_default().into_raw()
-            } else {
-                ptr::null_mut()
-            }
-        }
-        _ => ptr::null_mut(),
     }
 }
 
@@ -770,9 +733,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::IncomingMsgBunch { .. }
         | EventType::ChatlistItemChanged { .. }
         | EventType::ChatlistChanged
-        | EventType::AccountsChanged
-        | EventType::AccountsItemChanged
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
         | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -794,17 +754,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             libc::memcpy(ptr, data.as_ptr() as *mut libc::c_void, data.len());
             ptr as *mut libc::c_char
         }
-        EventType::IncomingReaction { reaction, .. } => reaction
-            .as_str()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
-        EventType::IncomingWebxdcNotify { text, .. } => {
-            text.to_c_string().unwrap_or_default().into_raw()
-        }
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -886,6 +835,8 @@ pub unsafe extern "C" fn dc_maybe_network(context: *mut dc_context_t) {
 #[no_mangle]
 pub unsafe extern "C" fn dc_preconfigure_keypair(
     context: *mut dc_context_t,
+    addr: *const libc::c_char,
+    _public_data: *const libc::c_char,
     secret_data: *const libc::c_char,
 ) -> i32 {
     if context.is_null() {
@@ -893,8 +844,9 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
         return 0;
     }
     let ctx = &*context;
+    let addr = to_string_lossy(addr);
     let secret_data = to_string_lossy(secret_data);
-    block_on(preconfigure_keypair(ctx, &secret_data))
+    block_on(preconfigure_keypair(ctx, &addr, &secret_data))
         .context("Failed to save keypair")
         .log_err(ctx)
         .is_ok() as libc::c_int
@@ -978,6 +930,27 @@ pub unsafe extern "C" fn dc_get_chat_id_by_contact_id(
     })
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_prepare_msg(
+    context: *mut dc_context_t,
+    chat_id: u32,
+    msg: *mut dc_msg_t,
+) -> u32 {
+    if context.is_null() || chat_id == 0 || msg.is_null() {
+        eprintln!("ignoring careless call to dc_prepare_msg()");
+        return 0;
+    }
+    let ctx = &mut *context;
+    let ffi_msg: &mut MessageWrapper = &mut *msg;
+
+    block_on(async move {
+        chat::prepare_msg(ctx, ChatId::new(chat_id), &mut ffi_msg.message)
+            .await
+            .unwrap_or_log_default(ctx, "Failed to prepare message")
+    })
+    .to_u32()
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_msg(
     context: *mut dc_context_t,
@@ -1065,7 +1038,7 @@ pub unsafe extern "C" fn dc_send_webxdc_status_update(
     context: *mut dc_context_t,
     msg_id: u32,
     json: *const libc::c_char,
-    _descr: *const libc::c_char,
+    descr: *const libc::c_char,
 ) -> libc::c_int {
     if context.is_null() {
         eprintln!("ignoring careless call to dc_send_webxdc_status_update()");
@@ -1073,10 +1046,14 @@ pub unsafe extern "C" fn dc_send_webxdc_status_update(
     }
     let ctx = &*context;
 
-    block_on(ctx.send_webxdc_status_update(MsgId::new(msg_id), &to_string_lossy(json)))
-        .context("Failed to send webxdc update")
-        .log_err(ctx)
-        .is_ok() as libc::c_int
+    block_on(ctx.send_webxdc_status_update(
+        MsgId::new(msg_id),
+        &to_string_lossy(json),
+        &to_string_lossy(descr),
+    ))
+    .context("Failed to send webxdc update")
+    .log_err(ctx)
+    .is_ok() as libc::c_int
 }
 
 #[no_mangle]
@@ -1469,6 +1446,48 @@ pub unsafe extern "C" fn dc_get_chat_media(
     })
 }
 
+#[no_mangle]
+#[allow(deprecated)]
+pub unsafe extern "C" fn dc_get_next_media(
+    context: *mut dc_context_t,
+    msg_id: u32,
+    dir: libc::c_int,
+    msg_type: libc::c_int,
+    or_msg_type2: libc::c_int,
+    or_msg_type3: libc::c_int,
+) -> u32 {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_get_next_media()");
+        return 0;
+    }
+    let direction = if dir < 0 {
+        chat::Direction::Backward
+    } else {
+        chat::Direction::Forward
+    };
+
+    let ctx = &*context;
+    let msg_type = from_prim(msg_type).expect(&format!("invalid msg_type = {msg_type}"));
+    let or_msg_type2 =
+        from_prim(or_msg_type2).expect(&format!("incorrect or_msg_type2 = {or_msg_type2}"));
+    let or_msg_type3 =
+        from_prim(or_msg_type3).expect(&format!("incorrect or_msg_type3 = {or_msg_type3}"));
+
+    block_on(async move {
+        chat::get_next_media(
+            ctx,
+            MsgId::new(msg_id),
+            direction,
+            msg_type,
+            or_msg_type2,
+            or_msg_type3,
+        )
+        .await
+        .map(|msg_id| msg_id.map(|id| id.to_u32()).unwrap_or_default())
+        .unwrap_or(0)
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_chat_visibility(
     context: *mut dc_context_t,
@@ -1979,26 +1998,6 @@ pub unsafe extern "C" fn dc_forward_msgs(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_save_msgs(
-    context: *mut dc_context_t,
-    msg_ids: *const u32,
-    msg_cnt: libc::c_int,
-) {
-    if context.is_null() || msg_ids.is_null() || msg_cnt <= 0 {
-        eprintln!("ignoring careless call to dc_save_msgs()");
-        return;
-    }
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
-    let ctx = &*context;
-
-    block_on(async move {
-        chat::save_msgs(ctx, &msg_ids[..])
-            .await
-            .unwrap_or_log_default(ctx, "Failed to save message")
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_resend_msgs(
     context: *mut dc_context_t,
@@ -2616,18 +2615,6 @@ pub unsafe extern "C" fn dc_delete_all_locations(context: *mut dc_context_t) {
     });
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_create_qr_svg(payload: *const libc::c_char) -> *mut libc::c_char {
-    if payload.is_null() {
-        eprintln!("ignoring careless call to dc_create_qr_svg()");
-        return "".strdup();
-    }
-
-    create_qr_svg(&to_string_lossy(payload))
-        .unwrap_or_else(|_| "".to_string())
-        .strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_last_error(context: *mut dc_context_t) -> *mut libc::c_char {
     if context.is_null() {
@@ -3704,14 +3691,13 @@ pub unsafe extern "C" fn dc_msg_get_info_type(msg: *mut dc_msg_t) -> libc::c_int
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_webxdc_href(msg: *mut dc_msg_t) -> *mut libc::c_char {
+pub unsafe extern "C" fn dc_msg_is_increation(msg: *mut dc_msg_t) -> libc::c_int {
     if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_webxdc_href()");
-        return "".strdup();
+        eprintln!("ignoring careless call to dc_msg_is_increation()");
+        return 0;
     }
-
     let ffi_msg = &*msg;
-    ffi_msg.message.get_webxdc_href().strdup()
+    ffi_msg.message.is_increation().into()
 }
 
 #[no_mangle]
@@ -3835,33 +3821,6 @@ pub unsafe extern "C" fn dc_msg_set_file(
     )
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_set_file_and_deduplicate(
-    msg: *mut dc_msg_t,
-    file: *const libc::c_char,
-    name: *const libc::c_char,
-    filemime: *const libc::c_char,
-) {
-    if msg.is_null() || file.is_null() {
-        eprintln!("ignoring careless call to dc_msg_set_file_and_deduplicate()");
-        return;
-    }
-    let ffi_msg = &mut *msg;
-    let ctx = &*ffi_msg.context;
-
-    ffi_msg
-        .message
-        .set_file_and_deduplicate(
-            ctx,
-            as_path(file),
-            to_opt_string_lossy(name).as_deref(),
-            to_opt_string_lossy(filemime).as_deref(),
-        )
-        .context("Failed to set file")
-        .log_err(&*ffi_msg.context)
-        .ok();
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_set_dimension(
     msg: *mut dc_msg_t,
@@ -4027,48 +3986,6 @@ pub unsafe extern "C" fn dc_msg_get_parent(msg: *const dc_msg_t) -> *mut dc_msg_
     }
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_original_msg_id(msg: *const dc_msg_t) -> u32 {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_original_msg_id()");
-        return 0;
-    }
-    let ffi_msg: &MessageWrapper = &*msg;
-    let context = &*ffi_msg.context;
-    block_on(async move {
-        ffi_msg
-            .message
-            .get_original_msg_id(context)
-            .await
-            .context("failed to get original message")
-            .log_err(context)
-            .unwrap_or_default()
-            .map(|id| id.to_u32())
-            .unwrap_or(0)
-    })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_saved_msg_id(msg: *const dc_msg_t) -> u32 {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_saved_msg_id()");
-        return 0;
-    }
-    let ffi_msg: &MessageWrapper = &*msg;
-    let context = &*ffi_msg.context;
-    block_on(async move {
-        ffi_msg
-            .message
-            .get_saved_msg_id(context)
-            .await
-            .context("failed to get original message")
-            .log_err(context)
-            .unwrap_or_default()
-            .map(|id| id.to_u32())
-            .unwrap_or(0)
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_force_plaintext(msg: *mut dc_msg_t) {
     if msg.is_null() {
@@ -4447,7 +4364,7 @@ pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provid
     let ctx = &*ffi_provider.context;
     let provider = &mut ffi_provider.provider;
     block_on(provider)
-        .context("Failed to await backup provider")
+        .context("Failed to await BackupProvider")
         .log_err(ctx)
         .set_last_error(ctx)
         .ok();
@@ -4501,7 +4418,7 @@ trait ResultExt<T, E> {
     /// Like `log_err()`, but:
     /// - returns the default value instead of an Err value.
     /// - emits an error instead of a warning for an [Err] result. This means
-    ///   that the error will be shown to the user in a small pop-up.
+    /// that the error will be shown to the user in a small pop-up.
     fn unwrap_or_log_default(self, context: &context::Context, message: &str) -> T;
 }
 
@@ -4620,16 +4537,19 @@ pub unsafe extern "C" fn dc_provider_new_from_email_with_dns(
     let addr = to_string_lossy(addr);
 
     let ctx = &*context;
-    let proxy_enabled = block_on(ctx.get_config_bool(config::Config::ProxyEnabled))
-        .context("Can't get config")
-        .log_err(ctx);
+    let socks5_enabled = block_on(async move {
+        ctx.get_config_bool(config::Config::Socks5Enabled)
+            .await
+            .context("Can't get config")
+            .log_err(ctx)
+    });
 
-    match proxy_enabled {
-        Ok(proxy_enabled) => {
+    match socks5_enabled {
+        Ok(socks5_enabled) => {
             match block_on(provider::get_provider_info_by_addr(
                 ctx,
                 addr.as_str(),
-                proxy_enabled,
+                socks5_enabled,
             ))
             .log_err(ctx)
             .unwrap_or_default()
@@ -4960,7 +4880,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
     }
 
     let accounts = &*accounts;
-    block_on(async move { accounts.read().await.maybe_network_lost().await });
+    block_on(async move { accounts.write().await.maybe_network_lost().await });
 }
 
 #[no_mangle]
@@ -4974,12 +4894,12 @@ pub unsafe extern "C" fn dc_accounts_background_fetch(
     }
 
     let accounts = &*accounts;
-    let background_fetch_future = {
-        let lock = block_on(accounts.read());
-        lock.background_fetch(Duration::from_secs(timeout_in_seconds))
-    };
-    // At this point account manager is not locked anymore.
-    block_on(background_fetch_future);
+    block_on(async move {
+        let accounts = accounts.read().await;
+        accounts
+            .background_fetch(Duration::from_secs(timeout_in_seconds))
+            .await;
+    });
     1
 }
 
@@ -4997,7 +4917,7 @@ pub unsafe extern "C" fn dc_accounts_set_push_device_token(
     let token = to_string_lossy(token);
 
     block_on(async move {
-        let accounts = accounts.read().await;
+        let mut accounts = accounts.write().await;
         if let Err(err) = accounts.set_push_device_token(&token).await {
             accounts.emit_event(EventType::Error(format!(
                 "Failed to set notify token: {err:#}."
@@ -5021,97 +4941,105 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
     Box::into_raw(Box::new(emitter))
 }
 
-pub struct dc_jsonrpc_instance_t {
-    receiver: OutReceiver,
-    handle: RpcSession<CommandApi>,
-}
+#[cfg(feature = "jsonrpc")]
+mod jsonrpc {
+    use deltachat_jsonrpc::api::CommandApi;
+    use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_jsonrpc_init(
-    account_manager: *mut dc_accounts_t,
-) -> *mut dc_jsonrpc_instance_t {
-    if account_manager.is_null() {
-        eprintln!("ignoring careless call to dc_jsonrpc_init()");
-        return ptr::null_mut();
+    use super::*;
+
+    pub struct dc_jsonrpc_instance_t {
+        receiver: OutReceiver,
+        handle: RpcSession<CommandApi>,
     }
 
-    let account_manager = &*account_manager;
-    let cmd_api = block_on(deltachat_jsonrpc::api::CommandApi::from_arc(
-        account_manager.inner.clone(),
-    ));
-
-    let (request_handle, receiver) = RpcClient::new();
-    let handle = RpcSession::new(request_handle, cmd_api);
-
-    let instance = dc_jsonrpc_instance_t { receiver, handle };
-
-    Box::into_raw(Box::new(instance))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_jsonrpc_unref(jsonrpc_instance: *mut dc_jsonrpc_instance_t) {
-    if jsonrpc_instance.is_null() {
-        eprintln!("ignoring careless call to dc_jsonrpc_unref()");
-        return;
-    }
-    drop(Box::from_raw(jsonrpc_instance));
-}
-
-fn spawn_handle_jsonrpc_request(handle: RpcSession<CommandApi>, request: String) {
-    spawn(async move {
-        handle.handle_incoming(&request).await;
-    });
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_jsonrpc_request(
-    jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-    request: *const libc::c_char,
-) {
-    if jsonrpc_instance.is_null() || request.is_null() {
-        eprintln!("ignoring careless call to dc_jsonrpc_request()");
-        return;
-    }
-
-    let handle = &(*jsonrpc_instance).handle;
-    let request = to_string_lossy(request);
-    spawn_handle_jsonrpc_request(handle.clone(), request);
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_jsonrpc_next_response(
-    jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-) -> *mut libc::c_char {
-    if jsonrpc_instance.is_null() {
-        eprintln!("ignoring careless call to dc_jsonrpc_next_response()");
-        return ptr::null_mut();
-    }
-    let api = &*jsonrpc_instance;
-    block_on(api.receiver.recv())
-        .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
-        .unwrap_or(ptr::null_mut())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_jsonrpc_blocking_call(
-    jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-    input: *const libc::c_char,
-) -> *mut libc::c_char {
-    if jsonrpc_instance.is_null() {
-        eprintln!("ignoring careless call to dc_jsonrpc_blocking_call()");
-        return ptr::null_mut();
-    }
-    let api = &*jsonrpc_instance;
-    let input = to_string_lossy(input);
-    let res = block_on(api.handle.process_incoming(&input));
-    match res {
-        Some(message) => {
-            if let Ok(message) = serde_json::to_string(&message) {
-                message.strdup()
-            } else {
-                ptr::null_mut()
-            }
+    #[no_mangle]
+    pub unsafe extern "C" fn dc_jsonrpc_init(
+        account_manager: *mut dc_accounts_t,
+    ) -> *mut dc_jsonrpc_instance_t {
+        if account_manager.is_null() {
+            eprintln!("ignoring careless call to dc_jsonrpc_init()");
+            return ptr::null_mut();
+        }
+
+        let account_manager = &*account_manager;
+        let cmd_api = block_on(deltachat_jsonrpc::api::CommandApi::from_arc(
+            account_manager.inner.clone(),
+        ));
+
+        let (request_handle, receiver) = RpcClient::new();
+        let handle = RpcSession::new(request_handle, cmd_api);
+
+        let instance = dc_jsonrpc_instance_t { receiver, handle };
+
+        Box::into_raw(Box::new(instance))
+    }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn dc_jsonrpc_unref(jsonrpc_instance: *mut dc_jsonrpc_instance_t) {
+        if jsonrpc_instance.is_null() {
+            eprintln!("ignoring careless call to dc_jsonrpc_unref()");
+            return;
+        }
+        drop(Box::from_raw(jsonrpc_instance));
+    }
+
+    fn spawn_handle_jsonrpc_request(handle: RpcSession<CommandApi>, request: String) {
+        spawn(async move {
+            handle.handle_incoming(&request).await;
+        });
+    }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn dc_jsonrpc_request(
+        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
+        request: *const libc::c_char,
+    ) {
+        if jsonrpc_instance.is_null() || request.is_null() {
+            eprintln!("ignoring careless call to dc_jsonrpc_request()");
+            return;
+        }
+
+        let handle = &(*jsonrpc_instance).handle;
+        let request = to_string_lossy(request);
+        spawn_handle_jsonrpc_request(handle.clone(), request);
+    }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn dc_jsonrpc_next_response(
+        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
+    ) -> *mut libc::c_char {
+        if jsonrpc_instance.is_null() {
+            eprintln!("ignoring careless call to dc_jsonrpc_next_response()");
+            return ptr::null_mut();
+        }
+        let api = &*jsonrpc_instance;
+        block_on(api.receiver.recv())
+            .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
+            .unwrap_or(ptr::null_mut())
+    }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn dc_jsonrpc_blocking_call(
+        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
+        input: *const libc::c_char,
+    ) -> *mut libc::c_char {
+        if jsonrpc_instance.is_null() {
+            eprintln!("ignoring careless call to dc_jsonrpc_blocking_call()");
+            return ptr::null_mut();
+        }
+        let api = &*jsonrpc_instance;
+        let input = to_string_lossy(input);
+        let res = block_on(api.handle.process_incoming(&input));
+        match res {
+            Some(message) => {
+                if let Ok(message) = serde_json::to_string(&message) {
+                    message.strdup()
+                } else {
+                    ptr::null_mut()
+                }
+            }
+            None => ptr::null_mut(),
         }
-        None => ptr::null_mut(),
     }
 }

deltachat-ffi/src/lot.rs

@@ -34,34 +34,33 @@ pub enum Meaning {
 }
 
 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<str>> {
+    pub fn get_text1(&self) -> Option<&str> {
         match self {
             Self::Summary(summary) => match &summary.prefix {
                 None => None,
-                Some(SummaryPrefix::Draft(text)) => Some(Cow::Borrowed(text)),
-                Some(SummaryPrefix::Username(username)) => Some(Cow::Borrowed(username)),
-                Some(SummaryPrefix::Me(text)) => Some(Cow::Borrowed(text)),
+                Some(SummaryPrefix::Draft(text)) => Some(text),
+                Some(SummaryPrefix::Username(username)) => Some(username),
+                Some(SummaryPrefix::Me(text)) => Some(text),
             },
             Self::Qr(qr) => match qr {
                 Qr::AskVerifyContact { .. } => None,
-                Qr::AskVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::AskVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::FprOk { .. } => None,
                 Qr::FprMismatch { .. } => None,
-                Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
-                Qr::Account { domain } => Some(Cow::Borrowed(domain)),
-                Qr::Backup2 { .. } => 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),
-                Qr::Url { url } => Some(Cow::Borrowed(url)),
-                Qr::Text { text } => Some(Cow::Borrowed(text)),
+                Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
+                Qr::Account { domain } => Some(domain),
+                Qr::Backup { .. } => None,
+                Qr::WebrtcInstance { domain, .. } => Some(domain),
+                Qr::Addr { draft, .. } => draft.as_deref(),
+                Qr::Url { url } => Some(url),
+                Qr::Text { text } => Some(text),
                 Qr::WithdrawVerifyContact { .. } => None,
-                Qr::WithdrawVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
-                Qr::ReviveVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
-                Qr::Login { address, .. } => Some(Cow::Borrowed(address)),
+                Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
+                Qr::Login { address, .. } => Some(address),
             },
-            Self::Error(err) => Some(Cow::Borrowed(err)),
+            Self::Error(err) => Some(err),
         }
     }
 
@@ -102,9 +101,8 @@ impl Lot {
                 Qr::FprMismatch { .. } => LotState::QrFprMismatch,
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
-                Qr::Backup2 { .. } => LotState::QrBackup2,
+                Qr::Backup { .. } => LotState::QrBackup,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
-                Qr::Proxy { .. } => LotState::QrProxy,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
                 Qr::Text { .. } => LotState::QrText,
@@ -128,9 +126,8 @@ impl Lot {
                 Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
-                Qr::Backup2 { .. } => Default::default(),
+                Qr::Backup { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Proxy { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
                 Qr::Text { .. } => Default::default(),
@@ -180,14 +177,9 @@ pub enum LotState {
 
     QrBackup = 251,
 
-    QrBackup2 = 252,
-
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 
-    /// text1=address, text2=protocol
-    QrProxy = 271,
-
     /// id=contact
     QrAddr = 320,
 

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.155.6"
+version = "1.140.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -13,30 +13,30 @@ 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.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"] }
-tokio = { workspace = true }
-sanitize-filename = { workspace = true }
+anyhow = "1"
+deltachat = { path = ".." }
+deltachat-contact-tools = { path = "../deltachat-contact-tools" }
+num-traits = "0.2"
+schemars = "0.8.19"
+serde = { version = "1.0", features = ["derive"] }
+tempfile = "3.10.1"
+log = "0.4"
+async-channel = { version = "2.2.1" }
+futures = { version = "0.3.30" }
+serde_json = "1"
+yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
+typescript-type-def = { version = "0.5.8", features = ["json_value"] }
+tokio = { version = "1.37.0" }
+sanitize-filename = "0.5"
 walkdir = "2.5.0"
-base64 = { workspace = true }
+base64 = "0.22"
 
 # optional dependencies
 axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.6", optional = true }
+env_logger = { version = "0.11.3", optional = true }
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.37.0", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api.rs

@@ -212,12 +212,14 @@ 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()
     }
@@ -252,12 +254,11 @@ impl CommandApi {
     /// Process all events until you get this one and you can safely return to the background
     /// without forgetting to create notifications caused by timing race conditions.
     async fn accounts_background_fetch(&self, timeout_in_seconds: f64) -> Result<()> {
-        let future = {
-            let lock = self.accounts.read().await;
-            lock.background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
-        };
-        // At this point account manager is not locked anymore.
-        future.await;
+        self.accounts
+            .write()
+            .await
+            .background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
+            .await;
         Ok(())
     }
 
@@ -320,12 +321,12 @@ impl CommandApi {
     ) -> Result<Option<ProviderInfo>> {
         let ctx = self.get_context(account_id).await?;
 
-        let proxy_enabled = ctx
-            .get_config_bool(deltachat::config::Config::ProxyEnabled)
+        let socks5_enabled = ctx
+            .get_config_bool(deltachat::config::Config::Socks5Enabled)
             .await?;
 
         let provider_info =
-            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), proxy_enabled).await;
+            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), socks5_enabled).await;
         Ok(ProviderInfo::from_dc_type(provider_info))
     }
 
@@ -706,22 +707,7 @@ impl CommandApi {
         ChatId::new(chat_id).get_encryption_info(&ctx).await
     }
 
-    /// Get QR code text that will offer a [SecureJoin](https://securejoin.delta.chat/) invitation.
-    ///
-    /// If `chat_id` is a group chat ID, SecureJoin QR code for the group is returned.
-    /// If `chat_id` is unset, setup contact QR code is returned.
-    async fn get_chat_securejoin_qr_code(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let chat = chat_id.map(ChatId::new);
-        let qr = securejoin::get_securejoin_qr(&ctx, chat).await?;
-        Ok(qr)
-    }
-
-    /// Get QR code (text and SVG) that will offer a Setup-Contact or Verified-Group invitation.
+    /// Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
     /// The QR code is compatible to the OPENPGP4FPR format
     /// so that a basic fingerprint comparison also works e.g. with OpenKeychain.
     ///
@@ -743,9 +729,10 @@ impl CommandApi {
     ) -> Result<(String, String)> {
         let ctx = self.get_context(account_id).await?;
         let chat = chat_id.map(ChatId::new);
-        let qr = securejoin::get_securejoin_qr(&ctx, chat).await?;
-        let svg = get_securejoin_qr_svg(&ctx, chat).await?;
-        Ok((qr, svg))
+        Ok((
+            securejoin::get_securejoin_qr(&ctx, chat).await?,
+            get_securejoin_qr_svg(&ctx, chat).await?,
+        ))
     }
 
     /// Continue a Setup-Contact or Verified-Group-Invite protocol
@@ -834,13 +821,6 @@ 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 group chat.
     ///
     /// After creation,
@@ -998,12 +978,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,
@@ -1092,9 +1066,6 @@ impl CommandApi {
         markseen_msgs(&ctx, msg_ids.into_iter().map(MsgId::new).collect()).await
     }
 
-    /// Returns all messages of a particular chat.
-    /// If `add_daymarker` is `true`, it will return them as
-    /// `DC_MSG_ID_DAYMARKER`, e.g. [1234, 1237, 9, 1239].
     async fn get_message_ids(
         &self,
         account_id: u32,
@@ -1149,11 +1120,9 @@ impl CommandApi {
     async fn get_message(&self, account_id: u32, msg_id: u32) -> Result<MessageObject> {
         let ctx = self.get_context(account_id).await?;
         let msg_id = MsgId::new(msg_id);
-        let message_object = MessageObject::from_msg_id(&ctx, msg_id)
+        MessageObject::from_msg_id(&ctx, msg_id)
             .await
-            .with_context(|| format!("Failed to load message {msg_id} for account {account_id}"))?
-            .with_context(|| format!("Message {msg_id} does not exist for account {account_id}"))?;
-        Ok(message_object)
+            .with_context(|| format!("Failed to load message {msg_id} for account {account_id}"))
     }
 
     async fn get_message_html(&self, account_id: u32, message_id: u32) -> Result<Option<String>> {
@@ -1177,10 +1146,7 @@ impl CommandApi {
             messages.insert(
                 message_id,
                 match message_result {
-                    Ok(Some(message)) => MessageLoadResult::Message(message),
-                    Ok(None) => MessageLoadResult::LoadingError {
-                        error: "Message does not exist".to_string(),
-                    },
+                    Ok(message) => MessageLoadResult::Message(message),
                     Err(error) => MessageLoadResult::LoadingError {
                         error: format!("{error:#}"),
                     },
@@ -1438,15 +1404,6 @@ impl CommandApi {
         Ok(())
     }
 
-    /// 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,
@@ -1519,20 +1476,6 @@ impl CommandApi {
         deltachat::contact::make_vcard(&ctx, &contacts).await
     }
 
-    /// Sets vCard containing the given contacts to the message draft.
-    async fn set_draft_vcard(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        contacts: Vec<u32>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts: Vec<_> = contacts.iter().map(|&c| ContactId::new(c)).collect();
-        let mut msg = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
-        msg.make_vcard(&ctx, &contacts).await?;
-        msg.get_chat_id().set_draft(&ctx, Some(&mut msg)).await
-    }
-
     // ---------------------------------------------
     //                   chat
     // ---------------------------------------------
@@ -1581,6 +1524,55 @@ impl CommandApi {
         Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
     }
 
+    /// Search next/previous message based on a given message and a list of types.
+    /// Typically used to implement the "next" and "previous" buttons
+    /// in a gallery or in a media player.
+    ///
+    /// one combined call for getting chat::get_next_media for both directions
+    /// the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
+    ///
+    /// Deprecated 2023-10-03, use `get_chat_media` method
+    /// and navigate the returned array instead.
+    #[allow(deprecated)]
+    async fn get_neighboring_chat_media(
+        &self,
+        account_id: u32,
+        msg_id: u32,
+        message_type: MessageViewtype,
+        or_message_type2: Option<MessageViewtype>,
+        or_message_type3: Option<MessageViewtype>,
+    ) -> Result<(Option<u32>, Option<u32>)> {
+        let ctx = self.get_context(account_id).await?;
+
+        let msg_type: Viewtype = message_type.into();
+        let msg_type2: Viewtype = or_message_type2.map(|v| v.into()).unwrap_or_default();
+        let msg_type3: Viewtype = or_message_type3.map(|v| v.into()).unwrap_or_default();
+
+        let prev = chat::get_next_media(
+            &ctx,
+            MsgId::new(msg_id),
+            chat::Direction::Backward,
+            msg_type,
+            msg_type2,
+            msg_type3,
+        )
+        .await?
+        .map(|id| id.to_u32());
+
+        let next = chat::get_next_media(
+            &ctx,
+            MsgId::new(msg_id),
+            chat::Direction::Forward,
+            msg_type,
+            msg_type2,
+            msg_type3,
+        )
+        .await?
+        .map(|id| id.to_u32());
+
+        Ok((prev, next))
+    }
+
     // ---------------------------------------------
     //                   backup
     // ---------------------------------------------
@@ -1652,10 +1644,10 @@ impl CommandApi {
     ///
     /// This call will block until the QR code is ready,
     /// even if there is no concurrent call to [`CommandApi::provide_backup`],
-    /// but will fail after 60 seconds to avoid deadlocks.
+    /// but will fail after 10 seconds to avoid deadlocks.
     async fn get_backup_qr(&self, account_id: u32) -> Result<String> {
         let qr = tokio::time::timeout(
-            Duration::from_secs(60),
+            Duration::from_secs(10),
             self.inner_get_backup_qr(account_id),
         )
         .await
@@ -1671,13 +1663,13 @@ impl CommandApi {
     ///
     /// This call will block until the QR code is ready,
     /// even if there is no concurrent call to [`CommandApi::provide_backup`],
-    /// but will fail after 60 seconds to avoid deadlocks.
+    /// but will fail after 10 seconds to avoid deadlocks.
     ///
     /// Returns the QR code rendered as an SVG image.
     async fn get_backup_qr_svg(&self, account_id: u32) -> Result<String> {
         let ctx = self.get_context(account_id).await?;
         let qr = tokio::time::timeout(
-            Duration::from_secs(60),
+            Duration::from_secs(10),
             self.inner_get_backup_qr(account_id),
         )
         .await
@@ -1781,10 +1773,10 @@ impl CommandApi {
         account_id: u32,
         instance_msg_id: u32,
         update_str: String,
-        _descr: Option<String>,
+        description: String,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        ctx.send_webxdc_status_update(MsgId::new(instance_msg_id), &update_str)
+        ctx.send_webxdc_status_update(MsgId::new(instance_msg_id), &update_str, &description)
             .await
     }
 
@@ -1843,18 +1835,6 @@ impl CommandApi {
         WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
     }
 
-    /// 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,
-        instance_msg_id: u32,
-    ) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
-        Ok(message.get_webxdc_href())
-    }
-
     /// Get blob encoded as base64 from a webxdc message
     ///
     /// path is the path of the file within webxdc archive
@@ -1987,13 +1967,9 @@ impl CommandApi {
 
     async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
-        let mut message = data
-            .create_message(&ctx)
-            .await
-            .context("Failed to create message")?;
+        let mut message = data.create_message(&ctx).await?;
         let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
-            .await
-            .context("Failed to send created message")?
+            .await?
             .to_u32();
         Ok(msg_id)
     }
@@ -2030,7 +2006,9 @@ impl CommandApi {
     async fn get_draft(&self, account_id: u32, chat_id: u32) -> Result<Option<MessageObject>> {
         let ctx = self.get_context(account_id).await?;
         if let Some(draft) = ChatId::new(chat_id).get_draft(&ctx).await? {
-            Ok(MessageObject::from_msg_id(&ctx, draft.get_id()).await?)
+            Ok(Some(
+                MessageObject::from_msg_id(&ctx, draft.get_id()).await?,
+            ))
         } else {
             Ok(None)
         }
@@ -2156,7 +2134,8 @@ impl CommandApi {
     ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
 
-        let mut msg = Message::new_text(text);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(text);
 
         let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
         Ok(message_id.to_u32())
@@ -2199,9 +2178,7 @@ impl CommandApi {
                 .await?;
         }
         let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message).await?;
-        let message = MessageObject::from_msg_id(&ctx, msg_id)
-            .await?
-            .context("Just sent message does not exist")?;
+        let message = MessageObject::from_msg_id(&ctx, msg_id).await?;
         Ok((msg_id.to_u32(), message))
     }
 

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

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

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

@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, Context as _, Result};
-use 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};
@@ -32,17 +32,12 @@ pub struct FullChat {
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     // subtitle  - will be moved to frontend because it uses translation functions
     chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
     contacts: Vec<ContactObject>,
     contact_ids: Vec<u32>,
-
-    /// Contact IDs of the past chat members.
-    past_contact_ids: Vec<u32>,
-
     color: String,
     fresh_message_counter: usize,
     // is_group - please check over chat.type in frontend instead
@@ -63,7 +58,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());
 
@@ -110,13 +104,11 @@ impl FullChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
             contacts,
             contact_ids: contact_ids.iter().map(|id| id.to_u32()).collect(),
-            past_contact_ids: past_contact_ids.iter().map(|id| id.to_u32()).collect(),
             color,
             fresh_message_counter,
             is_contact_request: chat.is_contact_request(),
@@ -161,7 +153,6 @@ pub struct BasicChat {
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
@@ -189,7 +180,6 @@ impl BasicChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),

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

@@ -88,17 +88,11 @@ pub(crate) async fn get_chat_list_item_by_id(
 
     let (last_updated, message_type) = match last_msgid {
         Some(id) => {
-            if let Some(last_message) =
-                deltachat::message::Message::load_from_db_optional(ctx, id).await?
-            {
-                (
-                    Some(last_message.get_timestamp() * 1000),
-                    Some(last_message.get_viewtype().into()),
-                )
-            } else {
-                // Message may be deleted by the time we try to load it.
-                (None, None)
-            }
+            let last_message = deltachat::message::Message::load_from_db(ctx, id).await?;
+            (
+                Some(last_message.get_timestamp() * 1000),
+                Some(last_message.get_viewtype().into()),
+            )
         }
         None => (None, None),
     };

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

@@ -19,7 +19,6 @@ pub struct ContactObject {
     profile_image: Option<String>, // BLOBS
     name_and_addr: String,
     is_blocked: bool,
-    e2ee_avail: bool,
 
     /// True if the contact can be added to verified groups.
     ///
@@ -80,7 +79,6 @@ impl ContactObject {
             profile_image, //BLOBS
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
-            e2ee_avail: contact.e2ee_avail(context).await?,
             is_verified,
             is_profile_verified,
             verifier_id,

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

@@ -69,7 +69,7 @@ pub enum EventType {
     /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
     /// it might be better to delay showing these events until the function has really
     /// failed (returned false). It should be sufficient to report only the *last* error
-    /// in a message box then.
+    /// in a messasge box then.
     Error { msg: String },
 
     /// An action cannot be performed because the user is not in the group.
@@ -84,78 +84,26 @@ 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.
-    #[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,
@@ -171,57 +119,21 @@ 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.
@@ -235,29 +147,21 @@ pub enum EventType {
 
     /// Chat ephemeral timer changed.
     #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified {
-        /// Chat ID.
-        chat_id: u32,
-
-        /// New ephemeral timer value.
-        timer: 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 {
@@ -272,11 +176,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().
@@ -293,34 +196,26 @@ pub enum EventType {
     ///
     /// 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,
-
-        /// Progress as:
-        /// 300=vg-/vc-request received, typically shown as "bob@addr joins".
-        /// 600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-        /// 800=contact added to chat, shown as "bob@addr securely joined GROUP". Only for the verified-group-protocol.
-        /// 1000=Protocol finished for this contact.
-        progress: usize,
-    },
+    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
@@ -341,37 +236,17 @@ 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>,
-    },
-
-    /// 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,
-    },
+    WebxdcRealtimeData { msg_id: u32, data: Vec<u8> },
 
     /// 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
@@ -387,30 +262,10 @@ 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>,
-    },
-
-    /// Inform that the list of accounts has changed (an account removed or added or (not yet implemented) the account order changes)
-    ///
-    /// This event is only emitted by the account manager
-    AccountsChanged,
-
-    /// Inform that an account property that might be shown in the account list changed, namely:
-    /// - is_configured (see is_configured())
-    /// - displayname
-    /// - selfavatar
-    /// - private_tag
-    ///
-    /// This event is emitted from the account whose property changed.
-    AccountsItemChanged,
+    ChatlistItemChanged { chat_id: Option<u32> },
 
     /// Inform than some events have been skipped due to event channel overflow.
-    EventChannelOverflow {
-        /// Number of events skipped.
-        n: u64,
-    },
+    EventChannelOverflow { n: u64 },
 }
 
 impl From<CoreEventType> for EventType {
@@ -442,30 +297,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 contact_id: contact_id.to_u32(),
             },
-            CoreEventType::IncomingReaction {
-                chat_id,
-                contact_id,
-                msg_id,
-                reaction,
-            } => IncomingReaction {
-                chat_id: chat_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                reaction: reaction.as_str().to_string(),
-            },
-            CoreEventType::IncomingWebxdcNotify {
-                chat_id,
-                contact_id,
-                msg_id,
-                text,
-                href,
-            } => IncomingWebxdcNotify {
-                chat_id: chat_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                text,
-                href,
-            },
             CoreEventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
                 chat_id: chat_id.to_u32(),
                 msg_id: msg_id.to_u32(),
@@ -542,11 +373,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 data,
             },
-            CoreEventType::WebxdcRealtimeAdvertisementReceived { msg_id } => {
-                WebxdcRealtimeAdvertisementReceived {
-                    msg_id: msg_id.to_u32(),
-                }
-            }
             CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
                 msg_id: msg_id.to_u32(),
             },
@@ -556,11 +382,6 @@ impl From<CoreEventType> for EventType {
             },
             CoreEventType::ChatlistChanged => ChatlistChanged,
             CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
-            CoreEventType::AccountsChanged => AccountsChanged,
-            CoreEventType::AccountsItemChanged => AccountsItemChanged,
-            #[allow(unreachable_patterns)]
-            #[cfg(test)]
-            _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
         }
     }
 }

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

@@ -85,8 +85,6 @@ pub struct MessageObject {
 
     webxdc_info: Option<WebxdcMessageInfo>,
 
-    webxdc_href: Option<String>,
-
     download_state: DownloadState,
 
     reactions: Option<JSONRPCReactions>,
@@ -104,9 +102,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>,
@@ -117,10 +112,8 @@ enum MessageQuote {
 }
 
 impl MessageObject {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Option<Self>> {
-        let Some(message) = Message::load_from_db_optional(context, msg_id).await? else {
-            return Ok(None);
-        };
+    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
+        let message = Message::load_from_db(context, msg_id).await?;
 
         let sender_contact = Contact::get_by_id(context, message.get_from_id())
             .await
@@ -150,7 +143,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(),
@@ -191,7 +183,7 @@ impl MessageObject {
             .map(Into::into)
             .collect();
 
-        let message_object = MessageObject {
+        Ok(MessageObject {
             id: msg_id.to_u32(),
             chat_id: message.get_chat_id().to_u32(),
             from_id: message.get_from_id().to_u32(),
@@ -247,17 +239,12 @@ impl MessageObject {
             file_name: message.get_filename(),
             webxdc_info,
 
-            // On a WebxdcInfoMessage this might include a hash holding
-            // information about a specific position or state in a webxdc app
-            webxdc_href: message.get_webxdc_href(),
-
             download_state,
 
             reactions,
 
             vcard_contact: vcard_contacts.first().cloned(),
-        };
-        Ok(Some(message_object))
+        })
     }
 }
 
@@ -277,9 +264,6 @@ pub enum MessageViewtype {
     Gif,
 
     /// Message containing a sticker, similar to image.
-    /// NB: When sending, the message viewtype may be changed to `Image` by some heuristics like
-    /// checking for transparent pixels. Use `Message::force_sticker()` to disable them.
-    ///
     /// If possible, the ui should display the image without borders in a transparent way.
     /// A click on a sticker will offer to install the sticker set in some future.
     Sticker,
@@ -506,7 +490,6 @@ pub struct MessageSearchResult {
     author_name: String,
     author_color: String,
     author_id: u32,
-    chat_id: u32,
     chat_profile_image: Option<String>,
     chat_color: String,
     chat_name: String,
@@ -546,7 +529,6 @@ impl MessageSearchResult {
             author_name,
             author_color: color_int_to_hex_string(sender.get_color()),
             author_id: sender.id.to_u32(),
-            chat_id: chat.id.to_u32(),
             chat_name: chat.get_name().to_owned(),
             chat_color,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
@@ -595,9 +577,7 @@ pub struct MessageData {
     pub file: Option<String>,
     pub location: Option<(f64, f64)>,
     pub override_sender_name: Option<String>,
-    /// Quoted message id. Takes preference over `quoted_text` (see below).
     pub quoted_message_id: Option<u32>,
-    pub quoted_text: Option<String>,
 }
 
 impl MessageData {
@@ -623,16 +603,16 @@ impl MessageData {
             message.set_location(latitude, longitude);
         }
         if let Some(id) = self.quoted_message_id {
-            let quoted_message = Message::load_from_db(context, MsgId::new(id))
-                .await
-                .context("Failed to load quoted message")?;
             message
-                .set_quote(context, Some(&quoted_message))
-                .await
-                .context("Failed to set quote")?;
-        } else if let Some(text) = self.quoted_text {
-            let protect = false;
-            message.set_quote_text(Some((text, protect)));
+                .set_quote(
+                    context,
+                    Some(
+                        &Message::load_from_db(context, MsgId::new(id))
+                            .await
+                            .context("message to quote could not be loaded")?,
+                    ),
+                )
+                .await?;
         }
         Ok(message)
     }
@@ -655,7 +635,7 @@ pub struct MessageInfo {
     error: Option<String>,
     rfc724_mid: String,
     server_urls: Vec<String>,
-    hop_info: String,
+    hop_info: Option<String>,
 }
 
 impl MessageInfo {

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

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

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

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

deltachat-jsonrpc/src/lib.rs

@@ -1,6 +1,4 @@
 #![recursion_limit = "256"]
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
 pub mod api;
 pub use yerpc;
 
@@ -85,7 +83,7 @@ mod tests {
             assert_eq!(result, response.to_owned());
         }
         {
-            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":""}]}"#;
+            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":"","socks5_enabled":"0","socks5_host":"","socks5_port":"","socks5_user":"","socks5_password":""}]}"#;
             let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#;
             session.handle_incoming(request).await;
             let result = receiver.recv().await?;

deltachat-jsonrpc/typescript/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.6.2"
+    "yerpc": "^0.4.3"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
@@ -58,5 +58,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.155.6"
+  "version": "1.140.0"
 }

deltachat-jsonrpc/typescript/test/online.ts

@@ -86,7 +86,10 @@ describe("online tests", function () {
       null
     );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
+    const eventPromise = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId2),
+      waitForEvent(dc, "IncomingMsg", accountId2),
+    ]);
 
     await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
     const { chatId: chatIdOnAccountB } = await eventPromise;
@@ -116,7 +119,10 @@ describe("online tests", function () {
       null
     );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
+    const eventPromise = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId2),
+      waitForEvent(dc, "IncomingMsg", accountId2),
+    ]);
     dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
     // wait for message from A
     console.log("wait for message from A");
@@ -137,7 +143,10 @@ describe("online tests", function () {
     );
     expect(message.text).equal("Hello2");
     // Send message back from B to A
-    const eventPromise2 = waitForEvent(dc, "IncomingMsg", accountId1);
+    const eventPromise2 = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId1),
+      waitForEvent(dc, "IncomingMsg", accountId1),
+    ]);
     dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
     // Check if answer arrives at A and if it is encrypted
     await eventPromise2;

deltachat-ratelimit/src/lib.rs

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

deltachat-repl/Cargo.toml

@@ -1,21 +1,20 @@
 [package]
 name = "deltachat-repl"
-version = "1.155.6"
+version = "1.140.0"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [dependencies]
-anyhow = { workspace = true }
-deltachat = { workspace = true, features = ["internals"]}
-dirs = "6"
-log = { workspace = true }
-nu-ansi-term = { workspace = true }
-qr2term = "0.3.3"
-rusqlite = { workspace = true }
-rustyline = "15"
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+ansi_term = "0.12.1"
+anyhow = "1"
+deltachat = { path = "..", features = ["internals"]}
+dirs = "5"
+log = "0.4.21"
+rusqlite = "0.31"
+rustyline = "14"
+tokio = { version = "1.37.0", features = ["fs", "rt-multi-thread", "macros"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [features]
 default = ["vendored"]

deltachat-repl/src/cmdline.rs

@@ -22,7 +22,6 @@ use deltachat::mimeparser::SystemMessage;
 use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::qr_code_generator::create_qr_svg;
 use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
@@ -340,6 +339,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  receive-backup <qr>\n\
                  export-keys\n\
                  import-keys\n\
+                 export-setup\n\
                  poke [<eml-file>|<folder>|<addr> <key-file>]\n\
                  reset <flags>\n\
                  stop\n\
@@ -356,7 +356,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  configure\n\
                  connect\n\
                  disconnect\n\
-                 fetch\n\
                  connectivity\n\
                  maybenetwork\n\
                  housekeeping\n\
@@ -426,7 +425,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  checkqr <qr-content>\n\
                  joinqr <qr-content>\n\
                  setqr <qr-content>\n\
-                 createqrsvg <qr-content>\n\
                  providerinfo <addr>\n\
                  fileinfo <file>\n\
                  estimatedeletion <seconds>\n\
@@ -489,9 +487,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         }
         "send-backup" => {
             let provider = BackupProvider::prepare(&context).await?;
-            let qr = format_backup(&provider.qr())?;
-            println!("QR code: {}", qr);
-            qr2term::print_qr(qr.as_str())?;
+            let qr = provider.qr();
+            println!("QR code: {}", format_backup(&qr)?);
             provider.await?;
         }
         "receive-backup" => {
@@ -507,6 +504,17 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "import-keys" => {
             imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
         }
+        "export-setup" => {
+            let setup_code = create_setup_code(&context);
+            let file_name = blobdir.join("autocrypt-setup-message.html");
+            let file_content = render_setup_file(&context, &setup_code).await?;
+            fs::write(&file_name, file_content).await?;
+            println!(
+                "Setup message written to: {}\nSetup code: {}",
+                file_name.display(),
+                &setup_code,
+            );
+        }
         "poke" => {
             ensure!(poke_spec(&context, Some(arg1)).await, "Poke failed");
         }
@@ -939,7 +947,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?;
         }
@@ -969,7 +977,9 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 "Arguments <msg-id> <json status update> expected"
             );
             let msg_id = MsgId::new(arg1.parse()?);
-            context.send_webxdc_status_update(msg_id, arg2).await?;
+            context
+                .send_webxdc_status_update(msg_id, arg2, "this is a webxdc status update")
+                .await?;
         }
         "videochat" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
@@ -1002,7 +1012,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             if !arg1.is_empty() {
-                let mut draft = Message::new_text(arg1.to_string());
+                let mut draft = Message::new(Viewtype::Text);
+                draft.set_text(arg1.to_string());
                 sel_chat
                     .as_ref()
                     .unwrap()
@@ -1025,7 +1036,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 !arg1.is_empty(),
                 "Please specify text to add as device message."
             );
-            let mut msg = Message::new_text(arg1.to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text(arg1.to_string());
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
         "listmedia" => {
@@ -1247,19 +1259,12 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 Err(err) => println!("Cannot set config from QR code: {err:?}"),
             }
         }
-        "createqrsvg" => {
-            ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
-            let svg = create_qr_svg(arg1)?;
-            let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
-            fs::write(&file, svg).await?;
-            println!("{file:#?} written.");
-        }
         "providerinfo" => {
             ensure!(!arg1.is_empty(), "Argument <addr> missing.");
-            let proxy_enabled = context
-                .get_config_bool(config::Config::ProxyEnabled)
+            let socks5_enabled = context
+                .get_config_bool(config::Config::Socks5Enabled)
                 .await?;
-            match provider::get_provider_info(&context, arg1, proxy_enabled).await {
+            match provider::get_provider_info(&context, arg1, socks5_enabled).await {
                 Some(info) => {
                     println!("Information for provider belonging to {arg1}:");
                     println!("status: {}", info.status as u32);

deltachat-repl/src/main.rs

@@ -9,7 +9,10 @@
 extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
+use std::io::{self, Write};
+use std::process::Command;
 
+use ansi_term::Color;
 use anyhow::{bail, Error};
 use deltachat::chat::ChatId;
 use deltachat::config;
@@ -19,10 +22,9 @@ use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
 use deltachat::EventType;
 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::{
@@ -150,7 +152,7 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 13] = [
+const IMEX_COMMANDS: [&str; 14] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
@@ -161,12 +163,13 @@ const IMEX_COMMANDS: [&str; 13] = [
     "receive-backup",
     "export-keys",
     "import-keys",
+    "export-setup",
     "poke",
     "reset",
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 11] = [
+const DB_COMMANDS: [&str; 10] = [
     "info",
     "set",
     "get",
@@ -174,7 +177,6 @@ const DB_COMMANDS: [&str; 11] = [
     "configure",
     "connect",
     "disconnect",
-    "fetch",
     "connectivity",
     "maybenetwork",
     "housekeeping",
@@ -240,13 +242,12 @@ const CONTACT_COMMANDS: [&str; 9] = [
     "unblock",
     "listblocked",
 ];
-const MISC_COMMANDS: [&str; 12] = [
+const MISC_COMMANDS: [&str; 11] = [
     "getqr",
     "getqrsvg",
     "getbadqr",
     "checkqr",
     "joinqr",
-    "createqrsvg",
     "fileinfo",
     "clear",
     "exit",
@@ -298,8 +299,8 @@ impl Highlighter for DcHelper {
         self.highlighter.highlight(line, pos)
     }
 
-    fn highlight_char(&self, line: &str, pos: usize, kind: HighlightCmdKind) -> bool {
-        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)
     }
 }
 
@@ -417,9 +418,6 @@ async fn handle_cmd(
         "disconnect" => {
             ctx.stop_io().await;
         }
-        "fetch" => {
-            ctx.background_fetch().await?;
-        }
         "configure" => {
             ctx.configure().await?;
         }
@@ -449,7 +447,12 @@ async fn handle_cmd(
                     qr.replace_range(12..22, "0000000000")
                 }
                 println!("{qr}");
-                qr2term::print_qr(qr.as_str())?;
+                let output = Command::new("qrencode")
+                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .output()
+                    .expect("failed to execute process");
+                io::stdout().write_all(&output.stdout).unwrap();
+                io::stderr().write_all(&output.stderr).unwrap();
             }
         }
         "getqrsvg" => {

deltachat-rpc-client/README.md

@@ -25,8 +25,7 @@ $ pip install .
 ## Testing
 
 1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-2. Install tox `pip install -U tox`
-3. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.
+2. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.
 
 Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.
 

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.155.6"
+version = "1.140.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -23,7 +23,9 @@ classifiers = [
     "Topic :: Communications :: Email"
 ]
 readme = "README.md"
-requires-python = ">=3.8"
+dependencies = [
+    "imap-tools",
+]
 
 [tool.setuptools.package-data]
 deltachat_rpc_client = [

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

@@ -250,16 +250,12 @@ class Account:
         """
         return Chat(self, self._rpc.secure_join(self.id, qrdata))
 
-    def get_qr_code(self) -> str:
-        """Get Setup-Contact QR Code text.
+    def get_qr_code(self) -> tuple[str, str]:
+        """Get Setup-Contact QR Code text and SVG data.
 
-        This data needs to be transferred to another Delta Chat account
+        this data needs to be transferred to another Delta Chat account
         in a second channel, typically used by mobiles with QRcode-show + scan UX.
         """
-        return self._rpc.get_chat_securejoin_qr_code(self.id, None)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
-        """Get Setup-Contact QR code text and SVG."""
         return self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
 
     def get_message_by_id(self, msg_id: int) -> Message:

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

@@ -96,11 +96,7 @@ class Chat:
         """Return encryption info for this chat."""
         return self._rpc.get_chat_encryption_info(self.account.id, self.id)
 
-    def get_qr_code(self) -> str:
-        """Get Join-Group QR code text."""
-        return self._rpc.get_chat_securejoin_qr_code(self.account.id, self.id)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
+    def get_qr_code(self) -> tuple[str, str]:
         """Get Join-Group QR code text and SVG data."""
         return self._rpc.get_chat_securejoin_qr_code_svg(self.account.id, self.id)
 
@@ -238,11 +234,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.
 

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

@@ -41,7 +41,6 @@ class EventType(str, Enum):
     REACTIONS_CHANGED = "ReactionsChanged"
     INCOMING_MSG = "IncomingMsg"
     INCOMING_MSG_BUNCH = "IncomingMsgBunch"
-    INCOMING_REACTION = "IncomingReaction"
     MSGS_NOTICED = "MsgsNoticed"
     MSG_DELIVERED = "MsgDelivered"
     MSG_FAILED = "MsgFailed"
@@ -62,11 +61,8 @@ class EventType(str, Enum):
     WEBXDC_INSTANCE_DELETED = "WebxdcInstanceDeleted"
     CHATLIST_CHANGED = "ChatlistChanged"
     CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
-    ACCOUNTS_CHANGED = "AccountsChanged"
-    ACCOUNTS_ITEM_CHANGED = "AccountsItemChanged"
     CONFIG_SYNCED = "ConfigSynced"
     WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
-    WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED = "WebxdcRealtimeAdvertisementReceived"
 
 
 class ChatId(IntEnum):

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

@@ -36,10 +36,6 @@ 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)

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

@@ -1,3 +1,7 @@
+"""
+Internal Python-level IMAP handling used by the tests.
+"""
+
 from __future__ import annotations
 
 import imaplib
@@ -5,13 +9,18 @@ import io
 import pathlib
 import ssl
 from contextlib import contextmanager
-from typing import TYPE_CHECKING
 
-import pytest
-from imap_tools import AND, Header, MailBox, MailMessage, MailMessageFlags, errors
+from imap_tools import (
+    AND,
+    Header,
+    MailBox,
+    MailBoxTls,
+    MailMessage,
+    MailMessageFlags,
+    errors,
+)
 
-if TYPE_CHECKING:
-    from deltachat_rpc_client import Account
+from . import Account, const
 
 FLAGS = b"FLAGS"
 FETCH = b"FETCH"
@@ -19,8 +28,6 @@ ALL = "1:*"
 
 
 class DirectImap:
-    """Internal Python-level IMAP handling."""
-
     def __init__(self, account: Account) -> None:
         self.account = account
         self.logid = account.get_config("displayname") or id(account)
@@ -28,15 +35,28 @@ class DirectImap:
         self.connect()
 
     def connect(self):
-        # Assume the testing server supports TLS on port 993.
         host = self.account.get_config("configured_mail_server")
-        port = 993
+        port = int(self.account.get_config("configured_mail_port"))
+        security = int(self.account.get_config("configured_mail_security"))
 
         user = self.account.get_config("addr")
-        host = user.rsplit("@")[-1]
         pw = self.account.get_config("mail_pw")
 
-        self.conn = MailBox(host, port, ssl_context=ssl.create_default_context())
+        if security == const.SocketSecurity.PLAIN:
+            ssl_context = None
+        else:
+            ssl_context = ssl.create_default_context()
+
+            # don't check if certificate hostname doesn't match target hostname
+            ssl_context.check_hostname = False
+
+            # don't check if the certificate is trusted by a certificate authority
+            ssl_context.verify_mode = ssl.CERT_NONE
+
+        if security == const.SocketSecurity.STARTTLS:
+            self.conn = MailBoxTls(host, port, ssl_context=ssl_context)
+        elif security == const.SocketSecurity.PLAIN or security == const.SocketSecurity.SSL:
+            self.conn = MailBox(host, port, ssl_context=ssl_context)
         self.conn.login(user, pw)
 
         self.select_folder("INBOX")
@@ -204,8 +224,3 @@ class IdleManager:
     def done(self):
         """send idle-done to server if we are currently in idle mode."""
         return self.direct_imap.conn.idle.stop()
-
-
-@pytest.fixture
-def direct_imap():
-    return DirectImap

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

@@ -114,13 +114,13 @@ class ACFactory:
         return to_client.run_until(lambda e: e.kind == EventType.INCOMING_MSG)
 
 
-@pytest.fixture
+@pytest.fixture()
 def rpc(tmp_path) -> AsyncGenerator:
     rpc_server = Rpc(accounts_dir=str(tmp_path / "accounts"))
     with rpc_server:
         yield rpc_server
 
 
-@pytest.fixture
+@pytest.fixture()
 def acfactory(rpc) -> AsyncGenerator:
     return ACFactory(DeltaChat(rpc))

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

@@ -131,7 +131,10 @@ class Rpc:
 
     def reader_loop(self) -> None:
         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"]
@@ -147,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()

deltachat-rpc-client/tests/test_account_events.py

@@ -1,29 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from deltachat_rpc_client import EventType
-
-if TYPE_CHECKING:
-    from deltachat_rpc_client.pytestplugin import ACFactory
-
-
-def test_event_on_configuration(acfactory: ACFactory) -> None:
-    """
-    Test if ACCOUNTS_ITEM_CHANGED event is emitted on configure
-    """
-
-    account = acfactory.new_preconfigured_account()
-    account.clear_all_events()
-    assert not account.is_configured()
-    future = account.configure.future()
-    while True:
-        event = account.wait_for_event()
-        if event.kind == EventType.ACCOUNTS_ITEM_CHANGED:
-            break
-    assert account.is_configured()
-
-    future()
-
-
-# other tests are written in rust: src/tests/account_events.rs

deltachat-rpc-client/tests/test_chatlist_events.py

@@ -210,7 +210,6 @@ def test_multidevice_sync_chat(acfactory: ACFactory) -> None:
     alice_second_device.clear_all_events()
     alice_chat_bob.pin()
     wait_for_chatlist_specific_item(alice_second_device, alice_chat_bob.id)
-    assert alice_second_device.get_chat_by_id(alice_chat_bob.id).get_basic_snapshot().pinned
 
     alice_second_device.clear_all_events()
     alice_chat_bob.mute()

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -7,17 +7,15 @@ If you want to debug iroh at rust-trace/log level set
     RUST_LOG=iroh_net=trace,iroh_gossip=trace
 """
 
-import logging
-import os
+import sys
 import threading
 import time
 
 import pytest
-
 from deltachat_rpc_client import EventType
 
 
-@pytest.fixture
+@pytest.fixture()
 def path_to_webxdc(request):
     p = request.path.parent.parent.parent.joinpath("test-data/webxdc/chess.xdc")
     assert p.exists()
@@ -25,7 +23,9 @@ def path_to_webxdc(request):
 
 
 def log(msg):
-    logging.info(msg)
+    print()
+    print("*" * 80 + "\n" + msg + "\n", file=sys.stderr)
+    print()
 
 
 def setup_realtime_webxdc(ac1, ac2, path_to_webxdc):
@@ -68,7 +68,7 @@ def wait_receive_realtime_data(msg_data_list):
         if event.kind == EventType.WEBXDC_REALTIME_DATA:
             for i, (msg, data) in enumerate(msg_data_list):
                 if msg.id == event.msg_id:
-                    assert list(data) == event.data
+                    assert data == event.data
                     log(f"msg {msg.id}: got correct realtime data {data}")
                     del msg_data_list[i]
                     break
@@ -106,15 +106,13 @@ def test_realtime_sequentially(acfactory, path_to_webxdc):
     assert snapshot.text == "ping2"
 
     log("sending realtime data ac1 -> ac2")
-    # Test that 128 KB of data can be sent in a single message.
-    data = os.urandom(128000)
-    ac1_webxdc_msg.send_webxdc_realtime_data(data)
+    ac1_webxdc_msg.send_webxdc_realtime_data(b"foo")
 
     log("ac2: waiting for realtime data")
     while 1:
         event = ac2.wait_for_event()
         if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert event.data == list(data)
+            assert event.data == list(b"foo")
             break
 
 
@@ -186,51 +184,3 @@ def test_no_duplicate_messages(acfactory, path_to_webxdc):
         if event.kind == EventType.WEBXDC_REALTIME_DATA:
             assert int(bytes(event.data).decode()) > n
             break
-
-
-def test_no_reordering(acfactory, path_to_webxdc):
-    """Test that sending a lot of realtime messages does not result in reordering."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
-
-    setup_thread_send_realtime_data(ac1_webxdc_msg, b"hello")
-    wait_receive_realtime_data([(ac2_webxdc_msg, b"hello")])
-
-    for i in range(200):
-        ac1_webxdc_msg.send_webxdc_realtime_data([i])
-
-    for i in range(200):
-        while 1:
-            event = ac2.wait_for_event()
-            if event.kind == EventType.WEBXDC_REALTIME_DATA and bytes(event.data) != b"hello":
-                if event.data[0] == i:
-                    break
-                pytest.fail("Reordering detected")
-
-
-def test_advertisement_after_chatting(acfactory, path_to_webxdc):
-    """Test that realtime advertisement is assigned to the correct message after chatting."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_ac2_chat = ac1.create_chat(ac2)
-    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="WebXDC", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
-    assert ac2_webxdc_msg.get_snapshot().text == "WebXDC"
-
-    ac1_ac2_chat.send_text("Hello!")
-    ac2_hello_msg = ac2.wait_for_incoming_msg()
-    ac2_hello_msg_snapshot = ac2_hello_msg.get_snapshot()
-    assert ac2_hello_msg_snapshot.text == "Hello!"
-    ac2_hello_msg_snapshot.chat.accept()
-
-    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    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_securejoin.py

@@ -1,15 +1,13 @@
 import logging
-import time
 
 import pytest
-
 from deltachat_rpc_client import Chat, EventType, SpecialContactId
 
 
 def test_qr_setup_contact(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
 
     alice.wait_for_securejoin_inviter_success()
@@ -32,66 +30,41 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
     bob2.export_self_keys(tmp_path)
 
     logging.info("Bob imports a key")
-    bob.import_self_keys(tmp_path)
+    bob.import_self_keys(tmp_path / "private-key-default.asc")
 
     assert bob.get_config("key_id") == "2"
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert not bob_contact_alice_snapshot.is_verified
 
 
-def test_qr_setup_contact_svg(acfactory) -> None:
-    alice = acfactory.new_configured_account()
-    _, _, domain = alice.get_config("addr").rpartition("@")
-
-    _qr_code, svg = alice.get_qr_code_svg()
-
-    alice.set_config("displayname", "Alice")
-
-    # Test that display name is used
-    # in SVG and no address is visible.
-    _qr_code, svg = alice.get_qr_code_svg()
-    assert domain not in svg
-    assert "Alice" in svg
-
-
 @pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect, tmp_path):
-    alice, bob, fiona = acfactory.get_online_accounts(3)
+def test_qr_securejoin(acfactory, protect):
+    alice, bob = acfactory.get_online_accounts(2)
 
-    # Setup second device for Alice
-    # to test observing securejoin protocol.
-    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)
+    logging.info("Alice creates a verified group")
+    alice_chat = alice.create_group("Verified group", protect=protect)
     assert alice_chat.get_basic_snapshot().is_protected == protect
 
-    logging.info("Bob joins the group")
-    qr_code = alice_chat.get_qr_code()
+    logging.info("Bob joins verified group")
+    qr_code, _svg = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
 
-    # Alice deletes "vg-request".
-    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".
+    # Check that at least some of the handshake messages are deleted.
     for ac in [alice, bob]:
         while True:
             event = ac.wait_for_event()
             if event["kind"] == "ImapMessageDeleted":
                 break
-    bob.wait_for_securejoin_joiner_success()
+
+    alice.wait_for_securejoin_inviter_success()
 
     # Test that Alice verified Bob's profile.
     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()
+
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
     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
@@ -101,21 +74,6 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert bob_contact_alice_snapshot.is_verified
 
-    # Start second Alice device.
-    # Alice observes securejoin protocol and verifies Bob on second device.
-    alice2.start_io()
-    alice2.wait_for_securejoin_inviter_success()
-    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
-
-    # The QR code token is synced, so alice2 must be able to handle join requests.
-    logging.info("Fiona joins the group via alice2")
-    alice.stop_io()
-    fiona.secure_join(qr_code)
-    alice2.wait_for_securejoin_inviter_success()
-    fiona.wait_for_securejoin_joiner_success()
-
 
 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."""
@@ -133,7 +91,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
 
     alice_chat = alice.create_group("Verified group", protect=True)
     logging.info("Bob joins verified group")
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
     while True:
         event = bob.wait_for_event()
@@ -148,7 +106,7 @@ def test_qr_readreceipt(acfactory) -> None:
     alice, bob, charlie = acfactory.get_online_accounts(3)
 
     logging.info("Bob and Charlie setup contact with Alice")
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
 
     bob.secure_join(qr_code)
     charlie.secure_join(qr_code)
@@ -210,13 +168,13 @@ def test_setup_contact_resetup(acfactory) -> None:
     """Tests that setup contact works after Alice resets the device and changes the key."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
     alice = acfactory.resetup_account(alice)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -230,7 +188,7 @@ def test_verified_group_recovery(acfactory) -> None:
     assert chat.get_basic_snapshot().is_protected
 
     logging.info("ac2 joins verified group")
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -247,7 +205,7 @@ def test_verified_group_recovery(acfactory) -> None:
     ac2 = acfactory.resetup_account(ac2)
 
     logging.info("ac2 reverifies with ac3")
-    qr_code = ac3.get_qr_code()
+    qr_code, _svg = ac3.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -294,7 +252,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     assert chat.get_basic_snapshot().is_protected
 
     logging.info("ac2 joins verified group")
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -311,7 +269,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     ac2 = acfactory.resetup_account(ac2)
 
     logging.info("ac2 reverifies with ac3")
-    qr_code = ac3.get_qr_code()
+    qr_code, _svg = ac3.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -329,6 +287,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
 
     ac3_contact_ac2 = ac3.get_contact_by_addr(ac2.get_config("addr"))
     ac3_chat.remove_contact(ac3_contact_ac2)
+    ac3_chat.add_contact(ac3_contact_ac2)
 
     msg_id = ac2.wait_for_incoming_msg_event().msg_id
     message = ac2.get_message_by_id(msg_id)
@@ -338,8 +297,6 @@ 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 "removed" in snapshot.text
 
-    ac3_chat.add_contact(ac3_contact_ac2)
-
     event = ac2.wait_for_incoming_msg_event()
     msg_id = event.msg_id
     chat_id = event.chat_id
@@ -379,7 +336,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
     ac1, ac2, ac3, ac4 = acfactory.get_online_accounts(4)
 
     logging.info("ac3: verify with ac2")
-    qr_code = ac2.get_qr_code()
+    qr_code, _svg = ac2.get_qr_code()
     ac3.secure_join(qr_code)
     ac2.wait_for_securejoin_inviter_success()
 
@@ -389,7 +346,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
 
     logging.info("ac1: create verified group that ac2 fully joins")
     ch1 = ac1.create_group("Group", protect=True)
-    qr_code = ch1.get_qr_code()
+    qr_code, _svg = ch1.get_qr_code()
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
 
@@ -402,7 +359,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
             break
 
     logging.info("ac1: let ac2 join again but shutoff ac1 in the middle of securejoin")
-    qr_code = ch1.get_qr_code()
+    qr_code, _svg = ch1.get_qr_code()
     ac2.secure_join(qr_code)
     ac1.remove()
     logging.info("ac2 now has pending bobstate but ac1 is shutoff")
@@ -424,7 +381,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
             break
 
     logging.info("ac3: create a join-code for group VG and let ac4 join, check that ac2 got it")
-    qr_code = vg.get_qr_code()
+    qr_code, _svg = vg.get_qr_code()
     ac4.secure_join(qr_code)
     ac3.wait_for_securejoin_inviter_success()
     while 1:
@@ -445,7 +402,7 @@ def test_qr_new_group_unblocked(acfactory):
 
     ac1, ac2 = acfactory.get_online_accounts(2)
     ac1_chat = ac1.create_group("Group for joining", protect=True)
-    qr_code = ac1_chat.get_qr_code()
+    qr_code, _svg = ac1_chat.get_qr_code()
     ac2.secure_join(qr_code)
 
     ac1.wait_for_securejoin_inviter_success()
@@ -463,19 +420,15 @@ def test_qr_new_group_unblocked(acfactory):
 
 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)
-
-    # ac1new is only used to get a new address.
-    ac1new = acfactory.new_preconfigured_account()
+    ac1, ac2, ac1new = acfactory.get_online_accounts(3)
 
     logging.info("ac1: create verified-group QR, ac2 scans and joins")
     chat = ac1.create_group("hello", protect=True)
     assert chat.get_basic_snapshot().is_protected
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     logging.info("ac2: start QR-code based join-group protocol")
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
-    ac2.wait_for_securejoin_joiner_success()
 
     logging.info("sending first message")
     msg_out = chat.send_text("old address").get_snapshot()
@@ -511,12 +464,12 @@ def test_gossip_verification(acfactory) -> None:
     alice, bob, carol = acfactory.get_online_accounts(3)
 
     # Bob verifies Alice.
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
     # Bob verifies Carol.
-    qr_code = carol.get_qr_code()
+    qr_code, _svg = carol.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -567,17 +520,16 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     ac3_chat = ac3.create_group("Verified group", protect=True)
 
     # ac1 joins ac3 group.
-    ac3_qr_code = ac3_chat.get_qr_code()
+    ac3_qr_code, _svg = ac3_chat.get_qr_code()
     ac1.secure_join(ac3_qr_code)
     ac1.wait_for_securejoin_joiner_success()
 
     # 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(ac1.get_config("addr"), ac3.get_config("addr"))
-    ac1_qr_code = snapshot.chat.get_qr_code()
+    ac1_qr_code, _svg = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
-    qr_code = ac1.get_qr_code()
+    qr_code, _svg = ac1.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -588,29 +540,17 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     # ac1 resetups the account.
     ac1 = acfactory.resetup_account(ac1)
 
-    # 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!")
+    # 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!")
+    # ac2 receives a message.
+    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "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 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
+    assert not ac2_contact_ac1.get_snapshot().is_verified
 
     # ac1 goes offline.
     ac1.remove()
@@ -649,7 +589,7 @@ def test_withdraw_securejoin_qr(acfactory):
     assert alice_chat.get_basic_snapshot().is_protected
     logging.info("Bob joins verified group")
 
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob_chat = bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -672,8 +612,7 @@ def test_withdraw_securejoin_qr(acfactory):
     logging.info("Bob scanned withdrawn QR code")
     while True:
         event = alice.wait_for_event()
-        if (
-            event.kind == EventType.WARNING
-            and "Ignoring vg-request-with-auth message because of invalid auth code." in event.msg
-        ):
+        if event.kind == EventType.MSGS_CHANGED and event.chat_id != 0:
             break
+    snapshot = alice.get_message_by_id(event.msg_id).get_snapshot()
+    assert snapshot.text == "Cannot establish guaranteed end-to-end encryption with {}".format(bob.get_config("addr"))

deltachat-rpc-client/tests/test_something.py

@@ -1,17 +1,15 @@
-import base64
 import concurrent.futures
 import json
 import logging
 import os
-import socket
 import subprocess
 import time
 from unittest.mock import MagicMock
 
 import pytest
-
 from deltachat_rpc_client import Contact, EventType, Message, events
 from deltachat_rpc_client.const import DownloadState, MessageState
+from deltachat_rpc_client.direct_imap import DirectImap
 from deltachat_rpc_client.rpc import JsonRpcError
 
 
@@ -56,8 +54,8 @@ def test_acfactory(acfactory) -> None:
             if event.progress == 1000:  # Success
                 break
         else:
-            logging.info(event)
-    logging.info("Successful configuration")
+            print(event)
+    print("Successful configuration")
 
 
 def test_configure_starttls(acfactory) -> None:
@@ -70,38 +68,6 @@ def test_configure_starttls(acfactory) -> None:
     assert account.is_configured()
 
 
-def test_configure_ip(acfactory) -> None:
-    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.configure()
-
-
-def test_configure_alternative_port(acfactory) -> None:
-    """Test that configuration with alternative port 443 works."""
-    account = acfactory.new_preconfigured_account()
-
-    account.set_config("mail_port", "443")
-    account.set_config("send_port", "443")
-
-    account.configure()
-
-
-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)
 
@@ -137,12 +103,12 @@ def test_account(acfactory) -> None:
     assert alice.get_chatlist(snapshot=True)
     assert alice.get_qr_code()
     assert alice.get_fresh_messages()
+    assert alice.get_next_messages()
 
     # Test sending empty message.
     assert len(bob.wait_next_messages()) == 0
     alice_chat_bob.send_text("")
     messages = bob.wait_next_messages()
-    assert bob.get_next_messages() == messages
     assert len(messages) == 1
     message = messages[0]
     snapshot = message.get_snapshot()
@@ -231,9 +197,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()
 
 
@@ -247,7 +211,6 @@ def test_contact(acfactory) -> None:
     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()
@@ -435,7 +398,7 @@ def test_provider_info(rpc) -> None:
     assert provider_info["id"] == "gmail"
 
     # Disable MX record resolution.
-    rpc.set_config(account_id, "proxy_enabled", "1")
+    rpc.set_config(account_id, "socks5_enabled", "1")
     provider_info = rpc.get_provider_info(account_id, "github.com")
     assert provider_info is None
 
@@ -537,7 +500,7 @@ def test_reaction_to_partially_fetched_msg(acfactory, tmp_path):
     assert list(reactions.reactions_by_contact.values())[0] == [react_str]
 
 
-def test_reactions_for_a_reordering_move(acfactory, direct_imap):
+def test_reactions_for_a_reordering_move(acfactory):
     """When a batch of messages is moved from Inbox to DeltaChat folder with a single MOVE command,
     their UIDs may be reordered (e.g. Gmail is known for that) which led to that messages were
     processed by receive_imf in the wrong order, and, particularly, reactions were processed before
@@ -561,7 +524,7 @@ def test_reactions_for_a_reordering_move(acfactory, direct_imap):
     msg1.send_reaction(react_str).wait_until_delivered()
 
     logging.info("moving messages to ac2's DeltaChat folder in the reverse order")
-    ac2_direct_imap = direct_imap(ac2)
+    ac2_direct_imap = DirectImap(ac2)
     ac2_direct_imap.connect()
     for uid in sorted([m.uid for m in ac2_direct_imap.get_all_messages()], reverse=True):
         ac2_direct_imap.conn.move(uid, "DeltaChat")
@@ -650,31 +613,3 @@ def test_markseen_contact_request(acfactory, tmp_path):
         if event.kind == EventType.MSGS_NOTICED:
             break
     assert message2.get_snapshot().state == MessageState.IN_SEEN
-
-
-def test_get_http_response(acfactory):
-    alice = acfactory.new_configured_account()
-    http_response = alice._rpc.get_http_response(alice.id, "https://example.org")
-    assert http_response["mimetype"] == "text/html"
-    assert b"<title>Example Domain</title>" in base64.b64decode((http_response["blob"] + "==").encode())
-
-
-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 configured_certificate_checks
-
-    # 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.
-    #
-    # New versions of Delta Chat are not disabling TLS checks
-    # unless users explicitly disables them
-    # or provider database says provider has invalid certificates.
-    #
-    # 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 configured_certificate_checks != "0"

deltachat-rpc-client/tests/test_webxdc.py

@@ -24,9 +24,6 @@ def test_webxdc(acfactory) -> None:
         "name": "Chess Board",
         "sourceCodeUrl": None,
         "summary": None,
-        "selfAddr": webxdc_info["selfAddr"],
-        "sendUpdateInterval": 1000,
-        "sendUpdateMaxSize": 18874368,
     }
 
     status_updates = message.get_webxdc_status_updates()

deltachat-rpc-client/tox.ini

@@ -16,7 +16,6 @@ deps =
     pytest
     pytest-timeout
     pytest-xdist
-    imap-tools
 
 [testenv:lint]
 skipsdist = True
@@ -29,5 +28,5 @@ commands =
 
 [pytest]
 timeout = 300
-log_cli = true
+#log_cli = true
 log_level = debug

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.155.6"
+version = "1.140.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -10,18 +10,18 @@ keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]
 
 [dependencies]
-deltachat-jsonrpc = { workspace = true }
-deltachat = { workspace = true }
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc", default-features = false }
+deltachat = { path = "..", default-features = false }
 
-anyhow = { workspace = true }
-futures-lite = { workspace = true }
-log = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["io-std"] }
-tokio-util = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
+anyhow = "1"
+futures-lite = "2.3.0"
+log = "0.4"
+serde_json = "1"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.37.0", features = ["io-std"] }
+tokio-util = "0.7.9"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 
 [features]
 default = ["vendored"]

deltachat-rpc-server/npm-package/README.md

@@ -7,7 +7,7 @@ This simplifies cross-compilation and even reduces binary size (no CFFI layer an
 
 ## Usage
 
-> The **minimum** nodejs version for this package is `16`
+> The **minimum** nodejs version for this package is `20.11`
 
 ```
 npm i @deltachat/stdio-rpc-server @deltachat/jsonrpc-client
@@ -65,13 +65,13 @@ so by default it uses the prebuilds.
   - this will run `update_optional_dependencies_and_version.js` (in the `prepack` script),
     which puts all platform packages into `optionalDependencies` and updates the `version` in `package.json`
 
-## How to build a version you can use locally on your host machine for development
+## How to build a version you can use localy on your host machine for development
 
-You can not install the npm packet from the previous section locally, unless you have a local npm registry set up where you upload it too. This is why we have separate scripts for making it work for local installation.
+You can not install the npm packet from the previous section locally, unless you have a local npm registry set up where you upload it too. This is why we have seperate scripts for making it work for local installation.
 
 - If you just need your host platform run `python scripts/make_local_dev_version.py`
 - note: this clears the `platform_package` folder
-- (advanced) If you need more than one platform for local install you can just run `node scripts/update_optional_dependencies_and_version.js` after building multiple platforms with `build_platform_package.py`
+- (advanced) If you need more than one platform for local install you can just run `node scripts/update_optional_dependencies_and_version.js` after building multiple plaftorms with `build_platform_package.py`
 
 ## Thanks to nlnet
 

deltachat-rpc-server/npm-package/index.js

@@ -11,6 +11,9 @@ import {
   NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR,
 } from "./src/errors.js";
 
+// Because this is not compiled by typescript, esm needs this stuff (` with { type: "json" };`,
+// nodejs still complains about it being experimental, but deno also uses it, so treefit bets taht it will become standard)
+import package_json from "./package.json" with { type: "json" };
 import { createRequire } from "node:module";
 
 function findRPCServerInNodeModules() {
@@ -22,12 +25,7 @@ function findRPCServerInNodeModules() {
     return resolve(package_name);
   } catch (error) {
     console.debug("findRpcServerInNodeModules", error);
-    const require = createRequire(import.meta.url);
-    if (
-      Object.keys(require("./package.json").optionalDependencies).includes(
-        package_name
-      )
-    ) {
+    if (Object.keys(package_json.optionalDependencies).includes(package_name)) {
       throw new Error(NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name));
     } else {
       throw new Error(NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR());

deltachat-rpc-server/npm-package/package.json

@@ -15,5 +15,5 @@
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "1.155.6"
+  "version": "1.140.0"
 }

deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js

@@ -6,7 +6,7 @@ const expected_cwd = join(dirname(fileURLToPath(import.meta.url)), "..");
 
 if (process.cwd() !== expected_cwd) {
   console.error(
-    "CWD mismatch: this script needs to be run from " + expected_cwd,
+    "CWD missmatch: this script needs to be run from " + expected_cwd,
     { actual: process.cwd(), expected: expected_cwd }
   );
   process.exit(1);
@@ -40,7 +40,7 @@ const platform_package_names = await Promise.all(
         "has a different version than the version of the rpc server.",
         { rpc_server: version, platform_package: p.version }
       );
-      throw new Error("version mismatch");
+      throw new Error("version missmatch");
     }
     return { folder_name: name, package_name: p.name };
   })
@@ -55,10 +55,9 @@ for (const { folder_name, package_name } of platform_package_names) {
 }
 
 if (is_local) {
-  package_json.peerDependencies["@deltachat/jsonrpc-client"] =
-    `file:${join(expected_cwd, "/../../deltachat-jsonrpc/typescript")}`;
+  package_json.peerDependencies["@deltachat/jsonrpc-client"] = 'file:../../deltachat-jsonrpc/typescript'
 } else {
-  package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*";
+  package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*"
 }
 
 await fs.writeFile("./package.json", JSON.stringify(package_json, null, 4));

deltachat-rpc-server/src/main.rs

@@ -66,7 +66,7 @@ async fn main_impl() -> Result<()> {
 
     // Logs from `log` crate and traces from `tracing` crate
     // are configurable with `RUST_LOG` environment variable
-    // and go to stderr to avoid interfering with JSON-RPC using stdout.
+    // and go to stderr to avoid interferring with JSON-RPC using stdout.
     tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
         .with_writer(std::io::stderr)

deny.toml

@@ -1,6 +1,7 @@
 [advisories]
 ignore = [
     "RUSTSEC-2020-0071",
+    "RUSTSEC-2022-0093",
 
     # Timing attack on RSA.
     # Delta Chat does not use RSA for new keys
@@ -9,14 +10,11 @@ ignore = [
     # <https://rustsec.org/advisories/RUSTSEC-2023-0071>
     "RUSTSEC-2023-0071",
 
+    # Unmaintained ansi_term
+    "RUSTSEC-2021-0139",
+
     # Unmaintained encoding
     "RUSTSEC-2021-0153",
-
-    # Unmaintained instant
-    "RUSTSEC-2024-0384",
-
-    # DNSSEC validation that we don't use anyway.
-    "RUSTSEC-2025-0006",
 ]
 
 [bans]
@@ -25,53 +23,91 @@ ignore = [
 # when upgrading.
 # Please keep this list alphabetically sorted.
 skip = [
+     { name = "asn1-rs-derive", version = "0.4.0" },
+     { name = "asn1-rs-impl", version = "0.1.0" },
+     { name = "asn1-rs", version = "0.5.2" },
      { name = "async-channel", version = "1.9.0" },
+     { name = "base16ct", version = "0.1.1" },
      { name = "base64", version = "<0.21" },
      { name = "base64", version = "0.21.7" },
      { name = "bitflags", version = "1.3.2" },
-     { name = "core-foundation", version = "0.9.4" },
+     { name = "block-buffer", version = "<0.10" },
+     { name = "convert_case", version = "0.4.0" },
+     { name = "curve25519-dalek", version = "3.2.0" },
+     { name = "darling_core", version = "<0.14" },
+     { name = "darling_macro", version = "<0.14" },
+     { name = "darling", version = "<0.14" },
+     { name = "der_derive", version = "0.6.1" },
+     { name = "derive_more", version = "0.99.17" },
+     { name = "der-parser", version = "8.2.0" },
+     { name = "der", version = "0.6.1" },
+     { name = "digest", version = "<0.10" },
+     { name = "dlopen2", version = "0.4.1" },
+     { name = "ed25519-dalek", version = "1.0.1" },
+     { name = "ed25519", version = "1.5.3" },
      { name = "event-listener", version = "2.5.3" },
-     { name = "generator", version = "0.7.5" },
+     { name = "event-listener", version = "4.0.3" },
+     { name = "fastrand", version = "1.9.0" },
+     { name = "futures-lite", version = "1.13.0" },
      { name = "getrandom", version = "<0.2" },
+     { name = "http-body", version = "0.4.6" },
      { name = "http", version = "0.2.12" },
-     { name = "loom", version = "0.5.6" },
-     { name = "netlink-packet-route", version = "0.17.1" },
+     { name = "hyper-rustls", version = "0.24.2" },
+     { name = "hyper", version = "0.14.28" },
+     { name = "idna", version = "0.4.0" },
+     { name = "netlink-packet-core", version = "0.5.0" },
+     { name = "netlink-packet-route", version = "0.15.0" },
      { name = "nix", version = "0.26.4" },
-     { name = "nix", version = "0.27.1" },
+     { name = "oid-registry", version = "0.6.1" },
+     { name = "pem-rfc7468", version = "0.6.0" },
+     { name = "pem", version = "1.1.1" },
+     { name = "pkcs8", version = "0.9.0" },
      { name = "quick-error", version = "<2.0" },
      { name = "rand_chacha", version = "<0.3" },
      { name = "rand_core", version = "<0.6" },
      { name = "rand", version = "<0.8" },
+     { name = "rcgen", version = "<0.12.1" },
      { name = "redox_syscall", version = "0.3.5" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
-     { name = "rtnetlink", version = "0.13.1" },
-     { name = "security-framework", version = "2.11.1" },
+     { name = "reqwest", version = "0.11.27" },
+     { name = "ring", version = "0.16.20" },
+     { name = "rustls-pemfile", version = "1.0.4" },
+     { name = "rustls", version = "0.21.11" },
+     { name = "rustls-webpki", version = "0.101.7" },
+     { name = "sec1", version = "0.3.0" },
+     { name = "sha2", version = "<0.10" },
+     { name = "signature", version = "1.6.4" },
+     { name = "spin", version = "<0.9.6" },
+     { name = "spki", version = "0.6.0" },
+     { name = "ssh-encoding", version = "0.1.0" },
+     { name = "ssh-key", version = "0.5.1" },
      { name = "sync_wrapper", version = "0.1.2" },
+     { name = "synstructure", version = "0.12.6" },
      { name = "syn", version = "1.0.109" },
-     { name = "thiserror-impl", version = "1.0.69" },
-     { name = "thiserror", version = "1.0.69" },
+     { name = "system-configuration-sys", version = "0.5.0" },
+     { name = "system-configuration", version = "0.5.1" },
      { name = "time", version = "<0.3" },
-     { name = "tokio-tungstenite", version = "0.21.0" },
-     { name = "tungstenite", version = "0.21.0" },
-     { name = "unicode-width", version = "0.1.11" },
+     { name = "tokio-rustls", version = "0.24.1" },
+     { name = "toml_edit", version = "0.21.1" },
+     { name = "untrusted", version = "0.7.1" },
      { name = "wasi", version = "<0.11" },
-     { name = "windows" },
-     { name = "windows_aarch64_gnullvm" },
-     { name = "windows_aarch64_msvc" },
-     { name = "windows-core" },
-     { name = "windows_i686_gnu" },
-     { name = "windows_i686_gnullvm" },
-     { name = "windows_i686_msvc" },
-     { name = "windows-implement" },
-     { name = "windows-interface" },
-     { name = "windows-result" },
-     { name = "windows-strings" },
-     { name = "windows-sys" },
-     { name = "windows-targets" },
-     { name = "windows_x86_64_gnu" },
-     { name = "windows_x86_64_gnullvm" },
-     { name = "windows_x86_64_msvc" },
+     { name = "webpki-roots", version ="0.25.4" },
+     { name = "windows_aarch64_gnullvm", version = "<0.52" },
+     { name = "windows_aarch64_msvc", version = "<0.52" },
+     { name = "windows-core", version = "<0.54.0" },
+     { name = "windows_i686_gnu", version = "<0.52" },
+     { name = "windows_i686_msvc", version = "<0.52" },
+     { name = "windows-sys", version = "<0.52" },
+     { name = "windows-targets", version = "<0.52" },
+     { name = "windows", version = "0.32.0" },
+     { name = "windows", version = "<0.54.0" },
+     { name = "windows_x86_64_gnullvm", version = "<0.52" },
+     { name = "windows_x86_64_gnu", version = "<0.52" },
+     { name = "windows_x86_64_msvc", version = "<0.52" },
+     { name = "winnow", version = "0.5.40" },
+     { name = "winreg", version = "0.50.0" },
+     { name = "x509-parser", version = "<0.16.0" },
 ]
 
 
@@ -87,7 +123,6 @@ allow = [
     "MIT",
     "MPL-2.0",
     "OpenSSL",
-    "Unicode-3.0",
     "Unicode-DFS-2016",
     "Zlib",
 ]
@@ -102,5 +137,6 @@ license-files = [
 [sources.allow-org]
 # Organisations which we allow git sources from.
 github = [
+       "async-email",
        "deltachat",
 ]

flake.lock

@@ -3,15 +3,15 @@
     "android": {
       "inputs": {
         "devshell": "devshell",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1731356359,
-        "narHash": "sha256-vYqJnu6jotmWpPT4DgzHVdvNIZcKZCIUqS8QaptsZA0=",
+        "lastModified": 1712088936,
+        "narHash": "sha256-mVjeSWQiR/t4UZ9fUawY9OEPAhY1R3meYG+0oh8DUBs=",
         "owner": "tadfisher",
         "repo": "android-nixpkgs",
-        "rev": "c028ead7e88edb2e94cd7c90ee37593f63ae494a",
+        "rev": "2d8181caef279f19c4a33dc694723f89ffc195d4",
         "type": "github"
       },
       "original": {
@@ -22,17 +22,18 @@
     },
     "devshell": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "android",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "lastModified": 1711099426,
+        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
         "type": "github"
       },
       "original": {
@@ -47,11 +48,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1737527504,
-        "narHash": "sha256-Z8S5gLPdIYeKwBXDaSxlJ72ZmiilYhu3418h3RSQZA0=",
+        "lastModified": 1714112748,
+        "narHash": "sha256-jq6Cpf/pQH85p+uTwPPrGG8Ky/zUOTwMJ7mcqc5M4So=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "aa13f23e3e91b95377a693ac655bbc6545ebec0d",
+        "rev": "3ae4b908a795b6a3824d401a0702e11a7157d7e1",
         "type": "github"
       },
       "original": {
@@ -65,11 +66,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -83,11 +84,29 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -101,11 +120,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1721727458,
-        "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
+        "lastModified": 1713520724,
+        "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
+        "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
         "type": "github"
       },
       "original": {
@@ -116,11 +135,11 @@
     },
     "nix-filter": {
       "locked": {
-        "lastModified": 1730207686,
-        "narHash": "sha256-SCHiL+1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I=",
+        "lastModified": 1710156097,
+        "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "776e68c1d014c3adde193a18db9d738458cd2ba4",
+        "rev": "3342559a24e85fc164b295c3444e8a139924675b",
         "type": "github"
       },
       "original": {
@@ -131,11 +150,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
         "type": "github"
       },
       "original": {
@@ -147,11 +166,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1713895582,
+        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
         "type": "github"
       },
       "original": {
@@ -163,9 +182,10 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
-        "path": "/nix/store/zq2axpgzd5kykk1v446rkffj3bxa2m2h-source",
+        "lastModified": 1711668574,
+        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
+        "path": "/nix/store/9fpv0kjq9a80isa1wkkvrdqsh9dpcn05-source",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
         "type": "path"
       },
       "original": {
@@ -175,11 +195,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1714076141,
+        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
         "type": "github"
       },
       "original": {
@@ -193,7 +213,7 @@
       "inputs": {
         "android": "android",
         "fenix": "fenix",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "naersk": "naersk",
         "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs_4"
@@ -202,11 +222,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1737453499,
-        "narHash": "sha256-fa5AJI9mjFU2oVXqdCq2oA2pripAXbHzkUkewJRQpxA=",
+        "lastModified": 1714031783,
+        "narHash": "sha256-xS/niQsq1CQPOe4M4jvVPO2cnXS/EIeRG5gIopUbk+Q=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "0b68402d781955d526b80e5d479e9e47addb4075",
+        "rev": "56bee2ddafa6177b19c631eedc88d43366553223",
         "type": "github"
       },
       "original": {
@@ -245,6 +265,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -18,9 +18,9 @@
         manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
         androidSdk = android.sdk.${system} (sdkPkgs:
           builtins.attrValues {
-            inherit (sdkPkgs) ndk-27-0-11902837 cmdline-tools-latest;
+            inherit (sdkPkgs) ndk-24-0-8215888 cmdline-tools-latest;
           });
-        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.0.11902837";
+        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/24.0.8215888";
 
         rustSrc = nix-filter.lib {
           root = ./.;
@@ -88,7 +88,8 @@
         cargoLock = {
           lockFile = ./Cargo.lock;
           outputHashes = {
-            "email-0.0.20" = "sha256-cfR3D5jFQpw32bGsgapK2Uwuxmht+rRK/n1ZUmCb2WA=";
+            "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw=";
+            "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
             "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
           };
         };
@@ -256,21 +257,13 @@
 
         androidAttrs = {
           armeabi-v7a = {
-            cc = "armv7a-linux-androideabi21-clang";
+            cc = "armv7a-linux-androideabi19-clang";
             rustTarget = "armv7-linux-androideabi";
           };
           arm64-v8a = {
             cc = "aarch64-linux-android21-clang";
             rustTarget = "aarch64-linux-android";
           };
-          x86 = {
-            cc = "i686-linux-android21-clang";
-            rustTarget = "i686-linux-android";
-          };
-          x86_64 = {
-            cc = "x86_64-linux-android21-clang";
-            rustTarget = "x86_64-linux-android";
-          };
         };
 
         mkAndroidRustPackage = arch: packageName:
@@ -362,8 +355,6 @@
           mkRustPackages "x86_64-linux" //
           mkRustPackages "armv7l-linux" //
           mkRustPackages "armv6l-linux" //
-          mkRustPackages "x86_64-darwin" //
-          mkRustPackages "aarch64-darwin" //
           mkAndroidPackages "armeabi-v7a" //
           mkAndroidPackages "arm64-v8a" //
           mkAndroidPackages "x86" //
@@ -480,8 +471,8 @@
                   pkgs.python3
                   pkgs.python3Packages.wheel
                 ];
-                buildPhase = ''python3 scripts/wheel-rpc-server.py source deltachat_rpc_server-${manifest.version}.tar.gz'';
-                installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-${manifest.version}.tar.gz $out'';
+                buildPhase = ''python3 scripts/wheel-rpc-server.py source deltachat-rpc-server-${manifest.version}.tar.gz'';
+                installPhase = ''mkdir -p $out; cp -av deltachat-rpc-server-${manifest.version}.tar.gz $out'';
               };
 
             deltachat-rpc-client =
@@ -534,30 +525,28 @@
               };
           };
 
-        devShells.default =
-          let
-            pkgs = import nixpkgs {
-              system = system;
-              overlays = [ fenix.overlays.default ];
-            };
-          in
-          pkgs.mkShell {
-
-            buildInputs = with pkgs; [
-              (fenix.packages.${system}.complete.withComponents [
-                "cargo"
-                "clippy"
-                "rust-src"
-                "rustc"
-                "rustfmt"
-              ])
-              cargo-deny
-              rust-analyzer-nightly
-              cargo-nextest
-              perl # needed to build vendored OpenSSL
-              git-cliff
-            ];
+        devShells.default = let 
+          pkgs = import nixpkgs {
+            system = system;
+            overlays = [ fenix.overlays.default ];
           };
+          in pkgs.mkShell {
+
+          buildInputs = with pkgs; [
+            (fenix.packages.${system}.complete.withComponents [
+              "cargo"
+              "clippy"
+              "rust-src"
+              "rustc"
+              "rustfmt"
+            ])
+            cargo-deny
+            rust-analyzer-nightly
+            cargo-nextest
+            perl # needed to build vendored OpenSSL
+            git-cliff
+          ];
+        };
       }
     );
 }

format-flowed/src/lib.rs

@@ -8,8 +8,6 @@
 //! is assumed to be set to "no".
 //!
 //! For received messages, DelSp parameter is honoured.
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
 
 /// Wraps line to 72 characters using format=flowed soft breaks.
 ///

node/.prettierrc.yml

@@ -0,0 +1,6 @@
+# .prettierrc
+trailingComma: es5
+tabWidth: 2
+semi: false
+singleQuote: true
+jsxSingleQuote: true

node/CONTRIBUTORS.md

@@ -0,0 +1,21 @@
+# Contributors
+
+| Name                  | GitHub                                           |
+| :-------------------- | :----------------------------------------------- |
+| **Lars-Magnus Skog**  |                                                  |
+| **jikstra**           |                                                  |
+| **Simon Laux**        | [**@Simon-Laux**](https://github.com/Simon-Laux) |
+| **Jikstra**           | [**@Jikstra**](https://github.com/Jikstra)       |
+| **Nico de Haen**      |                                                  |
+| **B. Petersen**       |                                                  |
+| **Karissa McKelvey**  | [**@karissa**](https://github.com/karissa)       |
+| **developer**         |                                                  |
+| **Alexander Krotov**  |                                                  |
+| **Floris Bruynooghe** |                                                  |
+| **lefherz**           |                                                  |
+| **Pablo**             | [**@pabzm**](https://github.com/pabzm)           |
+| **pabzm**             |                                                  |
+| **holger krekel**     |                                                  |
+| **Robert Schütz**     |                                                  |
+| **bb**                |                                                  |
+| **Charles Paul**      |                                                  |

node/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

node/README.md

@@ -0,0 +1,260 @@
+# deltachat-node
+
+> node.js bindings for [`deltachat-core-rust`](..)
+
+[![npm](https://img.shields.io/npm/v/deltachat-node.svg)](https://www.npmjs.com/package/deltachat-node)
+![Node version](https://img.shields.io/node/v/deltachat-node.svg)
+[![JavaScript Style Guide](https://img.shields.io/badge/code_style-prettier-brightgreen.svg)](https://prettier.io)
+
+`deltachat-node` primarily aims to offer two things:
+
+- A high level JavaScript api with syntactic sugar
+- A low level c binding api around  [`deltachat-core-rust`](..)
+
+This code used to live at [`deltachat-node`](https://github.com/deltachat/deltachat-node)
+
+## Table of Contents
+
+<details><summary>Click to expand</summary>
+
+- [Install](#install)
+- [Dependencies](#dependencies)
+- [Build from source](#build-from-source)
+- [Usage](#usage)
+- [Developing](#developing)
+- [License](#license)
+
+</details>
+
+## Install
+
+By default the installation will try to use the bundled prebuilds in the
+npm package. If this fails it falls back to compile `../deltachat-core-rust` from
+this repository, using `scripts/rebuild-core.js`.
+
+To install from npm use:
+
+```
+npm install deltachat-node
+```
+
+## Dependencies
+
+- Nodejs >= `v18.0.0`
+- rustup (optional if you can't use the prebuilds)
+
+> On Windows, you may need to also install **Perl** to be able to compile deltachat-core.
+
+## Build from source
+
+If you want to build from source, make sure that you have `rustup` installed.
+You can either use `npm install deltachat-node --build-from-source` to force
+building from source or clone this repository and follow this steps:
+
+1. `git clone https://github.com/deltachat/deltachat-core-rust.git`
+2. `cd deltachat-core-rust`
+3. `npm i`
+4. `npm run build`
+
+> Our `package.json` file is located in the root directory of this repository,
+> not inside this folder. (We need this in order to include the rust source
+> code in the npm package.)
+
+### Use a git branch in deltachat-desktop
+
+You can directly install a core branch, but make sure:
+- that you have typescript in your project dependencies, as it is likely required
+- you know that there are **no prebuilds** and so core is built during installation which is why it takes so long
+
+```
+npm install https://github.com/deltachat/deltachat-core-rust.git#branch
+```
+
+If you want prebuilds for a branch that has a core pr, you might find an npm tar.gz package for that branch at <https://download.delta.chat/node/preview/>.
+The github ci also posts a link to it in the checks for each pr.
+
+### Use build-from-source in deltachat-desktop
+
+If you want to use the manually built node bindings in the desktop client (for
+example), you can follow these instructions:
+
+First clone the
+[deltachat-desktop](https://github.com/deltachat/deltachat-desktop) repository,
+e.g. with `git clone https://github.com/deltachat/deltachat-desktop`.
+
+Then you need to make sure that this directory is referenced correctly in
+deltachat-desktop's package.json. You need to change
+`deltachat-desktop/package.json` like this:
+
+```
+diff --git i/package.json w/package.json
+index 45893894..5154512c 100644
+--- i/package.json
++++ w/package.json
+@@ -83,7 +83,7 @@
+     "application-config": "^1.0.1",
+     "classnames": "^2.3.1",
+     "debounce": "^1.2.0",
+-    "deltachat-node": "1.79.3",
++    "deltachat-node": "file:../deltachat-core-rust/",
+     "emoji-js-clean": "^4.0.0",
+     "emoji-mart": "^3.0.1",
+     "emoji-regex": "^9.2.2",
+```
+
+Then, in the `deltachat-desktop` repository, run:
+
+1. `npm i`
+2. `npm run build`
+3. And `npm run start` to start the newly built client.
+
+### Workaround to build for x86_64 on Apple's M1
+
+deltachat doesn't support universal (fat) binaries (that contain builds for both cpu architectures) yet, until it does you can use the following workaround to get x86_64 builds:
+
+```
+$ fnm install 19 --arch x64
+$ fnm use 19
+$ node -p process.arch
+# result should be x64
+$ rustup target add x86_64-apple-darwin
+$ git apply patches/m1_build_use_x86_64.patch
+$ CARGO_BUILD_TARGET=x86_64-apple-darwin npm run build
+$ npm run test
+```
+
+(when using [fnm](https://github.com/Schniz/fnm) instead of nvm, you can select the architecture)
+If your node and electron are already build for arm64 you can also try building for arm:
+
+```
+$ fnm install 18 --arch arm64
+$ fnm use 18
+$ node -p process.arch
+# result should be arm64
+$ npm_config_arch=arm64 npm run build
+$ npm run test
+```
+
+## Usage
+
+```js
+const { Context } = require('deltachat-node')
+
+const opts = {
+  addr: '[email]',
+  mail_pw: '[password]',
+}
+
+const contact = '[email]'
+
+async function main() {
+  const dc = Context.open('./')
+  dc.on('ALL', console.log.bind(null, 'core |'))
+
+  try {
+    await dc.configure(opts)
+  } catch (err) {
+    console.error('Failed to configure because of: ', err)
+    dc.unref()
+    return
+  }
+
+  dc.startIO()
+  console.log('fully configured')
+
+  const contactId = dc.createContact('Test', contact)
+  const chatId = dc.createChatByContactId(contactId)
+  dc.sendMessage(chatId, 'Hi!')
+
+  console.log('sent message')
+
+  dc.once('DC_EVENT_SMTP_MESSAGE_SENT', async () => {
+    console.log('Message sent, shutting down...')
+    dc.stopIO()
+    console.log('stopped io')
+    dc.unref()
+  })
+}
+
+main()
+```
+this example can also be found in the examples folder [examples/send_message.js](./examples/send_message.js)
+
+### Generating Docs
+
+We are currently migrating to automatically generated documentation.
+You can find the old documentation at [old_docs](./old_docs).
+
+to generate the documentation, run:
+
+```
+npx typedoc
+```
+
+The resulting documentation can be found in the `docs/` folder.
+An online version can be found under [js.delta.chat](https://js.delta.chat).
+
+## Developing
+
+### Tests and Coverage
+
+Running `npm test` ends with showing a code coverage report, which is produced by [`nyc`](https://github.com/istanbuljs/nyc#readme).
+
+![test output](images/tests.png)
+
+The coverage report from `nyc` in the console is rather limited. To get a more detailed coverage report you can run `npm run coverage-html-report`. This will produce a html report from the `nyc` data and display it in a browser on your local machine.
+
+To run the integration tests you need to set the `CHATMAIL_DOMAIN` environment variables. E.g.:
+
+```
+$ export CHATMAIL_DOMAIN=chat.example.org
+$ npm run test
+```
+
+### Scripts
+
+We have the following scripts for building, testing and coverage:
+
+- `npm run coverage` Creates a coverage report and passes it to `coveralls`. Only done by `Travis`.
+- `npm run coverage-html-report` Generates a html report from the coverage data and opens it in a browser on the local machine.
+- `npm run generate-constants` Generates `constants.js` and `events.js` based on the `deltachat-core-rust/deltachat-ffi/deltachat.h` header file.
+- `npm install` After dependencies are installed, runs `node-gyp-build` to see if the native code needs to be rebuilt.
+- `npm run build` Rebuilds all code.
+- `npm run build:core` Rebuilds code in `deltachat-core-rust`.
+- `npm run build:bindings` Rebuilds the bindings and links with `deltachat-core-rust`.
+- `ǹpm run clean` Removes all built code
+- `npm run prebuildify` Builds prebuilt binary to `prebuilds/$PLATFORM-$ARCH`. Copies `deltachat.dll` from `deltachat-core-rust` for windows.
+- `npm run download-prebuilds` Downloads all prebuilt binaries from github before `npm publish`.
+- `npm test` Runs `standard` and then the tests in `test/index.js`.
+- `npm run test-integration` Runs the integration tests.
+- `npm run hallmark` Runs `hallmark` on all markdown files.
+
+### Releases
+
+The following steps are needed to make a release:
+
+1. Wait until `pack-module` github action is completed
+2. Run `npm publish https://download.delta.chat/node/deltachat-node-1.x.x.tar.gz` to publish it to npm. You probably need write rights to npm.
+
+## License
+
+Licensed under `GPL-3.0-or-later`, see [LICENSE](./LICENSE) file for details.
+
+>    Copyright © 2018 `DeltaChat` contributors.
+>
+>    This program is free software: you can redistribute it and/or modify
+>    it under the terms of the GNU General Public License as published by
+>    the Free Software Foundation, either version 3 of the License, or
+>    (at your option) any later version.
+>
+>    This program is distributed in the hope that it will be useful,
+>    but WITHOUT ANY WARRANTY; without even the implied warranty of
+>    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+>    GNU General Public License for more details.
+>
+>    You should have received a copy of the GNU General Public License
+>    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+[appveyor-shield]: https://ci.appveyor.com/api/projects/status/t0narp672wpbl6pd?svg=true
+
+[appveyor]: https://ci.appveyor.com/project/ralphtheninja/deltachat-node-d4bf8

node/binding.gyp

@@ -0,0 +1,78 @@
+{
+  # documentation about the format of this file can be found under https://gyp.gsrc.io/docs/InputFormatReference.md
+  # Variables can be specified when calling node-gyp as so:
+  #   node-gyp configure -- -Dvarname=value
+  "variables": {
+    # Whether to use a system-wide installation of deltachat-core
+    # using pkg-config.  Set to either "true" or "false".
+    "USE_SYSTEM_LIBDELTACHAT%": "<!(echo $USE_SYSTEM_LIBDELTACHAT)",
+  },
+  "targets": [
+    {
+      "target_name": "deltachat",
+      "sources": ["./src/module.c"],
+      "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
+      "conditions": [
+        [
+          "OS == 'win'",
+          {
+            "include_dirs": ["../deltachat-ffi"],
+            "libraries": [
+              "../../target/release/deltachat.dll.lib",
+            ],
+            "conditions": [
+              [
+                "USE_SYSTEM_LIBDELTACHAT == 'true'",
+                {
+                  "cflags": ["<!(pkg-config --cflags deltachat)"],
+                  "libraries": ["<!(pkg-config --libs deltachat)"],
+                },
+              ],
+            ],
+          },
+        ],
+        [
+          "OS == 'linux' or OS == 'mac'",
+          {
+            "libraries": ["-lpthread"],
+            "cflags": ["-std=gnu99"],
+            "conditions": [
+              [
+                "USE_SYSTEM_LIBDELTACHAT != 'true'",
+                {
+                  "include_dirs": ["../deltachat-ffi"],
+                  "ldflags": ["-Wl,-Bsymbolic"], # Prevent sqlite3 from electron from overriding sqlcipher
+                  "libraries": [
+                    "../../target/release/libdeltachat.a",
+                    "-ldl",
+                  ],
+                  "conditions": [],
+                },
+                {
+                  # USE_SYSTEM_LIBDELTACHAT == 'true'
+                  "cflags": ["<!(pkg-config --cflags deltachat)"],
+                  "libraries": ["<!(pkg-config --libs deltachat)"],
+                },
+              ],
+              [
+                "OS == 'mac'",
+                {
+                  "libraries": [
+                    "-framework CoreFoundation",
+                    "-framework CoreServices",
+                    "-framework Security",
+                    "-lresolv",
+                  ],
+                },
+                {
+                  # OS == 'linux'
+                  "libraries": ["-lm", "-lrt"],
+                },
+              ],
+            ],
+          },
+        ],
+      ],
+    },
+  ],
+}

node/binding.js

@@ -0,0 +1 @@
+module.exports = require('node-gyp-build')(__dirname)

node/constants.js

@@ -0,0 +1,303 @@
+// Generated!
+
+module.exports = {
+  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES: 3,
+  DC_CERTCK_AUTO: 0,
+  DC_CERTCK_STRICT: 1,
+  DC_CHAT_ID_ALLDONE_HINT: 7,
+  DC_CHAT_ID_ARCHIVED_LINK: 6,
+  DC_CHAT_ID_LAST_SPECIAL: 9,
+  DC_CHAT_ID_TRASH: 3,
+  DC_CHAT_TYPE_BROADCAST: 160,
+  DC_CHAT_TYPE_GROUP: 120,
+  DC_CHAT_TYPE_MAILINGLIST: 140,
+  DC_CHAT_TYPE_SINGLE: 100,
+  DC_CHAT_TYPE_UNDEFINED: 0,
+  DC_CHAT_VISIBILITY_ARCHIVED: 1,
+  DC_CHAT_VISIBILITY_NORMAL: 0,
+  DC_CHAT_VISIBILITY_PINNED: 2,
+  DC_CONNECTIVITY_CONNECTED: 4000,
+  DC_CONNECTIVITY_CONNECTING: 2000,
+  DC_CONNECTIVITY_NOT_CONNECTED: 1000,
+  DC_CONNECTIVITY_WORKING: 3000,
+  DC_CONTACT_ID_DEVICE: 5,
+  DC_CONTACT_ID_INFO: 2,
+  DC_CONTACT_ID_LAST_SPECIAL: 9,
+  DC_CONTACT_ID_SELF: 1,
+  DC_DOWNLOAD_AVAILABLE: 10,
+  DC_DOWNLOAD_DONE: 0,
+  DC_DOWNLOAD_FAILURE: 20,
+  DC_DOWNLOAD_IN_PROGRESS: 1000,
+  DC_DOWNLOAD_UNDECIPHERABLE: 30,
+  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE: 2200,
+  DC_EVENT_CHANNEL_OVERFLOW: 2400,
+  DC_EVENT_CHATLIST_CHANGED: 2300,
+  DC_EVENT_CHATLIST_ITEM_CHANGED: 2301,
+  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
+  DC_EVENT_CHAT_MODIFIED: 2020,
+  DC_EVENT_CONFIGURE_PROGRESS: 2041,
+  DC_EVENT_CONFIG_SYNCED: 2111,
+  DC_EVENT_CONNECTIVITY_CHANGED: 2100,
+  DC_EVENT_CONTACTS_CHANGED: 2030,
+  DC_EVENT_DELETED_BLOB_FILE: 151,
+  DC_EVENT_ERROR: 400,
+  DC_EVENT_ERROR_SELF_NOT_IN_GROUP: 410,
+  DC_EVENT_IMAP_CONNECTED: 102,
+  DC_EVENT_IMAP_INBOX_IDLE: 106,
+  DC_EVENT_IMAP_MESSAGE_DELETED: 104,
+  DC_EVENT_IMAP_MESSAGE_MOVED: 105,
+  DC_EVENT_IMEX_FILE_WRITTEN: 2052,
+  DC_EVENT_IMEX_PROGRESS: 2051,
+  DC_EVENT_INCOMING_MSG: 2005,
+  DC_EVENT_INCOMING_MSG_BUNCH: 2006,
+  DC_EVENT_INFO: 100,
+  DC_EVENT_LOCATION_CHANGED: 2035,
+  DC_EVENT_MSGS_CHANGED: 2000,
+  DC_EVENT_MSGS_NOTICED: 2008,
+  DC_EVENT_MSG_DELETED: 2016,
+  DC_EVENT_MSG_DELIVERED: 2010,
+  DC_EVENT_MSG_FAILED: 2012,
+  DC_EVENT_MSG_READ: 2015,
+  DC_EVENT_NEW_BLOB_FILE: 150,
+  DC_EVENT_REACTIONS_CHANGED: 2001,
+  DC_EVENT_SECUREJOIN_INVITER_PROGRESS: 2060,
+  DC_EVENT_SECUREJOIN_JOINER_PROGRESS: 2061,
+  DC_EVENT_SELFAVATAR_CHANGED: 2110,
+  DC_EVENT_SMTP_CONNECTED: 101,
+  DC_EVENT_SMTP_MESSAGE_SENT: 103,
+  DC_EVENT_WARNING: 300,
+  DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
+  DC_EVENT_WEBXDC_REALTIME_DATA: 2150,
+  DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
+  DC_GCL_ADD_ALLDONE_HINT: 4,
+  DC_GCL_ADD_SELF: 2,
+  DC_GCL_ARCHIVED_ONLY: 1,
+  DC_GCL_FOR_FORWARDING: 8,
+  DC_GCL_NO_SPECIALS: 2,
+  DC_GCL_VERIFIED_ONLY: 1,
+  DC_GCM_ADDDAYMARKER: 1,
+  DC_GCM_INFO_ONLY: 2,
+  DC_IMEX_EXPORT_BACKUP: 11,
+  DC_IMEX_EXPORT_SELF_KEYS: 1,
+  DC_IMEX_IMPORT_BACKUP: 12,
+  DC_IMEX_IMPORT_SELF_KEYS: 2,
+  DC_INFO_AUTOCRYPT_SETUP_MESSAGE: 6,
+  DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
+  DC_INFO_GROUP_IMAGE_CHANGED: 3,
+  DC_INFO_GROUP_NAME_CHANGED: 2,
+  DC_INFO_INVALID_UNENCRYPTED_MAIL: 13,
+  DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
+  DC_INFO_LOCATION_ONLY: 9,
+  DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
+  DC_INFO_MEMBER_REMOVED_FROM_GROUP: 5,
+  DC_INFO_PROTECTION_DISABLED: 12,
+  DC_INFO_PROTECTION_ENABLED: 11,
+  DC_INFO_SECURE_JOIN_MESSAGE: 7,
+  DC_INFO_UNKNOWN: 0,
+  DC_INFO_WEBXDC_INFO_MESSAGE: 32,
+  DC_KEY_GEN_DEFAULT: 0,
+  DC_KEY_GEN_ED25519: 2,
+  DC_KEY_GEN_RSA2048: 1,
+  DC_KEY_GEN_RSA4096: 3,
+  DC_LP_AUTH_NORMAL: 4,
+  DC_LP_AUTH_OAUTH2: 2,
+  DC_MEDIA_QUALITY_BALANCED: 0,
+  DC_MEDIA_QUALITY_WORSE: 1,
+  DC_MSG_AUDIO: 40,
+  DC_MSG_FILE: 60,
+  DC_MSG_GIF: 21,
+  DC_MSG_ID_DAYMARKER: 9,
+  DC_MSG_ID_LAST_SPECIAL: 9,
+  DC_MSG_ID_MARKER1: 1,
+  DC_MSG_IMAGE: 20,
+  DC_MSG_STICKER: 23,
+  DC_MSG_TEXT: 10,
+  DC_MSG_VCARD: 90,
+  DC_MSG_VIDEO: 50,
+  DC_MSG_VIDEOCHAT_INVITATION: 70,
+  DC_MSG_VOICE: 41,
+  DC_MSG_WEBXDC: 80,
+  DC_PROVIDER_STATUS_BROKEN: 3,
+  DC_PROVIDER_STATUS_OK: 1,
+  DC_PROVIDER_STATUS_PREPARATION: 2,
+  DC_PUSH_CONNECTED: 2,
+  DC_PUSH_HEARTBEAT: 1,
+  DC_PUSH_NOT_CONNECTED: 0,
+  DC_QR_ACCOUNT: 250,
+  DC_QR_ADDR: 320,
+  DC_QR_ASK_VERIFYCONTACT: 200,
+  DC_QR_ASK_VERIFYGROUP: 202,
+  DC_QR_BACKUP: 251,
+  DC_QR_ERROR: 400,
+  DC_QR_FPR_MISMATCH: 220,
+  DC_QR_FPR_OK: 210,
+  DC_QR_FPR_WITHOUT_ADDR: 230,
+  DC_QR_LOGIN: 520,
+  DC_QR_REVIVE_VERIFYCONTACT: 510,
+  DC_QR_REVIVE_VERIFYGROUP: 512,
+  DC_QR_TEXT: 330,
+  DC_QR_URL: 332,
+  DC_QR_WEBRTC_INSTANCE: 260,
+  DC_QR_WITHDRAW_VERIFYCONTACT: 500,
+  DC_QR_WITHDRAW_VERIFYGROUP: 502,
+  DC_SHOW_EMAILS_ACCEPTED_CONTACTS: 1,
+  DC_SHOW_EMAILS_ALL: 2,
+  DC_SHOW_EMAILS_OFF: 0,
+  DC_SOCKET_AUTO: 0,
+  DC_SOCKET_PLAIN: 3,
+  DC_SOCKET_SSL: 1,
+  DC_SOCKET_STARTTLS: 2,
+  DC_STATE_IN_FRESH: 10,
+  DC_STATE_IN_NOTICED: 13,
+  DC_STATE_IN_SEEN: 16,
+  DC_STATE_OUT_DELIVERED: 26,
+  DC_STATE_OUT_DRAFT: 19,
+  DC_STATE_OUT_FAILED: 24,
+  DC_STATE_OUT_MDN_RCVD: 28,
+  DC_STATE_OUT_PENDING: 20,
+  DC_STATE_OUT_PREPARING: 18,
+  DC_STATE_UNDEFINED: 0,
+  DC_STR_AC_SETUP_MSG_BODY: 43,
+  DC_STR_AC_SETUP_MSG_SUBJECT: 42,
+  DC_STR_ADD_MEMBER_BY_OTHER: 129,
+  DC_STR_ADD_MEMBER_BY_YOU: 128,
+  DC_STR_AEAP_ADDR_CHANGED: 122,
+  DC_STR_AEAP_EXPLANATION_AND_LINK: 123,
+  DC_STR_ARCHIVEDCHATS: 40,
+  DC_STR_AUDIO: 11,
+  DC_STR_BACKUP_TRANSFER_MSG_BODY: 163,
+  DC_STR_BACKUP_TRANSFER_QR: 162,
+  DC_STR_BAD_TIME_MSG_BODY: 85,
+  DC_STR_BROADCAST_LIST: 115,
+  DC_STR_CANNOT_LOGIN: 60,
+  DC_STR_CANTDECRYPT_MSG_BODY: 29,
+  DC_STR_CHAT_PROTECTION_DISABLED: 171,
+  DC_STR_CHAT_PROTECTION_ENABLED: 170,
+  DC_STR_CONFIGURATION_FAILED: 84,
+  DC_STR_CONNECTED: 107,
+  DC_STR_CONNTECTING: 108,
+  DC_STR_CONTACT: 200,
+  DC_STR_CONTACT_NOT_VERIFIED: 36,
+  DC_STR_CONTACT_SETUP_CHANGED: 37,
+  DC_STR_CONTACT_VERIFIED: 35,
+  DC_STR_DEVICE_MESSAGES: 68,
+  DC_STR_DEVICE_MESSAGES_HINT: 70,
+  DC_STR_DOWNLOAD_AVAILABILITY: 100,
+  DC_STR_DRAFT: 3,
+  DC_STR_E2E_AVAILABLE: 25,
+  DC_STR_E2E_PREFERRED: 34,
+  DC_STR_ENCRYPTEDMSG: 24,
+  DC_STR_ENCR_NONE: 28,
+  DC_STR_ENCR_TRANSP: 27,
+  DC_STR_EPHEMERAL_DAY: 79,
+  DC_STR_EPHEMERAL_DAYS: 95,
+  DC_STR_EPHEMERAL_DISABLED: 75,
+  DC_STR_EPHEMERAL_FOUR_WEEKS: 81,
+  DC_STR_EPHEMERAL_HOUR: 78,
+  DC_STR_EPHEMERAL_HOURS: 94,
+  DC_STR_EPHEMERAL_MINUTE: 77,
+  DC_STR_EPHEMERAL_MINUTES: 93,
+  DC_STR_EPHEMERAL_SECONDS: 76,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER: 147,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU: 146,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER: 145,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU: 144,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER: 143,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU: 142,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER: 149,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU: 148,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER: 155,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU: 154,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER: 139,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU: 138,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER: 153,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU: 152,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER: 151,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU: 150,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER: 141,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU: 140,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER: 157,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU: 156,
+  DC_STR_EPHEMERAL_WEEK: 80,
+  DC_STR_EPHEMERAL_WEEKS: 96,
+  DC_STR_ERROR: 112,
+  DC_STR_ERROR_NO_NETWORK: 87,
+  DC_STR_FAILED_SENDING_TO: 74,
+  DC_STR_FILE: 12,
+  DC_STR_FINGERPRINTS: 30,
+  DC_STR_FORWARDED: 97,
+  DC_STR_GIF: 23,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER: 127,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU: 126,
+  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER: 135,
+  DC_STR_GROUP_IMAGE_DELETED_BY_YOU: 134,
+  DC_STR_GROUP_LEFT_BY_OTHER: 133,
+  DC_STR_GROUP_LEFT_BY_YOU: 132,
+  DC_STR_GROUP_NAME_CHANGED_BY_OTHER: 125,
+  DC_STR_GROUP_NAME_CHANGED_BY_YOU: 124,
+  DC_STR_IMAGE: 9,
+  DC_STR_INCOMING_MESSAGES: 103,
+  DC_STR_INVALID_UNENCRYPTED_MAIL: 174,
+  DC_STR_LAST_MSG_SENT_SUCCESSFULLY: 111,
+  DC_STR_LOCATION: 66,
+  DC_STR_LOCATION_ENABLED_BY_OTHER: 137,
+  DC_STR_LOCATION_ENABLED_BY_YOU: 136,
+  DC_STR_MESSAGES: 114,
+  DC_STR_MESSAGE_ADD_MEMBER: 173,
+  DC_STR_MSGACTIONBYME: 63,
+  DC_STR_MSGACTIONBYUSER: 62,
+  DC_STR_MSGADDMEMBER: 17,
+  DC_STR_MSGDELMEMBER: 18,
+  DC_STR_MSGGROUPLEFT: 19,
+  DC_STR_MSGGRPIMGCHANGED: 16,
+  DC_STR_MSGGRPIMGDELETED: 33,
+  DC_STR_MSGGRPNAME: 15,
+  DC_STR_MSGLOCATIONDISABLED: 65,
+  DC_STR_MSGLOCATIONENABLED: 64,
+  DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE: 172,
+  DC_STR_NOMESSAGES: 1,
+  DC_STR_NOT_CONNECTED: 121,
+  DC_STR_NOT_SUPPORTED_BY_PROVIDER: 113,
+  DC_STR_ONE_MOMENT: 106,
+  DC_STR_OUTGOING_MESSAGES: 104,
+  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY: 99,
+  DC_STR_PART_OF_TOTAL_USED: 116,
+  DC_STR_QUOTA_EXCEEDING_MSG_BODY: 98,
+  DC_STR_REACTED_BY: 177,
+  DC_STR_READRCPT: 31,
+  DC_STR_READRCPT_MAILBODY: 32,
+  DC_STR_REMOVE_MEMBER_BY_OTHER: 131,
+  DC_STR_REMOVE_MEMBER_BY_YOU: 130,
+  DC_STR_REPLY_NOUN: 90,
+  DC_STR_SAVED_MESSAGES: 69,
+  DC_STR_SECUREJOIN_WAIT: 190,
+  DC_STR_SECUREJOIN_WAIT_TIMEOUT: 191,
+  DC_STR_SECURE_JOIN_GROUP_QR_DESC: 120,
+  DC_STR_SECURE_JOIN_REPLIES: 118,
+  DC_STR_SECURE_JOIN_STARTED: 117,
+  DC_STR_SELF: 2,
+  DC_STR_SELF_DELETED_MSG_BODY: 91,
+  DC_STR_SENDING: 110,
+  DC_STR_SERVER_TURNED_OFF: 92,
+  DC_STR_SETUP_CONTACT_QR_DESC: 119,
+  DC_STR_STICKER: 67,
+  DC_STR_STORAGE_ON_DOMAIN: 105,
+  DC_STR_SUBJECT_FOR_NEW_CONTACT: 73,
+  DC_STR_SYNC_MSG_BODY: 102,
+  DC_STR_SYNC_MSG_SUBJECT: 101,
+  DC_STR_UNKNOWN_SENDER_FOR_CHAT: 72,
+  DC_STR_UPDATE_REMINDER_MSG_BODY: 86,
+  DC_STR_UPDATING: 109,
+  DC_STR_VIDEO: 10,
+  DC_STR_VIDEOCHAT_INVITATION: 82,
+  DC_STR_VIDEOCHAT_INVITE_MSG_BODY: 83,
+  DC_STR_VOICEMESSAGE: 7,
+  DC_STR_WELCOME_MESSAGE: 71,
+  DC_STR_YOU_REACTED: 176,
+  DC_TEXT1_DRAFT: 1,
+  DC_TEXT1_SELF: 3,
+  DC_TEXT1_USERNAME: 2,
+  DC_VIDEOCHATTYPE_BASICWEBRTC: 1,
+  DC_VIDEOCHATTYPE_JITSI: 2,
+  DC_VIDEOCHATTYPE_UNKNOWN: 0
+}

node/events.js

@@ -0,0 +1,45 @@
+/* eslint-disable quotes */
+// Generated!
+
+module.exports = {
+  100: 'DC_EVENT_INFO',
+  101: 'DC_EVENT_SMTP_CONNECTED',
+  102: 'DC_EVENT_IMAP_CONNECTED',
+  103: 'DC_EVENT_SMTP_MESSAGE_SENT',
+  104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
+  105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
+  106: 'DC_EVENT_IMAP_INBOX_IDLE',
+  150: 'DC_EVENT_NEW_BLOB_FILE',
+  151: 'DC_EVENT_DELETED_BLOB_FILE',
+  300: 'DC_EVENT_WARNING',
+  400: 'DC_EVENT_ERROR',
+  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
+  2000: 'DC_EVENT_MSGS_CHANGED',
+  2001: 'DC_EVENT_REACTIONS_CHANGED',
+  2005: 'DC_EVENT_INCOMING_MSG',
+  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
+  2008: 'DC_EVENT_MSGS_NOTICED',
+  2010: 'DC_EVENT_MSG_DELIVERED',
+  2012: 'DC_EVENT_MSG_FAILED',
+  2015: 'DC_EVENT_MSG_READ',
+  2016: 'DC_EVENT_MSG_DELETED',
+  2020: 'DC_EVENT_CHAT_MODIFIED',
+  2021: 'DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED',
+  2030: 'DC_EVENT_CONTACTS_CHANGED',
+  2035: 'DC_EVENT_LOCATION_CHANGED',
+  2041: 'DC_EVENT_CONFIGURE_PROGRESS',
+  2051: 'DC_EVENT_IMEX_PROGRESS',
+  2052: 'DC_EVENT_IMEX_FILE_WRITTEN',
+  2060: 'DC_EVENT_SECUREJOIN_INVITER_PROGRESS',
+  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
+  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
+  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
+  2111: 'DC_EVENT_CONFIG_SYNCED',
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
+  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
+  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
+  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
+  2300: 'DC_EVENT_CHATLIST_CHANGED',
+  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
+  2400: 'DC_EVENT_CHANNEL_OVERFLOW'
+}

node/examples/send_message.js

@@ -0,0 +1,40 @@
+//@ts-check
+const { Context } = require('../dist')
+
+const opts = {
+  addr: '[email]',
+  mail_pw: '[password]',
+}
+
+const contact = '[email]'
+
+async function main() {
+  const dc = Context.open('./')
+  dc.on('ALL', console.log.bind(null, 'core |'))
+
+  try {
+    await dc.configure(opts)
+  } catch (err) {
+    console.error('Failed to configure because of: ', err)
+    dc.unref()
+    return
+  }
+
+  dc.startIO()
+  console.log('fully configured')
+
+  const contactId = dc.createContact('Test', contact)
+  const chatId = dc.createChatByContactId(contactId)
+  dc.sendMessage(chatId, 'Hi!')
+
+  console.log('sent message')
+
+  dc.once('DC_EVENT_SMTP_MESSAGE_SENT', async () => {
+    console.log('Message sent, shutting down...')
+    dc.stopIO()
+    console.log('stopped io')
+    dc.unref()
+  })
+}
+
+main()

node/lib/binding.ts

@@ -0,0 +1,9 @@
+import { join } from 'path'
+
+/**
+ * bindings are not typed yet.
+ * if the available function names are required they can be found inside of `../src/module.c`
+ */
+export const bindings: any = require('node-gyp-build')(join(__dirname, '../'))
+
+export default bindings

node/lib/chat.ts

@@ -0,0 +1,111 @@
+/* eslint-disable camelcase */
+
+import binding from './binding'
+import rawDebug from 'debug'
+const debug = rawDebug('deltachat:node:chat')
+import { C } from './constants'
+import { integerToHexColor } from './util'
+import { ChatJSON } from './types'
+
+interface NativeChat {}
+/**
+ * Wrapper around dc_chat_t*
+ */
+
+export class Chat {
+  constructor(public dc_chat: NativeChat) {
+    debug('Chat constructor')
+    if (dc_chat === null) {
+      throw new Error('native chat can not be null')
+    }
+  }
+
+  getVisibility():
+    | C.DC_CHAT_VISIBILITY_NORMAL
+    | C.DC_CHAT_VISIBILITY_ARCHIVED
+    | C.DC_CHAT_VISIBILITY_PINNED {
+    return binding.dcn_chat_get_visibility(this.dc_chat)
+  }
+
+  get color(): string {
+    return integerToHexColor(binding.dcn_chat_get_color(this.dc_chat))
+  }
+
+  getId(): number {
+    return binding.dcn_chat_get_id(this.dc_chat)
+  }
+
+  getName(): string {
+    return binding.dcn_chat_get_name(this.dc_chat)
+  }
+
+  getMailinglistAddr(): string {
+    return binding.dcn_chat_get_mailinglist_addr(this.dc_chat)
+  }
+
+  getProfileImage(): string {
+    return binding.dcn_chat_get_profile_image(this.dc_chat)
+  }
+
+  getType(): number {
+    return binding.dcn_chat_get_type(this.dc_chat)
+  }
+
+  isSelfTalk(): boolean {
+    return Boolean(binding.dcn_chat_is_self_talk(this.dc_chat))
+  }
+
+  isContactRequest(): boolean {
+    return Boolean(binding.dcn_chat_is_contact_request(this.dc_chat))
+  }
+
+  isUnpromoted(): boolean {
+    return Boolean(binding.dcn_chat_is_unpromoted(this.dc_chat))
+  }
+
+  isProtected(): boolean {
+    return Boolean(binding.dcn_chat_is_protected(this.dc_chat))
+  }
+
+  get canSend(): boolean {
+    return Boolean(binding.dcn_chat_can_send(this.dc_chat))
+  }
+
+  isDeviceTalk(): boolean {
+    return Boolean(binding.dcn_chat_is_device_talk(this.dc_chat))
+  }
+
+  isSingle(): boolean {
+    return this.getType() === C.DC_CHAT_TYPE_SINGLE
+  }
+
+  isGroup(): boolean {
+    return this.getType() === C.DC_CHAT_TYPE_GROUP
+  }
+
+  isMuted(): boolean {
+    return Boolean(binding.dcn_chat_is_muted(this.dc_chat))
+  }
+
+  toJson(): ChatJSON {
+    debug('toJson')
+    const visibility = this.getVisibility()
+    return {
+      archived: visibility === C.DC_CHAT_VISIBILITY_ARCHIVED,
+      pinned: visibility === C.DC_CHAT_VISIBILITY_PINNED,
+      color: this.color,
+      id: this.getId(),
+      name: this.getName(),
+      mailinglistAddr: this.getMailinglistAddr(),
+      profileImage: this.getProfileImage(),
+      type: this.getType(),
+      isSelfTalk: this.isSelfTalk(),
+      isUnpromoted: this.isUnpromoted(),
+      isProtected: this.isProtected(),
+      canSend: this.canSend,
+      isDeviceTalk: this.isDeviceTalk(),
+      isContactRequest: this.isContactRequest(),
+      muted: this.isMuted(),
+    }
+  }
+}

node/lib/chatlist.ts

@@ -0,0 +1,42 @@
+/* eslint-disable camelcase */
+
+import binding from './binding'
+import { Lot } from './lot'
+import { Chat } from './chat'
+const debug = require('debug')('deltachat:node:chatlist')
+
+interface NativeChatList {}
+/**
+ * Wrapper around dc_chatlist_t*
+ */
+export class ChatList {
+  constructor(private dc_chatlist: NativeChatList) {
+    debug('ChatList constructor')
+    if (dc_chatlist === null) {
+      throw new Error('native chat list can not be null')
+    }
+  }
+
+  getChatId(index: number): number {
+    debug(`getChatId ${index}`)
+    return binding.dcn_chatlist_get_chat_id(this.dc_chatlist, index)
+  }
+
+  getCount(): number {
+    debug('getCount')
+    return binding.dcn_chatlist_get_cnt(this.dc_chatlist)
+  }
+
+  getMessageId(index: number): number {
+    debug(`getMessageId ${index}`)
+    return binding.dcn_chatlist_get_msg_id(this.dc_chatlist, index)
+  }
+
+  getSummary(index: number, chat?: Chat): Lot {
+    debug(`getSummary ${index}`)
+    const dc_chat = (chat && chat.dc_chat) || null
+    return new Lot(
+      binding.dcn_chatlist_get_summary(this.dc_chatlist, index, dc_chat)
+    )
+  }
+}

node/lib/constants.ts

@@ -0,0 +1,348 @@
+// Generated!
+
+export enum C {
+  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
+  DC_CERTCK_AUTO = 0,
+  DC_CERTCK_STRICT = 1,
+  DC_CHAT_ID_ALLDONE_HINT = 7,
+  DC_CHAT_ID_ARCHIVED_LINK = 6,
+  DC_CHAT_ID_LAST_SPECIAL = 9,
+  DC_CHAT_ID_TRASH = 3,
+  DC_CHAT_TYPE_BROADCAST = 160,
+  DC_CHAT_TYPE_GROUP = 120,
+  DC_CHAT_TYPE_MAILINGLIST = 140,
+  DC_CHAT_TYPE_SINGLE = 100,
+  DC_CHAT_TYPE_UNDEFINED = 0,
+  DC_CHAT_VISIBILITY_ARCHIVED = 1,
+  DC_CHAT_VISIBILITY_NORMAL = 0,
+  DC_CHAT_VISIBILITY_PINNED = 2,
+  DC_CONNECTIVITY_CONNECTED = 4000,
+  DC_CONNECTIVITY_CONNECTING = 2000,
+  DC_CONNECTIVITY_NOT_CONNECTED = 1000,
+  DC_CONNECTIVITY_WORKING = 3000,
+  DC_CONTACT_ID_DEVICE = 5,
+  DC_CONTACT_ID_INFO = 2,
+  DC_CONTACT_ID_LAST_SPECIAL = 9,
+  DC_CONTACT_ID_SELF = 1,
+  DC_DOWNLOAD_AVAILABLE = 10,
+  DC_DOWNLOAD_DONE = 0,
+  DC_DOWNLOAD_FAILURE = 20,
+  DC_DOWNLOAD_IN_PROGRESS = 1000,
+  DC_DOWNLOAD_UNDECIPHERABLE = 30,
+  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200,
+  DC_EVENT_CHANNEL_OVERFLOW = 2400,
+  DC_EVENT_CHATLIST_CHANGED = 2300,
+  DC_EVENT_CHATLIST_ITEM_CHANGED = 2301,
+  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
+  DC_EVENT_CHAT_MODIFIED = 2020,
+  DC_EVENT_CONFIGURE_PROGRESS = 2041,
+  DC_EVENT_CONFIG_SYNCED = 2111,
+  DC_EVENT_CONNECTIVITY_CHANGED = 2100,
+  DC_EVENT_CONTACTS_CHANGED = 2030,
+  DC_EVENT_DELETED_BLOB_FILE = 151,
+  DC_EVENT_ERROR = 400,
+  DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410,
+  DC_EVENT_IMAP_CONNECTED = 102,
+  DC_EVENT_IMAP_INBOX_IDLE = 106,
+  DC_EVENT_IMAP_MESSAGE_DELETED = 104,
+  DC_EVENT_IMAP_MESSAGE_MOVED = 105,
+  DC_EVENT_IMEX_FILE_WRITTEN = 2052,
+  DC_EVENT_IMEX_PROGRESS = 2051,
+  DC_EVENT_INCOMING_MSG = 2005,
+  DC_EVENT_INCOMING_MSG_BUNCH = 2006,
+  DC_EVENT_INFO = 100,
+  DC_EVENT_LOCATION_CHANGED = 2035,
+  DC_EVENT_MSGS_CHANGED = 2000,
+  DC_EVENT_MSGS_NOTICED = 2008,
+  DC_EVENT_MSG_DELETED = 2016,
+  DC_EVENT_MSG_DELIVERED = 2010,
+  DC_EVENT_MSG_FAILED = 2012,
+  DC_EVENT_MSG_READ = 2015,
+  DC_EVENT_NEW_BLOB_FILE = 150,
+  DC_EVENT_REACTIONS_CHANGED = 2001,
+  DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060,
+  DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061,
+  DC_EVENT_SELFAVATAR_CHANGED = 2110,
+  DC_EVENT_SMTP_CONNECTED = 101,
+  DC_EVENT_SMTP_MESSAGE_SENT = 103,
+  DC_EVENT_WARNING = 300,
+  DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
+  DC_EVENT_WEBXDC_REALTIME_DATA = 2150,
+  DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
+  DC_GCL_ADD_ALLDONE_HINT = 4,
+  DC_GCL_ADD_SELF = 2,
+  DC_GCL_ARCHIVED_ONLY = 1,
+  DC_GCL_FOR_FORWARDING = 8,
+  DC_GCL_NO_SPECIALS = 2,
+  DC_GCL_VERIFIED_ONLY = 1,
+  DC_GCM_ADDDAYMARKER = 1,
+  DC_GCM_INFO_ONLY = 2,
+  DC_IMEX_EXPORT_BACKUP = 11,
+  DC_IMEX_EXPORT_SELF_KEYS = 1,
+  DC_IMEX_IMPORT_BACKUP = 12,
+  DC_IMEX_IMPORT_SELF_KEYS = 2,
+  DC_INFO_AUTOCRYPT_SETUP_MESSAGE = 6,
+  DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
+  DC_INFO_GROUP_IMAGE_CHANGED = 3,
+  DC_INFO_GROUP_NAME_CHANGED = 2,
+  DC_INFO_INVALID_UNENCRYPTED_MAIL = 13,
+  DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
+  DC_INFO_LOCATION_ONLY = 9,
+  DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
+  DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5,
+  DC_INFO_PROTECTION_DISABLED = 12,
+  DC_INFO_PROTECTION_ENABLED = 11,
+  DC_INFO_SECURE_JOIN_MESSAGE = 7,
+  DC_INFO_UNKNOWN = 0,
+  DC_INFO_WEBXDC_INFO_MESSAGE = 32,
+  DC_KEY_GEN_DEFAULT = 0,
+  DC_KEY_GEN_ED25519 = 2,
+  DC_KEY_GEN_RSA2048 = 1,
+  DC_KEY_GEN_RSA4096 = 3,
+  DC_LP_AUTH_NORMAL = 4,
+  DC_LP_AUTH_OAUTH2 = 2,
+  DC_MEDIA_QUALITY_BALANCED = 0,
+  DC_MEDIA_QUALITY_WORSE = 1,
+  DC_MSG_AUDIO = 40,
+  DC_MSG_FILE = 60,
+  DC_MSG_GIF = 21,
+  DC_MSG_ID_DAYMARKER = 9,
+  DC_MSG_ID_LAST_SPECIAL = 9,
+  DC_MSG_ID_MARKER1 = 1,
+  DC_MSG_IMAGE = 20,
+  DC_MSG_STICKER = 23,
+  DC_MSG_TEXT = 10,
+  DC_MSG_VCARD = 90,
+  DC_MSG_VIDEO = 50,
+  DC_MSG_VIDEOCHAT_INVITATION = 70,
+  DC_MSG_VOICE = 41,
+  DC_MSG_WEBXDC = 80,
+  DC_PROVIDER_STATUS_BROKEN = 3,
+  DC_PROVIDER_STATUS_OK = 1,
+  DC_PROVIDER_STATUS_PREPARATION = 2,
+  DC_PUSH_CONNECTED = 2,
+  DC_PUSH_HEARTBEAT = 1,
+  DC_PUSH_NOT_CONNECTED = 0,
+  DC_QR_ACCOUNT = 250,
+  DC_QR_ADDR = 320,
+  DC_QR_ASK_VERIFYCONTACT = 200,
+  DC_QR_ASK_VERIFYGROUP = 202,
+  DC_QR_BACKUP = 251,
+  DC_QR_ERROR = 400,
+  DC_QR_FPR_MISMATCH = 220,
+  DC_QR_FPR_OK = 210,
+  DC_QR_FPR_WITHOUT_ADDR = 230,
+  DC_QR_LOGIN = 520,
+  DC_QR_REVIVE_VERIFYCONTACT = 510,
+  DC_QR_REVIVE_VERIFYGROUP = 512,
+  DC_QR_TEXT = 330,
+  DC_QR_URL = 332,
+  DC_QR_WEBRTC_INSTANCE = 260,
+  DC_QR_WITHDRAW_VERIFYCONTACT = 500,
+  DC_QR_WITHDRAW_VERIFYGROUP = 502,
+  DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1,
+  DC_SHOW_EMAILS_ALL = 2,
+  DC_SHOW_EMAILS_OFF = 0,
+  DC_SOCKET_AUTO = 0,
+  DC_SOCKET_PLAIN = 3,
+  DC_SOCKET_SSL = 1,
+  DC_SOCKET_STARTTLS = 2,
+  DC_STATE_IN_FRESH = 10,
+  DC_STATE_IN_NOTICED = 13,
+  DC_STATE_IN_SEEN = 16,
+  DC_STATE_OUT_DELIVERED = 26,
+  DC_STATE_OUT_DRAFT = 19,
+  DC_STATE_OUT_FAILED = 24,
+  DC_STATE_OUT_MDN_RCVD = 28,
+  DC_STATE_OUT_PENDING = 20,
+  DC_STATE_OUT_PREPARING = 18,
+  DC_STATE_UNDEFINED = 0,
+  DC_STR_AC_SETUP_MSG_BODY = 43,
+  DC_STR_AC_SETUP_MSG_SUBJECT = 42,
+  DC_STR_ADD_MEMBER_BY_OTHER = 129,
+  DC_STR_ADD_MEMBER_BY_YOU = 128,
+  DC_STR_AEAP_ADDR_CHANGED = 122,
+  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
+  DC_STR_ARCHIVEDCHATS = 40,
+  DC_STR_AUDIO = 11,
+  DC_STR_BACKUP_TRANSFER_MSG_BODY = 163,
+  DC_STR_BACKUP_TRANSFER_QR = 162,
+  DC_STR_BAD_TIME_MSG_BODY = 85,
+  DC_STR_BROADCAST_LIST = 115,
+  DC_STR_CANNOT_LOGIN = 60,
+  DC_STR_CANTDECRYPT_MSG_BODY = 29,
+  DC_STR_CHAT_PROTECTION_DISABLED = 171,
+  DC_STR_CHAT_PROTECTION_ENABLED = 170,
+  DC_STR_CONFIGURATION_FAILED = 84,
+  DC_STR_CONNECTED = 107,
+  DC_STR_CONNTECTING = 108,
+  DC_STR_CONTACT = 200,
+  DC_STR_CONTACT_NOT_VERIFIED = 36,
+  DC_STR_CONTACT_SETUP_CHANGED = 37,
+  DC_STR_CONTACT_VERIFIED = 35,
+  DC_STR_DEVICE_MESSAGES = 68,
+  DC_STR_DEVICE_MESSAGES_HINT = 70,
+  DC_STR_DOWNLOAD_AVAILABILITY = 100,
+  DC_STR_DRAFT = 3,
+  DC_STR_E2E_AVAILABLE = 25,
+  DC_STR_E2E_PREFERRED = 34,
+  DC_STR_ENCRYPTEDMSG = 24,
+  DC_STR_ENCR_NONE = 28,
+  DC_STR_ENCR_TRANSP = 27,
+  DC_STR_EPHEMERAL_DAY = 79,
+  DC_STR_EPHEMERAL_DAYS = 95,
+  DC_STR_EPHEMERAL_DISABLED = 75,
+  DC_STR_EPHEMERAL_FOUR_WEEKS = 81,
+  DC_STR_EPHEMERAL_HOUR = 78,
+  DC_STR_EPHEMERAL_HOURS = 94,
+  DC_STR_EPHEMERAL_MINUTE = 77,
+  DC_STR_EPHEMERAL_MINUTES = 93,
+  DC_STR_EPHEMERAL_SECONDS = 76,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER = 147,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU = 146,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER = 145,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU = 144,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER = 143,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU = 142,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER = 149,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU = 148,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER = 155,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU = 154,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER = 139,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU = 138,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER = 153,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU = 152,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER = 151,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU = 150,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER = 141,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU = 140,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER = 157,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU = 156,
+  DC_STR_EPHEMERAL_WEEK = 80,
+  DC_STR_EPHEMERAL_WEEKS = 96,
+  DC_STR_ERROR = 112,
+  DC_STR_ERROR_NO_NETWORK = 87,
+  DC_STR_FAILED_SENDING_TO = 74,
+  DC_STR_FILE = 12,
+  DC_STR_FINGERPRINTS = 30,
+  DC_STR_FORWARDED = 97,
+  DC_STR_GIF = 23,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER = 127,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU = 126,
+  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER = 135,
+  DC_STR_GROUP_IMAGE_DELETED_BY_YOU = 134,
+  DC_STR_GROUP_LEFT_BY_OTHER = 133,
+  DC_STR_GROUP_LEFT_BY_YOU = 132,
+  DC_STR_GROUP_NAME_CHANGED_BY_OTHER = 125,
+  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
+  DC_STR_IMAGE = 9,
+  DC_STR_INCOMING_MESSAGES = 103,
+  DC_STR_INVALID_UNENCRYPTED_MAIL = 174,
+  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
+  DC_STR_LOCATION = 66,
+  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
+  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
+  DC_STR_MESSAGES = 114,
+  DC_STR_MESSAGE_ADD_MEMBER = 173,
+  DC_STR_MSGACTIONBYME = 63,
+  DC_STR_MSGACTIONBYUSER = 62,
+  DC_STR_MSGADDMEMBER = 17,
+  DC_STR_MSGDELMEMBER = 18,
+  DC_STR_MSGGROUPLEFT = 19,
+  DC_STR_MSGGRPIMGCHANGED = 16,
+  DC_STR_MSGGRPIMGDELETED = 33,
+  DC_STR_MSGGRPNAME = 15,
+  DC_STR_MSGLOCATIONDISABLED = 65,
+  DC_STR_MSGLOCATIONENABLED = 64,
+  DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE = 172,
+  DC_STR_NOMESSAGES = 1,
+  DC_STR_NOT_CONNECTED = 121,
+  DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
+  DC_STR_ONE_MOMENT = 106,
+  DC_STR_OUTGOING_MESSAGES = 104,
+  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
+  DC_STR_PART_OF_TOTAL_USED = 116,
+  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
+  DC_STR_REACTED_BY = 177,
+  DC_STR_READRCPT = 31,
+  DC_STR_READRCPT_MAILBODY = 32,
+  DC_STR_REMOVE_MEMBER_BY_OTHER = 131,
+  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
+  DC_STR_REPLY_NOUN = 90,
+  DC_STR_SAVED_MESSAGES = 69,
+  DC_STR_SECUREJOIN_WAIT = 190,
+  DC_STR_SECUREJOIN_WAIT_TIMEOUT = 191,
+  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
+  DC_STR_SECURE_JOIN_REPLIES = 118,
+  DC_STR_SECURE_JOIN_STARTED = 117,
+  DC_STR_SELF = 2,
+  DC_STR_SELF_DELETED_MSG_BODY = 91,
+  DC_STR_SENDING = 110,
+  DC_STR_SERVER_TURNED_OFF = 92,
+  DC_STR_SETUP_CONTACT_QR_DESC = 119,
+  DC_STR_STICKER = 67,
+  DC_STR_STORAGE_ON_DOMAIN = 105,
+  DC_STR_SUBJECT_FOR_NEW_CONTACT = 73,
+  DC_STR_SYNC_MSG_BODY = 102,
+  DC_STR_SYNC_MSG_SUBJECT = 101,
+  DC_STR_UNKNOWN_SENDER_FOR_CHAT = 72,
+  DC_STR_UPDATE_REMINDER_MSG_BODY = 86,
+  DC_STR_UPDATING = 109,
+  DC_STR_VIDEO = 10,
+  DC_STR_VIDEOCHAT_INVITATION = 82,
+  DC_STR_VIDEOCHAT_INVITE_MSG_BODY = 83,
+  DC_STR_VOICEMESSAGE = 7,
+  DC_STR_WELCOME_MESSAGE = 71,
+  DC_STR_YOU_REACTED = 176,
+  DC_TEXT1_DRAFT = 1,
+  DC_TEXT1_SELF = 3,
+  DC_TEXT1_USERNAME = 2,
+  DC_VIDEOCHATTYPE_BASICWEBRTC = 1,
+  DC_VIDEOCHATTYPE_JITSI = 2,
+  DC_VIDEOCHATTYPE_UNKNOWN = 0,
+}
+
+// Generated!
+
+export const EventId2EventName: { [key: number]: string } = {
+  100: 'DC_EVENT_INFO',
+  101: 'DC_EVENT_SMTP_CONNECTED',
+  102: 'DC_EVENT_IMAP_CONNECTED',
+  103: 'DC_EVENT_SMTP_MESSAGE_SENT',
+  104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
+  105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
+  106: 'DC_EVENT_IMAP_INBOX_IDLE',
+  150: 'DC_EVENT_NEW_BLOB_FILE',
+  151: 'DC_EVENT_DELETED_BLOB_FILE',
+  300: 'DC_EVENT_WARNING',
+  400: 'DC_EVENT_ERROR',
+  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
+  2000: 'DC_EVENT_MSGS_CHANGED',
+  2001: 'DC_EVENT_REACTIONS_CHANGED',
+  2005: 'DC_EVENT_INCOMING_MSG',
+  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
+  2008: 'DC_EVENT_MSGS_NOTICED',
+  2010: 'DC_EVENT_MSG_DELIVERED',
+  2012: 'DC_EVENT_MSG_FAILED',
+  2015: 'DC_EVENT_MSG_READ',
+  2016: 'DC_EVENT_MSG_DELETED',
+  2020: 'DC_EVENT_CHAT_MODIFIED',
+  2021: 'DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED',
+  2030: 'DC_EVENT_CONTACTS_CHANGED',
+  2035: 'DC_EVENT_LOCATION_CHANGED',
+  2041: 'DC_EVENT_CONFIGURE_PROGRESS',
+  2051: 'DC_EVENT_IMEX_PROGRESS',
+  2052: 'DC_EVENT_IMEX_FILE_WRITTEN',
+  2060: 'DC_EVENT_SECUREJOIN_INVITER_PROGRESS',
+  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
+  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
+  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
+  2111: 'DC_EVENT_CONFIG_SYNCED',
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
+  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
+  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
+  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
+  2300: 'DC_EVENT_CHATLIST_CHANGED',
+  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
+  2400: 'DC_EVENT_CHANNEL_OVERFLOW',
+}

node/lib/contact.ts

@@ -0,0 +1,98 @@
+import { integerToHexColor } from './util'
+
+/* eslint-disable camelcase */
+
+import binding from './binding'
+const debug = require('debug')('deltachat:node:contact')
+
+interface NativeContact {}
+/**
+ * Wrapper around dc_contact_t*
+ */
+export class Contact {
+  constructor(public dc_contact: NativeContact) {
+    debug('Contact constructor')
+    if (dc_contact === null) {
+      throw new Error('native contact can not be null')
+    }
+  }
+
+  toJson() {
+    debug('toJson')
+    return {
+      address: this.getAddress(),
+      color: this.color,
+      authName: this.authName,
+      status: this.status,
+      displayName: this.getDisplayName(),
+      id: this.getId(),
+      lastSeen: this.lastSeen,
+      name: this.getName(),
+      profileImage: this.getProfileImage(),
+      nameAndAddr: this.getNameAndAddress(),
+      isBlocked: this.isBlocked(),
+      isVerified: this.isVerified(),
+    }
+  }
+
+  getAddress(): string {
+    return binding.dcn_contact_get_addr(this.dc_contact)
+  }
+
+  /** Get original contact name.
+   * This is the name of the contact as defined by the contact themself.
+   * If the contact themself does not define such a name,
+   * an empty string is returned. */
+  get authName(): string {
+    return binding.dcn_contact_get_auth_name(this.dc_contact)
+  }
+
+  get color(): string {
+    return integerToHexColor(binding.dcn_contact_get_color(this.dc_contact))
+  }
+
+  /**
+   * contact's status
+   *
+   * Status is the last signature received in a message from this contact.
+   */
+  get status(): string {
+    return binding.dcn_contact_get_status(this.dc_contact)
+  }
+
+  getDisplayName(): string {
+    return binding.dcn_contact_get_display_name(this.dc_contact)
+  }
+
+  getId(): number {
+    return binding.dcn_contact_get_id(this.dc_contact)
+  }
+
+  get lastSeen(): number {
+    return binding.dcn_contact_get_last_seen(this.dc_contact)
+  }
+
+  wasSeenRecently() {
+    return Boolean(binding.dcn_contact_was_seen_recently(this.dc_contact))
+  }
+
+  getName(): string {
+    return binding.dcn_contact_get_name(this.dc_contact)
+  }
+
+  getNameAndAddress(): string {
+    return binding.dcn_contact_get_name_n_addr(this.dc_contact)
+  }
+
+  getProfileImage(): string {
+    return binding.dcn_contact_get_profile_image(this.dc_contact)
+  }
+
+  isBlocked() {
+    return Boolean(binding.dcn_contact_is_blocked(this.dc_contact))
+  }
+
+  isVerified() {
+    return Boolean(binding.dcn_contact_is_verified(this.dc_contact))
+  }
+}

node/lib/context.ts

@@ -0,0 +1,938 @@
+/* eslint-disable camelcase */
+
+import binding from './binding'
+import { C, EventId2EventName } from './constants'
+import { Chat } from './chat'
+import { ChatList } from './chatlist'
+import { Contact } from './contact'
+import { Message } from './message'
+import { Lot } from './lot'
+import { Locations } from './locations'
+import rawDebug from 'debug'
+import { AccountManager } from './deltachat'
+import { join } from 'path'
+import { EventEmitter } from 'stream'
+const debug = rawDebug('deltachat:node:index')
+
+const noop = function () {}
+interface NativeContext {}
+
+/**
+ * Wrapper around dcn_context_t*
+ *
+ * only acts as event emitter when created in standalone mode (without account manager)
+ * with `Context.open`
+ */
+export class Context extends EventEmitter {
+  constructor(
+    readonly manager: AccountManager | null,
+    private inner_dcn_context: NativeContext,
+    readonly account_id: number | null
+  ) {
+    super()
+    debug('DeltaChat constructor')
+    if (inner_dcn_context === null) {
+      throw new Error('inner_dcn_context can not be null')
+    }
+  }
+
+  /** Opens a standalone context (without an account manager)
+   * automatically starts the event handler */
+  static open(cwd: string): Context {
+    const dbFile = join(cwd, 'db.sqlite')
+    const context = new Context(null, binding.dcn_context_new(dbFile), null)
+    debug('Opened context')
+    function handleCoreEvent(
+      eventId: number,
+      data1: number,
+      data2: number | string
+    ) {
+      const eventString = EventId2EventName[eventId]
+      debug(eventString, data1, data2)
+      if (!context.emit) {
+        console.log('Received an event but EventEmitter is already destroyed.')
+        console.log(eventString, data1, data2)
+        return
+      }
+      context.emit(eventString, data1, data2)
+      context.emit('ALL', eventString, data1, data2)
+    }
+    binding.dcn_start_event_handler(
+      context.dcn_context,
+      handleCoreEvent.bind(this)
+    )
+    debug('Started event handler')
+    return context
+  }
+
+  get dcn_context() {
+    return this.inner_dcn_context
+  }
+
+  get is_open() {
+    return Boolean(binding.dcn_context_is_open())
+  }
+
+  open(passphrase?: string) {
+    return Boolean(
+      binding.dcn_context_open(this.dcn_context, passphrase ? passphrase : '')
+    )
+  }
+
+  unref() {
+    binding.dcn_context_unref(this.dcn_context)
+    ;(this.inner_dcn_context as any) = null
+  }
+
+  acceptChat(chatId: number) {
+    binding.dcn_accept_chat(this.dcn_context, chatId)
+  }
+
+  blockChat(chatId: number) {
+    binding.dcn_block_chat(this.dcn_context, chatId)
+  }
+
+  addAddressBook(addressBook: string) {
+    debug(`addAddressBook ${addressBook}`)
+    return binding.dcn_add_address_book(this.dcn_context, addressBook)
+  }
+
+  addContactToChat(chatId: number, contactId: number) {
+    debug(`addContactToChat ${chatId} ${contactId}`)
+    return Boolean(
+      binding.dcn_add_contact_to_chat(
+        this.dcn_context,
+        Number(chatId),
+        Number(contactId)
+      )
+    )
+  }
+
+  addDeviceMessage(label: string, msg: Message | string) {
+    debug(`addDeviceMessage ${label} ${msg}`)
+    if (!msg) {
+      throw new Error('invalid msg parameter')
+    }
+    if (typeof label !== 'string') {
+      throw new Error('invalid label parameter, must be a string')
+    }
+    if (typeof msg === 'string') {
+      const msgObj = this.messageNew()
+      msgObj.setText(msg)
+      msg = msgObj
+    }
+    if (!msg.dc_msg) {
+      throw new Error('invalid msg object')
+    }
+    return binding.dcn_add_device_msg(this.dcn_context, label, msg.dc_msg)
+  }
+
+  setChatVisibility(
+    chatId: number,
+    visibility:
+      | C.DC_CHAT_VISIBILITY_NORMAL
+      | C.DC_CHAT_VISIBILITY_ARCHIVED
+      | C.DC_CHAT_VISIBILITY_PINNED
+  ) {
+    debug(`setChatVisibility ${chatId} ${visibility}`)
+    binding.dcn_set_chat_visibility(
+      this.dcn_context,
+      Number(chatId),
+      visibility
+    )
+  }
+
+  blockContact(contactId: number, block: boolean) {
+    debug(`blockContact ${contactId} ${block}`)
+    binding.dcn_block_contact(
+      this.dcn_context,
+      Number(contactId),
+      block ? 1 : 0
+    )
+  }
+
+  checkQrCode(qrCode: string) {
+    debug(`checkQrCode ${qrCode}`)
+    const dc_lot = binding.dcn_check_qr(this.dcn_context, qrCode)
+    let result = dc_lot ? new Lot(dc_lot) : null
+    if (result) {
+      return { id: result.getId(), ...result.toJson() }
+    }
+    return result
+  }
+
+  configure(opts: any): Promise<void> {
+    return new Promise((resolve, reject) => {
+      debug('configure')
+
+      const onSuccess = () => {
+        removeListeners()
+        resolve()
+      }
+      const onFail = (error: string) => {
+        removeListeners()
+        reject(new Error(error))
+      }
+
+      let onConfigure: (...args: any[]) => void
+      if (this.account_id === null) {
+        onConfigure = (data1: number, data2: string) => {
+          if (data1 === 0) return onFail(data2)
+          else if (data1 === 1000) return onSuccess()
+        }
+      } else {
+        onConfigure = (accountId: number, data1: number, data2: string) => {
+          if (this.account_id !== accountId) {
+            return
+          }
+          if (data1 === 0) return onFail(data2)
+          else if (data1 === 1000) return onSuccess()
+        }
+      }
+
+      const removeListeners = () => {
+        ;(this.manager || this).removeListener(
+          'DC_EVENT_CONFIGURE_PROGRESS',
+          onConfigure
+        )
+      }
+
+      const registerListeners = () => {
+        ;(this.manager || this).on('DC_EVENT_CONFIGURE_PROGRESS', onConfigure)
+      }
+
+      registerListeners()
+
+      if (!opts) opts = {}
+      Object.keys(opts).forEach((key) => {
+        const value = opts[key]
+        this.setConfig(key, value)
+      })
+
+      binding.dcn_configure(this.dcn_context)
+    })
+  }
+
+  continueKeyTransfer(messageId: number, setupCode: string) {
+    debug(`continueKeyTransfer ${messageId}`)
+    return new Promise((resolve, reject) => {
+      binding.dcn_continue_key_transfer(
+        this.dcn_context,
+        Number(messageId),
+        setupCode,
+        (result: number) => resolve(result === 1)
+      )
+    })
+  }
+  /** @returns chatId */
+  createBroadcastList(): number {
+    debug(`createBroadcastList`)
+    return binding.dcn_create_broadcast_list(this.dcn_context)
+  }
+
+  /** @returns chatId */
+  createChatByContactId(contactId: number): number {
+    debug(`createChatByContactId ${contactId}`)
+    return binding.dcn_create_chat_by_contact_id(
+      this.dcn_context,
+      Number(contactId)
+    )
+  }
+
+  /** @returns contactId */
+  createContact(name: string, addr: string): number {
+    debug(`createContact ${name} ${addr}`)
+    return binding.dcn_create_contact(this.dcn_context, name, addr)
+  }
+
+  /**
+   *
+   * @param chatName The name of the chat that should be created
+   * @param is_protected Whether the chat should be protected at creation time
+   * @returns chatId
+   */
+  createGroupChat(chatName: string, is_protected: boolean = false): number {
+    debug(`createGroupChat ${chatName} [protected:${is_protected}]`)
+    return binding.dcn_create_group_chat(
+      this.dcn_context,
+      is_protected ? 1 : 0,
+      chatName
+    )
+  }
+
+  deleteChat(chatId: number) {
+    debug(`deleteChat ${chatId}`)
+    binding.dcn_delete_chat(this.dcn_context, Number(chatId))
+  }
+
+  deleteContact(contactId: number) {
+    debug(`deleteContact ${contactId}`)
+    return Boolean(
+      binding.dcn_delete_contact(this.dcn_context, Number(contactId))
+    )
+  }
+
+  deleteMessages(messageIds: number[]) {
+    if (!Array.isArray(messageIds)) {
+      messageIds = [messageIds]
+    }
+    messageIds = messageIds.map((id) => Number(id))
+    debug('deleteMessages', messageIds)
+    binding.dcn_delete_msgs(this.dcn_context, messageIds)
+  }
+
+  forwardMessages(messageIds: number[], chatId: number) {
+    if (!Array.isArray(messageIds)) {
+      messageIds = [messageIds]
+    }
+    messageIds = messageIds.map((id) => Number(id))
+    debug('forwardMessages', messageIds)
+    binding.dcn_forward_msgs(this.dcn_context, messageIds, chatId)
+  }
+
+  getBlobdir(): string {
+    debug('getBlobdir')
+    return binding.dcn_get_blobdir(this.dcn_context)
+  }
+
+  getBlockedCount(): number {
+    debug('getBlockedCount')
+    return binding.dcn_get_blocked_cnt(this.dcn_context)
+  }
+
+  getBlockedContacts(): number[] {
+    debug('getBlockedContacts')
+    return binding.dcn_get_blocked_contacts(this.dcn_context)
+  }
+
+  getChat(chatId: number) {
+    debug(`getChat ${chatId}`)
+    const dc_chat = binding.dcn_get_chat(this.dcn_context, Number(chatId))
+    return dc_chat ? new Chat(dc_chat) : null
+  }
+
+  getChatContacts(chatId: number): number[] {
+    debug(`getChatContacts ${chatId}`)
+    return binding.dcn_get_chat_contacts(this.dcn_context, Number(chatId))
+  }
+
+  getChatIdByContactId(contactId: number): number {
+    debug(`getChatIdByContactId ${contactId}`)
+    return binding.dcn_get_chat_id_by_contact_id(
+      this.dcn_context,
+      Number(contactId)
+    )
+  }
+
+  getChatMedia(
+    chatId: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ): number[] {
+    debug(`getChatMedia ${chatId}`)
+    return binding.dcn_get_chat_media(
+      this.dcn_context,
+      Number(chatId),
+      msgType1,
+      msgType2 || 0,
+      msgType3 || 0
+    )
+  }
+
+  getMimeHeaders(messageId: number): string {
+    debug(`getMimeHeaders ${messageId}`)
+    return binding.dcn_get_mime_headers(this.dcn_context, Number(messageId))
+  }
+
+  getChatlistItemSummary(chatId: number, messageId: number) {
+    debug(`getChatlistItemSummary ${chatId} ${messageId}`)
+    return new Lot(
+      binding.dcn_chatlist_get_summary2(this.dcn_context, chatId, messageId)
+    )
+  }
+
+  getChatMessages(chatId: number, flags: number, marker1before: number) {
+    debug(`getChatMessages ${chatId} ${flags} ${marker1before}`)
+    return binding.dcn_get_chat_msgs(
+      this.dcn_context,
+      Number(chatId),
+      flags,
+      marker1before
+    )
+  }
+
+  /**
+   * Get encryption info for a chat.
+   * Get a multi-line encryption info, containing encryption preferences of all members.
+   * Can be used to find out why messages sent to group are not encrypted.
+   *
+   * @param chatId ID of the chat to get the encryption info for.
+   * @return Multi-line text, must be released using dc_str_unref() after usage.
+   */
+  getChatEncrytionInfo(chatId: number): string {
+    return binding.dcn_get_chat_encrinfo(this.dcn_context, chatId)
+  }
+
+  getChats(listFlags: number, queryStr: string, queryContactId: number) {
+    debug('getChats')
+    const result = []
+    const list = this.getChatList(listFlags, queryStr, queryContactId)
+    const count = list.getCount()
+    for (let i = 0; i < count; i++) {
+      result.push(list.getChatId(i))
+    }
+    return result
+  }
+
+  getChatList(listFlags: number, queryStr: string, queryContactId: number) {
+    listFlags = listFlags || 0
+    queryStr = queryStr || ''
+    queryContactId = queryContactId || 0
+    debug(`getChatList ${listFlags} ${queryStr} ${queryContactId}`)
+    return new ChatList(
+      binding.dcn_get_chatlist(
+        this.dcn_context,
+        listFlags,
+        queryStr,
+        Number(queryContactId)
+      )
+    )
+  }
+
+  getConfig(key: string): string {
+    debug(`getConfig ${key}`)
+    return binding.dcn_get_config(this.dcn_context, key)
+  }
+
+  getContact(contactId: number) {
+    debug(`getContact ${contactId}`)
+    const dc_contact = binding.dcn_get_contact(
+      this.dcn_context,
+      Number(contactId)
+    )
+    return dc_contact ? new Contact(dc_contact) : null
+  }
+
+  getContactEncryptionInfo(contactId: number) {
+    debug(`getContactEncryptionInfo ${contactId}`)
+    return binding.dcn_get_contact_encrinfo(this.dcn_context, Number(contactId))
+  }
+
+  getContacts(listFlags: number, query: string) {
+    listFlags = listFlags || 0
+    query = query || ''
+    debug(`getContacts ${listFlags} ${query}`)
+    return binding.dcn_get_contacts(this.dcn_context, listFlags, query)
+  }
+
+  wasDeviceMessageEverAdded(label: string) {
+    debug(`wasDeviceMessageEverAdded ${label}`)
+    const added = binding.dcn_was_device_msg_ever_added(this.dcn_context, label)
+    return added === 1
+  }
+
+  getDraft(chatId: number) {
+    debug(`getDraft ${chatId}`)
+    const dc_msg = binding.dcn_get_draft(this.dcn_context, Number(chatId))
+    return dc_msg ? new Message(dc_msg) : null
+  }
+
+  getFreshMessageCount(chatId: number): number {
+    debug(`getFreshMessageCount ${chatId}`)
+    return binding.dcn_get_fresh_msg_cnt(this.dcn_context, Number(chatId))
+  }
+
+  getFreshMessages() {
+    debug('getFreshMessages')
+    return binding.dcn_get_fresh_msgs(this.dcn_context)
+  }
+
+  getInfo() {
+    debug('getInfo')
+    const info = binding.dcn_get_info(this.dcn_context)
+    return AccountManager.parseGetInfo(info)
+  }
+
+  getMessage(messageId: number) {
+    debug(`getMessage ${messageId}`)
+    const dc_msg = binding.dcn_get_msg(this.dcn_context, Number(messageId))
+    return dc_msg ? new Message(dc_msg) : null
+  }
+
+  getMessageCount(chatId: number): number {
+    debug(`getMessageCount ${chatId}`)
+    return binding.dcn_get_msg_cnt(this.dcn_context, Number(chatId))
+  }
+
+  getMessageInfo(messageId: number): string {
+    debug(`getMessageInfo ${messageId}`)
+    return binding.dcn_get_msg_info(this.dcn_context, Number(messageId))
+  }
+
+  getMessageHTML(messageId: number): string {
+    debug(`getMessageHTML ${messageId}`)
+    return binding.dcn_get_msg_html(this.dcn_context, Number(messageId))
+  }
+
+  getNextMediaMessage(
+    messageId: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ) {
+    debug(
+      `getNextMediaMessage ${messageId} ${msgType1} ${msgType2} ${msgType3}`
+    )
+    return this._getNextMedia(messageId, 1, msgType1, msgType2, msgType3)
+  }
+
+  getPreviousMediaMessage(
+    messageId: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ) {
+    debug(
+      `getPreviousMediaMessage ${messageId} ${msgType1} ${msgType2} ${msgType3}`
+    )
+    return this._getNextMedia(messageId, -1, msgType1, msgType2, msgType3)
+  }
+
+  _getNextMedia(
+    messageId: number,
+    dir: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ): number {
+    return binding.dcn_get_next_media(
+      this.dcn_context,
+      Number(messageId),
+      dir,
+      msgType1 || 0,
+      msgType2 || 0,
+      msgType3 || 0
+    )
+  }
+
+  getSecurejoinQrCode(chatId: number): string {
+    debug(`getSecurejoinQrCode ${chatId}`)
+    return binding.dcn_get_securejoin_qr(this.dcn_context, Number(chatId))
+  }
+
+  getSecurejoinQrCodeSVG(chatId: number): string {
+    debug(`getSecurejoinQrCodeSVG ${chatId}`)
+    return binding.dcn_get_securejoin_qr_svg(this.dcn_context, chatId)
+  }
+
+  startIO(): void {
+    debug(`startIO`)
+    binding.dcn_start_io(this.dcn_context)
+  }
+
+  stopIO(): void {
+    debug(`stopIO`)
+    binding.dcn_stop_io(this.dcn_context)
+  }
+
+  stopOngoingProcess(): void {
+    debug(`stopOngoingProcess`)
+    binding.dcn_stop_ongoing_process(this.dcn_context)
+  }
+
+  /**
+   *
+   * @deprecated please use `AccountManager.getSystemInfo()` instead
+   */
+  static getSystemInfo() {
+    return AccountManager.getSystemInfo()
+  }
+
+  getConnectivity(): number {
+    return binding.dcn_get_connectivity(this.dcn_context)
+  }
+
+  getConnectivityHTML(): String {
+    return binding.dcn_get_connectivity_html(this.dcn_context)
+  }
+
+  importExport(what: number, param1: string, param2 = '') {
+    debug(`importExport ${what} ${param1} ${param2}`)
+    binding.dcn_imex(this.dcn_context, what, param1, param2)
+  }
+
+  importExportHasBackup(dir: string) {
+    debug(`importExportHasBackup ${dir}`)
+    return binding.dcn_imex_has_backup(this.dcn_context, dir)
+  }
+
+  initiateKeyTransfer(): Promise<string> {
+    return new Promise((resolve, reject) => {
+      debug('initiateKeyTransfer2')
+      binding.dcn_initiate_key_transfer(this.dcn_context, resolve)
+    })
+  }
+
+  isConfigured() {
+    debug('isConfigured')
+    return Boolean(binding.dcn_is_configured(this.dcn_context))
+  }
+
+  isContactInChat(chatId: number, contactId: number) {
+    debug(`isContactInChat ${chatId} ${contactId}`)
+    return Boolean(
+      binding.dcn_is_contact_in_chat(
+        this.dcn_context,
+        Number(chatId),
+        Number(contactId)
+      )
+    )
+  }
+
+  /**
+   *
+   * @returns resulting chat id or 0 on error
+   */
+  joinSecurejoin(qrCode: string): number {
+    debug(`joinSecurejoin ${qrCode}`)
+    return binding.dcn_join_securejoin(this.dcn_context, qrCode)
+  }
+
+  lookupContactIdByAddr(addr: string): number {
+    debug(`lookupContactIdByAddr ${addr}`)
+    return binding.dcn_lookup_contact_id_by_addr(this.dcn_context, addr)
+  }
+
+  markNoticedChat(chatId: number) {
+    debug(`markNoticedChat ${chatId}`)
+    binding.dcn_marknoticed_chat(this.dcn_context, Number(chatId))
+  }
+
+  markSeenMessages(messageIds: number[]) {
+    if (!Array.isArray(messageIds)) {
+      messageIds = [messageIds]
+    }
+    messageIds = messageIds.map((id) => Number(id))
+    debug('markSeenMessages', messageIds)
+    binding.dcn_markseen_msgs(this.dcn_context, messageIds)
+  }
+
+  maybeNetwork() {
+    debug('maybeNetwork')
+    binding.dcn_maybe_network(this.dcn_context)
+  }
+
+  messageNew(viewType = C.DC_MSG_TEXT) {
+    debug(`messageNew ${viewType}`)
+    return new Message(binding.dcn_msg_new(this.dcn_context, viewType))
+  }
+
+  removeContactFromChat(chatId: number, contactId: number) {
+    debug(`removeContactFromChat ${chatId} ${contactId}`)
+    return Boolean(
+      binding.dcn_remove_contact_from_chat(
+        this.dcn_context,
+        Number(chatId),
+        Number(contactId)
+      )
+    )
+  }
+
+  /**
+   *
+   * @param chatId 	ID of the chat to search messages in. Set this to 0 for a global search.
+   * @param query The query to search for.
+   */
+  searchMessages(chatId: number, query: string): number[] {
+    debug(`searchMessages ${chatId} ${query}`)
+    return binding.dcn_search_msgs(this.dcn_context, Number(chatId), query)
+  }
+
+  sendMessage(chatId: number, msg: string | Message) {
+    debug(`sendMessage ${chatId}`)
+    if (!msg) {
+      throw new Error('invalid msg parameter')
+    }
+    if (typeof msg === 'string') {
+      const msgObj = this.messageNew()
+      msgObj.setText(msg)
+      msg = msgObj
+    }
+    if (!msg.dc_msg) {
+      throw new Error('invalid msg object')
+    }
+    return binding.dcn_send_msg(this.dcn_context, Number(chatId), msg.dc_msg)
+  }
+
+  downloadFullMessage(messageId: number) {
+    binding.dcn_download_full_msg(this.dcn_context, messageId)
+  }
+
+  /**
+   *
+   * @returns {Promise<number>} Promise that resolves into the resulting message id
+   */
+  sendVideochatInvitation(chatId: number): Promise<number> {
+    debug(`sendVideochatInvitation ${chatId}`)
+    return new Promise((resolve, reject) => {
+      binding.dcn_send_videochat_invitation(
+        this.dcn_context,
+        chatId,
+        (result: number) => {
+          if (result !== 0) {
+            resolve(result)
+          } else {
+            reject(
+              'Videochatinvitation failed to send, see error events for detailed info'
+            )
+          }
+        }
+      )
+    })
+  }
+
+  setChatName(chatId: number, name: string) {
+    debug(`setChatName ${chatId} ${name}`)
+    return Boolean(
+      binding.dcn_set_chat_name(this.dcn_context, Number(chatId), name)
+    )
+  }
+
+  getChatEphemeralTimer(chatId: number): number {
+    debug(`getChatEphemeralTimer ${chatId}`)
+    return binding.dcn_get_chat_ephemeral_timer(
+      this.dcn_context,
+      Number(chatId)
+    )
+  }
+
+  setChatEphemeralTimer(chatId: number, timer: number) {
+    debug(`setChatEphemeralTimer ${chatId} ${timer}`)
+    return Boolean(
+      binding.dcn_set_chat_ephemeral_timer(
+        this.dcn_context,
+        Number(chatId),
+        Number(timer)
+      )
+    )
+  }
+
+  setChatProfileImage(chatId: number, image: string) {
+    debug(`setChatProfileImage ${chatId} ${image}`)
+    return Boolean(
+      binding.dcn_set_chat_profile_image(
+        this.dcn_context,
+        Number(chatId),
+        image || ''
+      )
+    )
+  }
+
+  setConfig(key: string, value: string | boolean | number): number {
+    debug(`setConfig (string) ${key} ${value}`)
+    if (value === null) {
+      return binding.dcn_set_config_null(this.dcn_context, key)
+    } else {
+      if (typeof value === 'boolean') {
+        value = value === true ? '1' : '0'
+      } else if (typeof value === 'number') {
+        value = String(value)
+      }
+      return binding.dcn_set_config(this.dcn_context, key, value)
+    }
+  }
+
+  setConfigFromQr(qrcodeContent: string): boolean {
+    return Boolean(
+      binding.dcn_set_config_from_qr(this.dcn_context, qrcodeContent)
+    )
+  }
+
+  estimateDeletionCount(fromServer: boolean, seconds: number): number {
+    debug(`estimateDeletionCount fromServer: ${fromServer} seconds: ${seconds}`)
+    return binding.dcn_estimate_deletion_cnt(
+      this.dcn_context,
+      fromServer === true ? 1 : 0,
+      seconds
+    )
+  }
+
+  setStockTranslation(stockId: number, stockMsg: string) {
+    debug(`setStockTranslation ${stockId} ${stockMsg}`)
+    return Boolean(
+      binding.dcn_set_stock_translation(
+        this.dcn_context,
+        Number(stockId),
+        stockMsg
+      )
+    )
+  }
+
+  setDraft(chatId: number, msg: Message | null) {
+    debug(`setDraft ${chatId}`)
+    binding.dcn_set_draft(
+      this.dcn_context,
+      Number(chatId),
+      msg ? msg.dc_msg : null
+    )
+  }
+
+  setLocation(latitude: number, longitude: number, accuracy: number) {
+    debug(`setLocation ${latitude}`)
+    binding.dcn_set_location(
+      this.dcn_context,
+      Number(latitude),
+      Number(longitude),
+      Number(accuracy)
+    )
+  }
+
+  /*
+   * @param chatId Chat-id to get location information for.
+   *     0 to get locations independently of the chat.
+   * @param contactId Contact id to get location information for.
+   *     If also a chat-id is given, this should be a member of the given chat.
+   *     0 to get locations independently of the contact.
+   * @param timestampFrom Start of timespan to return.
+   *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
+   *     0 for "start from the beginning".
+   * @param timestampTo End of timespan to return.
+   *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
+   *     0 for "all up to now".
+   * @return Array of locations, NULL is never returned.
+   *     The array is sorted descending;
+   *     the first entry in the array is the location with the newest timestamp.
+   *
+   * Examples:
+   * // get locations from the last hour for a global map
+   * getLocations(0, 0, time(NULL)-60*60, 0);
+   *
+   * // get locations from a contact for a global map
+   * getLocations(0, contact_id, 0, 0);
+   *
+   * // get all locations known for a given chat
+   * getLocations(chat_id, 0, 0, 0);
+   *
+   * // get locations from a single contact for a given chat
+   * getLocations(chat_id, contact_id, 0, 0);
+   */
+
+  getLocations(
+    chatId: number,
+    contactId: number,
+    timestampFrom = 0,
+    timestampTo = 0
+  ) {
+    const locations = new Locations(
+      binding.dcn_get_locations(
+        this.dcn_context,
+        Number(chatId),
+        Number(contactId),
+        timestampFrom,
+        timestampTo
+      )
+    )
+    return locations.toJson()
+  }
+
+  /**
+   *
+   * @param duration The duration (0 for no mute, -1 for forever mute, everything else is is the relative mute duration from now in seconds)
+   */
+  setChatMuteDuration(chatId: number, duration: number) {
+    return Boolean(
+      binding.dcn_set_chat_mute_duration(this.dcn_context, chatId, duration)
+    )
+  }
+
+  /** get information about the provider */
+  getProviderFromEmail(email: string) {
+    debug('DeltaChat.getProviderFromEmail')
+    const provider = binding.dcn_provider_new_from_email(
+      this.dcn_context,
+      email
+    )
+    if (!provider) {
+      return undefined
+    }
+    return {
+      before_login_hint: binding.dcn_provider_get_before_login_hint(provider),
+      overview_page: binding.dcn_provider_get_overview_page(provider),
+      status: binding.dcn_provider_get_status(provider),
+    }
+  }
+
+  sendWebxdcStatusUpdate<T>(
+    msgId: number,
+    json: WebxdcSendingStatusUpdate<T>,
+    descr: string
+  ) {
+    return Boolean(
+      binding.dcn_send_webxdc_status_update(
+        this.dcn_context,
+        msgId,
+        JSON.stringify(json),
+        descr
+      )
+    )
+  }
+
+  getWebxdcStatusUpdates<T>(
+    msgId: number,
+    serial = 0
+  ): WebxdcReceivedStatusUpdate<T>[] {
+    return JSON.parse(
+      binding.dcn_get_webxdc_status_updates(this.dcn_context, msgId, serial)
+    )
+  }
+
+  /** the string contains the binary data, it is an "u8 string", maybe we will use a more efficient type in the future. */
+  getWebxdcBlob(message: Message, filename: string): Buffer | null {
+    return binding.dcn_msg_get_webxdc_blob(message.dc_msg, filename)
+  }
+}
+
+export type WebxdcInfo = {
+  name: string
+  icon: string
+  summary: string
+  /**
+   * if set by the webxdc, name of the document in edit
+   */
+  document?: string
+}
+
+type WebxdcSendingStatusUpdate<T> = {
+  /** the payload, deserialized json:
+   * any javascript primitive, array or object. */
+  payload: T
+  /** optional, short, informational message that will be added to the chat,
+   * eg. "Alice voted" or "Bob scored 123 in MyGame";
+   * usually only one line of text is shown,
+   * use this option sparingly to not spam the chat. */
+  info?: string
+  /** optional, short text, shown beside app icon;
+   * it is recommended to use some aggregated value,
+   * eg. "8 votes", "Highscore: 123" */
+  summary?: string
+  /**
+   * optional, name of the document in edit,
+   * must not be used eg. in games where the Webxdc does not create documents
+   */
+  document?: string
+}
+
+type WebxdcReceivedStatusUpdate<T> = {
+  /** the payload, deserialized json */
+  payload: T
+  /** the serial number of this update. Serials are larger `0` and newer serials have higher numbers. */
+  serial: number
+  /** the maximum serial currently known.
+   *  If `max_serial` equals `serial` this update is the last update (until new network messages arrive). */
+  max_serial: number
+  /** optional, short, informational message. */
+  info?: string
+  /** optional, short text, shown beside app icon. If there are no updates, an empty JSON-array is returned. */
+  summary?: string
+}

node/lib/deltachat.ts

@@ -0,0 +1,234 @@
+/* eslint-disable camelcase */
+
+import binding from './binding'
+import { EventId2EventName } from './constants'
+import { EventEmitter } from 'events'
+import { existsSync } from 'fs'
+import rawDebug from 'debug'
+import { tmpdir } from 'os'
+import { join } from 'path'
+import { Context } from './context'
+const debug = rawDebug('deltachat:node:index')
+
+const noop = function () {}
+interface NativeAccount {}
+
+/**
+ * Wrapper around dcn_account_t*
+ */
+export class AccountManager extends EventEmitter {
+  dcn_accounts: NativeAccount
+  accountDir: string
+  jsonRpcStarted = false
+
+  constructor(cwd: string, writable = true) {
+    super()
+    debug('DeltaChat constructor')
+
+    this.accountDir = cwd
+    this.dcn_accounts = binding.dcn_accounts_new(
+      this.accountDir,
+      writable ? 1 : 0
+    )
+  }
+
+  getAllAccountIds() {
+    return binding.dcn_accounts_get_all(this.dcn_accounts)
+  }
+
+  selectAccount(account_id: number) {
+    return binding.dcn_accounts_select_account(this.dcn_accounts, account_id)
+  }
+
+  selectedAccount(): number {
+    return binding.dcn_accounts_get_selected_account(this.dcn_accounts)
+  }
+
+  addAccount(): number {
+    return binding.dcn_accounts_add_account(this.dcn_accounts)
+  }
+
+  addClosedAccount(): number {
+    return binding.dcn_accounts_add_closed_account(this.dcn_accounts)
+  }
+
+  removeAccount(account_id: number) {
+    return binding.dcn_accounts_remove_account(this.dcn_accounts, account_id)
+  }
+
+  accountContext(account_id: number) {
+    const native_context = binding.dcn_accounts_get_account(
+      this.dcn_accounts,
+      account_id
+    )
+    if (native_context === null) {
+      throw new Error(
+        `could not get context with id ${account_id}, does it even exist? please check your ids`
+      )
+    }
+    return new Context(this, native_context, account_id)
+  }
+
+  migrateAccount(dbfile: string): number {
+    return binding.dcn_accounts_migrate_account(this.dcn_accounts, dbfile)
+  }
+
+  close() {
+    this.stopIO()
+    debug('unrefing context')
+    binding.dcn_accounts_unref(this.dcn_accounts)
+    debug('Unref end')
+  }
+
+  emit(
+    event: string | symbol,
+    account_id: number,
+    data1: any,
+    data2: any
+  ): boolean {
+    super.emit('ALL', event, account_id, data1, data2)
+    return super.emit(event, account_id, data1, data2)
+  }
+
+  handleCoreEvent(
+    eventId: number,
+    accountId: number,
+    data1: number,
+    data2: number | string
+  ) {
+    const eventString = EventId2EventName[eventId]
+    debug('event', eventString, accountId, data1, data2)
+    debug(eventString, data1, data2)
+    if (!this.emit) {
+      console.log('Received an event but EventEmitter is already destroyed.')
+      console.log(eventString, data1, data2)
+      return
+    }
+    this.emit(eventString, accountId, data1, data2)
+  }
+
+  startEvents() {
+    if (this.dcn_accounts === null) {
+      throw new Error('dcn_account is null')
+    }
+    binding.dcn_accounts_start_event_handler(
+      this.dcn_accounts,
+      this.handleCoreEvent.bind(this)
+    )
+    debug('Started event handler')
+  }
+
+  startJsonRpcHandler(callback: ((response: string) => void) | null) {
+    if (this.dcn_accounts === null) {
+      throw new Error('dcn_account is null')
+    }
+    if (!callback) {
+      throw new Error('no callback set')
+    }
+    if (this.jsonRpcStarted) {
+      throw new Error('jsonrpc was started already')
+    }
+
+    binding.dcn_accounts_start_jsonrpc(this.dcn_accounts, callback.bind(this))
+    debug('Started JSON-RPC handler')
+    this.jsonRpcStarted = true
+  }
+
+  jsonRpcRequest(message: string) {
+    if (!this.jsonRpcStarted) {
+      throw new Error(
+        'jsonrpc is not active, start it with startJsonRpcHandler first'
+      )
+    }
+    binding.dcn_json_rpc_request(this.dcn_accounts, message)
+  }
+
+  startIO() {
+    binding.dcn_accounts_start_io(this.dcn_accounts)
+  }
+
+  stopIO() {
+    binding.dcn_accounts_stop_io(this.dcn_accounts)
+  }
+
+  static maybeValidAddr(addr: string) {
+    debug('DeltaChat.maybeValidAddr')
+    if (addr === null) return false
+    return Boolean(binding.dcn_maybe_valid_addr(addr))
+  }
+
+  static parseGetInfo(info: string) {
+    debug('static _getInfo')
+    const result: { [key: string]: string } = {}
+
+    const regex = /^(\w+)=(.*)$/i
+    info
+      .split('\n')
+      .filter(Boolean)
+      .forEach((line) => {
+        const match = regex.exec(line)
+        if (match) {
+          result[match[1]] = match[2]
+        }
+      })
+
+    return result
+  }
+
+  static newTemporary() {
+    let directory = null
+    while (true) {
+      const randomString = Math.random().toString(36).substring(2, 5)
+      directory = join(tmpdir(), 'deltachat-' + randomString)
+      if (!existsSync(directory)) break
+    }
+    const dc = new AccountManager(directory)
+    const accountId = dc.addAccount()
+    const context = dc.accountContext(accountId)
+    return { dc, context, accountId, directory }
+  }
+
+  static getSystemInfo() {
+    debug('DeltaChat.getSystemInfo')
+    const { dc, context } = AccountManager.newTemporary()
+    const info = AccountManager.parseGetInfo(
+      binding.dcn_get_info(context.dcn_context)
+    )
+    const {
+      deltachat_core_version,
+      sqlite_version,
+      sqlite_thread_safe,
+      libetpan_version,
+      openssl_version,
+      compile_date,
+      arch,
+    } = info
+    const result = {
+      deltachat_core_version,
+      sqlite_version,
+      sqlite_thread_safe,
+      libetpan_version,
+      openssl_version,
+      compile_date,
+      arch,
+    }
+    context.unref()
+    dc.close()
+    return result
+  }
+
+  /** get information about the provider
+   *
+   * This function creates a temporary context to be standalone,
+   * if possible use `Context.getProviderFromEmail` instead. (otherwise potential proxy settings are not used)
+   * @deprecated
+   */
+  static getProviderFromEmail(email: string) {
+    debug('DeltaChat.getProviderFromEmail')
+    const { dc, context } = AccountManager.newTemporary()
+    const provider = context.getProviderFromEmail(email)
+    context.unref()
+    dc.close()
+    return provider
+  }
+}

node/lib/index.ts

@@ -0,0 +1,20 @@
+import { AccountManager } from './deltachat'
+
+export default AccountManager
+
+export { Context } from './context'
+export { Chat } from './chat'
+export { ChatList } from './chatlist'
+export { C } from './constants'
+export { Contact } from './contact'
+export { AccountManager as DeltaChat }
+export { Locations } from './locations'
+export { Lot } from './lot'
+export {
+  Message,
+  MessageState,
+  MessageViewType,
+  MessageDownloadState,
+} from './message'
+
+export * from './types'

node/lib/locations.ts

@@ -0,0 +1,82 @@
+/* eslint-disable camelcase */
+
+const binding = require('../binding')
+const debug = require('debug')('deltachat:node:locations')
+
+interface NativeLocations {}
+/**
+ * Wrapper around dc_location_t*
+ */
+export class Locations {
+  constructor(public dc_locations: NativeLocations) {
+    debug('Locations constructor')
+    if (dc_locations === null) {
+      throw new Error('dc_locations can not be null')
+    }
+  }
+
+  locationToJson(index: number) {
+    debug('locationToJson')
+    return {
+      accuracy: this.getAccuracy(index),
+      latitude: this.getLatitude(index),
+      longitude: this.getLongitude(index),
+      timestamp: this.getTimestamp(index),
+      contactId: this.getContactId(index),
+      msgId: this.getMsgId(index),
+      chatId: this.getChatId(index),
+      isIndependent: this.isIndependent(index),
+      marker: this.getMarker(index),
+    }
+  }
+
+  toJson(): ReturnType<Locations['locationToJson']>[] {
+    debug('toJson')
+    const locations = []
+    const count = this.getCount()
+    for (let index = 0; index < count; index++) {
+      locations.push(this.locationToJson(index))
+    }
+    return locations
+  }
+
+  getCount(): number {
+    return binding.dcn_array_get_cnt(this.dc_locations)
+  }
+
+  getAccuracy(index: number): number {
+    return binding.dcn_array_get_accuracy(this.dc_locations, index)
+  }
+
+  getLatitude(index: number): number {
+    return binding.dcn_array_get_latitude(this.dc_locations, index)
+  }
+
+  getLongitude(index: number): number {
+    return binding.dcn_array_get_longitude(this.dc_locations, index)
+  }
+
+  getTimestamp(index: number): number {
+    return binding.dcn_array_get_timestamp(this.dc_locations, index)
+  }
+
+  getMsgId(index: number): number {
+    return binding.dcn_array_get_msg_id(this.dc_locations, index)
+  }
+
+  getContactId(index: number): number {
+    return binding.dcn_array_get_contact_id(this.dc_locations, index)
+  }
+
+  getChatId(index: number): number {
+    return binding.dcn_array_get_chat_id(this.dc_locations, index)
+  }
+
+  isIndependent(index: number): boolean {
+    return binding.dcn_array_is_independent(this.dc_locations, index)
+  }
+
+  getMarker(index: number): string {
+    return binding.dcn_array_get_marker(this.dc_locations, index)
+  }
+}

node/lib/lot.ts

@@ -0,0 +1,52 @@
+/* eslint-disable camelcase */
+
+const binding = require('../binding')
+const debug = require('debug')('deltachat:node:lot')
+
+interface NativeLot {}
+/**
+ * Wrapper around dc_lot_t*
+ */
+export class Lot {
+  constructor(public dc_lot: NativeLot) {
+    debug('Lot constructor')
+    if (dc_lot === null) {
+      throw new Error('dc_lot can not be null')
+    }
+  }
+
+  toJson() {
+    debug('toJson')
+    return {
+      state: this.getState(),
+      text1: this.getText1(),
+      text1Meaning: this.getText1Meaning(),
+      text2: this.getText2(),
+      timestamp: this.getTimestamp(),
+    }
+  }
+
+  getId(): number {
+    return binding.dcn_lot_get_id(this.dc_lot)
+  }
+
+  getState(): number {
+    return binding.dcn_lot_get_state(this.dc_lot)
+  }
+
+  getText1(): string {
+    return binding.dcn_lot_get_text1(this.dc_lot)
+  }
+
+  getText1Meaning(): string {
+    return binding.dcn_lot_get_text1_meaning(this.dc_lot)
+  }
+
+  getText2(): string {
+    return binding.dcn_lot_get_text2(this.dc_lot)
+  }
+
+  getTimestamp(): number {
+    return binding.dcn_lot_get_timestamp(this.dc_lot)
+  }
+}

node/lib/message.ts

@@ -0,0 +1,370 @@
+/* eslint-disable camelcase */
+
+import binding from './binding'
+import { C } from './constants'
+import { Lot } from './lot'
+import { Chat } from './chat'
+import { WebxdcInfo } from './context'
+const debug = require('debug')('deltachat:node:message')
+
+export enum MessageDownloadState {
+  Available = C.DC_DOWNLOAD_AVAILABLE,
+  Done = C.DC_DOWNLOAD_DONE,
+  Failure = C.DC_DOWNLOAD_FAILURE,
+  InProgress = C.DC_DOWNLOAD_IN_PROGRESS,
+}
+
+/**
+ * Helper class for message states so you can do e.g.
+ *
+ * if (msg.getState().isPending()) { .. }
+ *
+ */
+export class MessageState {
+  constructor(public state: number) {
+    debug(`MessageState constructor ${state}`)
+  }
+
+  isUndefined() {
+    return this.state === C.DC_STATE_UNDEFINED
+  }
+
+  isFresh() {
+    return this.state === C.DC_STATE_IN_FRESH
+  }
+
+  isNoticed() {
+    return this.state === C.DC_STATE_IN_NOTICED
+  }
+
+  isSeen() {
+    return this.state === C.DC_STATE_IN_SEEN
+  }
+
+  isPending() {
+    return this.state === C.DC_STATE_OUT_PENDING
+  }
+
+  isFailed() {
+    return this.state === C.DC_STATE_OUT_FAILED
+  }
+
+  isDelivered() {
+    return this.state === C.DC_STATE_OUT_DELIVERED
+  }
+
+  isReceived() {
+    return this.state === C.DC_STATE_OUT_MDN_RCVD
+  }
+}
+
+/**
+ * Helper class for message types so you can do e.g.
+ *
+ * if (msg.getViewType().isVideo()) { .. }
+ *
+ */
+export class MessageViewType {
+  constructor(public viewType: number) {
+    debug(`MessageViewType constructor ${viewType}`)
+  }
+
+  isText() {
+    return this.viewType === C.DC_MSG_TEXT
+  }
+
+  isImage() {
+    return this.viewType === C.DC_MSG_IMAGE || this.viewType === C.DC_MSG_GIF
+  }
+
+  isGif() {
+    return this.viewType === C.DC_MSG_GIF
+  }
+
+  isAudio() {
+    return this.viewType === C.DC_MSG_AUDIO || this.viewType === C.DC_MSG_VOICE
+  }
+
+  isVoice() {
+    return this.viewType === C.DC_MSG_VOICE
+  }
+
+  isVideo() {
+    return this.viewType === C.DC_MSG_VIDEO
+  }
+
+  isFile() {
+    return this.viewType === C.DC_MSG_FILE
+  }
+
+  isVideochatInvitation() {
+    return this.viewType === C.DC_MSG_VIDEOCHAT_INVITATION
+  }
+}
+
+interface NativeMessage {}
+/**
+ * Wrapper around dc_msg_t*
+ */
+export class Message {
+  constructor(public dc_msg: NativeMessage) {
+    debug('Message constructor')
+    if (dc_msg === null) {
+      throw new Error('dc_msg can not be null')
+    }
+  }
+
+  toJson() {
+    debug('toJson')
+    const quotedMessage = this.getQuotedMessage()
+    const viewType = binding.dcn_msg_get_viewtype(this.dc_msg)
+    return {
+      chatId: this.getChatId(),
+      webxdcInfo: viewType == C.DC_MSG_WEBXDC ? this.webxdcInfo : null,
+      downloadState: this.downloadState,
+      duration: this.getDuration(),
+      file: this.getFile(),
+      fromId: this.getFromId(),
+      id: this.getId(),
+      quotedText: this.getQuotedText(),
+      quotedMessageId: quotedMessage ? quotedMessage.getId() : null,
+      receivedTimestamp: this.getReceivedTimestamp(),
+      sortTimestamp: this.getSortTimestamp(),
+      text: this.getText(),
+      timestamp: this.getTimestamp(),
+      hasLocation: this.hasLocation(),
+      hasHTML: this.hasHTML,
+      viewType,
+      state: binding.dcn_msg_get_state(this.dc_msg),
+      hasDeviatingTimestamp: this.hasDeviatingTimestamp(),
+      showPadlock: this.getShowpadlock(),
+      summary: this.getSummary().toJson(),
+      subject: this.subject,
+      isSetupmessage: this.isSetupmessage(),
+      isInfo: this.isInfo(),
+      isForwarded: this.isForwarded(),
+      dimensions: {
+        height: this.getHeight(),
+        width: this.getWidth(),
+      },
+      videochatType: this.getVideochatType(),
+      videochatUrl: this.getVideochatUrl(),
+      overrideSenderName: this.overrideSenderName,
+      parentId: this.parent?.getId(),
+    }
+  }
+
+  getChatId(): number {
+    return binding.dcn_msg_get_chat_id(this.dc_msg)
+  }
+
+  get webxdcInfo(): WebxdcInfo | null {
+    let info = binding.dcn_msg_get_webxdc_info(this.dc_msg)
+    return info
+      ? JSON.parse(binding.dcn_msg_get_webxdc_info(this.dc_msg))
+      : null
+  }
+
+  get downloadState(): MessageDownloadState {
+    return binding.dcn_msg_get_download_state(this.dc_msg)
+  }
+
+  get parent(): Message | null {
+    let msg = binding.dcn_msg_get_parent(this.dc_msg)
+    return msg ? new Message(msg) : null
+  }
+
+  getDuration(): number {
+    return binding.dcn_msg_get_duration(this.dc_msg)
+  }
+
+  getFile(): string {
+    return binding.dcn_msg_get_file(this.dc_msg)
+  }
+
+  getFilebytes(): number {
+    return binding.dcn_msg_get_filebytes(this.dc_msg)
+  }
+
+  getFilemime(): string {
+    return binding.dcn_msg_get_filemime(this.dc_msg)
+  }
+
+  getFilename(): string {
+    return binding.dcn_msg_get_filename(this.dc_msg)
+  }
+
+  getFromId(): number {
+    return binding.dcn_msg_get_from_id(this.dc_msg)
+  }
+
+  getHeight(): number {
+    return binding.dcn_msg_get_height(this.dc_msg)
+  }
+
+  getId(): number {
+    return binding.dcn_msg_get_id(this.dc_msg)
+  }
+
+  getQuotedText(): string {
+    return binding.dcn_msg_get_quoted_text(this.dc_msg)
+  }
+
+  getQuotedMessage(): Message | null {
+    const dc_msg = binding.dcn_msg_get_quoted_msg(this.dc_msg)
+    return dc_msg ? new Message(dc_msg) : null
+  }
+
+  getReceivedTimestamp(): number {
+    return binding.dcn_msg_get_received_timestamp(this.dc_msg)
+  }
+
+  getSetupcodebegin() {
+    return binding.dcn_msg_get_setupcodebegin(this.dc_msg)
+  }
+
+  getShowpadlock() {
+    return Boolean(binding.dcn_msg_get_showpadlock(this.dc_msg))
+  }
+
+  getSortTimestamp(): number {
+    return binding.dcn_msg_get_sort_timestamp(this.dc_msg)
+  }
+
+  getState() {
+    return new MessageState(binding.dcn_msg_get_state(this.dc_msg))
+  }
+
+  getSummary(chat?: Chat) {
+    const dc_chat = (chat && chat.dc_chat) || null
+    return new Lot(binding.dcn_msg_get_summary(this.dc_msg, dc_chat))
+  }
+
+  get subject(): string {
+    return binding.dcn_msg_get_subject(this.dc_msg)
+  }
+
+  getSummarytext(approxCharacters: number): string {
+    approxCharacters = approxCharacters || 0
+    return binding.dcn_msg_get_summarytext(this.dc_msg, approxCharacters)
+  }
+
+  getText(): string {
+    return binding.dcn_msg_get_text(this.dc_msg)
+  }
+
+  getTimestamp(): number {
+    return binding.dcn_msg_get_timestamp(this.dc_msg)
+  }
+
+  getViewType() {
+    return new MessageViewType(binding.dcn_msg_get_viewtype(this.dc_msg))
+  }
+
+  getVideochatType(): number {
+    return binding.dcn_msg_get_videochat_type(this.dc_msg)
+  }
+
+  getVideochatUrl(): string {
+    return binding.dcn_msg_get_videochat_url(this.dc_msg)
+  }
+
+  getWidth(): number {
+    return binding.dcn_msg_get_width(this.dc_msg)
+  }
+
+  get overrideSenderName(): string {
+    return binding.dcn_msg_get_override_sender_name(this.dc_msg)
+  }
+
+  hasDeviatingTimestamp() {
+    return binding.dcn_msg_has_deviating_timestamp(this.dc_msg)
+  }
+
+  hasLocation() {
+    return Boolean(binding.dcn_msg_has_location(this.dc_msg))
+  }
+
+  get hasHTML() {
+    return Boolean(binding.dcn_msg_has_html(this.dc_msg))
+  }
+
+  isDeadDrop() {
+    // TODO: Fix
+    //return this.getChatId() === C.DC_CHAT_ID_DEADDROP
+    return false
+  }
+
+  isForwarded() {
+    return Boolean(binding.dcn_msg_is_forwarded(this.dc_msg))
+  }
+
+  isIncreation() {
+    return Boolean(binding.dcn_msg_is_increation(this.dc_msg))
+  }
+
+  isInfo() {
+    return Boolean(binding.dcn_msg_is_info(this.dc_msg))
+  }
+
+  isSent() {
+    return Boolean(binding.dcn_msg_is_sent(this.dc_msg))
+  }
+
+  isSetupmessage() {
+    return Boolean(binding.dcn_msg_is_setupmessage(this.dc_msg))
+  }
+
+  latefilingMediasize(width: number, height: number, duration: number) {
+    binding.dcn_msg_latefiling_mediasize(this.dc_msg, width, height, duration)
+  }
+
+  setDimension(width: number, height: number) {
+    binding.dcn_msg_set_dimension(this.dc_msg, width, height)
+    return this
+  }
+
+  setDuration(duration: number) {
+    binding.dcn_msg_set_duration(this.dc_msg, duration)
+    return this
+  }
+
+  setFile(file: string, mime?: string) {
+    if (typeof file !== 'string') throw new Error('Missing filename')
+    binding.dcn_msg_set_file(this.dc_msg, file, mime || '')
+    return this
+  }
+
+  setLocation(longitude: number, latitude: number) {
+    binding.dcn_msg_set_location(this.dc_msg, longitude, latitude)
+    return this
+  }
+
+  setQuote(quotedMessage: Message | null) {
+    binding.dcn_msg_set_quote(this.dc_msg, quotedMessage?.dc_msg)
+    return this
+  }
+
+  setText(text: string) {
+    binding.dcn_msg_set_text(this.dc_msg, text)
+    return this
+  }
+
+  setHTML(html: string) {
+    binding.dcn_msg_set_html(this.dc_msg, html)
+    return this
+  }
+
+  setOverrideSenderName(senderName: string) {
+    binding.dcn_msg_set_override_sender_name(this.dc_msg, senderName)
+    return this
+  }
+
+  /** Force the message to be sent in plain text.
+   *
+   * This API is for bots, there is no need to expose it in the UI.
+   */
+  forcePlaintext() {
+    binding.dcn_msg_force_plaintext(this.dc_msg)
+  }
+}

node/lib/types.ts

@@ -0,0 +1,25 @@
+import { C } from './constants'
+
+export type ChatTypes =
+  | C.DC_CHAT_TYPE_GROUP
+  | C.DC_CHAT_TYPE_MAILINGLIST
+  | C.DC_CHAT_TYPE_SINGLE
+  | C.DC_CHAT_TYPE_UNDEFINED
+
+export interface ChatJSON {
+  archived: boolean
+  pinned: boolean
+  color: string
+  id: number
+  name: string
+  mailinglistAddr: string
+  profileImage: string
+  type: number
+  isSelfTalk: boolean
+  isUnpromoted: boolean
+  isProtected: boolean
+  canSend: boolean
+  isDeviceTalk: boolean
+  isContactRequest: boolean
+  muted: boolean
+}

node/lib/util.ts

@@ -0,0 +1,6 @@
+/**
+ * @param integerColor expects a 24bit rgb integer (left to right: 8bits red, 8bits green, 8bits blue)
+ */
+export function integerToHexColor(integerColor: number) {
+  return '#' + (integerColor + 16777216).toString(16).substring(1)
+}