mimeparser: do not try to decrypt partially downloaded messages

Not completely sure it's worth it since some other dependencies still
depend on it. Anyway, proc macros are said to be bad for compile times, I just typed out what the proc macro generates and it's only 8 more lines, and we're already doing it this way in e.g. action_by_contact() and collect_texts_recursive() (the latter needs the boxed future both for the trait and for recursion).

.github/workflows/ci.yml

@@ -77,10 +77,10 @@ jobs:
         include:
           # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.60.0
+            rust: 1.61.0
             python: 3.9
           - os: windows-latest
-            rust: 1.60.0
+            rust: 1.61.0
             python: false # Python bindings compilation on Windows is not supported.
 
           # Minimum Supported Rust Version = 1.56.0

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

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

.github/workflows/node-docs.yml

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

.github/workflows/node-package.yml

@@ -0,0 +1,162 @@
+name: 'node.js build'
+on:
+  pull_request:
+  push:
+    tags:
+    - '*'
+    - '!py-*'
+
+
+jobs:
+  prebuild:
+    name: 'prebuild'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos-latest, windows-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry/
+            ~/.cargo/git
+            target
+          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
+
+      - name: Install dependencies & build
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          cd node
+          npm install --verbose
+
+      - name: Build Prebuild
+        run: |
+          cd node
+          npm run prebuildify
+          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
+
+      - name: Upload Prebuild
+        uses: actions/upload-artifact@v1
+        with:
+          name: ${{ matrix.os }}
+          path: node/${{ matrix.os }}.tar.gz
+
+  pack-module:
+    needs: prebuild
+    name: 'Package deltachat-node and upload to download.delta.chat'
+    runs-on: ubuntu-18.04
+    steps:
+      - name: install tree
+        run: sudo apt install tree
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        continue-on-error: true
+      - name: Get Pullrequest ID
+        id: prepare
+        run: |
+          tag=${{ steps.tag.outputs.tag }}
+          if [ -z "$tag" ]; then
+            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
+          else
+            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
+            echo "No preview will be uploaded this time, but the $tag release"
+          fi
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+          echo $DELTACHAT_NODE_TAR_GZ
+      - name: Download ubuntu prebuild
+        uses: actions/download-artifact@v1
+        with:
+          name: ubuntu-18.04
+      - name: Download macos prebuild
+        uses: actions/download-artifact@v1
+        with:
+          name: macos-latest
+      - name: Download windows prebuild
+        uses: actions/download-artifact@v1
+        with:
+          name: windows-latest
+      - shell: bash
+        run: |
+          mkdir node/prebuilds
+          tar -xvzf ubuntu-18.04/ubuntu-18.04.tar.gz -C node/prebuilds
+          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
+          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
+          tree node/prebuilds
+          rm -rf ubuntu-18.04 macos-latest windows-latest
+      - name: install dependencies without running scripts
+        run: |
+          npm install --ignore-scripts
+      - 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@v1
+        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,67 @@
+name: 'node.js tests'
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - staging
+      - trying
+
+jobs:
+  tests:
+    name: 'tests'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos-latest, windows-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: System info
+        run: |
+          rustc -vV
+          rustup -vV
+          cargo -vV
+          npm --version
+          node --version
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ env.APPDATA }}/npm-cache
+            ~/.npm
+          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry/
+            ~/.cargo/git
+            target
+          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
+
+      - name: Install dependencies & build
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          cd node
+          npm install --verbose
+
+      - name: Test
+        if: runner.os != 'Windows'
+        run: |
+          cd node
+          npm run test
+        env:
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+      - name: Run tests on Windows, except lint
+        if: runner.os == 'Windows'
+        run: |
+          cd node
+          npm run test:mocha
+        env:
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}

.gitignore

@@ -33,3 +33,10 @@ coverage/
 python/accounts.txt
 python/all-testaccounts.txt
 tmp/
+
+# from deltachat-node
+node_modules/
+node/build/
+node/dist/
+node/prebuilds/
+node/.nyc_output/

.npmignore

@@ -0,0 +1,42 @@
+.circleci/
+.gitmodules
+node/.nyc_output/
+.travis.yml
+appveyor.yml
+node/build/
+node/README.md
+rustfmt.toml
+spec.md
+test-data/
+build2/
+node_modules
+.git
+.idea/
+.pytest_cache
+CMakeLists.txt
+README.md
+contrib/
+node/ci_scripts/
+coverage/
+node/.circleci
+node/appveyor.yml
+ci/
+ci_scripts/
+python/
+target
+proptest-regressions
+deltachat-ffi/Doxyfile
+scripts
+webxdc.md
+standards.md
+draft/
+node/examples/
+# deltachat-core-rust/assets # don't exclude assets, otherwise it won't build
+node/images/
+node/test/
+node/windows.md
+node/*.tar.gz
+node/old_docs.md
+.vscode/
+.github/
+node/.prettierrc.yml

.npmrc

@@ -0,0 +1 @@
+package-lock=false

CHANGELOG.md

@@ -1,5 +1,79 @@
 # Changelog
 
+## Unreleased
+
+### Changes
+- refactorings #3373 #3345 #3380 #3382
+- node: move split2 to devDependencies
+
+
+### Fixes
+- delete outgoing MDNs found in the Sent folder on Gmail #3372
+- fix searching one-to-one chats #3377
+- do not add legacy info-messages on resending webxdc #3389
+
+
+## 1.84.0
+
+### Changes
+- refactorings #3354 #3347 #3353 #3346
+
+### Fixes
+- do not unnecessarily SELECT folders if there are no operations planned on
+  them #3333
+- trim chat encryption info #3350
+- fix failure to decrypt first message to self after key synchronization
+  via Autocrypt Setup Message #3352
+- Keep pgp key when you change your own email address #3351
+- Do not ignore Sent and Spam folders on Gmail #3369
+- handle decryption errors explicitly and don't get confused by encrypted mail attachments #3374
+
+
+## 1.83.0
+
+### Fixes
+- fix node prebuild & package ci #3337
+
+## 1.82.0
+
+### API-Changes
+- re-add removed DC_MSG_ID_MARKER1 as in use on iOS #3330
+
+### Changes
+- refactorings #3328
+
+### Fixes
+- fix node package ci #3331
+- fix race condition in ongoing process (import/export, configuration) allocation #3322
+
+
+## 1.81.0
+
+### API-Changes
+- deprecate unused `marker1before` argument of `dc_get_chat_msgs`
+  and remove `DC_MSG_ID_MARKER1` constant #3274
+
+### Changes
+- now the node-bindings are also part of this repository 🎉 #3283
+- support `source_code_url` from Webxdc manifests #3314
+- support Webxdc document names and add `document` to `dc_msg_get_webxdc_info()` #3317 #3324
+- improve chat encryption info, make it easier to find contacts without keys #3318
+- improve error reporting when creating a folder fails #3325
+- node: remove unmaintained coverage scripts
+- send normal messages with higher priority than MDNs #3243
+- make Scheduler stateless #3302
+- abort instead of unwinding on panic #3259
+- improve python bindings #3297 #3298
+- improve documentation #3307 #3306 #3309 #3319 #3321
+- refactorings #3304 #3303 #3323
+
+### Fixes
+- node: throw error when getting context with an invalid account id
+- node: throw error when instanciating a wrapper class on `null` (Context, Message, Chat, ChatList and so on)
+- use same contact-color if email address differ only in upper-/lowercase #3327
+- repair encrypted mails "mixed up" by Google Workspace "Append footer" function #3315
+
+
 ## 1.80.0
 
 ### Changes

Cargo.lock

@@ -230,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
+checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
 dependencies = [
  "concurrent-queue",
  "futures-lite",
@@ -279,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6"
+checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
 dependencies = [
  "async-io",
  "blocking",
@@ -297,7 +297,7 @@ dependencies = [
 [[package]]
 name = "async-smtp"
 version = "0.4.0"
-source = "git+https://github.com/async-email/async-smtp?branch=master#0cbf7043923b06612ce0dea7a3a3dae5ceaef578"
+source = "git+https://github.com/async-email/async-smtp?branch=master#d6b947cf2a104183fb1634dd885fc0abc2cc1f59"
 dependencies = [
  "async-native-tls",
  "async-std",
@@ -305,7 +305,7 @@ dependencies = [
  "base64 0.13.0",
  "bufstream",
  "fast-socks5",
- "hostname 0.1.5",
+ "hostname",
  "log",
  "nom 5.1.2",
  "pin-project",
@@ -581,9 +581,9 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
 
 [[package]]
 name = "bumpalo"
-version = "3.9.1"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
 
 [[package]]
 name = "byte-pool"
@@ -1067,7 +1067,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.80.0"
+version = "1.84.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1077,7 +1077,6 @@ dependencies = [
  "async-std",
  "async-std-resolver",
  "async-tar",
- "async-trait",
  "backtrace",
  "base64 0.13.0",
  "bitflags",
@@ -1132,7 +1131,7 @@ dependencies = [
  "thiserror",
  "toml",
  "url",
- "uuid",
+ "uuid 1.1.1",
  "zip",
 ]
 
@@ -1146,7 +1145,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.80.0"
+version = "1.84.0"
 dependencies = [
  "anyhow",
  "async-std",
@@ -1263,9 +1262,9 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
 [[package]]
 name = "ed25519"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d5c4b5e5959dc2c2b89918d8e2cc40fcdd623cef026ed09d2f0ee05199dc8e4"
+checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
 dependencies = [
  "signature",
 ]
@@ -1543,13 +1542,11 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
 dependencies = [
- "cfg-if 1.0.0",
  "crc32fast",
- "libc",
  "miniz_oxide",
 ]
 
@@ -1829,16 +1826,6 @@ dependencies = [
  "digest 0.9.0",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
-dependencies = [
- "libc",
- "winutil",
-]
-
 [[package]]
 name = "hostname"
 version = "0.3.1"
@@ -1852,9 +1839,9 @@ dependencies = [
 
 [[package]]
 name = "http-client"
-version = "6.5.1"
+version = "6.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c"
+checksum = "e023af341b797ce2c039f7c6e1d347b68d0f7fd0bc7ac234fe69cfadcca1f89a"
 dependencies = [
  "async-h1",
  "async-native-tls",
@@ -1908,7 +1895,7 @@ dependencies = [
  "serde_derive",
  "termcolor",
  "toml",
- "uuid",
+ "uuid 0.8.2",
 ]
 
 [[package]]
@@ -2025,15 +2012,15 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744c24117572563a98a7e9168a5ac1ee4a1ca7f702211258797bbe0ed0346c3c"
+checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b"
 
 [[package]]
 name = "js-sys"
@@ -2055,9 +2042,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
+checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
 
 [[package]]
 name = "kv-log-macro"
@@ -2098,7 +2085,7 @@ dependencies = [
  "mime",
  "regex",
  "time 0.1.44",
- "uuid",
+ "uuid 0.8.2",
 ]
 
 [[package]]
@@ -2116,9 +2103,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.124"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "libm"
@@ -2162,9 +2149,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if 1.0.0",
  "value-bag",
@@ -2215,9 +2202,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memoffset"
@@ -2246,9 +2233,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
 dependencies = [
  "adler",
 ]
@@ -2376,9 +2363,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg 1.1.0",
  "num-traits",
@@ -2408,9 +2395,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg 1.1.0",
 ]
@@ -2427,18 +2414,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.28.3"
+version = "0.28.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
+checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
 
 [[package]]
 name = "oorandom"
@@ -2454,18 +2441,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.38"
+version = "0.10.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
+checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
  "once_cell",
+ "openssl-macros",
  "openssl-sys",
 ]
 
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
@@ -2474,18 +2473,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "111.18.0+1.1.1n"
+version = "111.20.0+1.1.1o"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7897a926e1e8d00219127dc020130eca4292e5ca666dd592480d72c3eca2ff6c"
+checksum = "92892c4f87d56e376e469ace79f1128fdaded07646ddf73aa0be4706ff712dec"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.72"
+version = "0.9.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
+checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0"
 dependencies = [
  "autocfg 1.1.0",
  "cc",
@@ -2555,12 +2554,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.2",
+ "parking_lot_core 0.9.3",
 ]
 
 [[package]]
@@ -2579,15 +2578,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys 0.34.0",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -2807,11 +2806,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.37"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -2851,9 +2850,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
+checksum = "9279fbdacaad3baf559d8cabe0acc3d06e30ea14931af31af79578ac0946decc"
 dependencies = [
  "memchr",
 ]
@@ -2993,9 +2992,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
+checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
 dependencies = [
  "autocfg 1.1.0",
  "crossbeam-deque",
@@ -3005,9 +3004,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -3037,9 +3036,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.5"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3054,9 +3053,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
 
 [[package]]
 name = "remove_dir_all"
@@ -3073,7 +3072,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
- "hostname 0.3.1",
+ "hostname",
  "quick-error 1.2.3",
 ]
 
@@ -3152,14 +3151,14 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.7",
+ "semver 1.0.9",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.34.5"
+version = "0.34.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d275ec42d7bd48e2863912dd8075a4d7376c6f1433b922a0175578b5c7725ce"
+checksum = "2079c267b8394eb529872c3cf92e181c378b41fea36e68130357b52493701d2e"
 dependencies = [
  "bitflags",
  "errno",
@@ -3201,9 +3200,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
 
 [[package]]
 name = "safemem"
@@ -3222,9 +3221,9 @@ dependencies = [
 
 [[package]]
 name = "sanitize-filename"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf18934a12018228c5b55a6dae9df5d0641e3566b3630cb46cc55564068e7c2f"
+checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c"
 dependencies = [
  "lazy_static",
  "regex",
@@ -3232,21 +3231,21 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
 dependencies = [
  "lazy_static",
- "winapi",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
 name = "scheduled-thread-pool"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
+checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
 dependencies = [
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
 ]
 
 [[package]]
@@ -3289,9 +3288,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"
+checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
 
 [[package]]
 name = "semver-parser"
@@ -3301,9 +3300,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.136"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
  "serde_derive",
 ]
@@ -3320,9 +3319,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.136"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3331,11 +3330,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
 dependencies = [
- "itoa 1.0.1",
+ "itoa 1.0.2",
  "ryu",
  "serde",
 ]
@@ -3358,7 +3357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.1",
+ "itoa 1.0.2",
  "ryu",
  "serde",
 ]
@@ -3440,9 +3439,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
+checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -3601,9 +3600,9 @@ dependencies = [
 
 [[package]]
 name = "str-buf"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"
+checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
 [[package]]
 name = "strsim"
@@ -3660,13 +3659,13 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.92"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
+checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -3738,18 +3737,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3832,9 +3831,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.18.0"
+version = "1.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b"
+checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
 dependencies = [
  "pin-project-lite",
 ]
@@ -3884,7 +3883,7 @@ dependencies = [
  "lazy_static",
  "log",
  "lru-cache",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
  "resolv-conf",
  "smallvec",
  "thiserror",
@@ -3932,6 +3931,12 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.2"
@@ -3964,9 +3969,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
 
 [[package]]
 name = "universal-hash"
@@ -4002,6 +4007,15 @@ name = "uuid"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+dependencies = [
+ "getrandom 0.2.6",
+]
+
+[[package]]
+name = "uuid"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6d5d669b51467dcf7b2f1a796ce0f955f05f01cafda6c19d6e95f730df29238"
 dependencies = [
  "getrandom 0.2.6",
  "serde",
@@ -4009,9 +4023,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag"
-version = "1.0.0-alpha.8"
+version = "1.0.0-alpha.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f"
+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
 dependencies = [
  "ctor",
  "version_check 0.9.4",
@@ -4207,15 +4221,15 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.34.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "windows_aarch64_msvc 0.34.0",
- "windows_i686_gnu 0.34.0",
- "windows_i686_msvc 0.34.0",
- "windows_x86_64_gnu 0.34.0",
- "windows_x86_64_msvc 0.34.0",
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
 ]
 
 [[package]]
@@ -4226,9 +4240,9 @@ checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.34.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4238,9 +4252,9 @@ checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.34.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4250,9 +4264,9 @@ checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.34.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4262,9 +4276,9 @@ checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.34.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4274,9 +4288,9 @@ checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.34.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
 [[package]]
 name = "winreg"
@@ -4287,15 +4301,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "winutil"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "wyz"
 version = "0.2.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.80.0"
+version = "1.84.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -8,9 +8,11 @@ rust-version = "1.56"
 
 [profile.dev]
 debug = 0
+panic = 'abort'
 
 [profile.release]
 lto = true
+panic = 'abort'
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
@@ -23,7 +25,6 @@ async-smtp = { git = "https://github.com/async-email/async-smtp", branch="master
 async-std-resolver = "0.21"
 async-std = { version = "1" }
 async-tar = { version = "0.4", default-features=false }
-async-trait = "0.1"
 backtrace = "0.3"
 base64 = "0.13"
 bitflags = "1.3"
@@ -44,11 +45,11 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.10.0"
+once_cell = "1.12.0"
 percent-encoding = "2.0"
 pgp = { version = "0.7", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-quick-xml = "0.22"
+quick-xml = "0.23"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
 rand = "0.7"
@@ -56,7 +57,7 @@ regex = "1.5"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 rustyline = { version = "9", optional = true }
-sanitize-filename = "0.3"
+sanitize-filename = "0.4"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
@@ -68,7 +69,7 @@ surf = { version = "2.3", default-features = false, features = ["h1-client"] }
 thiserror = "1"
 toml = "0.5"
 url = "2"
-uuid = { version = "0.8", features = ["serde", "v4"] }
+uuid = { version = "1", features = ["serde", "v4"] }
 fast-socks5 = "0.4"
 humansize = "1"
 qrcodegen = "1.7.0"

README.md

@@ -128,7 +128,7 @@ $ cargo test -- --ignored
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **Node.js** \[[📂 source](https://github.com/deltachat/deltachat-node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+- **Node.js** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
 - **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
 - **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]

benches/get_chat_msgs.rs

@@ -12,7 +12,7 @@ async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
     let context = Context::new(dbfile.into(), id).await.unwrap();
 
     for c in chats.iter().take(10) {
-        black_box(chat::get_chat_msgs(&context, *c, 0, None).await.ok());
+        black_box(chat::get_chat_msgs(&context, *c, 0).await.ok());
     }
 }
 

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.80.0"
+version = "1.84.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"

deltachat-ffi/deltachat.h

@@ -1174,8 +1174,7 @@ dc_msg_t*       dc_get_draft                 (dc_context_t* context, uint32_t ch
  *     be added before each day (regarding the local timezone). Set this to 0 if you do not want this behaviour.
  *     To get the concrete time of the marker, use dc_array_get_timestamp().
  *     If set to DC_GCM_INFO_ONLY, only system messages will be returned, can be combined with DC_GCM_ADDDAYMARKER.
- * @param marker1before An optional message ID. If set, the ID DC_MSG_ID_MARKER1 will be added just
- *   before the given ID in the returned array. Set this to 0 if you do not want this behaviour.
+ * @param marker1before Deprecated, set this to 0.
  * @return Array of message IDs, must be dc_array_unref()'d when no longer used.
  */
 dc_array_t*     dc_get_chat_msgs             (dc_context_t* context, uint32_t chat_id, uint32_t flags, uint32_t marker1before);
@@ -3447,7 +3446,7 @@ int64_t          dc_chat_get_remaining_mute_duration (const dc_chat_t* chat);
  */
 
 
-#define         DC_MSG_ID_MARKER1            1
+#define         DC_MSG_ID_MARKER1            1 // this is used by iOS to mark things in the message list
 #define         DC_MSG_ID_DAYMARKER          9
 #define         DC_MSG_ID_LAST_SPECIAL       9
 
@@ -3730,9 +3729,15 @@ char*             dc_msg_get_webxdc_blob      (const dc_msg_t* msg, const char*
  *   To get the file, use dc_msg_get_webxdc_blob().
  *   App icons should should be square,
  *   the implementations will add round corners etc. as needed.
+ * - document: if the Webxdc represents a document, this is the name of the document,
+ *   otherwise, this is an empty string.
  * - summary: short string describing the state of the app,
  *   sth. as "2 votes", "Highscore: 123",
  *   can be changed by the apps and defaults to an empty string.
+ * - source_code_url:
+ *   URL where the source code of the Webxdc and other information can be found;
+ *   defaults to an empty string.
+ *   Implementations may offer an menu or a button to open this URL.
  *
  * @memberof dc_msg_t
  * @param msg The webxdc instance.

deltachat-ffi/src/dc_array.rs

@@ -1,5 +1,5 @@
 use crate::chat::ChatItem;
-use crate::constants::{DC_MSG_ID_DAYMARKER, DC_MSG_ID_MARKER1};
+use crate::constants::DC_MSG_ID_DAYMARKER;
 use crate::location::Location;
 use crate::message::MsgId;
 
@@ -18,7 +18,6 @@ impl dc_array_t {
             Self::MsgIds(array) => array[index].to_u32(),
             Self::Chat(array) => match array[index] {
                 ChatItem::Message { msg_id } => msg_id.to_u32(),
-                ChatItem::Marker1 => DC_MSG_ID_MARKER1,
                 ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
             },
             Self::Locations(array) => array[index].location_id,
@@ -31,7 +30,6 @@ impl dc_array_t {
             Self::MsgIds(_) => None,
             Self::Chat(array) => array.get(index).and_then(|item| match item {
                 ChatItem::Message { .. } => None,
-                ChatItem::Marker1 { .. } => None,
                 ChatItem::DayMarker { timestamp } => Some(*timestamp),
             }),
             Self::Locations(array) => array.get(index).map(|location| location.timestamp),

deltachat-ffi/src/lib.rs

@@ -458,7 +458,37 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
     }
 
     let event = &*event;
-    event.as_id()
+    match event.typ {
+        EventType::Info(_) => 100,
+        EventType::SmtpConnected(_) => 101,
+        EventType::ImapConnected(_) => 102,
+        EventType::SmtpMessageSent(_) => 103,
+        EventType::ImapMessageDeleted(_) => 104,
+        EventType::ImapMessageMoved(_) => 105,
+        EventType::NewBlobFile(_) => 150,
+        EventType::DeletedBlobFile(_) => 151,
+        EventType::Warning(_) => 300,
+        EventType::Error(_) => 400,
+        EventType::ErrorSelfNotInGroup(_) => 410,
+        EventType::MsgsChanged { .. } => 2000,
+        EventType::IncomingMsg { .. } => 2005,
+        EventType::MsgsNoticed { .. } => 2008,
+        EventType::MsgDelivered { .. } => 2010,
+        EventType::MsgFailed { .. } => 2012,
+        EventType::MsgRead { .. } => 2015,
+        EventType::ChatModified(_) => 2020,
+        EventType::ChatEphemeralTimerModified { .. } => 2021,
+        EventType::ContactsChanged(_) => 2030,
+        EventType::LocationChanged(_) => 2035,
+        EventType::ConfigureProgress { .. } => 2041,
+        EventType::ImexProgress(_) => 2051,
+        EventType::ImexFileWritten(_) => 2052,
+        EventType::SecurejoinInviterProgress { .. } => 2060,
+        EventType::SecurejoinJoinerProgress { .. } => 2061,
+        EventType::ConnectivityChanged => 2100,
+        EventType::SelfavatarChanged => 2110,
+        EventType::WebxdcStatusUpdate { .. } => 2120,
+    }
 }
 
 #[no_mangle]
@@ -1027,22 +1057,17 @@ pub unsafe extern "C" fn dc_get_chat_msgs(
     context: *mut dc_context_t,
     chat_id: u32,
     flags: u32,
-    marker1before: u32,
+    _marker1before: u32,
 ) -> *mut dc_array::dc_array_t {
     if context.is_null() {
         eprintln!("ignoring careless call to dc_get_chat_msgs()");
         return ptr::null_mut();
     }
     let ctx = &*context;
-    let marker_flag = if marker1before <= DC_MSG_ID_LAST_SPECIAL {
-        None
-    } else {
-        Some(MsgId::new(marker1before))
-    };
 
     block_on(async move {
         Box::into_raw(Box::new(
-            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags, marker_flag)
+            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags)
                 .await
                 .unwrap_or_log_default(ctx, "failed to get chat msgs")
                 .into(),
@@ -1919,7 +1944,7 @@ pub unsafe extern "C" fn dc_get_contacts(
     let query = to_opt_string_lossy(query);
 
     block_on(async move {
-        match Contact::get_all(ctx, flags, query).await {
+        match Contact::get_all(ctx, flags, query.as_deref()).await {
             Ok(contacts) => Box::into_raw(Box::new(dc_array_t::from(
                 contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>(),
             ))),

draft/aeap-mvp.md

@@ -0,0 +1,99 @@
+AEAP MVP
+========
+
+Changes to the UIs
+------------------
+
+- The secondary self addresses (see below) are shown in the UI, but not editable.
+
+- When the user changed the email address in the configure screen, show a dialog to the user, either directly explaining things or with a link to the FAQ (see "Other" below)
+
+Changes in the core
+-------------------
+
+- DONE: We have one primary self address and any number of secondary self addresses. `is_self_addr()` checks all of them.
+
+- DONE: If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
+
+  - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
+
+  - The key stays the same.
+
+- No changes for 1:1 chats, there simply is a new one. (This works since, contrary to group messages, messages sent to a 1:1 chat are not assigned to the group chat but always to the 1:1 chat with the sender. So it's not a problem that the new messages might be put into the old chat if they are a reply to a message there.)
+
+- When sending a message: If any of the secondary self addrs is in the chat's member list, remove it locally (because we just transitioned away from it). We add a log message for this (alternatively, a system message in the chat would be more visible).
+
+- When receiving a message: If the key exists, but belongs to another address (we may want to benchmark this)
+  AND there is a `Chat-Version` header\
+  AND the message timestamp is newer than the contact's `lastseen` (to prevent changing the address back when messages arrive out of order) (this condition is not that important since we will have eventual consistency even without it):
+
+  Replace the contact in _all_ groups, possibly deduplicate the members list, and add a system message to all of these chats.
+  
+  - Note that we can't simply compare the keys byte-by-byte, since the UID may have changed, or the sender may have rotated the key and signed the new key with the old one.
+
+### Notes:
+  
+- We treat protected and non-protected chats the same
+- We leave the aeap transition statement away since it seems not to be needed, makes things harder on the sending side, wastes some network traffic, and is worse for privacy (since more pepole know what old addresses you had).
+- As soon as we encrypt read receipts, sending a read receipt will be enough to tell a lot of people that you transitioned
+- AEAP will make the problem of inconsistent group state worse, both because it doesn't work if the message is unencrypted (even if the design allowed it, it would be problematic security-wise) and because some chat partners may have gotten the transition and some not. We should do something against this at some point in the future, like asking the user whether they want to add/remove the members to restore consistent group state.
+
+#### Downsides of this design:
+- Inconsistent group state: Suppose Alice does an AEAP transition and sends a 1:1 message to Bob, so Bob rewrites Alice's contact. Alice, Bob and Charlie are together in a group. Before Alice writes to this group, Bob and Charlie will have different membership lists, and Bob will send messages to Alice's new address, while Charlie will send them to her old address.
+
+#### Upsides:
+- With this approach, it's easy to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
+- Faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.
+
+### Alternatives and old discussions/plans:
+
+- Change the contact instead of rewriting the group member lists. This seems to call for more trouble since we will end up with multiple contacts having the same email address.
+
+- If needed, we could add a header a) indicating that the sender did an address transition or b) listing all the secondary (old) addresses.  For now, there is no big enough benefit to warrant introducing another header and its processing on the receiver side (including all the neccessary checks and handling of error cases). Instead, we only check for the `Chat-Version` header to prevent accidental transitions when an MUA user sends a message from another email address with the same key.
+
+- The condition for a transition temporarily was:
+
+  > When receiving a message: If we are going to assign a message to a chat, but the sender is not a member of this chat\
+  > AND the signing key is the same as the direct (non-gossiped) key of one of the chat members\
+  > AND ...
+
+  However, this would mean that in 1:1 messages can't trigger a transition, since we don't assign private messages to the parent chat, but always to the 1:1 chat with the sender.
+  
+<details>
+<summary>Some previous state of the discussion, which temporarily lived in an issue description</summary>
+Summarizing the discussions from https://github.com/deltachat/deltachat-core-rust/pull/2896, mostly quoting @hpk42:
+
+1. (DONE) At the time of configure we push the current primary to become a secondary. 
+
+2. When a message is sent out to a chat, and the message is encrypted, and we have secondary addresses, then we 
+  a) add a protected "AEAP-Replacement" header that contains all secondary addresses 
+  b) if any of the secondary addresses is in the chat's member list, we remove it and leave a system message that we did so
+3. When an encrypted message with a replacement header is received, replace the e-mail address of all secondary contacts (if they exist) with the new primary and drop a sysmessage in all chats the secondary is member off.  This might (in edge cases) result in chats that have two or more contacts with the same e-mail address.  We might ignore this for a first release and just log a warning.  Let's maybe not get hung up on this case before everything else works. 
+
+Notes: 
+- for now we will send out aeap replacement headers forever, there is no termination condition other than lack of secondary addresses.  I think that's fine for now.  Later on we might introduce options to remove secondary addresses but i wouldn't do this for a first release/PR. 
+- the design is resilient against changing e-mail providers from A to B to C and then back to A, with partially updated chats and diverging views from recipients/contacts on this transition.  In the end, you will have a primary and some secondaries, and when you start sending out messages everybody will eventually synchronize when they receive the current state of primaries/secondaries. 
+- of course on incoming message for need to check for each stated secondary address in the replacement header that it uses the same signature as the signature we verified as valid with the incoming message  **-->  Also we have to somehow make sure that the signing key was not just gossiped from some random other person in some group.**
+- there are no extra flags/columns in the database needed (i hope) 
+
+#### Downsides of the chosen approach:
+- Inconsistent group state: Suppose Alice does an AEAP transition and sends a 1:1 message to Bob, so Bob rewrites Alice's contact. Alice, Bob and Charlie are together in a group. Before Alice writes to this group, Bob and Charlie will have different membership lists, and Bob will send messages to Alice's new address, while Charlie will send them to her old address.
+- There will be multiple contacts with the same address in the database. We will have to do something against this at some point.
+
+The most obvious alternative would be to create a new contact with the new address and replace the old contact in the groups.
+
+#### Upsides:
+- With this approach, it's easier to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
+- (Also, less important: Slightly faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
+- It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't wast that much development time.)
+
+[full messages](https://github.com/deltachat/deltachat-core-rust/pull/2896#discussion_r852002161)
+  
+_end of the previous state of the discussion_  
+
+</details>
+  
+Other
+-----
+
+- The user is responsible that messages to the old address arrive at the new address, for example by configuring the old provider to forward all emails to the new one.

draft/aeap-mvp.rst

@@ -1,33 +0,0 @@
-AEAP MVP
-========
-
-Changes to the UIs
-------------------
-
-- The secondary self addresses (see below) are shown in the UI, but not editable.
-
-- When the user changed the email address in the configure screen, show a dialog to the user, either directly explaining things or with a link to the FAQ (see "Other" below)
-
-Changes in the core
--------------------
-
-- We have one primary self address and any number of secondary self addresses. `is_self_addr()` checks all of them.
-
-- If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
-
-  - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
-
-  - The key stays the same.
-
-- No changes for 1:1 chats, there simply is a new one
-
-- When we send a message to a group, and the primary address is not a member of a group, but a secondary address is:
-  
-  Add Chat-Group-Member-Removed=<old address> and Chat-Group-Member-Added=<new address> headers to this message
-
-  - On the receiving side, make sure that we accept this (even in verified groups) if the message is signed and the key stayed the same
-
-Other
------
-
-- The user is responsible that messages to the old address arrive at the new address, for example by configuring the old provider to forward all emails to the new one.

draft/webxdc-dev-reference.md

@@ -1,12 +1,14 @@
 # Webxdc Developer Reference
 
+(This document may eventually be merged with the [webxdc guidebook](https://deltachat.github.io/webxdc_docs/), where you may currently find other useful information.)
+
 ## Webxdc File Format
 
-- a **Webxdc app** is a **ZIP-file** with the extension `.xdc`
+- a **Webxdc** is a **ZIP-file** with the extension `.xdc`
 - the ZIP-file must use the default compression methods as of RFC 1950,
   this is "Deflate" or "Store"
 - the ZIP-file must contain at least the file `index.html`
-- if the Webxdc app is started, `index.html` is opened in a restricted webview
+- if the Webxdc is started, `index.html` is opened in a restricted webview
   that allow accessing resources only from the ZIP-file
 
 
@@ -26,7 +28,7 @@ no need to add `webxdc.js` to your ZIP-file):
 window.webxdc.sendUpdate(update, descr);
 ```
 
-Webxdc apps are usually shared in a chat and run independently on each peer.
+A Webxdc is usually shared in a chat and run independently on each peer.
 To get a shared state, the peers use `sendUpdate()` to send updates to each other.
 
 - `update`: an object with the following properties:  
@@ -35,7 +37,9 @@ To get a shared state, the peers use `sendUpdate()` to send updates to each othe
        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.
-    - `update.summary`: optional, short text, shown beside app icon;
+    - `update.document`: optional, name of the document in edit,
+       must not be used eg. in games where the Webxdc does not create documents
+    - `update.summary`: optional, short text, shown beside Webxdc icon;
        it is recommended to use some aggregated value,  eg. "8 votes", "Highscore: 123"
 
 - `descr`: short, human-readable description what this update is about.
@@ -74,9 +78,12 @@ Each `update` which is passed to the callback comes with the following propertie
 - `update.max_serial`: the maximum serial currently known.
   If `max_serial` equals `serial` this update is the last update (until new network messages arrive).
 
-- `update.info`: optional, short, informational message (see `send_update`) 
+- `update.info`: optional, short, informational message (see `sendUpdate()`)
 
-- `update.summary`: optional, short text, shown beside app icon (see `send_update`)
+- `update.document`: optional, document name as set by the sender, (see `sendUpdate()`),
+  implementations show the document name eg. beside the app icon or in the title bar
+
+- `update.summary`: optional, short text, shown beside icon (see `sendUpdate()`)
 
 
 ### selfAddr
@@ -110,17 +117,21 @@ some basic information are read and used from there.
 the `manifest.toml` has the following format
 
 ```toml
-name = "My App Name"
+name = "My Name"
+source_code_url = "https://example.org/orga/repo"
 ```
 
-- **name** - The name of the app.
-  If no name is set or if there is no manifest, the filename is used as the app name.
+- `name` - The name of the Webxdc.
+  If no name is set or if there is no manifest, the filename is used as the Webxdc name.
+
+- `source_code_url` - Optional URL where the source code of the Webxdc and maybe other information can be found.
+  UI may make the url accessible via a "Help" menu in the Webxdc window.
 
 
-## App Icon
+## Webxdc Icon
 
 If the ZIP-root contains an `icon.png` or `icon.jpg`,
-these files are used as the icon for the app.
+these files are used as the icon for the Webxdc.
 The icon should be a square at reasonable width/height;
 round corners etc. will be added by the implementations as needed.
 If no icon is set, a default icon will be used.
@@ -160,7 +171,7 @@ The following example shows an input field and  every input is show on all peers
 
 [Webxdc Development Tool](https://github.com/deltachat/webxdc-dev)
 offers an **Webxdc Simulator** that can be used in many browsers without any installation needed.
-You can also use that repository as a template for your own app -
+You can also use that repository as a template for your own Webxdc -
 just clone and start adapting things to your need.
 
 
@@ -170,7 +181,7 @@ just clone and start adapting things to your need.
 - [Draw](https://github.com/adbenitez/draw.xdc)
 - [Poll](https://github.com/r10s/webxdc-poll/)
 - [Tic Tac Toe](https://github.com/Simon-Laux/tictactoe.xdc)
-- Even more with [Topic #webxdc on Github](https://github.com/topics/webxdc)
+- Even more with [Topic #webxdc on Github](https://github.com/topics/webxdc) or in the [webxdc GitHub organization](https://github.com/webxdc)
 
 
 ## Closing Remarks
@@ -180,6 +191,8 @@ just clone and start adapting things to your need.
 - viewport and scaling features are implementation specific,
   if you want to have an explicit behavior, you can add eg.
   `<meta name="viewport" content="initial-scale=1; user-scalable=no">` to your Webxdc
+- the `<title>` tag should not be used and its content is usually not displayed;
+  instead, use the `name` property from `manifest.toml`
 - there are tons of ideas for enhancements of the API and the file format,
   eg. in the future, we will may define icon- and manifest-files,
   allow to aggregate the state or add metadata.

examples/repl/cmdline.rs

@@ -639,14 +639,13 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
 
             let time_start = std::time::SystemTime::now();
             let msglist =
-                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER, None).await?;
+                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER).await?;
             let time_needed = time_start.elapsed().unwrap_or_default();
 
             let msglist: Vec<MsgId> = msglist
                 .into_iter()
                 .map(|x| match x {
                     ChatItem::Message { msg_id } => msg_id,
-                    ChatItem::Marker1 => MsgId::new(DC_MSG_ID_MARKER1),
                     ChatItem::DayMarker { .. } => MsgId::new(DC_MSG_ID_DAYMARKER),
                 })
                 .collect();

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,247 @@
+# 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 build 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 >= `v16.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 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 17 --arch x64
+$ fnm use 17
+$ node -p process.arch
+# result should be x64
+$ cd deltachat-core-rust && rustup target add x86_64-apple-darwin && cd -
+$ 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 bulding for arm:
+
+```
+$ fnm install 16 --arch arm64
+$ fnm use 16
+$ 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 curently migrating to automaticaly 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 `DCC_NEW_TMP_EMAIL` environment variables. E.g.:
+
+```
+$ export DCC_NEW_TMP_EMAIL=https://testrun.org/new_email?t=[token]
+$ 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-v1.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,226 @@
+// 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_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
+  DC_EVENT_CHAT_MODIFIED: 2020,
+  DC_EVENT_CONFIGURE_PROGRESS: 2041,
+  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_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_INFO: 100,
+  DC_EVENT_LOCATION_CHANGED: 2035,
+  DC_EVENT_MSGS_CHANGED: 2000,
+  DC_EVENT_MSGS_NOTICED: 2008,
+  DC_EVENT_MSG_DELIVERED: 2010,
+  DC_EVENT_MSG_FAILED: 2012,
+  DC_EVENT_MSG_READ: 2015,
+  DC_EVENT_NEW_BLOB_FILE: 150,
+  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_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_PROTECTION_DISABLED: 12,
+  DC_INFO_PROTECTION_ENABLED: 11,
+  DC_KEY_GEN_DEFAULT: 0,
+  DC_KEY_GEN_ED25519: 2,
+  DC_KEY_GEN_RSA2048: 1,
+  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_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_QR_ACCOUNT: 250,
+  DC_QR_ADDR: 320,
+  DC_QR_ASK_VERIFYCONTACT: 200,
+  DC_QR_ASK_VERIFYGROUP: 202,
+  DC_QR_ERROR: 400,
+  DC_QR_FPR_MISMATCH: 220,
+  DC_QR_FPR_OK: 210,
+  DC_QR_FPR_WITHOUT_ADDR: 230,
+  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_ARCHIVEDCHATS: 40,
+  DC_STR_AUDIO: 11,
+  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_CONFIGURATION_FAILED: 84,
+  DC_STR_CONNECTED: 107,
+  DC_STR_CONNTECTING: 108,
+  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_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_IMAGE: 9,
+  DC_STR_INCOMING_MESSAGES: 103,
+  DC_STR_LAST_MSG_SENT_SUCCESSFULLY: 111,
+  DC_STR_LOCATION: 66,
+  DC_STR_MESSAGES: 114,
+  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_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_PROTECTION_DISABLED: 89,
+  DC_STR_PROTECTION_ENABLED: 88,
+  DC_STR_QUOTA_EXCEEDING_MSG_BODY: 98,
+  DC_STR_READRCPT: 31,
+  DC_STR_READRCPT_MAILBODY: 32,
+  DC_STR_REPLY_NOUN: 90,
+  DC_STR_SAVED_MESSAGES: 69,
+  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_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,34 @@
+/* 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',
+  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',
+  2005: 'DC_EVENT_INCOMING_MSG',
+  2008: 'DC_EVENT_MSGS_NOTICED',
+  2010: 'DC_EVENT_MSG_DELIVERED',
+  2012: 'DC_EVENT_MSG_FAILED',
+  2015: 'DC_EVENT_MSG_READ',
+  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',
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE'
+}

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 availible 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,106 @@
+/* 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)
+  }
+
+  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(),
+      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,260 @@
+// 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_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
+  DC_EVENT_CHAT_MODIFIED = 2020,
+  DC_EVENT_CONFIGURE_PROGRESS = 2041,
+  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_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_INFO = 100,
+  DC_EVENT_LOCATION_CHANGED = 2035,
+  DC_EVENT_MSGS_CHANGED = 2000,
+  DC_EVENT_MSGS_NOTICED = 2008,
+  DC_EVENT_MSG_DELIVERED = 2010,
+  DC_EVENT_MSG_FAILED = 2012,
+  DC_EVENT_MSG_READ = 2015,
+  DC_EVENT_NEW_BLOB_FILE = 150,
+  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_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_PROTECTION_DISABLED = 12,
+  DC_INFO_PROTECTION_ENABLED = 11,
+  DC_KEY_GEN_DEFAULT = 0,
+  DC_KEY_GEN_ED25519 = 2,
+  DC_KEY_GEN_RSA2048 = 1,
+  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_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_QR_ACCOUNT = 250,
+  DC_QR_ADDR = 320,
+  DC_QR_ASK_VERIFYCONTACT = 200,
+  DC_QR_ASK_VERIFYGROUP = 202,
+  DC_QR_ERROR = 400,
+  DC_QR_FPR_MISMATCH = 220,
+  DC_QR_FPR_OK = 210,
+  DC_QR_FPR_WITHOUT_ADDR = 230,
+  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_ARCHIVEDCHATS = 40,
+  DC_STR_AUDIO = 11,
+  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_CONFIGURATION_FAILED = 84,
+  DC_STR_CONNECTED = 107,
+  DC_STR_CONNTECTING = 108,
+  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_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_IMAGE = 9,
+  DC_STR_INCOMING_MESSAGES = 103,
+  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
+  DC_STR_LOCATION = 66,
+  DC_STR_MESSAGES = 114,
+  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_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_PROTECTION_DISABLED = 89,
+  DC_STR_PROTECTION_ENABLED = 88,
+  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
+  DC_STR_READRCPT = 31,
+  DC_STR_READRCPT_MAILBODY = 32,
+  DC_STR_REPLY_NOUN = 90,
+  DC_STR_SAVED_MESSAGES = 69,
+  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_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',
+  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',
+  2005: 'DC_EVENT_INCOMING_MSG',
+  2008: 'DC_EVENT_MSGS_NOTICED',
+  2010: 'DC_EVENT_MSG_DELIVERED',
+  2012: 'DC_EVENT_MSG_FAILED',
+  2015: 'DC_EVENT_MSG_READ',
+  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',
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
+}

node/lib/contact.ts

@@ -0,0 +1,94 @@
+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)
+  }
+
+  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,955 @@
+/* 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 stanalone 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)
+  }
+
+  /**
+   *
+   * @deprectated 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)
+    )
+  }
+
+  /**
+   *
+   * @param chatId
+   * @param protect
+   * @returns success boolean
+   */
+  setChatProtection(chatId: number, protect: boolean) {
+    debug(`setChatProtection ${chatId} ${protect}`)
+    return Boolean(
+      binding.dcn_set_chat_protection(
+        this.dcn_context,
+        Number(chatId),
+        protect ? 1 : 0
+      )
+    )
+  }
+
+  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 decending;
+   *     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,205 @@
+/* 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
+
+  constructor(cwd: string, os = 'deltachat-node') {
+    debug('DeltaChat constructor')
+    super()
+
+    this.accountDir = cwd
+    this.dcn_accounts = binding.dcn_accounts_new(os, this.accountDir)
+  }
+
+  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')
+  }
+
+  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).substr(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 posible 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,24 @@
+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
+  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)
+}

node/patches/m1_build_use_x86_64.patch

@@ -0,0 +1,13 @@
+diff --git i/node/binding.gyp w/node/binding.gyp
+index b0d92eae..c5e504fa 100644
+--- i/node/binding.gyp
++++ w/node/binding.gyp
+@@ -43,7 +43,7 @@
+                   "include_dirs": ["../deltachat-ffi"],
+                   "ldflags": ["-Wl,-Bsymbolic"], # Prevent sqlite3 from electron from overriding sqlcipher
+                   "libraries": [
+-                    "../../target/release/libdeltachat.a",
++                    "../../target/x86_64-apple-darwin/release/libdeltachat.a",
+                     "-ldl",
+                   ],
+                   "conditions": [],

node/scripts/common.js

@@ -0,0 +1,26 @@
+const spawnSync = require('child_process').spawnSync
+
+const verbose = isVerbose()
+
+function spawn (cmd, args, opts) {
+  log(`>> spawn: ${cmd} ${args.join(' ')}`)
+  const result = spawnSync(cmd, args, opts)
+  if (result.status === null) {
+    console.error(`Could not find ${cmd}`)
+    process.exit(1)
+  } else if (result.status !== 0) {
+    console.error(`${cmd} failed with code ${result.status}`)
+    process.exit(1)
+  }
+}
+
+function log (...args) {
+  if (verbose) console.log(...args)
+}
+
+function isVerbose () {
+  const loglevel = process.env.npm_config_loglevel
+  return loglevel === 'verbose' || process.env.CI === 'true'
+}
+
+module.exports = { spawn, log, isVerbose, verbose }

node/scripts/generate-constants.js

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+const fs = require('fs')
+const path = require('path')
+const split = require('split2')
+
+const data = []
+const regex = /^#define\s+(\w+)\s+(\w+)/i
+const header = path.resolve(
+  __dirname,
+  '../../deltachat-ffi/deltachat.h'
+)
+
+console.log('Generating constants...')
+
+fs.createReadStream(header)
+  .pipe(split())
+  .on('data', (line) => {
+    const match = regex.exec(line)
+    if (match) {
+      const key = match[1]
+      const value = parseInt(match[2])
+      if (isNaN(value)) return
+
+      data.push({ key, value })
+    }
+  })
+  .on('end', () => {
+    const constants = data
+      .filter(
+        ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
+      )
+      .sort((lhs, rhs) => {
+        if (lhs.key < rhs.key) return -1
+        else if (lhs.key > rhs.key) return 1
+        return 0
+      })
+      .map((row) => {
+        return `  ${row.key}: ${row.value}`
+      })
+      .join(',\n')
+
+    const events = data
+      .sort((lhs, rhs) => {
+        if (lhs.value < rhs.value) return -1
+        else if (lhs.value > rhs.value) return 1
+        return 0
+      })
+      .filter((i) => {
+        return i.key.startsWith('DC_EVENT_')
+      })
+      .map((i) => {
+        return `  ${i.value}: '${i.key}'`
+      })
+      .join(',\n')
+
+    // backwards compat
+    fs.writeFileSync(
+      path.resolve(__dirname, '../constants.js'),
+      `// Generated!\n\nmodule.exports = {\n${constants}\n}\n`
+    )
+    // backwards compat
+    fs.writeFileSync(
+      path.resolve(__dirname, '../events.js'),
+      `/* eslint-disable quotes */\n// Generated!\n\nmodule.exports = {\n${events}\n}\n`
+    )
+
+    fs.writeFileSync(
+      path.resolve(__dirname, '../lib/constants.ts'),
+      `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, ' =')},\n}\n
+// Generated!\n\nexport const EventId2EventName: { [key: number]: string } = {\n${events},\n}\n`
+    )
+  })

node/scripts/install.js

@@ -0,0 +1,22 @@
+const {execSync} = require('child_process')
+const {existsSync} = require('fs')
+const {join} = require('path')
+
+const run = (cmd) => {
+  console.log('[i] running `' + cmd + '`')
+  execSync(cmd, {stdio: 'inherit'})
+}
+
+// Build bindings
+if (process.env.USE_SYSTEM_LIBDELTACHAT === 'true') {
+  console.log('[i] USE_SYSTEM_LIBDELTACHAT is true, rebuilding c bindings and using pkg-config to retrieve lib paths and cflags of libdeltachat')
+  run('npm run build:bindings:c:c')
+} else {
+  console.log('[i] Building rust core & c bindings, if possible use prebuilds')
+  run('npm run install:prebuilds')
+}
+
+if (!existsSync(join(__dirname, '..', 'dist'))) {
+  console.log('[i] Didn\'t find already built typescript bindings. Trying to transpile them. If this fail, make sure typescript is installed ;)')
+  run('npm run build:bindings:ts')
+}

node/scripts/postLinksToDetails.js

@@ -0,0 +1,46 @@
+const { readFileSync } = require('fs')
+
+const sha = JSON.parse(
+  readFileSync(process.env['GITHUB_EVENT_PATH'], 'utf8')
+).pull_request.head.sha
+
+const base_url =
+  'https://download.delta.chat/node/'
+
+const GITHUB_API_URL =
+  'https://api.github.com/repos/deltachat/deltachat-core-rust/statuses/' + sha
+
+const file_url = process.env['URL']
+const GITHUB_TOKEN = process.env['GITHUB_TOKEN']
+
+const STATUS_DATA = {
+  state: 'success',
+  description: '⏩ Click on "Details" to download →',
+  context: 'Download the node-bindings.tar.gz',
+  target_url: base_url + file_url,
+}
+
+const http = require('https')
+
+const options = {
+  method: 'POST',
+  headers: {
+    'Content-Type': 'application/json',
+    'User-Agent': 'github-action ci for deltachat deskop',
+    authorization: 'Bearer ' + GITHUB_TOKEN,
+  },
+}
+
+const req = http.request(GITHUB_API_URL, options, function(res) {
+  var chunks = []
+  res.on('data', function(chunk) {
+    chunks.push(chunk)
+  })
+  res.on('end', function() {
+    var body = Buffer.concat(chunks)
+    console.log(body.toString())
+  })
+})
+
+req.write(JSON.stringify(STATUS_DATA))
+req.end()

node/scripts/postinstall.js

@@ -0,0 +1,57 @@
+const fs = require('fs')
+const path = require('path')
+
+if (process.platform !== 'win32') {
+  console.log('postinstall: not windows, so skipping!')
+  process.exit(0)
+}
+
+const from = path.resolve(
+  __dirname,
+  '..',
+  '..',
+  'target',
+  'release',
+  'deltachat.dll'
+)
+
+const getDestination = () => {
+  const argv = process.argv
+  if (argv.length === 3 && argv[2] === '--prebuild') {
+    return path.resolve(
+      __dirname,
+      '..',
+      'prebuilds',
+      'win32-x64',
+      'deltachat.dll'
+    )
+  } else {
+    return path.resolve(
+      __dirname,
+      '..',
+      'build',
+      'Release',
+      'deltachat.dll'
+    )
+  }
+}
+
+const dest = getDestination()
+
+copy(from, dest, (err) => {
+  if (err) throw err
+  console.log(`postinstall: copied ${from} to ${dest}`)
+})
+
+function copy (from, to, cb) {
+  fs.stat(from, (err, st) => {
+    if (err) return cb(err)
+    fs.readFile(from, (err, buf) => {
+      if (err) return cb(err)
+      fs.writeFile(to, buf, (err) => {
+        if (err) return cb(err)
+        fs.chmod(to, st.mode, cb)
+      })
+    })
+  })
+}

node/scripts/rebuild-core.js

@@ -0,0 +1,17 @@
+const path = require('path')
+const { spawn } = require('./common')
+const opts = {
+  cwd: path.resolve(__dirname, '../..'),
+  stdio: 'inherit'
+}
+
+const buildArgs = [
+  'build',
+  '--release',
+  '--features',
+  'vendored',
+  '-p',
+  'deltachat_ffi'
+]
+
+spawn('cargo', buildArgs, opts)

node/src/napi-macros-extensions.h

@@ -0,0 +1,144 @@
+#include <napi-macros.h>
+
+#undef NAPI_STATUS_THROWS
+
+#define NAPI_STATUS_THROWS(call) \
+  if ((call) != napi_ok) { \
+    napi_throw_error(env, NULL, #call " failed!"); \
+  }
+
+#define NAPI_DCN_CONTEXT() \
+  dcn_context_t* dcn_context; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dcn_context)); \
+  if (!dcn_context) { \
+    const char* msg = "Provided dnc_context is null"; \
+    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
+  } \
+  if (!dcn_context->dc_context) { \
+    const char* msg = "Provided dc_context is null, did you close the context or not open it?"; \
+    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
+  }
+
+#define NAPI_DCN_ACCOUNTS() \
+  dcn_accounts_t* dcn_accounts; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dcn_accounts)); \
+  if (!dcn_accounts) { \
+    const char* msg = "Provided dnc_acounts is null"; \
+    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
+  } \
+  if (!dcn_accounts->dc_accounts) { \
+    const char* msg = "Provided dc_accounts is null, did you unref the accounts object?"; \
+    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
+  }
+
+
+#define NAPI_DC_CHAT() \
+  dc_chat_t* dc_chat; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_chat));
+
+#define NAPI_DC_CHATLIST() \
+  dc_chatlist_t* dc_chatlist; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_chatlist));
+
+#define NAPI_DC_CONTACT() \
+  dc_contact_t* dc_contact; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_contact));
+
+#define NAPI_DC_LOT() \
+  dc_lot_t* dc_lot; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_lot));
+
+#define NAPI_DC_MSG() \
+  dc_msg_t* dc_msg; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_msg));
+
+#define NAPI_ARGV_DC_MSG(name, position) \
+  dc_msg_t* name; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[position], (void**)&name));
+
+#define NAPI_DC_PROVIDER() \
+  dc_provider_t* dc_provider; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_provider));
+
+#define NAPI_DC_ARRAY() \
+  dc_array_t* dc_array; \
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_array));
+
+#define NAPI_RETURN_UNDEFINED() \
+  return 0;
+
+#define NAPI_RETURN_UINT64(name) \
+  napi_value return_int64; \
+  NAPI_STATUS_THROWS(napi_create_bigint_int64(env, name, &return_int64)); \
+  return return_int64;
+
+#define NAPI_RETURN_INT64(name) \
+  napi_value return_int64; \
+  NAPI_STATUS_THROWS(napi_create_int64(env, name, &return_int64)); \
+  return return_int64;
+
+
+#define NAPI_RETURN_AND_UNREF_STRING(name) \
+  napi_value return_value; \
+  if (name == NULL) { \
+    NAPI_STATUS_THROWS(napi_get_null(env, &return_value)); \
+    return return_value; \
+  } \
+  NAPI_STATUS_THROWS(napi_create_string_utf8(env, name, NAPI_AUTO_LENGTH, &return_value)); \
+  dc_str_unref(name); \
+  return return_value;
+
+#define NAPI_ASYNC_CARRIER_BEGIN(name) \
+  typedef struct name##_carrier_t { \
+    napi_ref callback_ref; \
+    napi_async_work async_work; \
+    dcn_context_t* dcn_context;
+
+#define NAPI_ASYNC_CARRIER_END(name) \
+  } name##_carrier_t;
+
+#define NAPI_ASYNC_EXECUTE(name) \
+  static void name##_execute(napi_env env, void* data)
+
+#define NAPI_ASYNC_GET_CARRIER(name) \
+  name##_carrier_t* carrier = (name##_carrier_t*)data;
+
+#define NAPI_ASYNC_COMPLETE(name) \
+  static void name##_complete(napi_env env, napi_status status, void* data)
+
+#define NAPI_ASYNC_CALL_AND_DELETE_CB() \
+  napi_value global; \
+  NAPI_STATUS_THROWS(napi_get_global(env, &global)); \
+  napi_value callback; \
+  NAPI_STATUS_THROWS(napi_get_reference_value(env, carrier->callback_ref, &callback)); \
+  NAPI_STATUS_THROWS(napi_call_function(env, global, callback, argc, argv, NULL)); \
+  NAPI_STATUS_THROWS(napi_delete_reference(env, carrier->callback_ref)); \
+  NAPI_STATUS_THROWS(napi_delete_async_work(env, carrier->async_work));
+
+#define NAPI_ASYNC_NEW_CARRIER(name) \
+  name##_carrier_t* carrier = calloc(1, sizeof(name##_carrier_t)); \
+  carrier->dcn_context = dcn_context;
+
+#define NAPI_ASYNC_QUEUE_WORK(name, cb) \
+  napi_value callback = cb; \
+  napi_value async_resource_name; \
+  NAPI_STATUS_THROWS(napi_create_reference(env, callback, 1, &carrier->callback_ref)); \
+  NAPI_STATUS_THROWS(napi_create_string_utf8(env, #name "_callback", \
+                                             NAPI_AUTO_LENGTH, \
+                                             &async_resource_name)); \
+  NAPI_STATUS_THROWS(napi_create_async_work(env, callback, async_resource_name, \
+                                            name##_execute, name##_complete, \
+                                            carrier, &carrier->async_work)); \
+  NAPI_STATUS_THROWS(napi_queue_async_work(env, carrier->async_work));
+
+/***  this could/should be moved to napi-macros ***/
+
+#define NAPI_DOUBLE(name, val) \
+  double name; \
+  if (napi_get_value_double(env, val, &name) != napi_ok) { \
+    napi_throw_error(env, "EINVAL", "Expected double"); \
+    return NULL; \
+  }
+
+#define NAPI_ARGV_DOUBLE(name, i) \
+  NAPI_DOUBLE(name, argv[i])

node/test/test.js

@@ -0,0 +1,862 @@
+// @ts-check
+import DeltaChat, { Message } from '../dist'
+import binding from '../binding'
+
+import { strictEqual } from 'assert'
+import chai, { expect } from 'chai'
+import chaiAsPromised from 'chai-as-promised'
+import { EventId2EventName, C } from '../dist/constants'
+import { join } from 'path'
+import { mkdtempSync, statSync } from 'fs'
+import { tmpdir } from 'os'
+import { Context } from '../dist/context'
+chai.use(chaiAsPromised)
+
+async function createTempUser(url) {
+  const fetch = require('node-fetch')
+
+  async function postData(url = '') {
+    // Default options are marked with *
+    const response = await fetch(url, {
+      method: 'POST', // *GET, POST, PUT, DELETE, etc.
+      mode: 'cors', // no-cors, *cors, same-origin
+      cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
+      credentials: 'same-origin', // include, *same-origin, omit
+      headers: {
+        'cache-control': 'no-cache',
+      },
+      referrerPolicy: 'no-referrer', // no-referrer, *client
+    })
+    return response.json() // parses JSON response into native JavaScript objects
+  }
+
+  return await postData(url)
+}
+
+describe('static tests', function () {
+  it('reverse lookup of events', function () {
+    const eventKeys = Object.keys(EventId2EventName).map((k) => Number(k))
+    const eventValues = Object.values(EventId2EventName)
+    const reverse = eventValues.map((v) => C[v])
+    expect(reverse).to.be.deep.equal(eventKeys)
+  })
+
+  it('event constants are consistent', function () {
+    const eventKeys = Object.keys(C)
+      .filter((k) => k.startsWith('DC_EVENT_'))
+      .sort()
+    const eventValues = Object.values(EventId2EventName).sort()
+    expect(eventKeys).to.be.deep.equal(eventValues)
+  })
+
+  it('static method maybeValidAddr()', function () {
+    expect(DeltaChat.maybeValidAddr(null)).to.equal(false)
+    expect(DeltaChat.maybeValidAddr('')).to.equal(false)
+    expect(DeltaChat.maybeValidAddr('uuu')).to.equal(false)
+    expect(DeltaChat.maybeValidAddr('dd.tt')).to.equal(false)
+    expect(DeltaChat.maybeValidAddr('tt.dd@yggmail')).to.equal(true)
+    expect(DeltaChat.maybeValidAddr('u@d')).to.equal(true)
+    //expect(DeltaChat.maybeValidAddr('u@d.')).to.equal(false)
+    //expect(DeltaChat.maybeValidAddr('u@d.t')).to.equal(false)
+    //expect(DeltaChat.maybeValidAddr('u@.tt')).to.equal(false)
+    expect(DeltaChat.maybeValidAddr('@d.tt')).to.equal(false)
+    expect(DeltaChat.maybeValidAddr('user@domain.tld')).to.equal(true)
+    expect(DeltaChat.maybeValidAddr('u@d.tt')).to.equal(true)
+  })
+
+  it('static getSystemInfo()', function () {
+    const info = Context.getSystemInfo()
+    expect(info).to.contain.keys([
+      'arch',
+      'deltachat_core_version',
+      'sqlite_version',
+    ])
+  })
+
+  it('static context.getProviderFromEmail("example@example.com")', function () {
+    const provider = DeltaChat.getProviderFromEmail('example@example.com')
+
+    expect(provider).to.deep.equal({
+      before_login_hint: "Hush this provider doesn't exist!",
+      overview_page: 'https://providers.delta.chat/example-com',
+      status: 3,
+    })
+  })
+})
+
+describe('Basic offline Tests', function () {
+  it('opens a context', async function () {
+    const { dc, context } = DeltaChat.newTemporary()
+
+    strictEqual(context.isConfigured(), false)
+    dc.close()
+  })
+
+  it('set config', async function () {
+    const { dc, context } = DeltaChat.newTemporary()
+
+    context.setConfig('bot', true)
+    strictEqual(context.getConfig('bot'), '1')
+    context.setConfig('bot', false)
+    strictEqual(context.getConfig('bot'), '0')
+    context.setConfig('bot', '1')
+    strictEqual(context.getConfig('bot'), '1')
+    context.setConfig('bot', '0')
+    strictEqual(context.getConfig('bot'), '0')
+    context.setConfig('bot', 1)
+    strictEqual(context.getConfig('bot'), '1')
+    context.setConfig('bot', 0)
+    strictEqual(context.getConfig('bot'), '0')
+
+    context.setConfig('bot', null)
+    strictEqual(context.getConfig('bot'), '')
+
+    strictEqual(context.getConfig('selfstatus'), '')
+    context.setConfig('selfstatus', 'hello')
+    strictEqual(context.getConfig('selfstatus'), 'hello')
+    context.setConfig('selfstatus', '')
+    strictEqual(context.getConfig('selfstatus'), '')
+    context.setConfig('selfstatus', null)
+    strictEqual(context.getConfig('selfstatus'), '')
+
+    dc.close()
+  })
+
+  it('configure with either missing addr or missing mail_pw throws', async function () {
+    const { dc, context } = DeltaChat.newTemporary()
+    dc.startEvents()
+
+    await expect(
+      context.configure({ addr: 'delta1@delta.localhost' })
+    ).to.eventually.be.rejectedWith('Please enter a password.')
+    await expect(context.configure({ mailPw: 'delta1' })).to.eventually.be
+      .rejected
+
+    context.stopOngoingProcess()
+    dc.close()
+  })
+
+  it('context.getInfo()', async function () {
+    const { dc, context } = DeltaChat.newTemporary()
+
+    const info = await context.getInfo()
+    expect(typeof info).to.be.equal('object')
+    expect(info).to.contain.keys([
+      'arch',
+      'bcc_self',
+      'blobdir',
+      'bot',
+      'configured_mvbox_folder',
+      'configured_sentbox_folder',
+      'database_dir',
+      'database_encrypted',
+      'database_version',
+      'delete_device_after',
+      'delete_server_after',
+      'deltachat_core_version',
+      'display_name',
+      'download_limit',
+      'e2ee_enabled',
+      'entered_account_settings',
+      'fetch_existing_msgs',
+      'fingerprint',
+      'folders_configured',
+      'is_configured',
+      'journal_mode',
+      'key_gen_type',
+      'last_housekeeping',
+      'level',
+      'mdns_enabled',
+      'media_quality',
+      'messages_in_contact_requests',
+      'mvbox_move',
+      'num_cpus',
+      'number_of_chat_messages',
+      'number_of_chats',
+      'number_of_contacts',
+      'only_fetch_mvbox',
+      'private_key_count',
+      'public_key_count',
+      'quota_exceeding',
+      'scan_all_folders_debounce_secs',
+      'selfavatar',
+      'send_sync_msgs',
+      'sentbox_watch',
+      'show_emails',
+      'socks5_enabled',
+      'sqlite_version',
+      'uptime',
+      'used_account_settings',
+      'webrtc_instance',
+    ])
+
+    dc.close()
+  })
+})
+
+describe('Offline Tests with unconfigured account', function () {
+  let [dc, context, accountId, directory] = [null, null, null, null]
+
+  this.beforeEach(async function () {
+    let tmp = DeltaChat.newTemporary()
+    dc = tmp.dc
+    context = tmp.context
+    accountId = tmp.accountId
+    directory = tmp.directory
+    dc.startEvents()
+  })
+
+  this.afterEach(async function () {
+    if (context) {
+      context.stopOngoingProcess()
+    }
+    if (dc) {
+      try {
+        dc.stopIO()
+        dc.close()
+      } catch (error) {
+        console.error(error)
+      }
+    }
+
+    dc = null
+    context = null
+    accountId = null
+    directory = null
+  })
+
+  it('invalid context.joinSecurejoin', async function () {
+    expect(context.joinSecurejoin('test')).to.be.eq(0)
+  })
+
+  it('Device Chat', async function () {
+    const deviceChatMessageText = 'test234'
+
+    expect((await context.getChatList(0, '', null)).getCount()).to.equal(
+      0,
+      'no device chat after setup'
+    )
+
+    await context.addDeviceMessage('test', deviceChatMessageText)
+
+    const chatList = await context.getChatList(0, '', null)
+    expect(chatList.getCount()).to.equal(
+      1,
+      'device chat after adding device msg'
+    )
+
+    const deviceChatId = await chatList.getChatId(0)
+    const deviceChat = await context.getChat(deviceChatId)
+    expect(deviceChat.isDeviceTalk()).to.be.true
+    expect(deviceChat.toJson().isDeviceTalk).to.be.true
+
+    const deviceChatMessages = await context.getChatMessages(deviceChatId, 0, 0)
+    expect(deviceChatMessages.length).to.be.equal(
+      1,
+      'device chat has added message'
+    )
+
+    const deviceChatMessage = await context.getMessage(deviceChatMessages[0])
+    expect(deviceChatMessage.getText()).to.equal(
+      deviceChatMessageText,
+      'device chat message has the inserted text'
+    )
+  })
+
+  it('should have e2ee enabled and right blobdir', function () {
+    expect(context.getConfig('e2ee_enabled')).to.equal(
+      '1',
+      'e2eeEnabled correct'
+    )
+    expect(
+      String(context.getBlobdir()).startsWith(directory),
+      'blobdir should be inside temp directory'
+    )
+    expect(
+      String(context.getBlobdir()).endsWith('db.sqlite-blobs'),
+      'blobdir end with "db.sqlite-blobs"'
+    )
+  })
+
+  it('should create chat from contact and Chat methods', async function () {
+    const contactId = context.createContact('aaa', 'aaa@site.org')
+
+    strictEqual(context.lookupContactIdByAddr('aaa@site.org'), contactId)
+    strictEqual(context.lookupContactIdByAddr('nope@site.net'), 0)
+
+    let chatId = context.createChatByContactId(contactId)
+    let chat = context.getChat(chatId)
+
+    strictEqual(
+      chat.getVisibility(),
+      C.DC_CHAT_VISIBILITY_NORMAL,
+      'not archived'
+    )
+    strictEqual(chat.getId(), chatId, 'chat id matches')
+    strictEqual(chat.getName(), 'aaa', 'chat name matches')
+    strictEqual(chat.getProfileImage(), null, 'no profile image')
+    strictEqual(chat.getType(), C.DC_CHAT_TYPE_SINGLE, 'single chat')
+    strictEqual(chat.isSelfTalk(), false, 'no self talk')
+    // TODO make sure this is really the case!
+    strictEqual(chat.isUnpromoted(), false, 'not unpromoted')
+    strictEqual(chat.isProtected(), false, 'not verified')
+    strictEqual(typeof chat.color, 'string', 'color is a string')
+
+    strictEqual(context.getDraft(chatId), null, 'no draft message')
+    context.setDraft(chatId, context.messageNew().setText('w00t!'))
+    strictEqual(
+      context.getDraft(chatId).toJson().text,
+      'w00t!',
+      'draft text correct'
+    )
+    context.setDraft(chatId, null)
+    strictEqual(context.getDraft(chatId), null, 'draft removed')
+
+    strictEqual(context.getChatIdByContactId(contactId), chatId)
+    expect(context.getChatContacts(chatId)).to.deep.equal([contactId])
+
+    context.setChatVisibility(chatId, C.DC_CHAT_VISIBILITY_ARCHIVED)
+    strictEqual(
+      context.getChat(chatId).getVisibility(),
+      C.DC_CHAT_VISIBILITY_ARCHIVED,
+      'chat archived'
+    )
+    context.setChatVisibility(chatId, C.DC_CHAT_VISIBILITY_NORMAL)
+    strictEqual(
+      chat.getVisibility(),
+      C.DC_CHAT_VISIBILITY_NORMAL,
+      'chat unarchived'
+    )
+
+    chatId = context.createGroupChat('unverified group', false)
+    chat = context.getChat(chatId)
+    strictEqual(chat.isProtected(), false, 'is not verified')
+    strictEqual(chat.getType(), C.DC_CHAT_TYPE_GROUP, 'group chat')
+    expect(context.getChatContacts(chatId)).to.deep.equal([
+      C.DC_CONTACT_ID_SELF,
+    ])
+
+    const draft2 = context.getDraft(chatId)
+    expect(draft2 == null, 'unpromoted group has no draft by default')
+
+    context.setChatName(chatId, 'NEW NAME')
+    strictEqual(context.getChat(chatId).getName(), 'NEW NAME', 'name updated')
+
+    chatId = context.createGroupChat('a verified group', true)
+    chat = context.getChat(chatId)
+    strictEqual(chat.isProtected(), true, 'is verified')
+  })
+
+  it('test setting profile image', async function () {
+    const chatId = context.createGroupChat('testing profile image group', false)
+    const image = 'image.jpeg'
+    const imagePath = join(__dirname, 'fixtures', image)
+    const blobs = context.getBlobdir()
+
+    context.setChatProfileImage(chatId, imagePath)
+    const blobPath = context.getChat(chatId).getProfileImage()
+    expect(blobPath.startsWith(blobs)).to.be.true
+    expect(blobPath.endsWith(image)).to.be.true
+
+    context.setChatProfileImage(chatId, null)
+    expect(context.getChat(chatId).getProfileImage()).to.be.equal(
+      null,
+      'image is null'
+    )
+  })
+
+  it('test setting ephemeral timer', function () {
+    const chatId = context.createGroupChat('testing ephemeral timer')
+
+    strictEqual(
+      context.getChatEphemeralTimer(chatId),
+      0,
+      'ephemeral timer is not set by default'
+    )
+
+    context.setChatEphemeralTimer(chatId, 60)
+    strictEqual(
+      context.getChatEphemeralTimer(chatId),
+      60,
+      'ephemeral timer is set to 1 minute'
+    )
+
+    context.setChatEphemeralTimer(chatId, 0)
+    strictEqual(
+      context.getChatEphemeralTimer(chatId),
+      0,
+      'ephemeral timer is reset'
+    )
+  })
+
+  it('should create and delete chat', function () {
+    const chatId = context.createGroupChat('GROUPCHAT')
+    const chat = context.getChat(chatId)
+    strictEqual(chat.getId(), chatId, 'correct chatId')
+    context.deleteChat(chat.getId())
+    strictEqual(context.getChat(chatId), null, 'chat removed')
+  })
+
+  it('new message and Message methods', function () {
+    const text = 'w00t!'
+    const msg = context.messageNew().setText(text)
+
+    strictEqual(msg.getChatId(), 0, 'chat id 0 before sent')
+    strictEqual(msg.getDuration(), 0, 'duration 0 before sent')
+    strictEqual(msg.getFile(), '', 'no file set by default')
+    strictEqual(msg.getFilebytes(), 0, 'and file bytes is 0')
+    strictEqual(msg.getFilemime(), '', 'no filemime by default')
+    strictEqual(msg.getFilename(), '', 'no filename set by default')
+    strictEqual(msg.getFromId(), 0, 'no contact id set by default')
+    strictEqual(msg.getHeight(), 0, 'plain text message have height 0')
+    strictEqual(msg.getId(), 0, 'id 0 before sent')
+    strictEqual(msg.getSetupcodebegin(), '', 'no setupcode begin')
+    strictEqual(msg.getShowpadlock(), false, 'no padlock by default')
+
+    const state = msg.getState()
+    strictEqual(state.isUndefined(), true, 'no state by default')
+    strictEqual(state.isFresh(), false, 'no state by default')
+    strictEqual(state.isNoticed(), false, 'no state by default')
+    strictEqual(state.isSeen(), false, 'no state by default')
+    strictEqual(state.isPending(), false, 'no state by default')
+    strictEqual(state.isFailed(), false, 'no state by default')
+    strictEqual(state.isDelivered(), false, 'no state by default')
+    strictEqual(state.isReceived(), false, 'no state by default')
+
+    const summary = msg.getSummary()
+    strictEqual(summary.getId(), 0, 'no summary id')
+    strictEqual(summary.getState(), 0, 'no summary state')
+    strictEqual(summary.getText1(), null, 'no summary text1')
+    strictEqual(summary.getText1Meaning(), 0, 'no summary text1 meaning')
+    strictEqual(summary.getText2(), '', 'no summary text2')
+    strictEqual(summary.getTimestamp(), 0, 'no summary timestamp')
+
+    //strictEqual(msg.getSummarytext(50), text, 'summary text is text')
+    strictEqual(msg.getText(), text, 'msg text set correctly')
+    strictEqual(msg.getTimestamp(), 0, 'no timestamp')
+
+    const viewType = msg.getViewType()
+    strictEqual(viewType.isText(), true)
+    strictEqual(viewType.isImage(), false)
+    strictEqual(viewType.isGif(), false)
+    strictEqual(viewType.isAudio(), false)
+    strictEqual(viewType.isVoice(), false)
+    strictEqual(viewType.isVideo(), false)
+    strictEqual(viewType.isFile(), false)
+
+    strictEqual(msg.getWidth(), 0, 'no message width')
+    strictEqual(msg.isDeadDrop(), false, 'not deaddrop')
+    strictEqual(msg.isForwarded(), false, 'not forwarded')
+    strictEqual(msg.isIncreation(), false, 'not in creation')
+    strictEqual(msg.isInfo(), false, 'not an info message')
+    strictEqual(msg.isSent(), false, 'messge is not sent')
+    strictEqual(msg.isSetupmessage(), false, 'not an autocrypt setup message')
+
+    msg.latefilingMediasize(10, 20, 30)
+    strictEqual(msg.getWidth(), 10, 'message width set correctly')
+    strictEqual(msg.getHeight(), 20, 'message height set correctly')
+    strictEqual(msg.getDuration(), 30, 'message duration set correctly')
+
+    msg.setDimension(100, 200)
+    strictEqual(msg.getWidth(), 100, 'message width set correctly')
+    strictEqual(msg.getHeight(), 200, 'message height set correctly')
+
+    msg.setDuration(314)
+    strictEqual(msg.getDuration(), 314, 'message duration set correctly')
+
+    expect(() => {
+      msg.setFile(null)
+    }).to.throw('Missing filename')
+
+    const logo = join(__dirname, 'fixtures', 'logo.png')
+    const stat = statSync(logo)
+    msg.setFile(logo)
+    strictEqual(msg.getFilebytes(), stat.size, 'correct file size')
+    strictEqual(msg.getFile(), logo, 'correct file name')
+    strictEqual(msg.getFilemime(), 'image/png', 'mime set implicitly')
+    msg.setFile(logo, 'image/gif')
+    strictEqual(msg.getFilemime(), 'image/gif', 'mime set (in)correctly')
+    msg.setFile(logo, 'image/png')
+    strictEqual(msg.getFilemime(), 'image/png', 'mime set correctly')
+
+    const json = msg.toJson()
+    expect(json).to.not.equal(null, 'not null')
+    strictEqual(typeof json, 'object', 'json object')
+  })
+
+  it('Contact methods', function () {
+    const contactId = context.createContact('First Last', 'first.last@site.org')
+    const contact = context.getContact(contactId)
+
+    strictEqual(contact.getAddress(), 'first.last@site.org', 'correct address')
+    strictEqual(typeof contact.color, 'string', 'color is a string')
+    strictEqual(contact.getDisplayName(), 'First Last', 'correct display name')
+    strictEqual(contact.getId(), contactId, 'contact id matches')
+    strictEqual(contact.getName(), 'First Last', 'correct name')
+    strictEqual(contact.getNameAndAddress(), 'First Last (first.last@site.org)')
+    strictEqual(contact.getProfileImage(), null, 'no contact image')
+    strictEqual(contact.isBlocked(), false, 'not blocked')
+    strictEqual(contact.isVerified(), false, 'unverified status')
+    strictEqual(contact.lastSeen, 0, 'last seen unknown')
+  })
+
+  it('create contacts from address book', function () {
+    const addresses = [
+      'Name One',
+      'name1@site.org',
+      'Name Two',
+      'name2@site.org',
+      'Name Three',
+      'name3@site.org',
+    ]
+    const count = context.addAddressBook(addresses.join('\n'))
+    strictEqual(count, addresses.length / 2)
+    context
+      .getContacts(0, 'Name ')
+      .map((id) => context.getContact(id))
+      .forEach((contact) => {
+        expect(contact.getName().startsWith('Name ')).to.be.true
+      })
+  })
+
+  it('delete contacts', function () {
+    const id = context.createContact('someuser', 'someuser@site.com')
+    const contact = context.getContact(id)
+    strictEqual(contact.getId(), id, 'contact id matches')
+    strictEqual(context.deleteContact(id), true, 'delete call succesful')
+    strictEqual(context.getContact(id), null, 'contact is gone')
+  })
+
+  it('adding and removing a contact from a chat', function () {
+    const chatId = context.createGroupChat('adding_and_removing')
+    const contactId = context.createContact('Add Remove', 'add.remove@site.com')
+    strictEqual(
+      context.addContactToChat(chatId, contactId),
+      true,
+      'contact added'
+    )
+    strictEqual(
+      context.isContactInChat(chatId, contactId),
+      true,
+      'contact in chat'
+    )
+    strictEqual(
+      context.removeContactFromChat(chatId, contactId),
+      true,
+      'contact removed'
+    )
+    strictEqual(
+      context.isContactInChat(chatId, contactId),
+      false,
+      'contact not in chat'
+    )
+  })
+
+  it('blocking contacts', function () {
+    const id = context.createContact('badcontact', 'bad@site.com')
+
+    strictEqual(context.getBlockedCount(), 0)
+    strictEqual(context.getContact(id).isBlocked(), false)
+    expect(context.getBlockedContacts()).to.be.empty
+
+    context.blockContact(id, true)
+    strictEqual(context.getBlockedCount(), 1)
+    strictEqual(context.getContact(id).isBlocked(), true)
+    expect(context.getBlockedContacts()).to.deep.equal([id])
+
+    context.blockContact(id, false)
+    strictEqual(context.getBlockedCount(), 0)
+    strictEqual(context.getContact(id).isBlocked(), false)
+    expect(context.getBlockedContacts()).to.be.empty
+  })
+
+  it('ChatList methods', function () {
+    const ids = [
+      context.createGroupChat('groupchat1'),
+      context.createGroupChat('groupchat11'),
+      context.createGroupChat('groupchat111'),
+    ]
+
+    let chatList = context.getChatList(0, 'groupchat1', null)
+    strictEqual(chatList.getCount(), 3, 'should contain above chats')
+    expect(ids.indexOf(chatList.getChatId(0))).not.to.equal(-1)
+    expect(ids.indexOf(chatList.getChatId(1))).not.to.equal(-1)
+    expect(ids.indexOf(chatList.getChatId(2))).not.to.equal(-1)
+
+    const lot = chatList.getSummary(0)
+    strictEqual(lot.getId(), 0, 'lot has no id')
+    strictEqual(lot.getState(), C.DC_STATE_UNDEFINED, 'correct state')
+
+    const text = 'No messages.'
+    context.createGroupChat('groupchat1111')
+    chatList = context.getChatList(0, 'groupchat1111', null)
+    strictEqual(
+      chatList.getSummary(0).getText2(),
+      text,
+      'custom new group message'
+    )
+
+    context.setChatVisibility(ids[0], C.DC_CHAT_VISIBILITY_ARCHIVED)
+    chatList = context.getChatList(C.DC_GCL_ARCHIVED_ONLY, 'groupchat1', null)
+    strictEqual(chatList.getCount(), 1, 'only one archived')
+  })
+
+  it('Remove qoute from (draft) message', function () {
+    context.addDeviceMessage('test_qoute', 'test')
+    const msgId = context.getChatMessages(10, 0, 0)[0]
+    const msg = context.messageNew()
+
+    msg.setQuote(context.getMessage(msgId))
+    expect(msg.getQuotedMessage()).to.not.be.null
+    msg.setQuote(null)
+    expect(msg.getQuotedMessage()).to.be.null
+  })
+})
+
+describe('Integration tests', function () {
+  this.timeout(60 * 3000) // increase timeout to 1min
+
+  let [dc, context, accountId, directory, account] = [
+    null,
+    null,
+    null,
+    null,
+    null,
+  ]
+
+  let [dc2, context2, accountId2, directory2, account2] = [
+    null,
+    null,
+    null,
+    null,
+    null,
+  ]
+
+  this.beforeEach(async function () {
+    let tmp = DeltaChat.newTemporary()
+    dc = tmp.dc
+    context = tmp.context
+    accountId = tmp.accountId
+    directory = tmp.directory
+    dc.startEvents()
+  })
+
+  this.afterEach(async function () {
+    if (context) {
+      try {
+        context.stopOngoingProcess()
+      } catch (error) {
+        console.error(error)
+      }
+    }
+    if (context2) {
+      try {
+        context2.stopOngoingProcess()
+      } catch (error) {
+        console.error(error)
+      }
+    }
+
+    if (dc) {
+      try {
+        dc.stopIO()
+        dc.close()
+      } catch (error) {
+        console.error(error)
+      }
+    }
+
+    dc = null
+    context = null
+    accountId = null
+    directory = null
+
+    context2 = null
+    accountId2 = null
+    directory2 = null
+  })
+
+  this.beforeAll(async function () {
+    if (!process.env.DCC_NEW_TMP_EMAIL) {
+      console.log(
+        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests'
+      )
+      this.skip()
+    }
+
+    account = await createTempUser(process.env.DCC_NEW_TMP_EMAIL)
+    if (!account || !account.email || !account.password) {
+      console.log(
+        "We didn't got back an account from the api, skip intergration tests"
+      )
+      this.skip()
+    }
+  })
+
+  it('configure', async function () {
+    strictEqual(context.isConfigured(), false, 'should not be configured')
+
+    // Not sure what's the best way to check the events
+    // TODO: check the events
+
+    // dc.once('DC_EVENT_CONFIGURE_PROGRESS', (data) => {
+    //   t.pass('DC_EVENT_CONFIGURE_PROGRESS called at least once')
+    // })
+    // dc.on('DC_EVENT_ERROR', (error) => {
+    //   console.error('DC_EVENT_ERROR', error)
+    // })
+    // dc.on('DC_EVENT_ERROR_NETWORK', (first, error) => {
+    //   console.error('DC_EVENT_ERROR_NETWORK', error)
+    // })
+
+    // dc.on('ALL', (event, data1, data2) => console.log('ALL', event, data1, data2))
+
+    await expect(
+      context.configure({
+        addr: account.email,
+        mail_pw: account.password,
+
+        displayname: 'Delta One',
+        selfstatus: 'From Delta One with <3',
+        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
+      })
+    ).to.be.eventually.fulfilled
+
+    strictEqual(context.getConfig('addr'), account.email, 'addr correct')
+    strictEqual(
+      context.getConfig('displayname'),
+      'Delta One',
+      'displayName correct'
+    )
+    strictEqual(
+      context.getConfig('selfstatus'),
+      'From Delta One with <3',
+      'selfStatus correct'
+    )
+    expect(
+      context.getConfig('selfavatar').endsWith('avatar.png'),
+      'selfavatar correct'
+    )
+    strictEqual(context.getConfig('e2ee_enabled'), '1', 'e2ee_enabled correct')
+    strictEqual(
+      context.getConfig('save_mime_headers'),
+      '',
+      'save_mime_headers correct'
+    )
+
+    expect(context.getBlobdir().endsWith('db.sqlite-blobs'), 'correct blobdir')
+    strictEqual(context.isConfigured(), true, 'is configured')
+
+    // whole re-configure to only change displayname: what the heck? (copied this from the old test)
+    await expect(
+      context.configure({
+        addr: account.email,
+        mail_pw: account.password,
+        displayname: 'Delta Two',
+        selfstatus: 'From Delta One with <3',
+        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
+      })
+    ).to.be.eventually.fulfilled
+    strictEqual(
+      context.getConfig('displayname'),
+      'Delta Two',
+      'updated displayName correct'
+    )
+  })
+
+  it('Autocrypt setup - key transfer', async function () {
+    // Spawn a second dc instance with same account
+    // dc.on('ALL', (event, data1, data2) =>
+    //   console.log('FIRST ', event, data1, data2)
+    // )
+    dc.stopIO()
+    await expect(
+      context.configure({
+        addr: account.email,
+        mail_pw: account.password,
+
+        displayname: 'Delta One',
+        selfstatus: 'From Delta One with <3',
+        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
+      })
+    ).to.be.eventually.fulfilled
+
+    const accountId2 = dc.addAccount()
+    console.log('accountId2:', accountId2)
+    context2 = dc.accountContext(accountId2)
+
+    let setupCode = null
+    const waitForSetupCode = waitForSomething()
+    const waitForEnd = waitForSomething()
+
+    dc.on('ALL', (event, accountId, data1, data2) => {
+      console.log('[' + accountId + ']', event, data1, data2)
+    })
+
+    dc.on('DC_EVENT_MSGS_CHANGED', async (aId, chatId, msgId) => {
+      console.log('[' + accountId + '] DC_EVENT_MSGS_CHANGED', chatId, msgId)
+      if (
+        aId != accountId ||
+        !context.getChat(chatId).isSelfTalk() ||
+        !context.getMessage(msgId).isSetupmessage()
+      ) {
+        return
+      }
+      console.log('Setupcode!')
+      let setupCode = await waitForSetupCode.promise
+      // console.log('incoming msg', { setupCode })
+      const messages = context.getChatMessages(chatId, 0, 0)
+      expect(messages.indexOf(msgId) !== -1, 'msgId is in chat messages').to.be
+        .true
+      const result = await context.continueKeyTransfer(msgId, setupCode)
+      expect(result === true, 'continueKeyTransfer was successful').to.be.true
+
+      waitForEnd.done()
+    })
+
+    dc.stopIO()
+    await expect(
+      context2.configure({
+        addr: account.email,
+        mail_pw: account.password,
+
+        displayname: 'Delta One',
+        selfstatus: 'From Delta One with <3',
+        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
+      })
+    ).to.be.eventually.fulfilled
+    dc.startIO()
+
+    console.log('Sending autocrypt setup code')
+    setupCode = await context2.initiateKeyTransfer()
+    console.log('Sent autocrypt setup code')
+    waitForSetupCode.done(setupCode)
+    console.log('setupCode is: ' + setupCode)
+    expect(typeof setupCode).to.equal('string', 'setupCode is string')
+
+    await waitForEnd.promise
+  })
+
+  it('configure using invalid password should fail', async function () {
+    await expect(
+      context.configure({
+        addr: 'hpk5@testrun.org',
+        mail_pw: 'asd',
+      })
+    ).to.be.eventually.rejected
+  })
+})
+
+/**
+ * @returns {{done: (result?)=>void, promise:Promise<any> }}
+ */
+function waitForSomething() {
+  let resolvePromise
+  const promise = new Promise((res, rej) => {
+    resolvePromise = res
+  })
+  return {
+    done: resolvePromise,
+    promise,
+  }
+}

node/tsconfig.json

@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "outDir": "dist",
+        "rootDir": "./lib",
+        "sourceMap": true,
+        "module": "commonjs",
+        "target": "es5",
+        "esModuleInterop": true,
+        "declaration": true,
+        "declarationMap": true,
+        "strictNullChecks": true,
+        "strict": true
+    },
+    "exclude": ["node_modules", "deltachat-core-rust", "dist", "scripts"],
+    "typedocOptions": {
+        "mode": "file",
+        "out": "docs",
+        "excludeNotExported": true,
+        "defaultCategory": "index",
+        "includeVersion": true
+    }
+}

node/windows.md

@@ -0,0 +1,37 @@
+> Steps on how to get windows set up properly for the node bindings
+
+## install git
+
+E.g via <https://git-scm.com/download/win>
+
+## install node
+
+Download and install `v16` from <https://nodejs.org/en/>
+
+## install rust
+
+Download and run `rust-init.exe` from <https://www.rust-lang.org/tools/install>
+
+## configure node for native addons
+
+```
+$ npm i node-gyp -g
+$ npm i windows-build-tools -g
+```
+
+`windows-build-tools` will install `Visual Studio 2017` by default and should not mess with existing installations of `Visual Studio C++`.
+
+## get the code
+
+```
+$ mkdir -p src/deltachat
+$ cd src/deltachat
+$ git clone https://github.com/deltachat/deltachat-node
+```
+
+## build the code
+
+```
+$ cd src/deltachat/deltachat-node
+$ npm install
+```

package.json

@@ -0,0 +1,65 @@
+{
+  "dependencies": {
+    "debug": "^4.1.1",
+    "napi-macros": "^2.0.0",
+    "node-gyp-build": "^4.1.0"
+  },
+  "description": "node.js bindings for deltachat-core",
+  "devDependencies": {
+    "@types/debug": "^4.1.7",
+    "@types/node": "^16.11.26",
+    "chai": "^4.2.0",
+    "chai-as-promised": "^7.1.1",
+    "esm": "^3.2.25",
+    "hallmark": "^2.0.0",
+    "mocha": "^8.2.1",
+    "node-fetch": "^2.6.7",
+    "node-gyp": "^9.0.0",
+    "opn-cli": "^5.0.0",
+    "prebuildify": "^3.0.0",
+    "prebuildify-ci": "^1.0.4",
+    "prettier": "^2.0.5",
+    "split2": "^4.1.0",
+    "typedoc": "^0.17.0",
+    "typescript": "^3.9.10"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "files": [
+    "node/scripts/*",
+    "*"
+  ],
+  "homepage": "https://github.com/deltachat/deltachat-core-rust/tree/master/node",
+  "license": "GPL-3.0-or-later",
+  "main": "node/dist/index.js",
+  "name": "deltachat-node",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
+  },
+  "scripts": {
+    "build": "npm run build:core && npm run build:bindings",
+    "build:bindings": "npm run build:bindings:c && npm run build:bindings:ts",
+    "build:bindings:c": "npm run build:bindings:c:c && npm run build:bindings:c:postinstall",
+    "build:bindings:c:c": "cd node && npx node-gyp rebuild",
+    "build:bindings:c:postinstall": "node node/scripts/postinstall.js",
+    "build:bindings:ts": "cd node && tsc",
+    "build:core": "npm run build:core:rust && npm run build:core:constants",
+    "build:core:constants": "node node/scripts/generate-constants.js",
+    "build:core:rust": "node node/scripts/rebuild-core.js",
+    "clean": "rm -rf node/dist node/build node/prebuilds node/node_modules ./target",
+    "download-prebuilds": "prebuildify-ci download",
+    "hallmark": "hallmark --fix",
+    "install": "node node/scripts/install.js",
+    "install:prebuilds": "cd node && node-gyp-build \"npm run build:core\" \"npm run build:bindings:c:postinstall\"",
+    "lint": "prettier --check \"node/lib/**/*.{ts,tsx}\"",
+    "lint-fix": "prettier --write \"node/lib/**/*.{ts,tsx}\" \"node/test/**/*.js\"",
+    "prebuildify": "cd node && prebuildify -t 16.13.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
+    "test": "npm run test:lint && npm run test:mocha",
+    "test:lint": "npm run lint",
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec"
+  },
+  "types": "node/dist/index.d.ts",
+  "version": "1.84.0"
+}

python/mypy.ini

@@ -1,5 +1,8 @@
 [mypy]
 
+[mypy-py.*]
+ignore_missing_imports = True
+
 [mypy-deltachat.capi.*]
 ignore_missing_imports = True
 

python/src/deltachat/chat.py

@@ -64,7 +64,7 @@ class Chat(object):
     def is_group(self) -> bool:
         """ return true if this chat is a group chat.
 
-        :returns: True if chat is a group-chat, false if it's a contact 1:1 chat.
+        :returns: True if chat is a group-chat, false otherwise
         """
         return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_GROUP
 

python/src/deltachat/direct_imap.py

@@ -177,6 +177,9 @@ class IdleManager:
     def __init__(self, direct_imap):
         self.direct_imap = direct_imap
         self.log = direct_imap.account.log
+        # fetch latest messages before starting idle so that it only
+        # returns messages that arrive anew
+        self.direct_imap.conn.fetch("1:*")
         self.direct_imap.conn.idle.start()
 
     def check(self, timeout=None) -> List[bytes]:

python/src/deltachat/testplugin.py

@@ -13,6 +13,7 @@ from typing import List, Callable
 
 import pytest
 import requests
+import pathlib
 
 from . import Account, const, account_hookimpl, get_core_info
 from .events import FFIEventLogger, FFIEventTracker
@@ -138,6 +139,8 @@ class TestProcess:
     """
     def __init__(self, pytestconfig):
         self.pytestconfig = pytestconfig
+        self._addr2files = {}
+        self._configlist = []
 
     def get_liveconfig_producer(self):
         """ provide live account configs, cached on a per-test-process scope
@@ -149,7 +152,6 @@ class TestProcess:
         if not liveconfig_opt:
             pytest.skip("specify DCC_NEW_TMP_EMAIL or --liveconfig to provide live accounts")
 
-        configlist = []
         if not liveconfig_opt.startswith("http"):
             for line in open(liveconfig_opt):
                 if line.strip() and not line.strip().startswith('#'):
@@ -157,14 +159,14 @@ class TestProcess:
                     for part in line.split():
                         name, value = part.split("=")
                         d[name] = value
-                    configlist.append(d)
+                    self._configlist.append(d)
 
-            yield from iter(configlist)
+            yield from iter(self._configlist)
         else:
             MAX_LIVE_CREATED_ACCOUNTS = 10
             for index in range(MAX_LIVE_CREATED_ACCOUNTS):
                 try:
-                    yield configlist[index]
+                    yield self._configlist[index]
                 except IndexError:
                     res = requests.post(liveconfig_opt)
                     if res.status_code != 200:
@@ -173,10 +175,52 @@ class TestProcess:
                     d = res.json()
                     config = dict(addr=d["email"], mail_pw=d["password"])
                     print("newtmpuser {}: addr={}".format(index, config["addr"]))
-                    configlist.append(config)
+                    self._configlist.append(config)
                     yield config
             pytest.fail("more than {} live accounts requested.".format(MAX_LIVE_CREATED_ACCOUNTS))
 
+    def cache_maybe_retrieve_configured_db_files(self, cache_addr, db_target_path):
+        db_target_path = pathlib.Path(db_target_path)
+        assert not db_target_path.exists()
+
+        try:
+            filescache = self._addr2files[cache_addr]
+        except KeyError:
+            print("CACHE FAIL for", cache_addr)
+            return False
+        else:
+            print("CACHE HIT for", cache_addr)
+            targetdir = db_target_path.parent
+            write_dict_to_dir(filescache, targetdir)
+            return True
+
+    def cache_maybe_store_configured_db_files(self, acc):
+        addr = acc.get_config("addr")
+        assert acc.is_configured()
+        # don't overwrite existing entries
+        if addr not in self._addr2files:
+            print("storing cache for", addr)
+            basedir = pathlib.Path(acc.get_blobdir()).parent
+            self._addr2files[addr] = create_dict_from_files_in_path(basedir)
+            return True
+
+
+def create_dict_from_files_in_path(base):
+    cachedict = {}
+    for path in base.glob("**/*"):
+        if path.is_file():
+            cachedict[path.relative_to(base)] = path.read_bytes()
+    return cachedict
+
+
+def write_dict_to_dir(dic, target_dir):
+    assert dic
+    for relpath, content in dic.items():
+        path = target_dir.joinpath(relpath)
+        if not path.parent.exists():
+            os.makedirs(path.parent)
+        path.write_bytes(content)
+
 
 @pytest.fixture
 def data(request):
@@ -217,12 +261,22 @@ class ACSetup:
     CONFIGURED = "CONFIGURED"
     IDLEREADY = "IDLEREADY"
 
-    def __init__(self, init_time):
+    def __init__(self, testprocess, init_time):
         self._configured_events = Queue()
         self._account2state = {}
         self._imap_cleaned = set()
+        self.testprocess = testprocess
         self.init_time = init_time
 
+    def log(self, *args):
+        print("[acsetup]", "{:.3f}".format(time.time() - self.init_time), *args)
+
+    def add_configured(self, account):
+        """ add an already configured account. """
+        assert account.is_configured()
+        self._account2state[account] = self.CONFIGURED
+        self.log("added already configured account", account, account.get_config("addr"))
+
     def start_configure(self, account, reconfigure=False):
         """ add an account and start its configure process. """
         class PendingTracker:
@@ -233,7 +287,7 @@ class ACSetup:
         account.add_account_plugin(PendingTracker(), name="pending_tracker")
         self._account2state[account] = self.CONFIGURING
         account.configure(reconfigure=reconfigure)
-        print("started configure on pending", account)
+        self.log("started configure on", account)
 
     def wait_one_configured(self, account):
         """ wait until this account has successfully configured. """
@@ -242,7 +296,8 @@ class ACSetup:
                 acc = self._pop_config_success()
                 if acc == account:
                     break
-            self.init_direct_imap_and_logging(acc)
+            self.init_imap(acc)
+            self.init_logging(acc)
             acc._evtracker.consume_events()
 
     def bring_online(self):
@@ -272,25 +327,24 @@ class ACSetup:
         return acc
 
     def _onconfigure_start_io(self, acc):
+        self.init_imap(acc)
+        self.init_logging(acc)
         acc.start_io()
         print(acc._logid, "waiting for inbox IDLE to become ready")
         acc._evtracker.wait_idle_inbox_ready()
-        self.init_direct_imap_and_logging(acc)
         acc._evtracker.consume_events()
         acc.log("inbox IDLE ready")
 
-    def init_direct_imap_and_logging(self, acc):
-        """ idempotent function for initializing direct_imap and logging for an account. """
-        self.init_direct_imap(acc)
-        self.init_logging(acc)
-
     def init_logging(self, acc):
+        """ idempotent function for initializing logging (will replace existing logger). """
         logger = FFIEventLogger(acc, logid=acc._logid, init_time=self.init_time)
-        acc.add_account_plugin(logger, name=acc._logid)
+        acc.add_account_plugin(logger, name="logger-" + acc._logid)
 
-    def init_direct_imap(self, acc):
-        """ idempotent function for initializing direct_imap."""
+    def init_imap(self, acc):
+        """ initialize direct_imap and cleanup server state. """
         from deltachat.direct_imap import DirectImap
+
+        assert acc.is_configured()
         if not hasattr(acc, "direct_imap"):
             acc.direct_imap = DirectImap(acc)
         addr = acc.get_config("addr")
@@ -315,16 +369,20 @@ class ACFactory:
         self.tmpdir = tmpdir
         self.pytestconfig = request.config
         self.data = data
+        self.testprocess = testprocess
         self._liveconfig_producer = testprocess.get_liveconfig_producer()
 
         self._finalizers = []
         self._accounts = []
-        self._acsetup = ACSetup(self.init_time)
+        self._acsetup = ACSetup(testprocess, self.init_time)
         self._preconfigured_keys = ["alice", "bob", "charlie",
                                     "dom", "elena", "fiona"]
         self.set_logging_default(False)
         request.addfinalizer(self.finalize)
 
+    def log(self, *args):
+        print("[acfactory]", "{:.3f}".format(time.time() - self.init_time), *args)
+
     def finalize(self):
         while self._finalizers:
             fin = self._finalizers.pop()
@@ -344,7 +402,7 @@ class ACFactory:
         """ Base function to get functional online configurations
         where we can make valid SMTP and IMAP connections with.
         """
-        configdict = next(self._liveconfig_producer)
+        configdict = next(self._liveconfig_producer).copy()
         if "e2ee_enabled" not in configdict:
             configdict["e2ee_enabled"] = "1"
 
@@ -356,9 +414,19 @@ class ACFactory:
         assert "addr" in configdict and "mail_pw" in configdict
         return configdict
 
+    def _get_cached_account(self, addr):
+        if addr in self.testprocess._addr2files:
+            return self._getaccount(addr)
+
     def get_unconfigured_account(self):
+        return self._getaccount()
+
+    def _getaccount(self, try_cache_addr=None):
         logid = "ac{}".format(len(self._accounts) + 1)
-        path = self.tmpdir.join(logid)
+        # we need to use fixed database basename for maybe_cache_* functions to work
+        path = self.tmpdir.mkdir(logid).join("dc.db")
+        if try_cache_addr:
+            self.testprocess.cache_maybe_retrieve_configured_db_files(try_cache_addr, path)
         ac = Account(path.strpath, logging=self._logging)
         ac._logid = logid  # later instantiated FFIEventLogger needs this
         ac._evtracker = ac.add_account_plugin(FFIEventTracker(ac))
@@ -391,7 +459,7 @@ class ACFactory:
     def get_pseudo_configured_account(self):
         # do a pseudo-configured account
         ac = self.get_unconfigured_account()
-        acname = os.path.basename(ac.db_path)
+        acname = ac._logid
         addr = "{}@offline.org".format(acname)
         ac.update_config(dict(
             addr=addr, displayname=acname, mail_pw="123",
@@ -402,7 +470,7 @@ class ACFactory:
         self._acsetup.init_logging(ac)
         return ac
 
-    def new_online_configuring_account(self, cloned_from=None, **kwargs):
+    def new_online_configuring_account(self, cloned_from=None, cache=False, **kwargs):
         if cloned_from is None:
             configdict = self.get_next_liveconfig()
         else:
@@ -412,6 +480,12 @@ class ACFactory:
                 mail_pw=cloned_from.get_config("mail_pw"),
             )
         configdict.update(kwargs)
+        ac = self._get_cached_account(addr=configdict["addr"]) if cache else None
+        if ac is not None:
+            # make sure we consume a preconfig key, as if we had created a fresh account
+            self._preconfigured_keys.pop(0)
+            self._acsetup.add_configured(ac)
+            return ac
         ac = self.prepare_account_from_liveconfig(configdict)
         self._acsetup.start_configure(ac)
         return ac
@@ -436,9 +510,11 @@ class ACFactory:
         print("all accounts online")
 
     def get_online_accounts(self, num):
-        # to reduce number of log events logging starts after accounts can receive
-        accounts = [self.new_online_configuring_account() for i in range(num)]
+        accounts = [self.new_online_configuring_account(cache=True) for i in range(num)]
         self.bring_accounts_online()
+        # we cache fully configured and started accounts
+        for acc in accounts:
+            self.testprocess.cache_maybe_store_configured_db_files(acc)
         return accounts
 
     def run_bot_process(self, module, ffi=True):
@@ -480,10 +556,6 @@ class ACFactory:
             ac.dump_account_info(logfile=logfile)
             imap = getattr(ac, "direct_imap", None)
             if imap is not None:
-                try:
-                    imap.idle_done()
-                except Exception:
-                    pass
                 imap.dump_imap_structures(self.tmpdir, logfile=logfile)
 
     def get_accepted_chat(self, ac1: Account, ac2: Account):
@@ -501,6 +573,7 @@ class ACFactory:
                     acc2.create_chat(acc).send_text("hi back")
                     to_wait.append(acc)
         for acc in to_wait:
+            acc.log("waiting for incoming message")
             acc._evtracker.wait_next_incoming_message()
 
 

python/tests/bench_test_setup.py

@@ -8,11 +8,13 @@ to see timings of test setups.
 
 import pytest
 
+BENCH_NUM = 3
+
 
 class TestEmpty:
     def test_prepare_setup_measurings(self, acfactory):
-        acfactory.get_online_accounts(5)
+        acfactory.get_online_accounts(BENCH_NUM)
 
-    @pytest.mark.parametrize("num", range(0, 5))
+    @pytest.mark.parametrize("num", range(0, BENCH_NUM + 1))
     def test_setup_online_accounts(self, acfactory, num):
         acfactory.get_online_accounts(num)

python/tests/test_1_online.py

@@ -419,8 +419,8 @@ def test_send_and_receive_message_markseen(acfactory, lp):
             assert msg2.chat.id == msg4.chat.id
             assert ev.data1 == msg2.chat.id
             assert ev.data2 == 0
+            idle2.wait_for_seen()
 
-            idle2.wait_for_new_message()
         lp.step("1")
         for i in range(2):
             ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
@@ -689,7 +689,7 @@ def test_gossip_encryption_preference(acfactory, lp):
     msg = ac1._evtracker.wait_next_incoming_message()
     assert msg.text == "first message"
     assert not msg.is_encrypted()
-    res = "{} End-to-end encryption preferred.".format(ac2.get_config('addr'))
+    res = "End-to-end encryption preferred:\n{}".format(ac2.get_config('addr'))
     assert msg.chat.get_encryption_info() == res
     lp.sec("ac2 learns that ac3 prefers encryption")
     ac2.create_chat(ac3)
@@ -701,7 +701,7 @@ def test_gossip_encryption_preference(acfactory, lp):
     lp.sec("ac3 does not know that ac1 prefers encryption")
     ac1.create_chat(ac3)
     chat = ac3.create_chat(ac1)
-    res = "{} No encryption.".format(ac1.get_config('addr'))
+    res = "No encryption:\n{}".format(ac1.get_config('addr'))
     assert chat.get_encryption_info() == res
     msg = chat.send_text("not encrypted")
     msg = ac1._evtracker.wait_next_incoming_message()
@@ -712,7 +712,7 @@ def test_gossip_encryption_preference(acfactory, lp):
     group_chat = ac1.create_group_chat("hello")
     group_chat.add_contact(ac2)
     encryption_info = group_chat.get_encryption_info()
-    res = "{} End-to-end encryption preferred.".format(ac2.get_config("addr"))
+    res = "End-to-end encryption preferred:\n{}".format(ac2.get_config("addr"))
     assert encryption_info == res
     msg = group_chat.send_text("hi")
 
@@ -727,10 +727,9 @@ def test_gossip_encryption_preference(acfactory, lp):
     lp.sec("ac3 learns that ac1 prefers encryption")
     msg = ac3._evtracker.wait_next_incoming_message()
     encryption_info = msg.chat.get_encryption_info().splitlines()
-    res = "{} End-to-end encryption preferred.".format(ac1.get_config("addr"))
-    assert res in encryption_info
-    res = "{} End-to-end encryption preferred.".format(ac2.get_config("addr"))
-    assert res in encryption_info
+    assert encryption_info[0] == "End-to-end encryption preferred:"
+    assert ac1.get_config("addr") in encryption_info[1:]
+    assert ac2.get_config("addr") in encryption_info[1:]
     msg = chat.send_text("encrypted")
     assert msg.is_encrypted()
 

python/tests/test_4_lowlevel.py

@@ -1,4 +1,5 @@
-from __future__ import print_function
+
+import os
 
 from queue import Queue
 from deltachat import capi, cutil, const
@@ -6,28 +7,44 @@ from deltachat import register_global_plugin
 from deltachat.hookspec import global_hookimpl
 from deltachat.capi import ffi
 from deltachat.capi import lib
-from deltachat.testplugin import ACSetup
+from deltachat.testplugin import ACSetup, create_dict_from_files_in_path, write_dict_to_dir
 # from deltachat.account import EventLogger
 
 
 class TestACSetup:
-    def test_basic_states(self, acfactory, monkeypatch):
-        pc = ACSetup(init_time=0.0)
+
+    def test_cache_writing(self, tmp_path):
+        base = tmp_path.joinpath("hello")
+        base.mkdir()
+        d1 = base.joinpath("dir1")
+        d1.mkdir()
+        d1.joinpath("file1").write_bytes(b'content1')
+        d2 = d1.joinpath("dir2")
+        d2.mkdir()
+        d2.joinpath("file2").write_bytes(b"123")
+        d = create_dict_from_files_in_path(base)
+        newbase = tmp_path.joinpath("other")
+        write_dict_to_dir(d, newbase)
+        assert newbase.joinpath("dir1", "dir2", "file2").exists()
+        assert newbase.joinpath("dir1", "file1").exists()
+
+    def test_basic_states(self, acfactory, monkeypatch, testprocess):
+        pc = ACSetup(init_time=0.0, testprocess=testprocess)
         acc = acfactory.get_unconfigured_account()
         monkeypatch.setattr(acc, "configure", lambda **kwargs: None)
         pc.start_configure(acc)
         assert pc._account2state[acc] == pc.CONFIGURING
         pc._configured_events.put((acc, True))
-        monkeypatch.setattr(pc, "init_direct_imap", lambda *args, **kwargs: None)
+        monkeypatch.setattr(pc, "init_imap", lambda *args, **kwargs: None)
         pc.wait_one_configured(acc)
         assert pc._account2state[acc] == pc.CONFIGURED
         monkeypatch.setattr(pc, "_onconfigure_start_io", lambda *args, **kwargs: None)
         pc.bring_online()
         assert pc._account2state[acc] == pc.IDLEREADY
 
-    def test_two_accounts_one_waited_all_started(self, monkeypatch, acfactory):
-        pc = ACSetup(init_time=0.0)
-        monkeypatch.setattr(pc, "init_direct_imap", lambda *args, **kwargs: None)
+    def test_two_accounts_one_waited_all_started(self, monkeypatch, acfactory, testprocess):
+        pc = ACSetup(init_time=0.0, testprocess=testprocess)
+        monkeypatch.setattr(pc, "init_imap", lambda *args, **kwargs: None)
         monkeypatch.setattr(pc, "_onconfigure_start_io", lambda *args, **kwargs: None)
         ac1 = acfactory.get_unconfigured_account()
         monkeypatch.setattr(ac1, "configure", lambda **kwargs: None)
@@ -46,6 +63,29 @@ class TestACSetup:
         assert pc._account2state[ac1] == pc.IDLEREADY
         assert pc._account2state[ac2] == pc.IDLEREADY
 
+    def test_store_and_retrieve_configured_account_cache(self, acfactory, tmpdir):
+        ac1 = acfactory.get_pseudo_configured_account()
+        holder = acfactory._acsetup.testprocess
+        assert holder.cache_maybe_store_configured_db_files(ac1)
+        assert not holder.cache_maybe_store_configured_db_files(ac1)
+        acdir = tmpdir.mkdir("newaccount")
+        addr = ac1.get_config("addr")
+        target_db_path = acdir.join("db").strpath
+        assert holder.cache_maybe_retrieve_configured_db_files(addr, target_db_path)
+        assert len(os.listdir(acdir)) >= 2
+
+
+def test_liveconfig_caching(acfactory, monkeypatch):
+    prod = [
+        {"addr": "1@example.org", "mail_pw": "123"},
+    ]
+    acfactory._liveconfig_producer = iter(prod)
+    d1 = acfactory.get_next_liveconfig()
+    d1["hello"] = "world"
+    acfactory._liveconfig_producer = iter(prod)
+    d2 = acfactory.get_next_liveconfig()
+    assert "hello" not in d2
+
 
 def test_empty_context():
     ctx = capi.lib.dc_context_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL)

rust-toolchain

@@ -1 +1 @@
-1.60.0
+1.61.0

scripts/docker-coredeps-arm64/deps/build_rust.sh

@@ -8,7 +8,7 @@ set -e -x
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.60.0
+RUST_VERSION=1.61.0
 
 curl "https://static.rust-lang.org/dist/rust-${RUST_VERSION}-$(uname -m)-unknown-linux-gnu.tar.gz" | tar xz
 cd "rust-${RUST_VERSION}-$(uname -m)-unknown-linux-gnu"

scripts/docker-coredeps/deps/build_rust.sh

@@ -8,7 +8,7 @@ set -e -x
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.60.0
+RUST_VERSION=1.61.0
 
 curl "https://static.rust-lang.org/dist/rust-${RUST_VERSION}-$(uname -m)-unknown-linux-gnu.tar.gz" | tar xz
 cd "rust-${RUST_VERSION}-$(uname -m)-unknown-linux-gnu"

scripts/set_core_version.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import os
-import sys
+import json
 import re
 import pathlib
 import subprocess
@@ -41,6 +41,24 @@ def replace_toml_version(relpath, newversion):
     os.rename(tmp_path, str(p))
 
 
+def read_json_version(relpath):
+    p = pathlib.Path("package.json")
+    assert p.exists()
+    with open(p, "r") as f:
+        json_data = json.loads(f.read())
+    return json_data["version"]
+
+
+def update_package_json(newversion):
+    p = pathlib.Path("package.json")
+    assert p.exists()
+    with open(p, "r") as f:
+        json_data = json.loads(f.read())
+    json_data["version"] = newversion
+    with open(p, "w") as f:
+        f.write(json.dumps(json_data, sort_keys=True, indent=2))
+
+
 def main():
     parser = ArgumentParser(prog="set_core_version")
     parser.add_argument("newversion")
@@ -52,6 +70,7 @@ def main():
         print()
         for x in toml_list:
             print("{}: {}".format(x, read_toml_version(x)))
+        print("package.json:", str(read_json_version("package.json")))
         print()
         raise SystemExit("need argument: new version, example: 1.25.0")
 
@@ -74,6 +93,7 @@ def main():
 
     replace_toml_version("Cargo.toml", newversion)
     replace_toml_version("deltachat-ffi/Cargo.toml", newversion)
+    update_package_json(newversion)
 
     print("running cargo check")
     subprocess.call(["cargo", "check"])

src/accounts.rs

@@ -141,9 +141,10 @@ impl Accounts {
 
     /// Remove an account.
     pub async fn remove_account(&mut self, id: u32) -> Result<()> {
-        let ctx = self.accounts.remove(&id);
-        ensure!(ctx.is_some(), "no account with this id: {}", id);
-        let ctx = ctx.unwrap();
+        let ctx = self
+            .accounts
+            .remove(&id)
+            .with_context(|| format!("no account with id {}", id))?;
         ctx.stop_io().await;
         drop(ctx);
 
@@ -445,7 +446,7 @@ impl Config {
         let id = {
             let id = self.inner.next_id;
             let uuid = Uuid::new_v4();
-            let target_dir = dir.join(uuid.to_simple_ref().to_string());
+            let target_dir = dir.join(uuid.to_string());
 
             self.inner.accounts.push(AccountConfig {
                 id,

src/blob.rs

@@ -289,7 +289,7 @@ impl<'a> BlobObject<'a> {
 
     /// Returns the filename of the blob.
     pub fn as_file_name(&self) -> &str {
-        self.name.rsplit('/').next().unwrap()
+        self.name.rsplit('/').next().unwrap_or_default()
     }
 
     /// The path relative in the blob directory.
@@ -1083,8 +1083,7 @@ mod tests {
         assert_eq!(img.width() as u32, compressed_width);
         assert_eq!(img.height() as u32, compressed_height);
 
-        bob.recv_msg(&sent).await;
-        let bob_msg = bob.get_last_msg().await;
+        let bob_msg = bob.recv_msg(&sent).await;
         assert_eq!(bob_msg.get_width() as u32, compressed_width);
         assert_eq!(bob_msg.get_height() as u32, compressed_height);
         let file = bob_msg.get_file(&bob).unwrap();

src/chat.rs

@@ -41,16 +41,12 @@ use crate::webxdc::WEBXDC_SUFFIX;
 use crate::{location, sql};
 
 /// An chat item, such as a message or a marker.
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub enum ChatItem {
     Message {
         msg_id: MsgId,
     },
 
-    /// A marker without inherent meaning. It is inserted before user
-    /// supplied MsgId.
-    Marker1,
-
     /// Day marker, separating messages that correspond to different
     /// days according to local time.
     DayMarker {
@@ -790,7 +786,7 @@ impl ChatId {
         );
         let row = sql
             .query_row_optional(
-                query,
+                &query,
                 paramsv![
                     self,
                     MessageState::OutPreparing,
@@ -846,7 +842,9 @@ impl ChatId {
     ///
     /// To get more verbose summary for a contact, including its key fingerprint, use [`Contact::get_encrinfo`].
     pub async fn get_encryption_info(self, context: &Context) -> Result<String> {
-        let mut ret = String::new();
+        let mut ret_mutual = String::new();
+        let mut ret_nopreference = String::new();
+        let mut ret_reset = String::new();
 
         for contact_id in get_chat_contacts(context, self)
             .await?
@@ -857,7 +855,7 @@ impl ChatId {
             let addr = contact.get_addr();
             let peerstate = Peerstate::from_addr(context, addr).await?;
 
-            let stock_message = match peerstate
+            match peerstate
                 .filter(|peerstate| {
                     peerstate
                         .peek_key(PeerstateVerifiedStatus::Unverified)
@@ -865,18 +863,39 @@ impl ChatId {
                 })
                 .map(|peerstate| peerstate.prefer_encrypt)
             {
-                Some(EncryptPreference::Mutual) => stock_str::e2e_preferred(context).await,
-                Some(EncryptPreference::NoPreference) => stock_str::e2e_available(context).await,
-                Some(EncryptPreference::Reset) => stock_str::encr_none(context).await,
-                None => stock_str::encr_none(context).await,
+                Some(EncryptPreference::Mutual) => ret_mutual += &format!("{}\n", addr),
+                Some(EncryptPreference::NoPreference) => ret_nopreference += &format!("{}\n", addr),
+                Some(EncryptPreference::Reset) | None => ret_reset += &format!("{}\n", addr),
             };
-            if !ret.is_empty() {
-                ret.push('\n')
-            }
-            ret += &format!("{} {}", addr, stock_message);
         }
 
-        Ok(ret)
+        let mut ret = String::new();
+        if !ret_reset.is_empty() {
+            ret += &stock_str::encr_none(context).await;
+            ret.push(':');
+            ret.push('\n');
+            ret += &ret_reset;
+        }
+        if !ret_nopreference.is_empty() {
+            if !ret.is_empty() {
+                ret.push('\n');
+            }
+            ret += &stock_str::e2e_available(context).await;
+            ret.push(':');
+            ret.push('\n');
+            ret += &ret_nopreference;
+        }
+        if !ret_mutual.is_empty() {
+            if !ret.is_empty() {
+                ret.push('\n');
+            }
+            ret += &stock_str::e2e_preferred(context).await;
+            ret.push(':');
+            ret.push('\n');
+            ret += &ret_mutual;
+        }
+
+        Ok(ret.trim().to_string())
     }
 
     /// Bad evil escape hatch.
@@ -1022,7 +1041,9 @@ impl Chat {
         if chat.id.is_archived_link() {
             chat.name = stock_str::archived_chats(context).await;
         } else {
-            if chat.typ == Chattype::Single {
+            if chat.typ == Chattype::Single && chat.name.is_empty() {
+                // chat.name is set to contact.display_name on changes,
+                // however, if things went wrong somehow, we do this here explicitly.
                 let mut chat_name = "Err [Name not found]".to_owned();
                 match get_chat_contacts(context, chat.id).await {
                     Ok(contacts) => {
@@ -2176,7 +2197,6 @@ pub async fn get_chat_msgs(
     context: &Context,
     chat_id: ChatId,
     flags: u32,
-    marker1before: Option<MsgId>,
 ) -> Result<Vec<ChatItem>> {
     let process_row = if (flags & DC_GCM_INFO_ONLY) != 0 {
         |row: &rusqlite::Row| {
@@ -2226,12 +2246,8 @@ pub async fn get_chat_msgs(
         let mut ret = Vec::new();
         let mut last_day = 0;
         let cnv_to_local = dc_gm2local_offset();
-        let marker1 = marker1before.unwrap_or_else(MsgId::new_unset);
 
         for (ts, curr_id) in sorted_rows {
-            if curr_id == marker1 {
-                ret.push(ChatItem::Marker1);
-            }
             if (flags & DC_GCM_ADDDAYMARKER) != 0 {
                 let curr_local_timestamp = ts + cnv_to_local;
                 let curr_day = curr_local_timestamp / 86400;
@@ -3047,7 +3063,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
         let ids = context
             .sql
             .query_map(
-                format!(
+                &format!(
                     "SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id",
                     sql::repeat_vars(msg_ids.len())
                 ),
@@ -3662,12 +3678,11 @@ mod tests {
 
         // create group and sync it to the second device
         let a1_chat_id = create_group_chat(&a1, ProtectionStatus::Unprotected, "foo").await?;
-        send_text_msg(&a1, a1_chat_id, "ho!".to_string()).await?;
+        a1.send_text(a1_chat_id, "ho!").await;
         let a1_msg = a1.get_last_msg().await;
         let a1_chat = Chat::load_from_db(&a1, a1_chat_id).await?;
 
-        a2.recv_msg(&a1.pop_sent_msg().await).await;
-        let a2_msg = a2.get_last_msg().await;
+        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
         let a2_chat_id = a2_msg.chat_id;
         let a2_chat = Chat::load_from_db(&a2, a2_chat_id).await?;
 
@@ -3686,8 +3701,7 @@ mod tests {
         add_contact_to_chat(&a1, a1_chat_id, bob).await?;
         let a1_msg = a1.get_last_msg().await;
 
-        a2.recv_msg(&a1.pop_sent_msg().await).await;
-        let a2_msg = a2.get_last_msg().await;
+        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
 
         assert!(a1_msg.is_system_message());
         assert!(a2_msg.is_system_message());
@@ -3700,8 +3714,7 @@ mod tests {
         set_chat_name(&a1, a1_chat_id, "bar").await?;
         let a1_msg = a1.get_last_msg().await;
 
-        a2.recv_msg(&a1.pop_sent_msg().await).await;
-        let a2_msg = a2.get_last_msg().await;
+        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
 
         assert!(a1_msg.is_system_message());
         assert!(a2_msg.is_system_message());
@@ -3714,8 +3727,7 @@ mod tests {
         remove_contact_from_chat(&a1, a1_chat_id, bob).await?;
         let a1_msg = a1.get_last_msg().await;
 
-        a2.recv_msg(&a1.pop_sent_msg().await).await;
-        let a2_msg = a2.get_last_msg().await;
+        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
 
         assert!(a1_msg.is_system_message());
         assert!(a2_msg.is_system_message());
@@ -3778,10 +3790,9 @@ mod tests {
         bob.recv_msg(&add3).await;
         async_std::task::sleep(std::time::Duration::from_millis(1100)).await;
 
-        bob.recv_msg(&add2).await;
+        let bob_chat_id = bob.recv_msg(&add2).await.chat_id;
         async_std::task::sleep(std::time::Duration::from_millis(1100)).await;
 
-        let bob_chat_id = bob.get_last_msg().await.chat_id;
         assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 4);
 
         bob.recv_msg(&remove2).await;
@@ -3850,12 +3861,11 @@ mod tests {
 
         // Alice sends first message to group.
         let sent_msg = alice.send_text(alice_chat_id, "Hello!").await;
-        bob.recv_msg(&sent_msg).await;
+        let bob_msg = bob.recv_msg(&sent_msg).await;
 
         assert_eq!(get_chat_contacts(&alice, alice_chat_id).await?.len(), 2);
 
         // Bob leaves the group.
-        let bob_msg = bob.get_last_msg().await;
         let bob_chat_id = bob_msg.chat_id;
         bob_chat_id.accept(&bob).await?;
         remove_contact_from_chat(&bob, bob_chat_id, ContactId::SELF).await?;
@@ -4547,7 +4557,7 @@ mod tests {
         assert!(chat.is_protected());
         assert!(chat.is_unpromoted());
 
-        let msgs = get_chat_msgs(&t, chat_id, 0, None).await.unwrap();
+        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         let msg = t.get_last_msg_in(chat_id).await;
@@ -4577,7 +4587,7 @@ mod tests {
         assert!(!chat.is_protected());
         assert!(!chat.is_unpromoted());
 
-        let msgs = get_chat_msgs(&t, chat_id, 0, None).await.unwrap();
+        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 3);
 
         // enable protection on promoted chat, the info-message is sent via send_msg() this time
@@ -4674,10 +4684,7 @@ mod tests {
         add_contact_to_chat(&alice, alice_chat_id, contact_id).await?;
         assert_eq!(get_chat_contacts(&alice, alice_chat_id).await?.len(), 2);
         send_text_msg(&alice, alice_chat_id, "hi!".to_string()).await?;
-        assert_eq!(
-            get_chat_msgs(&alice, alice_chat_id, 0, None).await?.len(),
-            1
-        );
+        assert_eq!(get_chat_msgs(&alice, alice_chat_id, 0).await?.len(), 1);
 
         // Alice has an SMTP-server replacing the `Message-ID:`-header (as done eg. by outlook.com).
         let sent_msg = alice.pop_sent_msg().await;
@@ -4710,10 +4717,7 @@ mod tests {
         let msg = alice.get_last_msg().await;
         assert_eq!(msg.chat_id, alice_chat_id);
         assert_eq!(msg.text, Some("ho!".to_string()));
-        assert_eq!(
-            get_chat_msgs(&alice, alice_chat_id, 0, None).await?.len(),
-            2
-        );
+        assert_eq!(get_chat_msgs(&alice, alice_chat_id, 0).await?.len(), 2);
         Ok(())
     }
 
@@ -4741,7 +4745,7 @@ mod tests {
         assert_eq!(chat.id.get_fresh_msg_cnt(&t).await?, 1);
         assert_eq!(t.get_fresh_msgs().await?.len(), 1);
 
-        let msgs = get_chat_msgs(&t, chat.id, 0, None).await?;
+        let msgs = get_chat_msgs(&t, chat.id, 0).await?;
         assert_eq!(msgs.len(), 1);
         let msg_id = match msgs.first().unwrap() {
             ChatItem::Message { msg_id } => *msg_id,
@@ -4791,7 +4795,7 @@ mod tests {
             .is_contact_request());
         assert_eq!(chat_id.get_msg_cnt(&t).await?, 1);
         assert_eq!(chat_id.get_fresh_msg_cnt(&t).await?, 1);
-        let msgs = get_chat_msgs(&t, chat_id, 0, None).await?;
+        let msgs = get_chat_msgs(&t, chat_id, 0).await?;
         assert_eq!(msgs.len(), 1);
         let msg_id = match msgs.first().unwrap() {
             ChatItem::Message { msg_id } => *msg_id,
@@ -4879,7 +4883,7 @@ mod tests {
         let chat_id = msg.chat_id;
         assert_eq!(chat_id.get_fresh_msg_cnt(&alice).await?, 1);
 
-        let msgs = get_chat_msgs(&alice, chat_id, 0, None).await?;
+        let msgs = get_chat_msgs(&alice, chat_id, 0).await?;
         assert_eq!(msgs.len(), 1);
 
         // Alice disables receiving classic emails.
@@ -4891,12 +4895,28 @@ mod tests {
         // Already received classic email should still be in the chat.
         assert_eq!(chat_id.get_fresh_msg_cnt(&alice).await?, 1);
 
-        let msgs = get_chat_msgs(&alice, chat_id, 0, None).await?;
+        let msgs = get_chat_msgs(&alice, chat_id, 0).await?;
         assert_eq!(msgs.len(), 1);
 
         Ok(())
     }
 
+    #[async_std::test]
+    async fn test_chat_get_color() -> Result<()> {
+        let t = TestContext::new().await;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "a chat").await?;
+        let color1 = Chat::load_from_db(&t, chat_id).await?.get_color(&t).await?;
+        assert_eq!(color1, 0x008772);
+
+        // upper-/lowercase makes a difference for the colors, these are different groups
+        // (in contrast to email addresses, where upper-/lowercase is ignored in practise)
+        let t = TestContext::new().await;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "A CHAT").await?;
+        let color2 = Chat::load_from_db(&t, chat_id).await?.get_color(&t).await?;
+        assert_ne!(color2, color1);
+        Ok(())
+    }
+
     async fn test_sticker(filename: &str, bytes: &[u8], w: i32, h: i32) -> Result<()> {
         let alice = TestContext::new_alice().await;
         let bob = TestContext::new_bob().await;
@@ -4913,8 +4933,7 @@ mod tests {
         let mime = sent_msg.payload();
         assert_eq!(mime.match_indices("Chat-Content: sticker").count(), 1);
 
-        bob.recv_msg(&sent_msg).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&sent_msg).await;
         assert_eq!(msg.chat_id, bob_chat.id);
         assert_eq!(msg.get_viewtype(), Viewtype::Sticker);
         assert_eq!(msg.get_filename(), Some(filename.to_string()));
@@ -4976,18 +4995,16 @@ mod tests {
 
         // send sticker to bob
         let sent_msg = alice.send_msg(alice_chat.get_id(), &mut msg).await;
-        bob.recv_msg(&sent_msg).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&sent_msg).await;
 
         // forward said sticker to alice
         forward_msgs(&bob, &[msg.id], bob_chat.get_id()).await?;
         let forwarded_msg = bob.pop_sent_msg().await;
-        alice.recv_msg(&forwarded_msg).await;
-
-        // retrieve forwarded sticker which should not have forwarded-flag
-        let msg = alice.get_last_msg().await;
 
+        let msg = alice.recv_msg(&forwarded_msg).await;
+        // forwarded sticker should not have forwarded-flag
         assert!(!msg.is_forwarded());
+
         Ok(())
     }
 
@@ -5001,15 +5018,12 @@ mod tests {
         let mut msg = Message::new(Viewtype::Text);
         msg.set_text(Some("Hi Bob".to_owned()));
         let sent_msg = alice.send_msg(alice_chat.get_id(), &mut msg).await;
-        bob.recv_msg(&sent_msg).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&sent_msg).await;
 
         forward_msgs(&bob, &[msg.id], bob_chat.get_id()).await?;
 
         let forwarded_msg = bob.pop_sent_msg().await;
-        alice.recv_msg(&forwarded_msg).await;
-
-        let msg = alice.get_last_msg().await;
+        let msg = alice.recv_msg(&forwarded_msg).await;
         assert!(msg.get_text().unwrap() == "Hi Bob");
         assert!(msg.is_forwarded());
         Ok(())
@@ -5024,23 +5038,19 @@ mod tests {
 
         // Alice sends a message to Bob.
         let sent_msg = alice.send_text(alice_chat.id, "Hi Bob").await;
-        bob.recv_msg(&sent_msg).await;
-        let received_msg = bob.get_last_msg().await;
+        let received_msg = bob.recv_msg(&sent_msg).await;
 
         // Bob quotes received message and sends a reply to Alice.
         let mut reply = Message::new(Viewtype::Text);
         reply.set_text(Some("Reply".to_owned()));
         reply.set_quote(&bob, Some(&received_msg)).await?;
         let sent_reply = bob.send_msg(bob_chat.id, &mut reply).await;
-        alice.recv_msg(&sent_reply).await;
-        let received_reply = alice.get_last_msg().await;
+        let received_reply = alice.recv_msg(&sent_reply).await;
 
         // Alice forwards a reply.
         forward_msgs(&alice, &[received_reply.id], alice_chat.get_id()).await?;
         let forwarded_msg = alice.pop_sent_msg().await;
-        bob.recv_msg(&forwarded_msg).await;
-
-        let alice_forwarded_msg = alice.get_last_msg().await;
+        let alice_forwarded_msg = bob.recv_msg(&forwarded_msg).await;
         assert!(alice_forwarded_msg.quoted_message(&alice).await?.is_none());
         assert_eq!(
             alice_forwarded_msg.quoted_text(),
@@ -5072,8 +5082,7 @@ mod tests {
         let sent_group_msg = alice
             .send_text(alice_group_chat_id, "Hi Bob and Claire")
             .await;
-        bob.recv_msg(&sent_group_msg).await;
-        let bob_group_chat_id = bob.get_last_msg().await.chat_id;
+        let bob_group_chat_id = bob.recv_msg(&sent_group_msg).await.chat_id;
 
         // Alice deletes a message on her device.
         // This is needed to make assignment of further messages received in this group
@@ -5083,15 +5092,13 @@ mod tests {
 
         // Alice sends a message to Bob.
         let sent_msg = alice.send_text(alice_chat.id, "Hi Bob").await;
-        bob.recv_msg(&sent_msg).await;
-        let received_msg = bob.get_last_msg().await;
+        let received_msg = bob.recv_msg(&sent_msg).await;
         assert_eq!(received_msg.get_text(), Some("Hi Bob".to_string()));
         assert_eq!(received_msg.chat_id, bob_chat.id);
 
         // Alice sends another message to Bob, this has first message as a parent.
         let sent_msg = alice.send_text(alice_chat.id, "Hello Bob").await;
-        bob.recv_msg(&sent_msg).await;
-        let received_msg = bob.get_last_msg().await;
+        let received_msg = bob.recv_msg(&sent_msg).await;
         assert_eq!(received_msg.get_text(), Some("Hello Bob".to_string()));
         assert_eq!(received_msg.chat_id, bob_chat.id);
 
@@ -5128,8 +5135,7 @@ mod tests {
         // Bob forwards that message to Claire -
         // Claire should not get information about Alice for the original Group
         let bob = TestContext::new_bob().await;
-        bob.recv_msg(&sent_msg).await;
-        let orig_msg = bob.get_last_msg().await;
+        let orig_msg = bob.recv_msg(&sent_msg).await;
         let claire_id = Contact::create(&bob, "claire", "claire@foo").await?;
         let single_id = ChatId::create_for_contact(&bob, claire_id).await?;
         let group_id = create_group_chat(&bob, ProtectionStatus::Unprotected, "group2").await?;
@@ -5176,27 +5182,27 @@ mod tests {
 
         // Bob receives all messages
         let bob = TestContext::new_bob().await;
-        bob.recv_msg(&sent1).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&sent1).await;
         assert_eq!(msg.get_text().unwrap(), "alice->bob");
         assert_eq!(get_chat_contacts(&bob, msg.chat_id).await?.len(), 2);
-        assert_eq!(get_chat_msgs(&bob, msg.chat_id, 0, None).await?.len(), 1);
+        assert_eq!(get_chat_msgs(&bob, msg.chat_id, 0).await?.len(), 1);
         bob.recv_msg(&sent2).await;
         assert_eq!(get_chat_contacts(&bob, msg.chat_id).await?.len(), 3);
-        assert_eq!(get_chat_msgs(&bob, msg.chat_id, 0, None).await?.len(), 2);
-        bob.recv_msg(&sent3).await;
+        assert_eq!(get_chat_msgs(&bob, msg.chat_id, 0).await?.len(), 2);
+        let received = bob.recv_msg_opt(&sent3).await;
+        // No message should actually be added since we already know this message:
+        assert!(received.is_none());
         assert_eq!(get_chat_contacts(&bob, msg.chat_id).await?.len(), 3);
-        assert_eq!(get_chat_msgs(&bob, msg.chat_id, 0, None).await?.len(), 2);
+        assert_eq!(get_chat_msgs(&bob, msg.chat_id, 0).await?.len(), 2);
 
         // Claire does not receive the first message, however, due to resending, she has a similar view as Alice and Bob
         let claire = TestContext::new().await;
         claire.configure_addr("claire@example.org").await;
         claire.recv_msg(&sent2).await;
-        claire.recv_msg(&sent3).await;
-        let msg = claire.get_last_msg().await;
+        let msg = claire.recv_msg(&sent3).await;
         assert_eq!(msg.get_text().unwrap(), "alice->bob");
         assert_eq!(get_chat_contacts(&claire, msg.chat_id).await?.len(), 3);
-        assert_eq!(get_chat_msgs(&claire, msg.chat_id, 0, None).await?.len(), 2);
+        assert_eq!(get_chat_msgs(&claire, msg.chat_id, 0).await?.len(), 2);
         let msg_from = Contact::get_by_id(&claire, msg.get_from_id()).await?;
         assert_eq!(msg_from.get_addr(), "alice@example.org");
 
@@ -5216,8 +5222,7 @@ mod tests {
         let sent1 = alice.send_text(alice_grp, "alice->bob").await;
 
         let bob = TestContext::new_bob().await;
-        bob.recv_msg(&sent1).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&sent1).await;
         assert!(resend_msgs(&bob, &[msg.id]).await.is_err());
 
         Ok(())
@@ -5238,8 +5243,7 @@ mod tests {
 
         // Bob now can send an encrypted message
         let bob = TestContext::new_bob().await;
-        bob.recv_msg(&sent1).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&sent1).await;
         assert!(!msg.get_showpadlock());
 
         msg.chat_id.accept(&bob).await?;
@@ -5323,8 +5327,7 @@ mod tests {
 
         let chat_bob = bob.create_chat(&alice).await;
         send_text_msg(&bob, chat_bob.id, "ho!".to_string()).await?;
-        alice.recv_msg(&bob.pop_sent_msg().await).await;
-        let msg = alice.get_last_msg().await;
+        let msg = alice.recv_msg(&bob.pop_sent_msg().await).await;
         assert!(msg.get_showpadlock());
 
         // test broadcast list
@@ -5344,8 +5347,7 @@ mod tests {
         let msg = alice.get_last_msg().await;
         assert_eq!(msg.chat_id, chat.id);
 
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
         assert_eq!(msg.get_text(), Some("ola!".to_string()));
         assert!(!msg.get_showpadlock()); // avoid leaking recipients in encryption data
         let chat = Chat::load_from_db(&bob, msg.chat_id).await?;
@@ -5389,4 +5391,59 @@ mod tests {
 
         Ok(())
     }
+
+    #[async_std::test]
+    async fn test_chat_get_encryption_info() -> Result<()> {
+        let alice = TestContext::new_alice().await;
+        let bob = TestContext::new_bob().await;
+
+        let contact_bob = Contact::create(&alice, "Bob", "bob@example.net").await?;
+        let contact_fiona = Contact::create(&alice, "", "fiona@example.net").await?;
+
+        let chat_id = create_group_chat(&alice, ProtectionStatus::Unprotected, "Group").await?;
+        assert_eq!(chat_id.get_encryption_info(&alice).await?, "");
+
+        add_contact_to_chat(&alice, chat_id, contact_bob).await?;
+        assert_eq!(
+            chat_id.get_encryption_info(&alice).await?,
+            "No encryption:\n\
+            bob@example.net"
+        );
+
+        add_contact_to_chat(&alice, chat_id, contact_fiona).await?;
+        assert_eq!(
+            chat_id.get_encryption_info(&alice).await?,
+            "No encryption:\n\
+            bob@example.net\n\
+            fiona@example.net"
+        );
+
+        let direct_chat = bob.create_chat(&alice).await;
+        send_text_msg(&bob, direct_chat.id, "Hello!".to_string()).await?;
+        alice.recv_msg(&bob.pop_sent_msg().await).await;
+
+        assert_eq!(
+            chat_id.get_encryption_info(&alice).await?,
+            "No encryption:\n\
+            fiona@example.net\n\
+            \n\
+            End-to-end encryption preferred:\n\
+            bob@example.net"
+        );
+
+        bob.set_config(Config::E2eeEnabled, Some("0")).await?;
+        send_text_msg(&bob, direct_chat.id, "Hello!".to_string()).await?;
+        alice.recv_msg(&bob.pop_sent_msg().await).await;
+
+        assert_eq!(
+            chat_id.get_encryption_info(&alice).await?,
+            "No encryption:\n\
+            fiona@example.net\n\
+            \n\
+            End-to-end encryption available:\n\
+            bob@example.net"
+        );
+
+        Ok(())
+    }
 }

src/config.rs

@@ -8,7 +8,7 @@ use crate::blob::BlobObject;
 use crate::constants::DC_VERSION_STR;
 use crate::contact::addr_cmp;
 use crate::context::Context;
-use crate::dc_tools::{dc_get_abs_path, improve_single_line_input};
+use crate::dc_tools::{dc_get_abs_path, improve_single_line_input, EmailAddress};
 use crate::events::EventType;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
 use crate::provider::{get_provider_by_id, Provider};
@@ -355,6 +355,8 @@ impl Context {
     ///
     /// This should only be used by test code and during configure.
     pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
+        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
+
         // add old primary address (if exists) to secondary addresses
         let mut secondary_addrs = self.get_all_self_addrs().await?;
         // never store a primary address also as a secondary
@@ -368,6 +370,17 @@ impl Context {
         self.set_config(Config::ConfiguredAddr, Some(primary_new))
             .await?;
 
+        if let Some(old_addr) = old_addr {
+            let old_addr = EmailAddress::new(&old_addr)?;
+            let old_keypair = crate::key::load_keypair(self, &old_addr).await?;
+
+            if let Some(mut old_keypair) = old_keypair {
+                old_keypair.addr = EmailAddress::new(primary_new)?;
+                crate::key::store_self_keypair(self, &old_keypair, crate::key::KeyPairUse::Default)
+                    .await?;
+            }
+        }
+
         Ok(())
     }
 
@@ -419,7 +432,9 @@ mod tests {
     use std::string::ToString;
 
     use crate::constants;
+    use crate::dc_receive_imf::dc_receive_imf;
     use crate::test_utils::TestContext;
+    use crate::test_utils::TestContextManager;
     use num_traits::FromPrimitive;
 
     #[test]
@@ -499,14 +514,14 @@ mod tests {
         assert_eq!(alice.get_all_self_addrs().await?, vec!["Alice@Example.Org"]);
 
         // Test adding a new (primary) self address
-        // The address is trimmed during by `LoginParam::from_database()`,
+        // The address is trimmed during configure by `LoginParam::from_database()`,
         // so `set_primary_self_addr()` doesn't have to trim it.
-        alice.set_primary_self_addr(" Alice@alice.com ").await?;
-        assert!(alice.is_self_addr("    aliCe@example.org").await?);
+        alice.set_primary_self_addr("Alice@alice.com").await?;
+        assert!(alice.is_self_addr("aliCe@example.org").await?);
         assert!(alice.is_self_addr("alice@alice.com").await?);
         assert_eq!(
             alice.get_all_self_addrs().await?,
-            vec![" Alice@alice.com ", "Alice@Example.Org"]
+            vec!["Alice@alice.com", "Alice@Example.Org"]
         );
 
         // Check that the entry is not duplicated
@@ -537,4 +552,68 @@ mod tests {
 
         Ok(())
     }
+
+    #[async_std::test]
+    async fn test_change_primary_self_addr() -> Result<()> {
+        let mut tcm = TestContextManager::new().await;
+        let alice = tcm.alice().await;
+        let bob = tcm.bob().await;
+
+        // Alice sends a message to Bob
+        let alice_bob_chat = alice.create_chat(&bob).await;
+        let sent = alice.send_text(alice_bob_chat.id, "Hi").await;
+        let bob_msg = bob.recv_msg(&sent).await;
+        bob_msg.chat_id.accept(&bob).await?;
+        assert_eq!(bob_msg.text.unwrap(), "Hi");
+
+        // Alice changes her self address and reconfigures
+        // (ensure_secret_key_exists() is called during configure)
+        alice
+            .set_primary_self_addr("alice@someotherdomain.xyz")
+            .await?;
+        crate::e2ee::ensure_secret_key_exists(&alice).await?;
+
+        assert_eq!(
+            alice.get_primary_self_addr().await?,
+            "alice@someotherdomain.xyz"
+        );
+
+        // Bob sends a message to Alice, encrypting to her previous key
+        let sent = bob.send_text(bob_msg.chat_id, "hi back").await;
+
+        // Alice set up message forwarding so that she still receives
+        // the message with her new address
+        let alice_msg = alice.recv_msg(&sent).await;
+        assert_eq!(alice_msg.text, Some("hi back".to_string()));
+        assert_eq!(alice_msg.get_showpadlock(), true);
+        assert_eq!(alice_msg.chat_id, alice_bob_chat.id);
+
+        // Even if Bob sends a message to Alice without In-Reply-To,
+        // it's still assigned to the 1:1 chat with Bob and not to
+        // a group (without secondary addresses, an ad-hoc group
+        // would be created)
+        dc_receive_imf(
+            &alice,
+            b"From: bob@example.net
+To: alice@example.org
+Chat-Version: 1.0
+Message-ID: <456@example.com>
+
+Message w/out In-Reply-To
+",
+            false,
+        )
+        .await?;
+
+        let alice_msg = alice.get_last_msg().await;
+
+        assert_eq!(
+            alice_msg.text,
+            Some("Message w/out In-Reply-To".to_string())
+        );
+        assert_eq!(alice_msg.get_showpadlock(), false);
+        assert_eq!(alice_msg.chat_id, alice_bob_chat.id);
+
+        Ok(())
+    }
 }

src/configure.rs

@@ -60,7 +60,7 @@ impl Context {
         use futures::future::FutureExt;
 
         ensure!(
-            !self.scheduler.read().await.is_running(),
+            self.scheduler.read().await.is_none(),
             "cannot configure, already running"
         );
         ensure!(

src/constants.rs

@@ -162,7 +162,6 @@ impl Default for Chattype {
     }
 }
 
-pub const DC_MSG_ID_MARKER1: u32 = 1;
 pub const DC_MSG_ID_DAYMARKER: u32 = 9;
 pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;
 

src/contact.rs

@@ -562,7 +562,7 @@ impl Contact {
                     .await
                     .ok();
 
-                if update_name {
+                if update_name || update_authname {
                     // Update the contact name also if it is used as a group name.
                     // This is one of the few duplicated data, however, getting the chat list is easier this way.
                     let chat_id: Option<i32> = context.sql.query_get_value(
@@ -686,7 +686,7 @@ impl Contact {
     pub async fn get_all(
         context: &Context,
         listflags: u32,
-        query: Option<impl AsRef<str>>,
+        query: Option<&str>,
     ) -> Result<Vec<ContactId>> {
         let self_addrs = context.get_all_self_addrs().await?;
         let mut add_self = false;
@@ -695,11 +695,11 @@ impl Contact {
         let flag_add_self = (listflags & DC_GCL_ADD_SELF) != 0;
 
         if flag_verified_only || query.is_some() {
-            let s3str_like_cmd = format!("%{}%", query.as_ref().map(|s| s.as_ref()).unwrap_or(""));
+            let s3str_like_cmd = format!("%{}%", query.unwrap_or(""));
             context
                 .sql
                 .query_map(
-                    format!(
+                    &format!(
                         "SELECT c.id FROM contacts c \
                  LEFT JOIN acpeerstates ps ON c.addr=ps.addr  \
                  WHERE c.addr NOT IN ({})
@@ -739,9 +739,9 @@ impl Contact {
                     .unwrap_or_default();
                 let self_name2 = stock_str::self_msg(context);
 
-                if self_addr.contains(query.as_ref())
-                    || self_name.contains(query.as_ref())
-                    || self_name2.await.contains(query.as_ref())
+                if self_addr.contains(query)
+                    || self_name.contains(query)
+                    || self_name2.await.contains(query)
                 {
                     add_self = true;
                 }
@@ -754,7 +754,7 @@ impl Contact {
             context
                 .sql
                 .query_map(
-                    format!(
+                    &format!(
                         "SELECT id FROM contacts
                  WHERE addr NOT IN ({})
                  AND id>?
@@ -889,7 +889,7 @@ impl Contact {
                 };
 
                 ret += &format!(
-                    "{}\n{}:",
+                    "{}.\n{}:",
                     stock_message,
                     stock_str::finger_prints(context).await
                 );
@@ -1082,7 +1082,7 @@ impl Contact {
     /// and can be used for an fallback avatar with white initials
     /// as well as for headlines in bubbles of group chats.
     pub fn get_color(&self) -> u32 {
-        str_to_color(&self.addr)
+        str_to_color(&self.addr.to_lowercase())
     }
 
     /// Gets the contact's status.
@@ -1396,27 +1396,23 @@ pub fn normalize_name(full_name: &str) -> String {
 fn cat_fingerprint(
     ret: &mut String,
     addr: &str,
-    fingerprint_verified: impl AsRef<str>,
-    fingerprint_unverified: impl AsRef<str>,
+    fingerprint_verified: &str,
+    fingerprint_unverified: &str,
 ) {
     *ret += &format!(
         "\n\n{}:\n{}",
         addr,
-        if !fingerprint_verified.as_ref().is_empty() {
-            fingerprint_verified.as_ref()
+        if !fingerprint_verified.is_empty() {
+            fingerprint_verified
         } else {
-            fingerprint_unverified.as_ref()
+            fingerprint_unverified
         },
     );
-    if !fingerprint_verified.as_ref().is_empty()
-        && !fingerprint_unverified.as_ref().is_empty()
-        && fingerprint_verified.as_ref() != fingerprint_unverified.as_ref()
+    if !fingerprint_verified.is_empty()
+        && !fingerprint_unverified.is_empty()
+        && fingerprint_verified != fingerprint_unverified
     {
-        *ret += &format!(
-            "\n\n{} (alternative):\n{}",
-            addr,
-            fingerprint_unverified.as_ref()
-        );
+        *ret += &format!("\n\n{} (alternative):\n{}", addr, fingerprint_unverified);
     }
 }
 
@@ -1447,7 +1443,8 @@ mod tests {
 
     use super::*;
 
-    use crate::chat::send_text_msg;
+    use crate::chat::{get_chat_contacts, send_text_msg, Chat};
+    use crate::chatlist::Chatlist;
     use crate::dc_receive_imf::dc_receive_imf;
     use crate::message::Message;
     use crate::test_utils::{self, TestContext};
@@ -1688,6 +1685,118 @@ mod tests {
         assert!(!contact.is_blocked());
     }
 
+    #[async_std::test]
+    async fn test_contact_name_changes() -> Result<()> {
+        let t = TestContext::new_alice().await;
+
+        // first message creates contact and one-to-one-chat without name set
+        dc_receive_imf(
+            &t,
+            b"From: f@example.org\n\
+                 To: alice@example.org\n\
+                 Subject: foo\n\
+                 Message-ID: <1234-1@example.org>\n\
+                 Chat-Version: 1.0\n\
+                 Date: Sun, 29 May 2022 08:37:57 +0000\n\
+                 \n\
+                 hello one\n",
+            false,
+        )
+        .await?;
+        let chat_id = t.get_last_msg().await.get_chat_id();
+        chat_id.accept(&t).await?;
+        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "f@example.org");
+        let chatlist = Chatlist::try_load(&t, 0, Some("f@example.org"), None).await?;
+        assert_eq!(chatlist.len(), 1);
+        let contacts = get_chat_contacts(&t, chat_id).await?;
+        let contact_id = contacts.first().unwrap();
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
+        assert_eq!(contact.get_authname(), "");
+        assert_eq!(contact.get_name(), "");
+        assert_eq!(contact.get_display_name(), "f@example.org");
+        assert_eq!(contact.get_name_n_addr(), "f@example.org");
+        let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
+        assert_eq!(contacts.len(), 1);
+
+        // second message inits the name
+        dc_receive_imf(
+            &t,
+            b"From: Flobbyfoo <f@example.org>\n\
+                 To: alice@example.org\n\
+                 Subject: foo\n\
+                 Message-ID: <1234-2@example.org>\n\
+                 Chat-Version: 1.0\n\
+                 Date: Sun, 29 May 2022 08:38:57 +0000\n\
+                 \n\
+                 hello two\n",
+            false,
+        )
+        .await?;
+        let chat_id = t.get_last_msg().await.get_chat_id();
+        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Flobbyfoo");
+        let chatlist = Chatlist::try_load(&t, 0, Some("flobbyfoo"), None).await?;
+        assert_eq!(chatlist.len(), 1);
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
+        assert_eq!(contact.get_authname(), "Flobbyfoo");
+        assert_eq!(contact.get_name(), "");
+        assert_eq!(contact.get_display_name(), "Flobbyfoo");
+        assert_eq!(contact.get_name_n_addr(), "Flobbyfoo (f@example.org)");
+        let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
+        assert_eq!(contacts.len(), 1);
+        let contacts = Contact::get_all(&t, 0, Some("flobbyfoo")).await?;
+        assert_eq!(contacts.len(), 1);
+
+        // third message changes the name
+        dc_receive_imf(
+            &t,
+            b"From: Foo Flobby <f@example.org>\n\
+                 To: alice@example.org\n\
+                 Subject: foo\n\
+                 Message-ID: <1234-3@example.org>\n\
+                 Chat-Version: 1.0\n\
+                 Date: Sun, 29 May 2022 08:39:57 +0000\n\
+                 \n\
+                 hello three\n",
+            false,
+        )
+        .await?;
+        let chat_id = t.get_last_msg().await.get_chat_id();
+        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Foo Flobby");
+        let chatlist = Chatlist::try_load(&t, 0, Some("Flobbyfoo"), None).await?;
+        assert_eq!(chatlist.len(), 0);
+        let chatlist = Chatlist::try_load(&t, 0, Some("Foo Flobby"), None).await?;
+        assert_eq!(chatlist.len(), 1);
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
+        assert_eq!(contact.get_authname(), "Foo Flobby");
+        assert_eq!(contact.get_name(), "");
+        assert_eq!(contact.get_display_name(), "Foo Flobby");
+        assert_eq!(contact.get_name_n_addr(), "Foo Flobby (f@example.org)");
+        let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
+        assert_eq!(contacts.len(), 1);
+        let contacts = Contact::get_all(&t, 0, Some("flobbyfoo")).await?;
+        assert_eq!(contacts.len(), 0);
+        let contacts = Contact::get_all(&t, 0, Some("Foo Flobby")).await?;
+        assert_eq!(contacts.len(), 1);
+
+        // change name manually
+        let test_id = Contact::create(&t, "Falk", "f@example.org").await?;
+        assert_eq!(*contact_id, test_id);
+        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Falk");
+        let chatlist = Chatlist::try_load(&t, 0, Some("Falk"), None).await?;
+        assert_eq!(chatlist.len(), 1);
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
+        assert_eq!(contact.get_authname(), "Foo Flobby");
+        assert_eq!(contact.get_name(), "Falk");
+        assert_eq!(contact.get_display_name(), "Falk");
+        assert_eq!(contact.get_name_n_addr(), "Falk (f@example.org)");
+        let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
+        assert_eq!(contacts.len(), 1);
+        let contacts = Contact::get_all(&t, 0, Some("falk")).await?;
+        assert_eq!(contacts.len(), 1);
+
+        Ok(())
+    }
+
     #[async_std::test]
     async fn test_delete() -> Result<()> {
         let alice = TestContext::new_alice().await;
@@ -1950,6 +2059,25 @@ mod tests {
         assert_eq!(id, Some(ContactId::SELF));
     }
 
+    #[async_std::test]
+    async fn test_contact_get_color() -> Result<()> {
+        let t = TestContext::new().await;
+        let contact_id = Contact::create(&t, "name", "name@example.net").await?;
+        let color1 = Contact::get_by_id(&t, contact_id).await?.get_color();
+        assert_eq!(color1, 0xA739FF);
+
+        let t = TestContext::new().await;
+        let contact_id = Contact::create(&t, "prename name", "name@example.net").await?;
+        let color2 = Contact::get_by_id(&t, contact_id).await?.get_color();
+        assert_eq!(color2, color1);
+
+        let t = TestContext::new().await;
+        let contact_id = Contact::create(&t, "Name", "nAme@exAmple.NET").await?;
+        let color3 = Contact::get_by_id(&t, contact_id).await?.get_color();
+        assert_eq!(color3, color1);
+        Ok(())
+    }
+
     #[async_std::test]
     async fn test_contact_get_encrinfo() -> Result<()> {
         let alice = TestContext::new_alice().await;
@@ -1965,7 +2093,7 @@ mod tests {
                 .await?;
 
         let encrinfo = Contact::get_encrinfo(&alice, contact_bob_id).await?;
-        assert_eq!(encrinfo, "No encryption.");
+        assert_eq!(encrinfo, "No encryption");
 
         let bob = TestContext::new_bob().await;
         let chat_alice = bob

src/context.rs

@@ -5,7 +5,7 @@ use std::ffi::OsString;
 use std::ops::Deref;
 use std::time::{Instant, SystemTime};
 
-use anyhow::{bail, ensure, Result};
+use anyhow::{ensure, Result};
 use async_std::{
     channel::{self, Receiver, Sender},
     path::{Path, PathBuf},
@@ -44,7 +44,7 @@ pub struct InnerContext {
     pub(crate) blobdir: PathBuf,
     pub(crate) sql: Sql,
     pub(crate) last_smeared_timestamp: RwLock<i64>,
-    pub(crate) running_state: RwLock<RunningState>,
+    running_state: RwLock<RunningState>,
     /// Mutex to avoid generating the key for the user more than once.
     pub(crate) generating_key_mutex: Mutex<()>,
     /// Mutex to enforce only a single running oauth2 is running.
@@ -54,7 +54,7 @@ pub struct InnerContext {
     pub(crate) translated_stockstrings: RwLock<HashMap<usize, String>>,
     pub(crate) events: Events,
 
-    pub(crate) scheduler: RwLock<Scheduler>,
+    pub(crate) scheduler: RwLock<Option<Scheduler>>,
 
     /// Recently loaded quota information, if any.
     /// Set to `None` if quota was never tried to load.
@@ -76,11 +76,23 @@ pub struct InnerContext {
     pub(crate) last_error: RwLock<String>,
 }
 
+/// The state of ongoing process.
 #[derive(Debug)]
-pub struct RunningState {
-    ongoing_running: bool,
-    shall_stop_ongoing: bool,
-    cancel_sender: Option<Sender<()>>,
+enum RunningState {
+    /// Ongoing process is allocated.
+    Running { cancel_sender: Sender<()> },
+
+    /// Cancel signal has been sent, waiting for ongoing process to be freed.
+    ShallStop,
+
+    /// There is no ongoing process, a new one can be allocated.
+    Stopped,
+}
+
+impl Default for RunningState {
+    fn default() -> Self {
+        Self::Stopped
+    }
 }
 
 /// Return some info about deltachat-core
@@ -173,7 +185,7 @@ impl Context {
             wrong_pw_warning_mutex: Mutex::new(()),
             translated_stockstrings: RwLock::new(HashMap::new()),
             events: Events::default(),
-            scheduler: RwLock::new(Scheduler::Stopped),
+            scheduler: RwLock::new(None),
             quota: RwLock::new(None),
             creation_time: std::time::SystemTime::now(),
             last_full_folder_scan: Mutex::new(None),
@@ -195,8 +207,12 @@ impl Context {
         }
 
         info!(self, "starting IO");
-        if let Err(err) = self.inner.scheduler.write().await.start(self.clone()).await {
-            error!(self, "Failed to start IO: {}", err)
+        let mut lock = self.inner.scheduler.write().await;
+        if lock.is_none() {
+            match Scheduler::start(self.clone()).await {
+                Err(err) => error!(self, "Failed to start IO: {}", err),
+                Ok(scheduler) => *lock = Some(scheduler),
+            }
         }
     }
 
@@ -209,8 +225,8 @@ impl Context {
         // which will emit the below event(s)
         info!(self, "stopping IO");
 
-        if let Err(err) = self.inner.stop_io().await {
-            warn!(self, "failed to stop IO: {}", err);
+        if let Some(scheduler) = self.inner.scheduler.write().await.take() {
+            scheduler.stop(self).await;
         }
     }
 
@@ -274,57 +290,47 @@ impl Context {
     // Ongoing process allocation/free/check
 
     pub(crate) async fn alloc_ongoing(&self) -> Result<Receiver<()>> {
-        if self.has_ongoing().await {
-            bail!("There is already another ongoing process running.");
-        }
+        let mut s = self.running_state.write().await;
+        ensure!(
+            matches!(*s, RunningState::Stopped),
+            "There is already another ongoing process running."
+        );
 
-        let s_a = &self.running_state;
-        let mut s = s_a.write().await;
-
-        s.ongoing_running = true;
-        s.shall_stop_ongoing = false;
         let (sender, receiver) = channel::bounded(1);
-        s.cancel_sender = Some(sender);
+        *s = RunningState::Running {
+            cancel_sender: sender,
+        };
 
         Ok(receiver)
     }
 
     pub(crate) async fn free_ongoing(&self) {
-        let s_a = &self.running_state;
-        let mut s = s_a.write().await;
-
-        s.ongoing_running = false;
-        s.shall_stop_ongoing = true;
-        s.cancel_sender.take();
-    }
-
-    pub(crate) async fn has_ongoing(&self) -> bool {
-        let s_a = &self.running_state;
-        let s = s_a.read().await;
-
-        s.ongoing_running || !s.shall_stop_ongoing
+        let mut s = self.running_state.write().await;
+        *s = RunningState::Stopped;
     }
 
     /// Signal an ongoing process to stop.
     pub async fn stop_ongoing(&self) {
-        let s_a = &self.running_state;
-        let mut s = s_a.write().await;
-        if let Some(cancel) = s.cancel_sender.take() {
-            if let Err(err) = cancel.send(()).await {
-                warn!(self, "could not cancel ongoing: {:?}", err);
+        let mut s = self.running_state.write().await;
+        match &*s {
+            RunningState::Running { cancel_sender } => {
+                if let Err(err) = cancel_sender.send(()).await {
+                    warn!(self, "could not cancel ongoing: {:?}", err);
+                }
+                info!(self, "Signaling the ongoing process to stop ASAP.",);
+                *s = RunningState::ShallStop;
+            }
+            RunningState::ShallStop | RunningState::Stopped => {
+                info!(self, "No ongoing process to stop.",);
             }
         }
-
-        if s.ongoing_running && !s.shall_stop_ongoing {
-            info!(self, "Signaling the ongoing process to stop ASAP.",);
-            s.shall_stop_ongoing = true;
-        } else {
-            info!(self, "No ongoing process to stop.",);
-        };
     }
 
     pub(crate) async fn shall_stop_ongoing(&self) -> bool {
-        self.running_state.read().await.shall_stop_ongoing
+        match &*self.running_state.read().await {
+            RunningState::Running { .. } => false,
+            RunningState::ShallStop | RunningState::Stopped => true,
+        }
     }
 
     /*******************************************************************************
@@ -642,23 +648,6 @@ impl Context {
     }
 }
 
-impl InnerContext {
-    async fn stop_io(&self) -> Result<()> {
-        self.scheduler.write().await.stop().await?;
-        Ok(())
-    }
-}
-
-impl Default for RunningState {
-    fn default() -> Self {
-        RunningState {
-            ongoing_running: false,
-            shall_stop_ongoing: true,
-            cancel_sender: None,
-        }
-    }
-}
-
 pub fn get_version_str() -> &'static str {
     &DC_VERSION_STR
 }
@@ -729,23 +718,20 @@ mod tests {
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 0);
 
         receive_msg(&t, &bob).await;
-        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).await.unwrap().len(), 1);
+        assert_eq!(get_chat_msgs(&t, bob.id, 0).await.unwrap().len(), 1);
         assert_eq!(bob.id.get_fresh_msg_cnt(&t).await.unwrap(), 1);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 1);
 
         receive_msg(&t, &claire).await;
         receive_msg(&t, &claire).await;
-        assert_eq!(
-            get_chat_msgs(&t, claire.id, 0, None).await.unwrap().len(),
-            2
-        );
+        assert_eq!(get_chat_msgs(&t, claire.id, 0).await.unwrap().len(), 2);
         assert_eq!(claire.id.get_fresh_msg_cnt(&t).await.unwrap(), 2);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 3);
 
         receive_msg(&t, &dave).await;
         receive_msg(&t, &dave).await;
         receive_msg(&t, &dave).await;
-        assert_eq!(get_chat_msgs(&t, dave.id, 0, None).await.unwrap().len(), 3);
+        assert_eq!(get_chat_msgs(&t, dave.id, 0).await.unwrap().len(), 3);
         assert_eq!(dave.id.get_fresh_msg_cnt(&t).await.unwrap(), 3);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 6);
 
@@ -760,10 +746,7 @@ mod tests {
         receive_msg(&t, &bob).await;
         receive_msg(&t, &claire).await;
         receive_msg(&t, &dave).await;
-        assert_eq!(
-            get_chat_msgs(&t, claire.id, 0, None).await.unwrap().len(),
-            3
-        );
+        assert_eq!(get_chat_msgs(&t, claire.id, 0).await.unwrap().len(), 3);
         assert_eq!(claire.id.get_fresh_msg_cnt(&t).await.unwrap(), 3);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 6); // muted claire is not counted
 
@@ -780,7 +763,7 @@ mod tests {
         let t = TestContext::new_alice().await;
         let bob = t.create_chat_with_contact("", "bob@g.it").await;
         receive_msg(&t, &bob).await;
-        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).await.unwrap().len(), 1);
+        assert_eq!(get_chat_msgs(&t, bob.id, 0).await.unwrap().len(), 1);
 
         // chat is unmuted by default, here and in the following assert(),
         // we check mainly that the SQL-statements in is_muted() and get_fresh_msgs()
@@ -1064,4 +1047,44 @@ mod tests {
 
         Ok(())
     }
+
+    #[async_std::test]
+    async fn test_ongoing() -> Result<()> {
+        let context = TestContext::new().await;
+
+        // No ongoing process allocated.
+        assert!(context.shall_stop_ongoing().await);
+
+        let receiver = context.alloc_ongoing().await?;
+
+        // Cannot allocate another ongoing process while the first one is running.
+        assert!(context.alloc_ongoing().await.is_err());
+
+        // Stop signal is not sent yet.
+        assert!(receiver.try_recv().is_err());
+
+        assert!(!context.shall_stop_ongoing().await);
+
+        // Send the stop signal.
+        context.stop_ongoing().await;
+
+        // Receive stop signal.
+        receiver.recv().await?;
+
+        assert!(context.shall_stop_ongoing().await);
+
+        // Ongoing process is still running even though stop signal was received,
+        // so another one cannot be allocated.
+        assert!(context.alloc_ongoing().await.is_err());
+
+        context.free_ongoing().await;
+
+        // No ongoing process allocated, should have been stopped already.
+        assert!(context.shall_stop_ongoing().await);
+
+        // Another ongoing process can be allocated now.
+        let _receiver = context.alloc_ongoing().await?;
+
+        Ok(())
+    }
 }

src/dc_receive_imf.rs

@@ -47,16 +47,9 @@ pub struct ReceivedMsg {
     pub chat_id: ChatId,
     pub state: MessageState,
     pub sort_timestamp: i64,
-    // Feel free to add more fields here
-}
-
-/// Information about added message parts.
-struct AddedParts {
-    /// Common info about received messages.
-    pub received_msg: ReceivedMsg,
 
     /// IDs of inserted rows in messages table.
-    pub created_db_entries: Vec<MsgId>,
+    pub msg_ids: Vec<MsgId>,
 
     /// Whether IMAP messages should be immediately deleted.
     pub needs_delete_job: bool,
@@ -186,7 +179,7 @@ pub(crate) async fn dc_receive_imf_inner(
         .map_or(rcvd_timestamp, |value| min(value, rcvd_timestamp));
 
     // Add parts
-    let added_parts = add_parts(
+    let received_msg = add_parts(
         context,
         &mut mime_parser,
         imf_raw,
@@ -211,7 +204,7 @@ pub(crate) async fn dc_receive_imf_inner(
     // Update gossiped timestamp for the chat if someone else or our other device sent
     // Autocrypt-Gossip for all recipients in the chat to avoid sending Autocrypt-Gossip ourselves
     // and waste traffic.
-    let chat_id = added_parts.received_msg.chat_id;
+    let chat_id = received_msg.chat_id;
     if !chat_id.is_special()
         && mime_parser
             .recipients
@@ -229,7 +222,7 @@ pub(crate) async fn dc_receive_imf_inner(
         }
     }
 
-    let insert_msg_id = if let Some(msg_id) = added_parts.created_db_entries.last() {
+    let insert_msg_id = if let Some(msg_id) = received_msg.msg_ids.last() {
         *msg_id
     } else {
         MsgId::new_unset()
@@ -310,8 +303,8 @@ pub(crate) async fn dc_receive_imf_inner(
     // Get user-configured server deletion
     let delete_server_after = context.get_config_delete_server_after().await?;
 
-    if !added_parts.created_db_entries.is_empty() {
-        if added_parts.needs_delete_job
+    if !received_msg.msg_ids.is_empty() {
+        if received_msg.needs_delete_job
             || (delete_server_after == Some(0) && is_partial_download.is_none())
         {
             context
@@ -330,12 +323,12 @@ pub(crate) async fn dc_receive_imf_inner(
     if replace_partial_download {
         context.emit_msgs_changed(chat_id, MsgId::new(0));
     } else if !chat_id.is_trash() {
-        let fresh = added_parts.received_msg.state == MessageState::InFresh;
-        for msg_id in added_parts.created_db_entries {
+        let fresh = received_msg.state == MessageState::InFresh;
+        for msg_id in &received_msg.msg_ids {
             if incoming && fresh {
-                context.emit_incoming_msg(chat_id, msg_id);
+                context.emit_incoming_msg(chat_id, *msg_id);
             } else {
-                context.emit_msgs_changed(chat_id, msg_id);
+                context.emit_msgs_changed(chat_id, *msg_id);
             };
         }
     }
@@ -344,7 +337,7 @@ pub(crate) async fn dc_receive_imf_inner(
         .handle_reports(context, from_id, sent_timestamp, &mime_parser.parts)
         .await;
 
-    Ok(Some(added_parts.received_msg))
+    Ok(Some(received_msg))
 }
 
 /// Converts "From" field to contact id.
@@ -408,7 +401,7 @@ async fn add_parts(
     is_partial_download: Option<u32>,
     fetching_existing_messages: bool,
     prevent_rename: bool,
-) -> Result<AddedParts> {
+) -> Result<ReceivedMsg> {
     let mut chat_id = None;
     let mut chat_id_blocked = Blocked::Not;
 
@@ -1181,15 +1174,18 @@ INSERT INTO msgs
         }
     }
 
-    let received_msg = ReceivedMsg {
+    if !incoming && is_mdn && is_dc_message == MessengerMessage::Yes {
+        // Normally outgoing MDNs sent by us never appear in mailboxes, but Gmail saves all
+        // outgoing messages, including MDNs, to the Sent folder. If we detect such saved MDN,
+        // delete it.
+        needs_delete_job = true;
+    }
+
+    Ok(ReceivedMsg {
         chat_id,
         state,
         sort_timestamp,
-    };
-
-    Ok(AddedParts {
-        received_msg,
-        created_db_entries,
+        msg_ids: created_db_entries,
         needs_delete_job,
     })
 }
@@ -1441,7 +1437,9 @@ async fn create_or_lookup_group(
             return Ok(None);
         }
 
-        let grpname = mime_parser.get_header(HeaderDef::ChatGroupName).unwrap();
+        let grpname = mime_parser
+            .get_header(HeaderDef::ChatGroupName)
+            .context("Chat-Group-Name vanished")?;
         let new_chat_id = ChatId::create_multiuser_record(
             context,
             Chattype::Group,
@@ -2008,7 +2006,7 @@ async fn check_verified_properties(
     let rows = context
         .sql
         .query_map(
-            format!(
+            &format!(
                 "SELECT c.addr, LENGTH(ps.verified_key_fingerprint)  FROM contacts c  \
              LEFT JOIN acpeerstates ps ON c.addr=ps.addr  WHERE c.id IN({}) ",
                 sql::repeat_vars(to_ids.len())
@@ -2350,26 +2348,14 @@ mod tests {
         assert_eq!(chat.typ, Chattype::Single);
         assert_eq!(chat.name, "Bob");
         assert_eq!(chat::get_chat_contacts(&t, chat_id).await.unwrap().len(), 1);
-        assert_eq!(
-            chat::get_chat_msgs(&t, chat_id, 0, None)
-                .await
-                .unwrap()
-                .len(),
-            1
-        );
+        assert_eq!(chat::get_chat_msgs(&t, chat_id, 0).await.unwrap().len(), 1);
 
         // receive a non-delta-message from Bob, shows up because of the show_emails setting
         dc_receive_imf(&t, ONETOONE_NOREPLY_MAIL, false)
             .await
             .unwrap();
 
-        assert_eq!(
-            chat::get_chat_msgs(&t, chat_id, 0, None)
-                .await
-                .unwrap()
-                .len(),
-            2
-        );
+        assert_eq!(chat::get_chat_msgs(&t, chat_id, 0).await.unwrap().len(), 2);
 
         // let Bob create an adhoc-group by a non-delta-message, shows up because of the show_emails setting
         dc_receive_imf(&t, GRP_MAIL, false).await.unwrap();
@@ -2418,13 +2404,7 @@ mod tests {
         // create a group with bob, archive group
         let group_id = chat::create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
         chat::add_contact_to_chat(&t, group_id, bob_id).await?;
-        assert_eq!(
-            chat::get_chat_msgs(&t, group_id, 0, None)
-                .await
-                .unwrap()
-                .len(),
-            0
-        );
+        assert_eq!(chat::get_chat_msgs(&t, group_id, 0).await.unwrap().len(), 0);
         group_id
             .set_visibility(&t, ChatVisibility::Archived)
             .await?;
@@ -2505,7 +2485,7 @@ mod tests {
             false,
         )
         .await?;
-        assert_eq!(chat::get_chat_msgs(&t, group_id, 0, None).await?.len(), 1);
+        assert_eq!(chat::get_chat_msgs(&t, group_id, 0).await?.len(), 1);
         let msg = message::Message::load_from_db(&t, msg.id).await?;
         assert_eq!(msg.state, MessageState::OutMdnRcvd);
 
@@ -2834,7 +2814,7 @@ mod tests {
 
         assert_eq!(msg.state, MessageState::OutFailed);
 
-        let msgs = chat::get_chat_msgs(&t, msg.chat_id, 0, None).await?;
+        let msgs = chat::get_chat_msgs(&t, msg.chat_id, 0).await?;
         let msg_id = if let ChatItem::Message { msg_id } = msgs.last().unwrap() {
             msg_id
         } else {
@@ -2920,7 +2900,7 @@ mod tests {
 
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await?;
         assert_eq!(chats.len(), 1);
-        let contacts = Contact::get_all(&t.ctx, 0, None as Option<String>).await?;
+        let contacts = Contact::get_all(&t.ctx, 0, None).await?;
         assert_eq!(contacts.len(), 0); // mailing list recipients and senders do not count as "known contacts"
 
         let msg1 = get_chat_msg(&t, chat_id, 0, 2).await;
@@ -3087,7 +3067,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chats.len(), 0); // Test that the message is not shown
 
         // Both messages are in the same blocked chat.
-        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 2);
     }
 
@@ -3120,7 +3100,7 @@ Hello mailinglist!\r\n"
             .await
             .unwrap();
         let msg = t.get_last_msg().await;
-        let msgs = chat::get_chat_msgs(&t, msg.chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t, msg.chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 2);
     }
 
@@ -3142,7 +3122,7 @@ Hello mailinglist!\r\n"
 
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1); // Test that chat is still in the chatlist
-        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1); // ...and contains 1 message
 
         dc_receive_imf(&t.ctx, DC_MAILINGLIST2, false)
@@ -3151,7 +3131,7 @@ Hello mailinglist!\r\n"
 
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1); // Test that the new mailing list message got into the same chat
-        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 2);
         let chat = Chat::load_from_db(&t.ctx, chat_id).await.unwrap();
         assert!(chat.is_contact_request());
@@ -3179,7 +3159,7 @@ Hello mailinglist!\r\n"
             .await
             .unwrap();
 
-        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 2);
         let chat = chat::Chat::load_from_db(&t.ctx, chat_id).await.unwrap();
         assert!(chat.can_send(&t.ctx).await.unwrap());
@@ -3212,13 +3192,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.typ, Chattype::Mailinglist);
         assert_eq!(chat.grpid, "mylist@bar.org");
         assert_eq!(chat.name, "ola");
-        assert_eq!(
-            chat::get_chat_msgs(&t, chat.id, 0, None)
-                .await
-                .unwrap()
-                .len(),
-            1
-        );
+        assert_eq!(chat::get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 1);
 
         // receive another message with no sender name but the same address,
         // make sure this lands in the same chat
@@ -3237,13 +3211,7 @@ Hello mailinglist!\r\n"
         )
         .await
         .unwrap();
-        assert_eq!(
-            chat::get_chat_msgs(&t, chat.id, 0, None)
-                .await
-                .unwrap()
-                .len(),
-            2
-        );
+        assert_eq!(chat::get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 2);
     }
 
     #[async_std::test]
@@ -3422,10 +3390,7 @@ Hello mailinglist!\r\n"
         );
         assert!(msg.has_html());
         let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
-        assert_eq!(
-            get_chat_msgs(&t, msg.chat_id, 0, None).await.unwrap().len(),
-            1
-        );
+        assert_eq!(get_chat_msgs(&t, msg.chat_id, 0).await.unwrap().len(), 1);
         assert_eq!(chat.typ, Chattype::Mailinglist);
         assert_eq!(chat.blocked, Blocked::Request);
         assert_eq!(chat.grpid, "intern.lists.abc.de");
@@ -3445,10 +3410,7 @@ Hello mailinglist!\r\n"
         .await
         .unwrap();
         let msg = t.get_last_msg().await;
-        assert_eq!(
-            get_chat_msgs(&t, msg.chat_id, 0, None).await.unwrap().len(),
-            1
-        );
+        assert_eq!(get_chat_msgs(&t, msg.chat_id, 0).await.unwrap().len(), 1);
         let text = msg.text.clone().unwrap();
         assert!(text.contains("content text"));
         assert!(!text.contains("footer text"));
@@ -3604,7 +3566,7 @@ YEAAAAAA!.
         assert_eq!(msg.viewtype, Viewtype::Image);
         assert!(msg.has_html());
         let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
-        assert_eq!(get_chat_msgs(&t, chat.id, 0, None).await.unwrap().len(), 1);
+        assert_eq!(get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 1);
     }
 
     /// Test that classical MUA messages are assigned to group chats based on the `In-Reply-To`
@@ -3654,7 +3616,7 @@ YEAAAAAA!.
         assert_eq!(msg.get_text().unwrap(), "reply foo");
 
         // Load the first message from the same chat.
-        let msgs = chat::get_chat_msgs(&t, msg.chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t, msg.chat_id, 0).await.unwrap();
         let msg_id = if let ChatItem::Message { msg_id } = msgs.first().unwrap() {
             msg_id
         } else {
@@ -3783,8 +3745,7 @@ YEAAAAAA!.
         let chat_alice = alice.create_chat(&bob).await;
         chat::send_text_msg(&alice, chat_alice.id, "hi!".to_string()).await?;
 
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
         assert_eq!(msg.get_text(), Some("hi!".to_string()));
         assert!(!msg.get_showpadlock());
         let mime = message::get_mime_headers(&bob, msg.id).await?;
@@ -3803,25 +3764,23 @@ YEAAAAAA!.
         let chat_alice = alice.create_chat(&bob).await;
         chat::send_text_msg(&alice, chat_alice.id, "hi!".to_string()).await?;
 
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-        let msg = bob.get_last_msg().await;
+        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
         assert_eq!(msg.get_text(), Some("hi!".to_string()));
         assert!(!msg.get_showpadlock());
         let mime = message::get_mime_headers(&bob, msg.id).await?;
         let mime_str = String::from_utf8_lossy(&mime);
-        assert!(mime_str.contains("Received:"));
+        assert!(mime_str.contains("Message-ID:"));
         assert!(mime_str.contains("From:"));
 
         // another one, from bob to alice, that gets encrypted
         let chat_bob = bob.create_chat(&alice).await;
         chat::send_text_msg(&bob, chat_bob.id, "ho!".to_string()).await?;
-        alice.recv_msg(&bob.pop_sent_msg().await).await;
-        let msg = alice.get_last_msg().await;
+        let msg = alice.recv_msg(&bob.pop_sent_msg().await).await;
         assert_eq!(msg.get_text(), Some("ho!".to_string()));
         assert!(msg.get_showpadlock());
         let mime = message::get_mime_headers(&alice, msg.id).await?;
         let mime_str = String::from_utf8_lossy(&mime);
-        assert!(mime_str.contains("Received:"));
+        assert!(mime_str.contains("Message-ID:"));
         assert!(mime_str.contains("From:"));
         Ok(())
     }
@@ -3887,10 +3846,7 @@ YEAAAAAA!.
         assert!(msg.get_text().unwrap().contains("hi support!"));
         let chat = Chat::load_from_db(&alice, msg.chat_id).await.unwrap();
         assert_eq!(chat.typ, Chattype::Group);
-        assert_eq!(
-            get_chat_msgs(&alice, chat.id, 0, None).await.unwrap().len(),
-            1
-        );
+        assert_eq!(get_chat_msgs(&alice, chat.id, 0).await.unwrap().len(), 1);
         if group_request {
             assert_eq!(get_chat_contacts(&alice, chat.id).await.unwrap().len(), 4);
         } else {
@@ -3923,13 +3879,7 @@ YEAAAAAA!.
         } else {
             assert_eq!(chat.typ, Chattype::Single);
         }
-        assert_eq!(
-            get_chat_msgs(&claire, chat.id, 0, None)
-                .await
-                .unwrap()
-                .len(),
-            1
-        );
+        assert_eq!(get_chat_msgs(&claire, chat.id, 0).await.unwrap().len(), 1);
         assert_eq!(msg.get_override_sender_name(), None);
 
         (claire, alice)
@@ -4044,7 +3994,7 @@ YEAAAAAA!.
         println!("\n========= Delete the message ==========");
         msg.id.trash(&t).await.unwrap();
 
-        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0, None).await.unwrap();
+        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 0);
 
         println!("\n========= Receive a message that is a reply to the deleted message ==========");
@@ -4515,16 +4465,14 @@ Second thread."#;
         let alice_first_reply = alice
             .send_text(alice_first_msg.chat_id, "First reply")
             .await;
-        bob.recv_msg(&alice_first_reply).await;
-        let bob_first_reply = bob.get_last_msg().await;
+        let bob_first_reply = bob.recv_msg(&alice_first_reply).await;
         assert_eq!(bob_first_reply.chat_id, bob_first_msg.chat_id);
 
         alice_second_msg.chat_id.accept(&alice).await?;
         let alice_second_reply = alice
             .send_text(alice_second_msg.chat_id, "Second reply")
             .await;
-        bob.recv_msg(&alice_second_reply).await;
-        let bob_second_reply = bob.get_last_msg().await;
+        let bob_second_reply = bob.recv_msg(&alice_second_reply).await;
         assert_eq!(bob_second_reply.chat_id, bob_second_msg.chat_id);
 
         // Alice adds Fiona to both ad hoc groups.
@@ -4539,13 +4487,11 @@ Second thread."#;
 
         chat::add_contact_to_chat(&alice, alice_first_msg.chat_id, alice_fiona_contact_id).await?;
         let alice_first_invite = alice.pop_sent_msg().await;
-        fiona.recv_msg(&alice_first_invite).await;
-        let fiona_first_invite = fiona.get_last_msg().await;
+        let fiona_first_invite = fiona.recv_msg(&alice_first_invite).await;
 
         chat::add_contact_to_chat(&alice, alice_second_msg.chat_id, alice_fiona_contact_id).await?;
         let alice_second_invite = alice.pop_sent_msg().await;
-        fiona.recv_msg(&alice_second_invite).await;
-        let fiona_second_invite = fiona.get_last_msg().await;
+        let fiona_second_invite = fiona.recv_msg(&alice_second_invite).await;
 
         // Fiona was added to two separate chats and should see two separate chats, even though they
         // don't have different group IDs to distinguish them.
@@ -4827,8 +4773,7 @@ Reply from different address
             let sent = alice.send_msg(alice_chat.id, &mut msg_alice).await;
             println!("{}", sent.payload());
 
-            bob.recv_msg(&sent).await;
-            let msg_bob = bob.get_last_msg().await;
+            let msg_bob = bob.recv_msg(&sent).await;
 
             async fn check_message(msg: &Message, t: &TestContext, content: &str) {
                 assert_eq!(msg.get_viewtype(), Viewtype::File);
@@ -4868,9 +4813,7 @@ Reply from different address
 
         alice1.recv_msg(&sent).await;
         alice2.recv_msg(&sent).await;
-        bob2.recv_msg(&sent).await;
-
-        let alice1_msg = alice1.get_last_msg().await;
+        let alice1_msg = bob2.recv_msg(&sent).await;
         assert_eq!(alice1_msg.text.unwrap(), "Hello!");
         let alice1_chat = chat::Chat::load_from_db(&alice1, alice1_msg.chat_id).await?;
         assert!(alice1_chat.is_contact_request());

src/dc_tools.rs

@@ -13,7 +13,7 @@ use async_std::path::{Path, PathBuf};
 use async_std::prelude::*;
 use async_std::{fs, io};
 
-use anyhow::Error;
+use anyhow::{bail, Error, Result};
 use chrono::{Local, TimeZone};
 use mailparse::dateparse;
 use mailparse::headers::Headers;
@@ -443,14 +443,6 @@ pub(crate) fn time() -> i64 {
         .as_secs() as i64
 }
 
-/// An invalid email address was encountered
-#[derive(Debug, thiserror::Error)]
-#[error("Invalid email address: {message} ({addr})")]
-pub struct InvalidEmailError {
-    message: String,
-    addr: String,
-}
-
 /// Very simple email address wrapper.
 ///
 /// Represents an email address, right now just the `name@domain` portion.
@@ -474,7 +466,7 @@ pub struct EmailAddress {
 }
 
 impl EmailAddress {
-    pub fn new(input: &str) -> Result<Self, InvalidEmailError> {
+    pub fn new(input: &str) -> Result<Self> {
         input.parse::<EmailAddress>()
     }
 }
@@ -486,18 +478,12 @@ impl fmt::Display for EmailAddress {
 }
 
 impl FromStr for EmailAddress {
-    type Err = InvalidEmailError;
+    type Err = Error;
 
     /// Performs a dead-simple parse of an email address.
-    fn from_str(input: &str) -> Result<EmailAddress, InvalidEmailError> {
-        let err = |msg: &str| {
-            Err(InvalidEmailError {
-                message: msg.to_string(),
-                addr: input.to_string(),
-            })
-        };
+    fn from_str(input: &str) -> Result<EmailAddress> {
         if input.is_empty() {
-            return err("empty string is not valid");
+            bail!("empty string is not valid");
         }
         let parts: Vec<&str> = input.rsplitn(2, '@').collect();
 
@@ -505,23 +491,23 @@ impl FromStr for EmailAddress {
             .chars()
             .any(|c| c.is_whitespace() || c == '<' || c == '>')
         {
-            return err("Email must not contain whitespaces, '>' or '<'");
+            bail!("Email {:?} must not contain whitespaces, '>' or '<'", input);
         }
 
         match &parts[..] {
             [domain, local] => {
                 if local.is_empty() {
-                    return err("empty string is not valid for local part");
+                    bail!("empty string is not valid for local part in {:?}", input);
                 }
                 if domain.is_empty() {
-                    return err("missing domain after '@'");
+                    bail!("missing domain after '@' in {:?}", input);
                 }
                 Ok(EmailAddress {
                     local: (*local).to_string(),
                     domain: (*domain).to_string(),
                 })
             }
-            _ => err("missing '@' character"),
+            _ => bail!("Email {:?} must contain '@' character", input),
         }
     }
 }
@@ -1042,9 +1028,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0).unwrap();
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         // the message should be added only once a day - test that an hour later and nearly a day later
@@ -1054,9 +1038,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
             get_provider_update_timestamp(),
         )
         .await;
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         maybe_warn_on_bad_time(
@@ -1065,9 +1047,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
             get_provider_update_timestamp(),
         )
         .await;
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         // next day, there should be another device message
@@ -1080,9 +1060,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         assert_eq!(device_chat_id, chats.get_chat_id(0).unwrap());
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 2);
     }
 
@@ -1112,9 +1090,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0).unwrap();
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         // do not repeat the warning every day ...
@@ -1134,9 +1110,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0).unwrap();
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         let test_len = msgs.len();
         assert!(test_len == 1 || test_len == 2);
 
@@ -1151,9 +1125,7 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0).unwrap();
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), test_len + 1);
     }
 }

src/dehtml.rs

@@ -94,7 +94,7 @@ fn dehtml_quick_xml(buf: &str) -> String {
             }
             Ok(quick_xml::events::Event::End(ref e)) => dehtml_endtag_cb(e, &mut dehtml),
             Ok(quick_xml::events::Event::Text(ref e)) => dehtml_text_cb(e, &mut dehtml),
-            Ok(quick_xml::events::Event::CData(ref e)) => dehtml_cdata_cb(e, &mut dehtml),
+            Ok(quick_xml::events::Event::CData(e)) => dehtml_text_cb(&e.escape(), &mut dehtml),
             Ok(quick_xml::events::Event::Empty(ref e)) => {
                 // Handle empty tags as a start tag immediately followed by end tag.
                 // For example, `<p/>` is treated as `<p></p>`.
@@ -134,23 +134,6 @@ fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
     }
 }
 
-fn dehtml_cdata_cb(event: &BytesText, dehtml: &mut Dehtml) {
-    if dehtml.get_add_text() == AddText::YesPreserveLineEnds
-        || dehtml.get_add_text() == AddText::YesRemoveLineEnds
-    {
-        let last_added = escaper::decode_html_buf_sloppy(event.escaped()).unwrap_or_default();
-
-        if dehtml.get_add_text() == AddText::YesRemoveLineEnds {
-            dehtml.strbuilder += LINE_RE.replace_all(&last_added, "\r").as_ref();
-        } else if !dehtml.line_prefix().is_empty() {
-            let l = dehtml.append_prefix("\n");
-            dehtml.strbuilder += LINE_RE.replace_all(&last_added, l.as_str()).as_ref();
-        } else {
-            dehtml.strbuilder += &last_added;
-        }
-    }
-}
-
 fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
     let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
 

src/e2ee.rs

@@ -131,6 +131,54 @@ impl EncryptHelper {
     }
 }
 
+/// Applies Autocrypt header to Autocrypt peer state.
+///
+/// Returns updated peer state.
+pub(crate) async fn get_autocrypt_peerstate(
+    context: &Context,
+    mail: &ParsedMail<'_>,
+    message_time: i64,
+) -> Result<Option<Peerstate>> {
+    let from = mail
+        .headers
+        .get_header(HeaderDef::From_)
+        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
+        .and_then(|from| from.extract_single_info())
+        .map(|from| from.addr)
+        .unwrap_or_default();
+
+    let aheader = match Aheader::from_headers(&from, &mail.headers) {
+        Ok(header) => header,
+        Err(err) => {
+            warn!(context, "Failed to parse Autocrypt header: {}", err);
+            None
+        }
+    };
+
+    let peerstate = Peerstate::from_addr(context, &from).await?;
+    let peerstate = if let Some(aheader) = aheader {
+        if let Some(mut peerstate) = peerstate {
+            peerstate.apply_header(&aheader, message_time);
+            peerstate.save_to_db(&context.sql, false).await?;
+            Some(peerstate)
+        } else {
+            let p = Peerstate::from_header(&aheader, message_time);
+            p.save_to_db(&context.sql, true).await?;
+            Some(p)
+        }
+    } else {
+        peerstate
+    };
+
+    if let Some(peerstate) = peerstate.as_ref() {
+        peerstate
+            .handle_fingerprint_change(context, message_time)
+            .await?;
+    }
+
+    Ok(peerstate)
+}
+
 /// Tries to decrypt a message, but only if it is structured as an
 /// Autocrypt message.
 ///
@@ -142,72 +190,15 @@ impl EncryptHelper {
 pub async fn try_decrypt(
     context: &Context,
     mail: &ParsedMail<'_>,
-    message_time: i64,
+    peerstate: &Option<Peerstate>,
 ) -> Result<(Option<Vec<u8>>, HashSet<Fingerprint>)> {
-    let from = mail
-        .headers
-        .get_header(HeaderDef::From_)
-        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
-        .and_then(|from| from.extract_single_info())
-        .map(|from| from.addr)
-        .unwrap_or_default();
-
-    let mut peerstate = Peerstate::from_addr(context, &from).await?;
-
-    // Apply Autocrypt header
-    match Aheader::from_headers(&from, &mail.headers) {
-        Ok(Some(ref header)) => {
-            if let Some(ref mut peerstate) = peerstate {
-                peerstate.apply_header(header, message_time);
-                peerstate.save_to_db(&context.sql, false).await?;
-            } else {
-                let p = Peerstate::from_header(header, message_time);
-                p.save_to_db(&context.sql, true).await?;
-                peerstate = Some(p);
-            }
-        }
-        Ok(None) => {}
-        Err(err) => warn!(context, "Failed to parse Autocrypt header: {}", err),
-    }
-
     // Possibly perform decryption
-    let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context).await?;
-    let mut public_keyring_for_validate: Keyring<SignedPublicKey> = Keyring::new();
-
-    if let Some(ref mut peerstate) = peerstate {
-        peerstate
-            .handle_fingerprint_change(context, message_time)
-            .await?;
-        if let Some(key) = &peerstate.public_key {
-            public_keyring_for_validate.add(key.clone());
-        } else if let Some(key) = &peerstate.gossip_key {
-            public_keyring_for_validate.add(key.clone());
-        }
-    }
-
-    let (out_mail, signatures) = match decrypt_if_autocrypt_message(
-        context,
-        mail,
-        private_keyring,
-        public_keyring_for_validate,
-    )
-    .await?
-    {
-        Some((out_mail, signatures)) => (Some(out_mail), signatures),
-        None => (None, Default::default()),
-    };
-
-    if let Some(mut peerstate) = peerstate {
-        // If message is not encrypted and it is not a read receipt, degrade encryption.
-        if out_mail.is_none()
-            && message_time > peerstate.last_seen_autocrypt
-            && !contains_report(mail)
-        {
-            peerstate.degrade_encryption(message_time);
-            peerstate.save_to_db(&context.sql, false).await?;
-        }
-    }
-
+    let public_keyring_for_validate = keyring_from_peerstate(&peerstate);
+    let (out_mail, signatures) =
+        match decrypt_if_autocrypt_message(context, mail, public_keyring_for_validate).await? {
+            Some((out_mail, signatures)) => (Some(out_mail), signatures),
+            None => (None, Default::default()),
+        };
     Ok((out_mail, signatures))
 }
 
@@ -266,13 +257,51 @@ fn get_mixed_up_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<
     }
 }
 
+/// Returns a reference to the encrypted payload of a message turned into attachment.
+///
+/// Google Workspace has an option "Append footer" which appends standard footer defined
+/// by administrator to all outgoing messages. However, there is no plain text part in
+/// encrypted messages sent by Delta Chat, so Google Workspace turns the message into
+/// multipart/mixed MIME, where the first part is an empty plaintext part with a footer
+/// and the second part is the original encrypted message.
+fn get_attachment_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
+    if mail.ctype.mimetype != "multipart/mixed" {
+        return None;
+    }
+    if let [first_part, second_part] = &mail.subparts[..] {
+        if first_part.ctype.mimetype == "text/plain"
+            && second_part.ctype.mimetype == "multipart/encrypted"
+        {
+            get_autocrypt_mime(second_part)
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublicKey> {
+    let mut public_keyring_for_validate: Keyring<SignedPublicKey> = Keyring::new();
+    if let Some(peerstate) = peerstate.as_ref() {
+        if let Some(key) = &peerstate.public_key {
+            public_keyring_for_validate.add(key.clone());
+        } else if let Some(key) = &peerstate.gossip_key {
+            public_keyring_for_validate.add(key.clone());
+        }
+    }
+    public_keyring_for_validate
+}
+
 async fn decrypt_if_autocrypt_message(
     context: &Context,
     mail: &ParsedMail<'_>,
-    private_keyring: Keyring<SignedSecretKey>,
     public_keyring_for_validate: Keyring<SignedPublicKey>,
 ) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    let encrypted_data_part = match get_autocrypt_mime(mail).or_else(|| get_mixed_up_mime(mail)) {
+    let encrypted_data_part = match get_autocrypt_mime(mail)
+        .or_else(|| get_mixed_up_mime(mail))
+        .or_else(|| get_attachment_mime(mail))
+    {
         None => {
             // not an autocrypt mime message, abort and ignore
             return Ok(None);
@@ -280,6 +309,9 @@ async fn decrypt_if_autocrypt_message(
         Some(res) => res,
     };
     info!(context, "Detected Autocrypt-mime message");
+    let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context)
+        .await
+        .context("failed to get own keyring")?;
 
     decrypt_part(
         encrypted_data_part,
@@ -358,18 +390,6 @@ fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
     false
 }
 
-/// Checks if a MIME structure contains a multipart/report part.
-///
-/// As reports are often unencrypted, we do not reset the Autocrypt header in
-/// this case.
-///
-/// However, Delta Chat itself has no problem with encrypted multipart/report
-/// parts and MUAs should be encouraged to encrpyt multipart/reports as well so
-/// that we could use the normal Autocrypt processing.
-fn contains_report(mail: &ParsedMail<'_>) -> bool {
-    mail.ctype.mimetype == "multipart/report"
-}
-
 /// Ensures a private key exists for the configured user.
 ///
 /// Normally the private key is generated when the first message is
@@ -389,6 +409,7 @@ pub async fn ensure_secret_key_exists(context: &Context) -> Result<String> {
 #[cfg(test)]
 mod tests {
     use crate::chat;
+    use crate::dc_receive_imf::dc_receive_imf;
     use crate::message::{Message, Viewtype};
     use crate::param::Param;
     use crate::peerstate::ToSave;
@@ -592,8 +613,8 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());
     }
 
-    #[test]
-    fn test_mixed_up_mime() -> Result<()> {
+    #[async_std::test]
+    async fn test_mixed_up_mime() -> Result<()> {
         // "Mixed Up" mail as received when sending an encrypted
         // message using Delta Chat Desktop via ProtonMail IMAP/SMTP
         // Bridge.
@@ -601,6 +622,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         let mail = mailparse::parse_mail(mixed_up_mime)?;
         assert!(get_autocrypt_mime(&mail).is_none());
         assert!(get_mixed_up_mime(&mail).is_some());
+        assert!(get_attachment_mime(&mail).is_none());
 
         // Same "Mixed Up" mail repaired by Thunderbird 78.9.0.
         //
@@ -611,6 +633,20 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         let mail = mailparse::parse_mail(repaired_mime)?;
         assert!(get_autocrypt_mime(&mail).is_some());
         assert!(get_mixed_up_mime(&mail).is_none());
+        assert!(get_attachment_mime(&mail).is_none());
+
+        // Another form of "Mixed Up" mail created by Google Workspace,
+        // where original message is turned into attachment to empty plaintext message.
+        let attachment_mime = include_bytes!("../test-data/message/google-workspace-mixed-up.eml");
+        let mail = mailparse::parse_mail(attachment_mime)?;
+        assert!(get_autocrypt_mime(&mail).is_none());
+        assert!(get_mixed_up_mime(&mail).is_none());
+        assert!(get_attachment_mime(&mail).is_some());
+
+        let bob = TestContext::new_bob().await;
+        dc_receive_imf(&bob, attachment_mime, false).await?;
+        let msg = bob.get_last_msg().await;
+        assert_eq!(msg.text.as_deref(), Some("Hello from Thunderbird!"));
 
         Ok(())
     }

src/ephemeral.rs

@@ -76,7 +76,7 @@ use crate::events::EventType;
 use crate::log::LogExt;
 use crate::message::{Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
-use crate::sql;
+use crate::sql::{self, params_iter};
 use crate::stock_str;
 use std::cmp::max;
 
@@ -303,15 +303,11 @@ pub(crate) async fn start_ephemeral_timers_msgids(
     context: &Context,
     msg_ids: &[MsgId],
 ) -> Result<()> {
-    let msg_ids: Vec<&dyn crate::ToSql> = msg_ids
-        .iter()
-        .map(|msg_id| msg_id as &dyn crate::ToSql)
-        .collect();
     let now = time();
     let count = context
         .sql
         .execute(
-            format!(
+            &format!(
                 "UPDATE msgs SET ephemeral_timestamp = ? + ephemeral_timer
          WHERE (ephemeral_timestamp == 0 OR ephemeral_timestamp > ? + ephemeral_timer) AND ephemeral_timer > 0
          AND id IN ({})",
@@ -320,7 +316,7 @@ pub(crate) async fn start_ephemeral_timers_msgids(
             rusqlite::params_from_iter(
                 std::iter::once(&now as &dyn crate::ToSql)
                     .chain(std::iter::once(&now as &dyn crate::ToSql))
-                    .chain(msg_ids),
+                    .chain(params_iter(msg_ids)),
             ),
         )
         .await?;
@@ -966,7 +962,7 @@ mod tests {
     }
 
     async fn check_msg_is_deleted(t: &TestContext, chat: &Chat, msg_id: MsgId) {
-        let chat_items = chat::get_chat_msgs(t, chat.id, 0, None).await.unwrap();
+        let chat_items = chat::get_chat_msgs(t, chat.id, 0).await.unwrap();
         // Check that the chat is empty except for possibly info messages:
         for item in &chat_items {
             if let ChatItem::Message { msg_id } = item {

src/events.rs

@@ -1,10 +1,7 @@
 //! # Events specification.
 
-use std::ops::Deref;
-
 use async_std::channel::{self, Receiver, Sender, TrySendError};
 use async_std::path::PathBuf;
-use strum::EnumProperty;
 
 use crate::chat::ChatId;
 use crate::contact::ContactId;
@@ -92,8 +89,6 @@ impl async_std::stream::Stream for EventEmitter {
 /// context emits them in relation to various operations happening, a lot of these are again
 /// documented in `deltachat.h`.
 ///
-/// This struct [`Deref`]s to the [`EventType`].
-///
 /// [`Context`]: crate::context::Context
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Event {
@@ -110,68 +105,39 @@ pub struct Event {
     pub typ: EventType,
 }
 
-impl Deref for Event {
-    type Target = EventType;
-
-    fn deref(&self) -> &EventType {
-        &self.typ
-    }
-}
-
-impl EventType {
-    /// Returns the corresponding Event ID.
-    ///
-    /// These are the IDs used in the `DC_EVENT_*` constants in `deltachat.h`.
-    pub fn as_id(&self) -> i32 {
-        self.get_str("id")
-            .expect("missing id")
-            .parse()
-            .expect("invalid id")
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, EnumProperty)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum EventType {
     /// The library-user may write an informational string to the log.
     ///
     /// This event should *not* be reported to the end-user using a popup or something like
     /// that.
-    #[strum(props(id = "100"))]
     Info(String),
 
     /// Emitted when SMTP connection is established and login was successful.
-    #[strum(props(id = "101"))]
     SmtpConnected(String),
 
     /// Emitted when IMAP connection is established and login was successful.
-    #[strum(props(id = "102"))]
     ImapConnected(String),
 
     /// Emitted when a message was successfully sent to the SMTP server.
-    #[strum(props(id = "103"))]
     SmtpMessageSent(String),
 
     /// Emitted when an IMAP message has been marked as deleted
-    #[strum(props(id = "104"))]
     ImapMessageDeleted(String),
 
     /// Emitted when an IMAP message has been moved
-    #[strum(props(id = "105"))]
     ImapMessageMoved(String),
 
     /// Emitted when an new file in the $BLOBDIR was created
-    #[strum(props(id = "150"))]
     NewBlobFile(String),
 
     /// Emitted when an file in the $BLOBDIR was deleted
-    #[strum(props(id = "151"))]
     DeletedBlobFile(String),
 
     /// The library-user should write a warning string to the log.
     ///
     /// This event should *not* be reported to the end-user using a popup or something like
     /// that.
-    #[strum(props(id = "300"))]
     Warning(String),
 
     /// The library-user should report an error to the end-user.
@@ -184,7 +150,6 @@ pub enum EventType {
     /// it might be better to delay showing these events until the function has really
     /// failed (returned false). It should be sufficient to report only the *last* error
     /// in a messasge box then.
-    #[strum(props(id = "400"))]
     Error(String),
 
     /// An action cannot be performed because the user is not in the group.
@@ -192,7 +157,6 @@ pub enum EventType {
     /// dc_set_chat_name(), dc_set_chat_profile_image(),
     /// dc_add_contact_to_chat(), dc_remove_contact_from_chat(),
     /// dc_send_text_msg() or another sending function.
-    #[strum(props(id = "410"))]
     ErrorSelfNotInGroup(String),
 
     /// Messages or chats changed.  One or more messages or chats changed for various
@@ -203,35 +167,44 @@ pub enum EventType {
     ///
     /// `chat_id` is set if only a single chat is affected by the changes, otherwise 0.
     /// `msg_id` is set if only a single message is affected by the changes, otherwise 0.
-    #[strum(props(id = "2000"))]
-    MsgsChanged { chat_id: ChatId, msg_id: MsgId },
+    MsgsChanged {
+        chat_id: ChatId,
+        msg_id: MsgId,
+    },
 
     /// 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.
-    #[strum(props(id = "2005"))]
-    IncomingMsg { chat_id: ChatId, msg_id: MsgId },
+    IncomingMsg {
+        chat_id: ChatId,
+        msg_id: MsgId,
+    },
 
     /// Messages were seen or noticed.
     /// chat id is always set.
-    #[strum(props(id = "2008"))]
     MsgsNoticed(ChatId),
 
     /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
     /// DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
-    #[strum(props(id = "2010"))]
-    MsgDelivered { chat_id: ChatId, msg_id: MsgId },
+    MsgDelivered {
+        chat_id: ChatId,
+        msg_id: MsgId,
+    },
 
     /// 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 dc_msg_get_state().
-    #[strum(props(id = "2012"))]
-    MsgFailed { chat_id: ChatId, msg_id: MsgId },
+    MsgFailed {
+        chat_id: ChatId,
+        msg_id: MsgId,
+    },
 
     /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
     /// DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
-    #[strum(props(id = "2015"))]
-    MsgRead { chat_id: ChatId, msg_id: MsgId },
+    MsgRead {
+        chat_id: ChatId,
+        msg_id: MsgId,
+    },
 
     /// 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.
@@ -240,11 +213,9 @@ pub enum EventType {
     ///
     /// This event does not include ephemeral timer modification, which
     /// is a separate event.
-    #[strum(props(id = "2020"))]
     ChatModified(ChatId),
 
     /// Chat ephemeral timer changed.
-    #[strum(props(id = "2021"))]
     ChatEphemeralTimerModified {
         chat_id: ChatId,
         timer: EphemeralTimer,
@@ -253,7 +224,6 @@ pub enum EventType {
     /// 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.
-    #[strum(props(id = "2030"))]
     ContactsChanged(Option<ContactId>),
 
     /// Location of one or more contact has changed.
@@ -261,11 +231,9 @@ pub enum EventType {
     /// @param data1 (u32) contact_id of the contact for which the location has changed.
     ///     If the locations of several contacts have been changed,
     ///     eg. after calling dc_delete_all_locations(), this parameter is set to `None`.
-    #[strum(props(id = "2035"))]
     LocationChanged(Option<ContactId>),
 
     /// Inform about the configuration progress started by configure().
-    #[strum(props(id = "2041"))]
     ConfigureProgress {
         /// Progress.
         ///
@@ -280,7 +248,6 @@ pub enum EventType {
     ///
     /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
     /// @param data2 0
-    #[strum(props(id = "2051"))]
     ImexProgress(usize),
 
     /// A file has been exported. A file has been written by imex().
@@ -290,7 +257,6 @@ pub enum EventType {
     /// services.
     ///
     /// @param data2 0
-    #[strum(props(id = "2052"))]
     ImexFileWritten(PathBuf),
 
     /// Progress information of a secure-join handshake from the view of the inviter
@@ -305,7 +271,6 @@ pub enum EventType {
     ///     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.
-    #[strum(props(id = "2060"))]
     SecurejoinInviterProgress {
         contact_id: ContactId,
         progress: usize,
@@ -319,7 +284,6 @@ pub enum EventType {
     /// @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)
-    #[strum(props(id = "2061"))]
     SecurejoinJoinerProgress {
         contact_id: ContactId,
         progress: usize,
@@ -329,13 +293,10 @@ pub enum EventType {
     /// This means that you should refresh the connectivity view
     /// and possibly the connectivtiy HTML; see dc_get_connectivity() and
     /// dc_get_connectivity_html() for details.
-    #[strum(props(id = "2100"))]
     ConnectivityChanged,
 
-    #[strum(props(id = "2110"))]
     SelfavatarChanged,
 
-    #[strum(props(id = "2120"))]
     WebxdcStatusUpdate {
         msg_id: MsgId,
         status_update_serial: StatusUpdateSerial,

src/html.rs

@@ -11,7 +11,7 @@ use futures::future::FutureExt;
 use std::future::Future;
 use std::pin::Pin;
 
-use anyhow::Result;
+use anyhow::{Context as _, Result};
 use lettre_email::mime::{self, Mime};
 
 use crate::headerdef::{HeaderDef, HeaderDefMap};
@@ -134,7 +134,7 @@ impl HtmlMsgParser {
                     if raw.is_empty() {
                         return Ok(());
                     }
-                    let mail = mailparse::parse_mail(&raw).unwrap();
+                    let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?;
                     self.collect_texts_recursive(context, &mail).await
                 }
                 MimeMultipartType::Single => {
@@ -190,7 +190,7 @@ impl HtmlMsgParser {
                     if raw.is_empty() {
                         return Ok(());
                     }
-                    let mail = mailparse::parse_mail(&raw).unwrap();
+                    let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?;
                     self.cid_to_data_recursive(context, &mail).await
                 }
                 MimeMultipartType::Single => {
@@ -467,8 +467,8 @@ test some special html-characters as < > and & but also " and &#x
         // bob: check that bob also got the html-part of the forwarded message
         let bob = TestContext::new_bob().await;
         let chat = bob.create_chat_with_contact("", "alice@example.org").await;
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-        let msg = bob.get_last_msg_in(chat.get_id()).await;
+        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
+        assert_eq!(chat.id, msg.chat_id);
         assert_ne!(msg.get_from_id(), ContactId::SELF);
         assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
         assert!(msg.is_forwarded());
@@ -503,9 +503,8 @@ test some special html-characters as < > and & but also " and &#x
         // receive the message on another device
         let alice = TestContext::new_alice().await;
         assert_eq!(alice.get_config_int(Config::ShowEmails).await.unwrap(), 0); // set to "1" above, make sure it is another db
-        alice.recv_msg(&msg).await;
-        let chat = alice.get_self_chat().await;
-        let msg = alice.get_last_msg_in(chat.get_id()).await;
+        let msg = alice.recv_msg(&msg).await;
+        assert_eq!(msg.chat_id, alice.get_self_chat().await.id);
         assert_eq!(msg.get_from_id(), ContactId::SELF);
         assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
         assert!(msg.get_showpadlock());
@@ -539,8 +538,8 @@ test some special html-characters as < > and & but also " and &#x
 
         // let bob receive the message
         let chat_id = bob.create_chat(&alice).await.id;
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-        let msg = bob.get_last_msg_in(chat_id).await;
+        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
+        assert_eq!(msg.chat_id, chat_id);
         assert_eq!(msg.get_text(), Some("plain text".to_string()));
         assert!(!msg.is_forwarded());
         assert!(msg.mime_modified);

src/imap.rs

@@ -125,6 +125,14 @@ enum FolderMeaning {
     Sent,
     Drafts,
     Other,
+
+    /// Virtual folders.
+    ///
+    /// On Gmail there are virtual folders marked as \\All, \\Important and \\Flagged.
+    /// Delta Chat ignores these folders because the same messages can be fetched
+    /// from the real folder and the result of moving and deleting messages via
+    /// virtual folder is unclear.
+    Virtual,
 }
 
 impl FolderMeaning {
@@ -135,6 +143,7 @@ impl FolderMeaning {
             FolderMeaning::Sent => Some(Config::ConfiguredSentboxFolder),
             FolderMeaning::Drafts => None,
             FolderMeaning::Other => None,
+            FolderMeaning::Virtual => None,
         }
     }
 }
@@ -910,7 +919,7 @@ impl Imap {
         context
             .sql
             .execute(
-                format!(
+                &format!(
                     "DELETE FROM imap WHERE id IN ({})",
                     sql::repeat_vars(row_ids.len())
                 ),
@@ -947,7 +956,7 @@ impl Imap {
                     context
                         .sql
                         .execute(
-                            format!(
+                            &format!(
                                 "DELETE FROM imap WHERE id IN ({})",
                                 sql::repeat_vars(row_ids.len())
                             ),
@@ -989,7 +998,7 @@ impl Imap {
                 context
                     .sql
                     .execute(
-                        format!(
+                        &format!(
                             "UPDATE imap SET target='' WHERE id IN ({})",
                             sql::repeat_vars(row_ids.len())
                         ),
@@ -1030,9 +1039,14 @@ impl Imap {
             .await?;
 
         self.prepare(context).await?;
-        self.select_folder(context, Some(folder)).await?;
 
         for (target, rowid_set, uid_set) in UidGrouper::from(rows) {
+            // Select folder inside the loop to avoid selecting it if there are no pending
+            // MOVE/DELETE operations. This does not result in multiple SELECT commands
+            // being sent because `select_folder()` does nothing if the folder is already
+            // selected.
+            self.select_folder(context, Some(folder)).await?;
+
             // Empty target folder name means messages should be deleted.
             if target.is_empty() {
                 self.delete_message_batch(context, &uid_set, rowid_set)
@@ -1101,7 +1115,7 @@ impl Imap {
                 context
                     .sql
                     .execute(
-                        format!(
+                        &format!(
                             "DELETE FROM imap_markseen WHERE id IN ({})",
                             sql::repeat_vars(rowid_set.len())
                         ),
@@ -1883,6 +1897,7 @@ fn get_folder_meaning(folder_name: &Name) -> FolderMeaning {
                 "\\Sent" => return FolderMeaning::Sent,
                 "\\Spam" | "\\Junk" => return FolderMeaning::Spam,
                 "\\Drafts" => return FolderMeaning::Drafts,
+                "\\All" | "\\Important" | "\\Flagged" => return FolderMeaning::Virtual,
                 _ => {}
             };
         }

src/imap/scan_folders.rs

@@ -35,16 +35,14 @@ impl Imap {
         let mut folder_configs = BTreeMap::new();
 
         for folder in folders {
-            // Gmail labels are not folders and should be skipped. For example,
-            // emails appear in the inbox and under "All Mail" as soon as it is
-            // received. The code used to wrongly conclude that the email had
-            // already been moved and left it in the inbox.
-            let folder_name = folder.name();
-            if folder_name.starts_with("[Gmail]") {
+            let folder_meaning = get_folder_meaning(&folder);
+            if folder_meaning == FolderMeaning::Virtual {
+                // Gmail has virtual folders that should be skipped. For example,
+                // emails appear in the inbox and under "All Mail" as soon as it is
+                // received. The code used to wrongly conclude that the email had
+                // already been moved and left it in the inbox.
                 continue;
             }
-
-            let folder_meaning = get_folder_meaning(&folder);
             let folder_name_meaning = get_folder_meaning_by_name(folder.name());
 
             if let Some(config) = folder_meaning.to_config() {

src/imap/select_folder.rs

@@ -1,6 +1,7 @@
 use super::Imap;
 
 use crate::context::Context;
+use anyhow::Context as _;
 
 type Result<T> = std::result::Result<T, Error>;
 
@@ -15,8 +16,8 @@ pub enum Error {
     #[error("IMAP Folder name invalid: {0}")]
     BadFolderName(String),
 
-    #[error("IMAP folder does not exist: {0}")]
-    NoFolder(String),
+    #[error("Got a NO response when trying to select {0}, usually this means that it doesn't exist: {1}")]
+    NoFolder(String, String),
 
     #[error("IMAP close/expunge failed")]
     CloseExpungeFailed(#[from] async_imap::error::Error),
@@ -117,8 +118,8 @@ impl Imap {
                     Err(async_imap::error::Error::Validate(_)) => {
                         Err(Error::BadFolderName(folder.to_string()))
                     }
-                    Err(async_imap::error::Error::No(_)) => {
-                        Err(Error::NoFolder(folder.to_string()))
+                    Err(async_imap::error::Error::No(response)) => {
+                        Err(Error::NoFolder(folder.to_string(), response))
                     }
                     Err(err) => {
                         self.config.selected_folder = None;
@@ -139,19 +140,19 @@ impl Imap {
         &mut self,
         context: &Context,
         folder: &str,
-    ) -> Result<NewlySelected> {
+    ) -> anyhow::Result<NewlySelected> {
         match self.select_folder(context, Some(folder)).await {
             Ok(newly_selected) => Ok(newly_selected),
             Err(err) => match err {
-                Error::NoFolder(_) => {
-                    if let Some(ref mut session) = self.session {
-                        session.create(folder).await?;
-                    } else {
-                        return Err(Error::NoSession);
-                    }
-                    self.select_folder(context, Some(folder)).await
+                Error::NoFolder(..) => {
+                    let session = self.session.as_mut().context("no IMAP session")?;
+                    session.create(folder).await.with_context(|| {
+                        format!("Couldn't select folder ('{}'), then create() failed", err)
+                    })?;
+
+                    Ok(self.select_folder(context, Some(folder)).await?)
                 }
-                _ => Err(err),
+                _ => Err(err.into()),
             },
         }
     }

src/imex.rs

@@ -445,8 +445,8 @@ async fn import_backup(
         "Cannot import backups to accounts in use."
     );
     ensure!(
-        !context.scheduler.read().await.is_running(),
-        "cannot import backup, IO already running"
+        context.scheduler.read().await.is_none(),
+        "cannot import backup, IO is running"
     );
 
     let backup_file = File::open(backup_to_import).await?;
@@ -563,8 +563,8 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
         .ok();
 
     ensure!(
-        !context.scheduler.read().await.is_running(),
-        "cannot export backup, IO already running"
+        context.scheduler.read().await.is_none(),
+        "cannot export backup, IO is running"
     );
 
     info!(
@@ -987,4 +987,49 @@ mod tests {
         assert_eq!(headers.get(HEADER_AUTOCRYPT), Some(&"mutual".to_string()));
         assert!(headers.get(HEADER_SETUPCODE).is_none());
     }
+
+    #[async_std::test]
+    async fn test_key_transfer() -> Result<()> {
+        let alice = TestContext::new_alice().await;
+
+        let alice_clone = alice.clone();
+        let key_transfer_task = async_std::task::spawn(async move {
+            let ctx = alice_clone;
+            initiate_key_transfer(&ctx).await
+        });
+
+        // Wait for the message to be added to the queue.
+        async_std::task::sleep(std::time::Duration::from_secs(1)).await;
+        let sent = alice.pop_sent_msg().await;
+        let setup_code = key_transfer_task.await?;
+
+        // Alice sets up a second device.
+        let alice2 = TestContext::new().await;
+        alice2.set_name("alice2");
+        alice2.configure_addr("alice@example.org").await;
+        alice2.recv_msg(&sent).await;
+        let msg = alice2.get_last_msg().await;
+
+        // Send a message that cannot be decrypted because the keys are
+        // not synchronized yet.
+        let sent = alice2.send_text(msg.chat_id, "Test").await;
+        alice.recv_msg(&sent).await;
+        assert_ne!(
+            alice.get_last_msg().await.get_text(),
+            Some("Test".to_string())
+        );
+
+        // Transfer the key.
+        continue_key_transfer(&alice2, msg.id, &setup_code).await?;
+
+        // Alice sends a message to self from the new device.
+        let sent = alice2.send_text(msg.chat_id, "Test").await;
+        alice.recv_msg(&sent).await;
+        assert_eq!(
+            alice.get_last_msg().await.get_text(),
+            Some("Test".to_string())
+        );
+
+        Ok(())
+    }
 }

src/job.rs

@@ -4,36 +4,22 @@
 //! and job types.
 use std::fmt;
 
-use anyhow::{format_err, Context as _, Result};
+use anyhow::{Context as _, Result};
 use deltachat_derive::{FromSql, ToSql};
 use rand::{thread_rng, Rng};
 
 use crate::config::Config;
-use crate::contact::{normalize_name, Contact, ContactId, Modifier, Origin};
+use crate::contact::{normalize_name, Contact, Modifier, Origin};
 use crate::context::Context;
 use crate::dc_tools::time;
 use crate::events::EventType;
 use crate::imap::Imap;
-use crate::message::{Message, MsgId};
-use crate::mimefactory::MimeFactory;
-use crate::param::{Param, Params};
+use crate::param::Params;
 use crate::scheduler::InterruptInfo;
-use crate::smtp::{smtp_send, SendResult, Smtp};
-use crate::sql;
 
 // results in ~3 weeks for the last backoff timespan
 const JOB_RETRIES: u32 = 17;
 
-/// Thread IDs
-#[derive(
-    Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql,
-)]
-#[repr(u32)]
-pub(crate) enum Thread {
-    Imap = 100,
-    Smtp = 5000,
-}
-
 /// Job try result.
 #[derive(Debug, Display)]
 pub enum Status {
@@ -72,7 +58,6 @@ macro_rules! job_try {
 )]
 #[repr(u32)]
 pub enum Action {
-    // Jobs in the INBOX-thread, range from DC_IMAP_THREAD..DC_IMAP_THREAD+999
     FetchExistingMsgs = 110,
 
     // this is user initiated so it should have a fairly high priority
@@ -87,24 +72,6 @@ pub enum Action {
     // UID synchronization is high-priority to make sure correct UIDs
     // are used by message moving/deletion.
     ResyncFolders = 300,
-
-    // Jobs in the SMTP-thread, range from DC_SMTP_THREAD..DC_SMTP_THREAD+999
-    SendMdn = 5010,
-}
-
-impl From<Action> for Thread {
-    fn from(action: Action) -> Thread {
-        use Action::*;
-
-        match action {
-            FetchExistingMsgs => Thread::Imap,
-            ResyncFolders => Thread::Imap,
-            UpdateRecentQuota => Thread::Imap,
-            DownloadMsg => Thread::Imap,
-
-            SendMdn => Thread::Smtp,
-        }
-    }
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -159,9 +126,7 @@ impl Job {
     ///
     /// The Job is consumed by this method.
     pub(crate) async fn save(self, context: &Context) -> Result<()> {
-        let thread: Thread = self.action.into();
-
-        info!(context, "saving job for {}-thread: {:?}", thread, self);
+        info!(context, "saving job {:?}", self);
 
         if self.job_id != 0 {
             context
@@ -178,10 +143,9 @@ impl Job {
                 .await?;
         } else {
             context.sql.execute(
-                "INSERT INTO jobs (added_timestamp, thread, action, foreign_id, param, desired_timestamp) VALUES (?,?,?,?,?,?);",
+                "INSERT INTO jobs (added_timestamp, action, foreign_id, param, desired_timestamp) VALUES (?,?,?,?,?);",
                 paramsv![
                     self.added_timestamp,
-                    thread,
                     self.action,
                     self.foreign_id,
                     self.param.to_string(),
@@ -193,118 +157,6 @@ impl Job {
         Ok(())
     }
 
-    /// Get `SendMdn` jobs with foreign_id equal to `contact_id` excluding the `job_id` job.
-    async fn get_additional_mdn_jobs(
-        &self,
-        context: &Context,
-        contact_id: ContactId,
-    ) -> Result<(Vec<u32>, Vec<String>)> {
-        // Extract message IDs from job parameters
-        let res: Vec<(u32, MsgId)> = context
-            .sql
-            .query_map(
-                "SELECT id, param FROM jobs WHERE foreign_id=? AND id!=?",
-                paramsv![contact_id, self.job_id],
-                |row| {
-                    let job_id: u32 = row.get(0)?;
-                    let params_str: String = row.get(1)?;
-                    let params: Params = params_str.parse().unwrap_or_default();
-                    Ok((job_id, params))
-                },
-                |jobs| {
-                    let res = jobs
-                        .filter_map(|row| {
-                            let (job_id, params) = row.ok()?;
-                            let msg_id = params.get_msg_id()?;
-                            Some((job_id, msg_id))
-                        })
-                        .collect();
-                    Ok(res)
-                },
-            )
-            .await?;
-
-        // Load corresponding RFC724 message IDs
-        let mut job_ids = Vec::new();
-        let mut rfc724_mids = Vec::new();
-        for (job_id, msg_id) in res {
-            if let Ok(Message { rfc724_mid, .. }) = Message::load_from_db(context, msg_id).await {
-                job_ids.push(job_id);
-                rfc724_mids.push(rfc724_mid);
-            }
-        }
-        Ok((job_ids, rfc724_mids))
-    }
-
-    async fn send_mdn(&mut self, context: &Context, smtp: &mut Smtp) -> Status {
-        let mdns_enabled = job_try!(context.get_config_bool(Config::MdnsEnabled).await);
-        if !mdns_enabled {
-            // User has disabled MDNs after job scheduling but before
-            // execution.
-            return Status::Finished(Err(format_err!("MDNs are disabled")));
-        }
-
-        let contact_id = ContactId::new(self.foreign_id);
-        let contact = job_try!(Contact::load_from_db(context, contact_id).await);
-        if contact.is_blocked() {
-            return Status::Finished(Err(format_err!("Contact is blocked")));
-        }
-
-        let msg_id = if let Some(msg_id) = self.param.get_msg_id() {
-            msg_id
-        } else {
-            return Status::Finished(Err(format_err!(
-                "SendMdn job has invalid parameters: {}",
-                self.param
-            )));
-        };
-
-        // Try to aggregate other SendMdn jobs and send a combined MDN.
-        let (additional_job_ids, additional_rfc724_mids) = self
-            .get_additional_mdn_jobs(context, contact_id)
-            .await
-            .unwrap_or_default();
-
-        if !additional_rfc724_mids.is_empty() {
-            info!(
-                context,
-                "SendMdn job: aggregating {} additional MDNs",
-                additional_rfc724_mids.len()
-            )
-        }
-
-        let msg = job_try!(Message::load_from_db(context, msg_id).await);
-        let mimefactory =
-            job_try!(MimeFactory::from_mdn(context, &msg, additional_rfc724_mids).await);
-        let rendered_msg = job_try!(mimefactory.render(context).await);
-        let body = rendered_msg.message;
-
-        let addr = contact.get_addr();
-        let recipient = job_try!(async_smtp::EmailAddress::new(addr.to_string())
-            .map_err(|err| format_err!("invalid recipient: {} {:?}", addr, err)));
-        let recipients = vec![recipient];
-
-        // connect to SMTP server, if not yet done
-        if let Err(err) = smtp.connect_configured(context).await {
-            warn!(context, "SMTP connection failure: {:?}", err);
-            smtp.last_send_error = Some(err.to_string());
-            return Status::RetryLater;
-        }
-
-        match smtp_send(context, &recipients, &body, smtp, msg_id, 0).await {
-            SendResult::Success => {
-                // Remove additional SendMdn jobs we have aggregated into this one.
-                job_try!(kill_ids(context, &additional_job_ids).await);
-                Status::Finished(Ok(()))
-            }
-            SendResult::Retry => {
-                info!(context, "Temporary SMTP failure while sending an MDN");
-                Status::RetryLater
-            }
-            SendResult::Failure(err) => Status::Finished(Err(err)),
-        }
-    }
-
     /// Read the recipients from old emails sent by the user and add them as contacts.
     /// This way, we can already offer them some email addresses they can write to.
     ///
@@ -387,22 +239,6 @@ pub async fn kill_action(context: &Context, action: Action) -> Result<()> {
     Ok(())
 }
 
-/// Remove jobs with specified IDs.
-async fn kill_ids(context: &Context, job_ids: &[u32]) -> Result<()> {
-    if job_ids.is_empty() {
-        return Ok(());
-    }
-    let q = format!(
-        "DELETE FROM jobs WHERE id IN({})",
-        sql::repeat_vars(job_ids.len())
-    );
-    context
-        .sql
-        .execute(q, rusqlite::params_from_iter(job_ids))
-        .await?;
-    Ok(())
-}
-
 pub async fn action_exists(context: &Context, action: Action) -> Result<bool> {
     let exists = context
         .sql
@@ -461,36 +297,18 @@ async fn add_all_recipients_as_contacts(context: &Context, imap: &mut Imap, fold
 
 pub(crate) enum Connection<'a> {
     Inbox(&'a mut Imap),
-    Smtp(&'a mut Smtp),
-}
-
-impl<'a> fmt::Display for Connection<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Connection::Inbox(_) => write!(f, "Inbox"),
-            Connection::Smtp(_) => write!(f, "Smtp"),
-        }
-    }
 }
 
 impl<'a> Connection<'a> {
     fn inbox(&mut self) -> &mut Imap {
         match self {
             Connection::Inbox(imap) => imap,
-            _ => panic!("Not an inbox"),
-        }
-    }
-
-    fn smtp(&mut self) -> &mut Smtp {
-        match self {
-            Connection::Smtp(smtp) => smtp,
-            _ => panic!("Not a smtp"),
         }
     }
 }
 
 pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_>, mut job: Job) {
-    info!(context, "{}-job {} started...", &connection, &job);
+    info!(context, "job {} started...", &job);
 
     let try_res = match perform_job_action(context, &mut job, &mut connection, 0).await {
         Status::RetryNow => perform_job_action(context, &mut job, &mut connection, 1).await,
@@ -502,17 +320,13 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
             let tries = job.tries + 1;
 
             if tries < JOB_RETRIES {
-                info!(
-                    context,
-                    "{} thread increases job {} tries to {}", &connection, job, tries
-                );
+                info!(context, "increase job {} tries to {}", job, tries);
                 job.tries = tries;
                 let time_offset = get_backoff_time_offset(tries, job.action);
                 job.desired_timestamp = time() + time_offset;
                 info!(
                     context,
-                    "{}-job #{} not succeeded on try #{}, retry in {} seconds.",
-                    &connection,
+                    "job #{} not succeeded on try #{}, retry in {} seconds.",
                     job.job_id as u32,
                     tries,
                     time_offset
@@ -523,10 +337,7 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
             } else {
                 info!(
                     context,
-                    "{} thread removes job {} as it exhausted {} retries",
-                    &connection,
-                    job,
-                    JOB_RETRIES
+                    "remove job {} as it exhausted {} retries", job, JOB_RETRIES
                 );
                 job.delete(context).await.unwrap_or_else(|err| {
                     error!(context, "failed to delete job: {}", err);
@@ -537,13 +348,10 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
             if let Err(err) = res {
                 warn!(
                     context,
-                    "{} removes job {} as it failed with error {:#}", &connection, job, err
+                    "remove job {} as it failed with error {:#}", job, err
                 );
             } else {
-                info!(
-                    context,
-                    "{} removes job {} as it succeeded", &connection, job
-                );
+                info!(context, "remove job {} as it succeeded", job);
             }
 
             job.delete(context).await.unwrap_or_else(|err| {
@@ -559,13 +367,9 @@ async fn perform_job_action(
     connection: &mut Connection<'_>,
     tries: u32,
 ) -> Status {
-    info!(
-        context,
-        "{} begin immediate try {} of job {}", &connection, tries, job
-    );
+    info!(context, "begin immediate try {} of job {}", tries, job);
 
     let try_res = match job.action {
-        Action::SendMdn => job.send_mdn(context, connection.smtp()).await,
         Action::ResyncFolders => job.resync_folders(context, connection.inbox()).await,
         Action::FetchExistingMsgs => job.fetch_existing_msgs(context, connection.inbox()).await,
         Action::UpdateRecentQuota => match context.update_recent_quota(connection.inbox()).await {
@@ -600,19 +404,6 @@ fn get_backoff_time_offset(tries: u32, action: Action) -> i64 {
     }
 }
 
-pub(crate) async fn send_mdn(context: &Context, msg_id: MsgId, from_id: ContactId) -> Result<()> {
-    let mut param = Params::new();
-    param.set(Param::MsgId, msg_id.to_u32().to_string());
-
-    add(
-        context,
-        Job::new(Action::SendMdn, from_id.to_u32(), param, 0),
-    )
-    .await?;
-
-    Ok(())
-}
-
 pub(crate) async fn schedule_resync(context: &Context) -> Result<()> {
     kill_action(context, Action::ResyncFolders).await?;
     add(
@@ -638,10 +429,6 @@ pub async fn add(context: &Context, job: Job) -> Result<()> {
                 info!(context, "interrupt: imap");
                 context.interrupt_inbox(InterruptInfo::new(false)).await;
             }
-            Action::SendMdn => {
-                info!(context, "interrupt: smtp");
-                context.interrupt_smtp(InterruptInfo::new(false)).await;
-            }
         }
     }
     Ok(())
@@ -649,21 +436,15 @@ pub async fn add(context: &Context, job: Job) -> Result<()> {
 
 /// Load jobs from the database.
 ///
-/// Load jobs for this "[Thread]", i.e. either load SMTP jobs or load
-/// IMAP jobs.  The `probe_network` parameter decides how to query
+/// The `probe_network` parameter decides how to query
 /// jobs, this is tricky and probably wrong currently. Look at the
 /// SQL queries for details.
-pub(crate) async fn load_next(
-    context: &Context,
-    thread: Thread,
-    info: &InterruptInfo,
-) -> Result<Option<Job>> {
-    info!(context, "loading job for {}-thread", thread);
+pub(crate) async fn load_next(context: &Context, info: &InterruptInfo) -> Result<Option<Job>> {
+    info!(context, "loading job");
 
     let query;
     let params;
     let t = time();
-    let thread_i = thread as i64;
 
     if !info.probe_network {
         // processing for first-try and after backoff-timeouts:
@@ -671,11 +452,11 @@ pub(crate) async fn load_next(
         query = r#"
 SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries
 FROM jobs
-WHERE thread=? AND desired_timestamp<=?
+WHERE desired_timestamp<=?
 ORDER BY action DESC, added_timestamp
 LIMIT 1;
 "#;
-        params = paramsv![thread_i, t];
+        params = paramsv![t];
     } else {
         // processing after call to dc_maybe_network():
         // process _all_ pending jobs that failed before
@@ -683,11 +464,11 @@ LIMIT 1;
         query = r#"
 SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries
 FROM jobs
-WHERE thread=? AND tries>0
+WHERE tries>0
 ORDER BY desired_timestamp, action DESC
 LIMIT 1;
 "#;
-        params = paramsv![thread_i];
+        params = paramsv![];
     };
 
     loop {
@@ -742,11 +523,10 @@ mod tests {
             .sql
             .execute(
                 "INSERT INTO jobs
-                   (added_timestamp, thread, action, foreign_id, param, desired_timestamp)
-                 VALUES (?, ?, ?, ?, ?, ?);",
+                   (added_timestamp, action, foreign_id, param, desired_timestamp)
+                 VALUES (?, ?, ?, ?, ?);",
                 paramsv![
                     now,
-                    Thread::from(Action::DownloadMsg),
                     if valid {
                         Action::DownloadMsg as i32
                     } else {
@@ -768,21 +548,11 @@ mod tests {
         // all jobs.
         let t = TestContext::new().await;
         insert_job(&t, 1, false).await; // This can not be loaded into Job struct.
-        let jobs = load_next(
-            &t,
-            Thread::from(Action::DownloadMsg),
-            &InterruptInfo::new(false),
-        )
-        .await?;
+        let jobs = load_next(&t, &InterruptInfo::new(false)).await?;
         assert!(jobs.is_none());
 
         insert_job(&t, 1, true).await;
-        let jobs = load_next(
-            &t,
-            Thread::from(Action::DownloadMsg),
-            &InterruptInfo::new(false),
-        )
-        .await?;
+        let jobs = load_next(&t, &InterruptInfo::new(false)).await?;
         assert!(jobs.is_some());
         Ok(())
     }
@@ -793,12 +563,7 @@ mod tests {
 
         insert_job(&t, 1, true).await;
 
-        let jobs = load_next(
-            &t,
-            Thread::from(Action::DownloadMsg),
-            &InterruptInfo::new(false),
-        )
-        .await?;
+        let jobs = load_next(&t, &InterruptInfo::new(false)).await?;
         assert!(jobs.is_some());
         Ok(())
     }

src/key.rs

@@ -3,9 +3,10 @@
 use std::collections::BTreeMap;
 use std::fmt;
 use std::io::Cursor;
+use std::pin::Pin;
 
-use anyhow::{format_err, Context as _, Result};
-use async_trait::async_trait;
+use anyhow::{ensure, Context as _, Result};
+use futures::Future;
 use num_traits::FromPrimitive;
 use pgp::composed::Deserializable;
 use pgp::ser::Serialize;
@@ -25,7 +26,6 @@ pub use pgp::composed::{SignedPublicKey, SignedSecretKey};
 /// This trait is implemented for rPGP's [SignedPublicKey] and
 /// [SignedSecretKey] types and makes working with them a little
 /// easier in the deltachat world.
-#[async_trait]
 pub trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
     type KeyType: Serialize + Deserializable + KeyTrait + Clone;
 
@@ -54,7 +54,9 @@ pub trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
     }
 
     /// Load the users' default key from the database.
-    async fn load_self(context: &Context) -> Result<Self::KeyType>;
+    fn load_self<'a>(
+        context: &'a Context,
+    ) -> Pin<Box<dyn Future<Output = Result<Self::KeyType>> + 'a + Send>>;
 
     /// Serialise the key as bytes.
     fn to_bytes(&self) -> Vec<u8> {
@@ -82,39 +84,42 @@ pub trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
 
     /// The fingerprint for the key.
     fn fingerprint(&self) -> Fingerprint {
-        Fingerprint::new(KeyTrait::fingerprint(self)).expect("Invalid fingerprint from rpgp")
+        Fingerprint::new(KeyTrait::fingerprint(self))
     }
 }
 
-#[async_trait]
 impl DcKey for SignedPublicKey {
     type KeyType = SignedPublicKey;
 
-    async fn load_self(context: &Context) -> Result<Self::KeyType> {
-        let addr = context.get_primary_self_addr().await?;
-        match context
-            .sql
-            .query_row_optional(
-                r#"
-            SELECT public_key
-              FROM keypairs
-             WHERE addr=?
-               AND is_default=1;
-            "#,
-                paramsv![addr],
-                |row| {
-                    let bytes: Vec<u8> = row.get(0)?;
-                    Ok(bytes)
-                },
-            )
-            .await?
-        {
-            Some(bytes) => Self::from_slice(&bytes),
-            None => {
-                let keypair = generate_keypair(context).await?;
-                Ok(keypair.public)
+    fn load_self<'a>(
+        context: &'a Context,
+    ) -> Pin<Box<dyn Future<Output = Result<Self::KeyType>> + 'a + Send>> {
+        Box::pin(async move {
+            let addr = context.get_primary_self_addr().await?;
+            match context
+                .sql
+                .query_row_optional(
+                    r#"
+                    SELECT public_key
+                      FROM keypairs
+                     WHERE addr=?
+                       AND is_default=1;
+                    "#,
+                    paramsv![addr],
+                    |row| {
+                        let bytes: Vec<u8> = row.get(0)?;
+                        Ok(bytes)
+                    },
+                )
+                .await?
+            {
+                Some(bytes) => Self::from_slice(&bytes),
+                None => {
+                    let keypair = generate_keypair(context).await?;
+                    Ok(keypair.public)
+                }
             }
-        }
+        })
     }
 
     fn to_asc(&self, header: Option<(&str, &str)>) -> String {
@@ -134,34 +139,37 @@ impl DcKey for SignedPublicKey {
     }
 }
 
-#[async_trait]
 impl DcKey for SignedSecretKey {
     type KeyType = SignedSecretKey;
 
-    async fn load_self(context: &Context) -> Result<Self::KeyType> {
-        match context
-            .sql
-            .query_row_optional(
-                r#"
-            SELECT private_key
-              FROM keypairs
-             WHERE addr=(SELECT value FROM config WHERE keyname="configured_addr")
-               AND is_default=1;
-            "#,
-                paramsv![],
-                |row| {
-                    let bytes: Vec<u8> = row.get(0)?;
-                    Ok(bytes)
-                },
-            )
-            .await?
-        {
-            Some(bytes) => Self::from_slice(&bytes),
-            None => {
-                let keypair = generate_keypair(context).await?;
-                Ok(keypair.secret)
+    fn load_self<'a>(
+        context: &'a Context,
+    ) -> Pin<Box<dyn Future<Output = Result<Self::KeyType>> + 'a + Send>> {
+        Box::pin(async move {
+            match context
+                .sql
+                .query_row_optional(
+                    r#"
+                    SELECT private_key
+                      FROM keypairs
+                     WHERE addr=(SELECT value FROM config WHERE keyname="configured_addr")
+                       AND is_default=1;
+                    "#,
+                    paramsv![],
+                    |row| {
+                        let bytes: Vec<u8> = row.get(0)?;
+                        Ok(bytes)
+                    },
+                )
+                .await?
+            {
+                Some(bytes) => Self::from_slice(&bytes),
+                None => {
+                    let keypair = generate_keypair(context).await?;
+                    Ok(keypair.secret)
+                }
             }
-        }
+        })
     }
 
     fn to_asc(&self, header: Option<(&str, &str)>) -> String {
@@ -204,29 +212,8 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     let _guard = context.generating_key_mutex.lock().await;
 
     // Check if the key appeared while we were waiting on the lock.
-    match context
-        .sql
-        .query_row_optional(
-            r#"
-        SELECT public_key, private_key
-          FROM keypairs
-         WHERE addr=?1
-           AND is_default=1;
-        "#,
-            paramsv![addr],
-            |row| {
-                let pub_bytes: Vec<u8> = row.get(0)?;
-                let sec_bytes: Vec<u8> = row.get(1)?;
-                Ok((pub_bytes, sec_bytes))
-            },
-        )
-        .await?
-    {
-        Some((pub_bytes, sec_bytes)) => Ok(KeyPair {
-            addr,
-            public: SignedPublicKey::from_slice(&pub_bytes)?,
-            secret: SignedSecretKey::from_slice(&sec_bytes)?,
-        }),
+    match load_keypair(context, &addr).await? {
+        Some(key_pair) => Ok(key_pair),
         None => {
             let start = std::time::SystemTime::now();
             let keytype = KeyGenType::from_i32(context.get_config_int(Config::KeyGenType).await?)
@@ -246,6 +233,39 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     }
 }
 
+pub(crate) async fn load_keypair(
+    context: &Context,
+    addr: &EmailAddress,
+) -> Result<Option<KeyPair>> {
+    let res = context
+        .sql
+        .query_row_optional(
+            r#"
+        SELECT public_key, private_key
+          FROM keypairs
+         WHERE addr=?1
+           AND is_default=1;
+        "#,
+            paramsv![addr],
+            |row| {
+                let pub_bytes: Vec<u8> = row.get(0)?;
+                let sec_bytes: Vec<u8> = row.get(1)?;
+                Ok((pub_bytes, sec_bytes))
+            },
+        )
+        .await?;
+
+    Ok(if let Some((pub_bytes, sec_bytes)) = res {
+        Some(KeyPair {
+            addr: addr.clone(),
+            public: SignedPublicKey::from_slice(&pub_bytes)?,
+            secret: SignedSecretKey::from_slice(&sec_bytes)?,
+        })
+    } else {
+        None
+    })
+}
+
 /// Use of a [KeyPair] for encryption or decryption.
 ///
 /// This is used by [store_self_keypair] to know what kind of key is
@@ -275,23 +295,20 @@ pub async fn store_self_keypair(
     keypair: &KeyPair,
     default: KeyPairUse,
 ) -> Result<()> {
-    // Everything should really be one transaction, more refactoring
-    // is needed for that.
+    let mut conn = context.sql.get_conn().await?;
+    let transaction = conn.transaction()?;
+
     let public_key = DcKey::to_bytes(&keypair.public);
     let secret_key = DcKey::to_bytes(&keypair.secret);
-    context
-        .sql
+    transaction
         .execute(
             "DELETE FROM keypairs WHERE public_key=? OR private_key=?;",
             paramsv![public_key, secret_key],
         )
-        .await
         .context("failed to remove old use of key")?;
     if default == KeyPairUse::Default {
-        context
-            .sql
+        transaction
             .execute("UPDATE keypairs SET is_default=0;", paramsv![])
-            .await
             .context("failed to clear default")?;
     }
     let is_default = match default {
@@ -302,16 +319,16 @@ pub async fn store_self_keypair(
     let addr = keypair.addr.to_string();
     let t = time();
 
-    context
-        .sql
+    transaction
         .execute(
             "INSERT INTO keypairs (addr, is_default, public_key, private_key, created)
                 VALUES (?,?,?,?,?);",
             paramsv![addr, is_default, public_key, secret_key, t],
         )
-        .await
         .context("failed to insert keypair")?;
 
+    transaction.commit()?;
+
     Ok(())
 }
 
@@ -320,11 +337,9 @@ pub async fn store_self_keypair(
 pub struct Fingerprint(Vec<u8>);
 
 impl Fingerprint {
-    pub fn new(v: Vec<u8>) -> Result<Fingerprint> {
-        match v.len() {
-            20 => Ok(Fingerprint(v)),
-            _ => Err(format_err!("Wrong fingerprint length")),
-        }
+    pub fn new(v: Vec<u8>) -> Fingerprint {
+        debug_assert_eq!(v.len(), 20);
+        Fingerprint(v)
     }
 
     /// Make a hex string from the fingerprint.
@@ -364,14 +379,15 @@ impl fmt::Display for Fingerprint {
 impl std::str::FromStr for Fingerprint {
     type Err = anyhow::Error;
 
-    fn from_str(input: &str) -> std::result::Result<Self, Self::Err> {
+    fn from_str(input: &str) -> Result<Self> {
         let hex_repr: String = input
             .to_uppercase()
             .chars()
             .filter(|&c| ('0'..='9').contains(&c) || ('A'..='F').contains(&c))
             .collect();
-        let v: Vec<u8> = hex::decode(hex_repr)?;
-        let fp = Fingerprint::new(v)?;
+        let v: Vec<u8> = hex::decode(&hex_repr)?;
+        ensure!(v.len() == 20, "wrong fingerprint length: {}", hex_repr);
+        let fp = Fingerprint::new(v);
         Ok(fp)
     }
 }
@@ -589,8 +605,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     fn test_fingerprint_from_str() {
         let res = Fingerprint::new(vec![
             1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-        ])
-        .unwrap();
+        ]);
 
         let fp: Fingerprint = "0102030405060708090A0B0c0d0e0F1011121314".parse().unwrap();
         assert_eq!(fp, res);
@@ -607,8 +622,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     fn test_fingerprint_hex() {
         let fp = Fingerprint::new(vec![
             1, 2, 4, 8, 16, 32, 64, 128, 255, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-        ])
-        .unwrap();
+        ]);
         assert_eq!(fp.hex(), "0102040810204080FF0A0B0C0D0E0F1011121314");
     }
 
@@ -616,8 +630,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     fn test_fingerprint_to_string() {
         let fp = Fingerprint::new(vec![
             1, 2, 4, 8, 16, 32, 64, 128, 255, 1, 2, 4, 8, 16, 32, 64, 128, 255, 19, 20,
-        ])
-        .unwrap();
+        ]);
         assert_eq!(
             fp.to_string(),
             "0102 0408 1020 4080 FF01\n0204 0810 2040 80FF 1314"

src/location.rs

@@ -153,12 +153,12 @@ impl Kml {
     ) {
         let tag = String::from_utf8_lossy(event.name()).trim().to_lowercase();
         if tag == "document" {
-            if let Some(addr) = event.attributes().find(|attr| {
-                attr.as_ref()
-                    .map(|a| String::from_utf8_lossy(a.key).trim().to_lowercase() == "addr")
-                    .unwrap_or_default()
-            }) {
-                self.addr = addr.unwrap().unescape_and_decode_value(reader).ok();
+            if let Some(addr) = event
+                .attributes()
+                .filter_map(|a| a.ok())
+                .find(|attr| String::from_utf8_lossy(attr.key).trim().to_lowercase() == "addr")
+            {
+                self.addr = addr.unescape_and_decode_value(reader).ok();
             }
         } else if tag == "placemark" {
             self.tag = KmlTag::PLACEMARK;

src/login_param.rs

@@ -150,8 +150,7 @@ impl LoginParam {
     }
 
     /// Read the login parameters from the database.
-    async fn from_database(context: &Context, prefix: impl AsRef<str>) -> Result<Self> {
-        let prefix = prefix.as_ref();
+    async fn from_database(context: &Context, prefix: &str) -> Result<Self> {
         let sql = &context.sql;
 
         let key = format!("{}addr", prefix);
@@ -211,7 +210,7 @@ impl LoginParam {
         let key = format!("{}smtp_certificate_checks", prefix);
         let smtp_certificate_checks =
             if let Some(certificate_checks) = sql.get_raw_config_int(key).await? {
-                num_traits::FromPrimitive::from_i32(certificate_checks).unwrap()
+                num_traits::FromPrimitive::from_i32(certificate_checks).unwrap_or_default()
             } else {
                 Default::default()
             };

src/message.rs

@@ -23,7 +23,6 @@ use crate::download::DownloadState;
 use crate::ephemeral::{start_ephemeral_timers_msgids, Timer as EphemeralTimer};
 use crate::events::EventType;
 use crate::imap::markseen_on_imap_table;
-use crate::job;
 use crate::log::LogExt;
 use crate::mimeparser::{parse_message_id, FailureReport, SystemMessage};
 use crate::param::{Param, Params};
@@ -1284,7 +1283,7 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
     let msgs = context
         .sql
         .query_map(
-            format!(
+            &format!(
                 "SELECT
                     m.id AS id,
                     m.chat_id AS chat_id,
@@ -1364,9 +1363,15 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
             {
                 let mdns_enabled = context.get_config_bool(Config::MdnsEnabled).await?;
                 if mdns_enabled {
-                    if let Err(err) = job::send_mdn(context, id, curr_from_id).await {
-                        warn!(context, "could not send out mdn for {}: {}", id, err);
-                    }
+                    context
+                        .sql
+                        .execute(
+                            "INSERT INTO smtp_mdns (msg_id, from_id, rfc724_mid) VALUES(?, ?, ?)",
+                            paramsv![id, curr_from_id, curr_rfc724_mid],
+                        )
+                        .await
+                        .context("failed to insert into smtp_mdns")?;
+                    context.interrupt_smtp(InterruptInfo::new(false)).await;
                 }
             }
             updated_chat_ids.insert(curr_chat_id);
@@ -1975,9 +1980,7 @@ mod tests {
             .unwrap();
 
         let mut has_image = false;
-        let chatitems = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let chatitems = chat::get_chat_msgs(&t, device_chat_id, 0).await.unwrap();
         for chatitem in chatitems {
             if let ChatItem::Message { msg_id } = chatitem {
                 if let Ok(msg) = Message::load_from_db(&t, msg_id).await {
@@ -2087,8 +2090,8 @@ mod tests {
             .first()
             .unwrap();
         let contact = Contact::load_from_db(&bob, contact_id).await.unwrap();
-        bob.recv_msg(&alice.pop_sent_msg().await).await;
-        let msg = bob.get_last_msg_in(chat.id).await;
+        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
+        assert_eq!(msg.chat_id, chat.id);
         assert_eq!(msg.text, Some("bla blubb".to_string()));
         assert_eq!(
             msg.get_override_sender_name(),
@@ -2113,17 +2116,15 @@ mod tests {
 
         // alice sends to bob,
         assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
-        bob.recv_msg(&alice.send_msg(alice_chat.id, &mut msg).await)
-            .await;
-        let msg1 = bob.get_last_msg().await;
+        let sent1 = alice.send_msg(alice_chat.id, &mut msg).await;
+        let msg1 = bob.recv_msg(&sent1).await;
         let bob_chat_id = msg1.chat_id;
-        bob.recv_msg(&alice.send_msg(alice_chat.id, &mut msg).await)
-            .await;
-        let msg2 = bob.get_last_msg().await;
+        let sent2 = alice.send_msg(alice_chat.id, &mut msg).await;
+        let msg2 = bob.recv_msg(&sent2).await;
         assert_eq!(msg1.chat_id, msg2.chat_id);
         let chats = Chatlist::try_load(&bob, 0, None, None).await?;
         assert_eq!(chats.len(), 1);
-        let msgs = chat::get_chat_msgs(&bob, bob_chat_id, 0, None).await?;
+        let msgs = chat::get_chat_msgs(&bob, bob_chat_id, 0).await?;
         assert_eq!(msgs.len(), 2);
         assert_eq!(bob.get_fresh_msgs().await?.len(), 0);
 
@@ -2134,20 +2135,18 @@ mod tests {
         let bob_chat = Chat::load_from_db(&bob, bob_chat_id).await?;
         assert_eq!(bob_chat.blocked, Blocked::Request);
 
-        let msgs = chat::get_chat_msgs(&bob, bob_chat_id, 0, None).await?;
+        let msgs = chat::get_chat_msgs(&bob, bob_chat_id, 0).await?;
         assert_eq!(msgs.len(), 2);
         bob_chat_id.accept(&bob).await.unwrap();
 
         // bob sends to alice,
         // alice knows bob and messages appear in normal chat
-        alice
+        let msg1 = alice
             .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
             .await;
-        let msg1 = alice.get_last_msg().await;
-        alice
+        let msg2 = alice
             .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
             .await;
-        let msg2 = alice.get_last_msg().await;
         let chats = Chatlist::try_load(&alice, 0, None, None).await?;
         assert_eq!(chats.len(), 1);
         assert_eq!(chats.get_chat_id(0)?, alice_chat.id);
@@ -2223,8 +2222,7 @@ mod tests {
         assert_state(&alice, alice_msg.id, MessageState::OutFailed).await;
 
         // check incoming message states on receiver side
-        bob.recv_msg(&payload).await;
-        let bob_msg = bob.get_last_msg().await;
+        let bob_msg = bob.recv_msg(&payload).await;
         assert_eq!(bob_chat.id, bob_msg.chat_id);
         assert_state(&bob, bob_msg.id, MessageState::InFresh).await;
 

src/mimeparser.rs

@@ -5,7 +5,7 @@ use std::future::Future;
 use std::io::Cursor;
 use std::pin::Pin;
 
-use anyhow::{bail, Result};
+use anyhow::{bail, Context as _, Result};
 use deltachat_derive::{FromSql, ToSql};
 use lettre_email::mime::{self, Mime};
 use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};
@@ -214,8 +214,9 @@ impl MimeMessage {
         let mut mail_raw = Vec::new();
         let mut gossiped_addr = Default::default();
 
-        let (mail, signatures, warn_empty_signature) =
-            match e2ee::try_decrypt(context, &mail, message_time).await {
+        let peerstate = e2ee::get_autocrypt_peerstate(context, &mail, message_time).await?;
+        let (mail, signatures, warn_empty_signature) = if partial.is_none() {
+            match e2ee::try_decrypt(context, &mail, &peerstate).await {
                 Ok((raw, signatures)) => {
                     if let Some(raw) = raw {
                         // Encrypted, but maybe unsigned message. Only if
@@ -265,24 +266,31 @@ impl MimeMessage {
                             &decrypted_mail.headers,
                         );
 
-                        (decrypted_mail, signatures, true)
+                        (Ok(decrypted_mail), signatures, true)
                     } else {
-                        // Message was not encrypted
-                        (mail, signatures, false)
+                        // Message was not encrypted.
+                        // If it is not a read receipt, degrade encryption.
+                        if let Some(mut peerstate) = peerstate {
+                            if message_time > peerstate.last_seen_autocrypt
+                                && mail.ctype.mimetype != "multipart/report"
+                            {
+                                peerstate.degrade_encryption(message_time);
+                                peerstate.save_to_db(&context.sql, false).await?;
+                            }
+                        }
+
+                        (Ok(mail), signatures, false)
                     }
                 }
                 Err(err) => {
-                    // continue with the current, still encrypted, mime tree.
-                    // unencrypted parts will be replaced by an error message
-                    // that is added as "the message" to the chat then.
-                    //
-                    // if we just return here, the header is missing
-                    // and the caller cannot display the message
-                    // and try to assign the message to a chat
                     warn!(context, "decryption failed: {}", err);
-                    (mail, Default::default(), true)
+                    (Err(err), Default::default(), true)
                 }
-            };
+            }
+        } else {
+            // Partial message, do not try to decrypt.
+            (Ok(mail), Default::default(), false)
+        };
 
         let mut parser = MimeMessage {
             parts: Vec::new(),
@@ -291,7 +299,7 @@ impl MimeMessage {
             list_post,
             from,
             chat_disposition_notification_to,
-            decrypting_failed: false,
+            decrypting_failed: mail.is_err(),
 
             // only non-empty if it was a valid autocrypt message
             signatures,
@@ -318,9 +326,24 @@ impl MimeMessage {
                     .create_stub_from_partial_download(context, org_bytes)
                     .await?;
             }
-            None => {
-                parser.parse_mime_recursive(context, &mail, false).await?;
-            }
+            None => match mail {
+                Ok(mail) => {
+                    parser.parse_mime_recursive(context, &mail, false).await?;
+                }
+                Err(err) => {
+                    let msg_body = stock_str::cant_decrypt_msg_body(context).await;
+                    let txt = format!("[{}]", msg_body);
+
+                    let part = Part {
+                        typ: Viewtype::Text,
+                        msg_raw: Some(txt.clone()),
+                        msg: txt,
+                        error: Some(format!("Decrypting failed: {}", err)),
+                        ..Default::default()
+                    };
+                    parser.parts.push(part);
+                }
+            },
         };
 
         parser.maybe_remove_bad_parts();
@@ -715,7 +738,7 @@ impl MimeMessage {
                     if raw.is_empty() {
                         return Ok(false);
                     }
-                    let mail = mailparse::parse_mail(&raw).unwrap();
+                    let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?;
 
                     self.parse_mime_recursive(context, &mail, is_related).await
                 }
@@ -779,25 +802,6 @@ impl MimeMessage {
                     self.is_mime_modified = true;
                 }
             }
-            (mime::MULTIPART, "encrypted") => {
-                // we currently do not try to decrypt non-autocrypt messages
-                // at all. If we see an encrypted part, we set
-                // decrypting_failed.
-                let msg_body = stock_str::cant_decrypt_msg_body(context).await;
-                let txt = format!("[{}]", msg_body);
-
-                let part = Part {
-                    typ: Viewtype::Text,
-                    msg_raw: Some(txt.clone()),
-                    msg: txt,
-                    error: Some("Decryption failed".to_string()),
-                    ..Default::default()
-                };
-                self.parts.push(part);
-
-                any_part_added = true;
-                self.decrypting_failed = true;
-            }
             (mime::MULTIPART, "signed") => {
                 /* RFC 1847: "The multipart/signed content type
                 contains exactly two body parts.  The first body
@@ -805,7 +809,7 @@ impl MimeMessage {
                 The second body part contains the control information necessary to
                 verify the digital signature." We simply take the first body part and
                 skip the rest.  (see
-                <https://k9mail.github.io/2016/11/24/OpenPGP-Considerations-Part-I.html>
+                <https://k9mail.app/2016/11/24/OpenPGP-Considerations-Part-I.html>
                 for background information why we use encrypted+signed) */
                 if let Some(first) = mail.subparts.get(0) {
                     any_part_added = self
@@ -1061,7 +1065,6 @@ impl MimeMessage {
                 .unwrap_or_default();
             self.sync_items = context
                 .parse_sync_items(serialized)
-                .await
                 .map_err(|err| {
                     warn!(context, "failed to parse sync data: {}", err);
                 })

src/oauth2.rs

@@ -146,8 +146,10 @@ pub async fn dc_get_oauth2_access_token(
                 value = &redirect_uri;
             } else if value == "$CODE" {
                 value = code;
-            } else if value == "$REFRESH_TOKEN" && refresh_token.is_some() {
-                value = refresh_token.as_ref().unwrap();
+            } else if value == "$REFRESH_TOKEN" {
+                if let Some(refresh_token) = refresh_token.as_ref() {
+                    value = refresh_token;
+                }
             }
 
             post_param.insert(key, value);
@@ -162,16 +164,18 @@ pub async fn dc_get_oauth2_access_token(
 
         let client = surf::Client::new();
         let parsed: Result<Response, _> = client.recv_json(req).await;
-        if parsed.is_err() {
-            warn!(
-                context,
-                "Failed to parse OAuth2 JSON response from {}: error: {:?}", token_url, parsed
-            );
-            return Ok(None);
-        }
+        let response = match parsed {
+            Ok(response) => response,
+            Err(err) => {
+                warn!(
+                    context,
+                    "Failed to parse OAuth2 JSON response from {}: error: {}", token_url, err
+                );
+                return Ok(None);
+            }
+        };
 
         // update refresh_token if given, typically on the first round, but we update it later as well.
-        let response = parsed.unwrap();
         if let Some(ref token) = response.refresh_token {
             context
                 .sql
@@ -286,12 +290,13 @@ impl Oauth2 {
         // }
         let response: Result<HashMap<String, serde_json::Value>, surf::Error> =
             surf::get(userinfo_url).recv_json().await;
-        if response.is_err() {
-            warn!(context, "Error getting userinfo: {:?}", response);
-            return None;
-        }
-
-        let parsed = response.unwrap();
+        let parsed = match response {
+            Ok(parsed) => parsed,
+            Err(err) => {
+                warn!(context, "Error getting userinfo: {}", err);
+                return None;
+            }
+        };
         // CAVE: serde_json::Value.as_str() removes the quotes of json-strings
         // but serde_json::Value.to_string() does not!
         if let Some(addr) = parsed.get("email") {

src/param.rs

@@ -169,6 +169,12 @@ pub enum Param {
     /// For Chats: timestamp of protection settings update.
     ProtectionSettingsTimestamp = b'L',
 
+    /// For Webxdc Message Instances: Current document name
+    WebxdcDocument = b'R',
+
+    /// For Webxdc Message Instances: timestamp of document name update.
+    WebxdcDocumentTimestamp = b'W',
+
     /// For Webxdc Message Instances: Current summary
     WebxdcSummary = b'N',
 

src/peerstate.rs

@@ -267,6 +267,11 @@ impl Peerstate {
         context: &Context,
         timestamp: i64,
     ) -> Result<()> {
+        if context.is_self_addr(&self.addr).await? {
+            // Do not try to search all the chats with self.
+            return Ok(());
+        }
+
         if self.fingerprint_changed {
             if let Some(contact_id) = context
                 .sql

src/pgp.rs

@@ -4,7 +4,7 @@ use std::collections::{BTreeMap, HashSet};
 use std::io;
 use std::io::Cursor;
 
-use anyhow::{bail, ensure, format_err, Context as _, Result};
+use anyhow::{bail, format_err, Context as _, Result};
 use pgp::armor::BlockType;
 use pgp::composed::{
     Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
@@ -98,9 +98,7 @@ pub fn split_armored_data(buf: &[u8]) -> Result<(BlockType, BTreeMap<String, Str
     let mut bytes = Vec::with_capacity(buf.len());
 
     dearmor.read_to_end(&mut bytes)?;
-    ensure!(dearmor.typ.is_some(), "Failed to parse type");
-
-    let typ = dearmor.typ.unwrap();
+    let typ = dearmor.typ.context("failed to parse type")?;
 
     // normalize headers
     let headers = dearmor
@@ -112,27 +110,6 @@ pub fn split_armored_data(buf: &[u8]) -> Result<(BlockType, BTreeMap<String, Str
     Ok((typ, headers, bytes))
 }
 
-/// Error with generating a PGP keypair.
-///
-/// Most of these are likely coding errors rather than user errors
-/// since all variability is hardcoded.
-#[derive(Debug, thiserror::Error)]
-#[error("PgpKeygenError: {message}")]
-pub struct PgpKeygenError {
-    message: String,
-    #[source]
-    cause: anyhow::Error,
-}
-
-impl PgpKeygenError {
-    fn new(message: impl Into<String>, cause: impl Into<anyhow::Error>) -> Self {
-        Self {
-            message: message.into(),
-            cause: cause.into(),
-        }
-    }
-}
-
 /// A PGP keypair.
 ///
 /// This has it's own struct to be able to keep the public and secret
@@ -145,10 +122,7 @@ pub struct KeyPair {
 }
 
 /// Create a new key pair.
-pub(crate) fn create_keypair(
-    addr: EmailAddress,
-    keygen_type: KeyGenType,
-) -> std::result::Result<KeyPair, PgpKeygenError> {
+pub(crate) fn create_keypair(addr: EmailAddress, keygen_type: KeyGenType) -> Result<KeyPair> {
     let (secret_key_type, public_key_type) = match keygen_type {
         KeyGenType::Rsa2048 => (PgpKeyType::Rsa(2048), PgpKeyType::Rsa(2048)),
         KeyGenType::Ed25519 | KeyGenType::Default => (PgpKeyType::EdDSA, PgpKeyType::ECDH),
@@ -183,26 +157,32 @@ pub(crate) fn create_keypair(
                 .can_encrypt(true)
                 .passphrase(None)
                 .build()
-                .unwrap(),
+                .map_err(|e| format_err!("{}", e))
+                .context("failed to build subkey parameters")?,
         )
         .build()
-        .map_err(|err| PgpKeygenError::new("invalid key params", format_err!(err)))?;
-    let key = key_params
-        .generate()
-        .map_err(|err| PgpKeygenError::new("invalid params", err))?;
-    let private_key = key.sign(|| "".into()).expect("failed to sign secret key");
+        .map_err(|e| format_err!("{}", e))
+        .context("invalid key params")?;
+    let key = key_params.generate().context("invalid params")?;
+    let private_key = key
+        .sign(|| "".into())
+        .map_err(|e| format_err!("{}", e))
+        .context("failed to sign secret key")?;
 
     let public_key = private_key.public_key();
     let public_key = public_key
         .sign(&private_key, || "".into())
-        .map_err(|err| PgpKeygenError::new("failed to sign public key", err))?;
+        .map_err(|e| format_err!("{}", e))
+        .context("failed to sign public key")?;
 
     private_key
         .verify()
-        .map_err(|err| PgpKeygenError::new("invalid private key generated", err))?;
+        .map_err(|e| format_err!("{}", e))
+        .context("invalid private key generated")?;
     public_key
         .verify()
-        .map_err(|err| PgpKeygenError::new("invalid public key generated", err))?;
+        .map_err(|e| format_err!("{}", e))
+        .context("invalid public key generated")?;
 
     Ok(KeyPair {
         addr,