save work

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "daily"
     commit-message:
       prefix: "cargo"
-    open-pull-requests-limit: 50
+    open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -45,7 +45,7 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --examples --benches
+          args: --workspace --tests --examples
 
   docs:
     name: Rust doc comments
@@ -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.59.0
             python: 3.9
           - os: windows-latest
-            rust: 1.60.0
+            rust: 1.59.0
             python: false # Python bindings compilation on Windows is not supported.
 
           # Minimum Supported Rust Version = 1.56.0

.github/workflows/dependabot.yml

@@ -1,21 +0,0 @@
-name: Dependabot auto-approve
-on: pull_request
-
-permissions:
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Approve a PR
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

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

@@ -1,32 +0,0 @@
-# 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/"

.github/workflows/node-docs.yml

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

@@ -1,170 +0,0 @@
-name: 'node.js'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-
-
-jobs:
-  prebuild:
-    name: 'Tests & 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: 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 }}
-      - 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('::set-output name=prid::' + '${{ github.ref }}'.split('/')[2])"
-          else
-            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
-      - 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 prebuilds
-          tar -xvzf ubuntu-18.04/ubuntu-18.04.tar.gz -C prebuilds
-          tar -xvzf macos-latest/macos-latest.tar.gz -C prebuilds
-          tar -xvzf windows-latest/windows-latest.tar.gz -C prebuilds
-          tree prebuilds
-      - 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: |
-          npm pack .
-          ls -lah
-          mv $(find deltachat-node-*) deltachat-node-${{ steps.prepare.outputs.prid }}.tar.gz
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: deltachat-node.tgz
-          path: deltachat-node-${{ steps.prepare.outputs.prid }}.tar.gz
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-node preview to download.delta.chat/node/preview/
-        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-${{ steps.prepare.outputs.prid }}.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/deltachat-node-${{ steps.prepare.outputs.prid }}
-         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-${{ steps.prepare.outputs.prid }}.tar.gz "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.gitignore

@@ -29,14 +29,3 @@ deltachat-ffi/xml
 
 coverage/
 .DS_Store
-.vscode/launch.json
-python/accounts.txt
-python/all-testaccounts.txt
-tmp/
-
-# from deltachat-node
-node_modules/
-node/build/
-node/dist/
-node/prebuilds/
-node/.nyc_output/

.npmignore

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

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

CHANGELOG.md

@@ -1,93 +1,24 @@
 # Changelog
 
-## 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
-- update provider database #3284
-- improve python bindings, tests and ci #3287 #3286 #3287 #3289 #3290 #3292
-
-### Fixes
-- fix escaping in generated QR-code-SVG #3295
-
-
-## 1.79.0
-
-### Changes
-- Send locations in the background regardless of SMTP loop activity #3247
-- refactorings #3268
-- improve tests and ci #3266 #3271
-
-### Fixes
-- simplify `dc_stop_io()` and remove potential panics and race conditions #3273
-- fix correct message escaping consisting of a dot in SMTP protocol #3265
-
-
-## 1.78.0
-
-### API-Changes
-- replaced stock string `DC_STR_ONE_MOMENT` by `DC_STR_NOT_CONNECTED` #3222
-- add `dc_resend_msgs()` #3238
-- `dc_provider_new_from_email()` does no longer do an DNS lookup for checking custom domains,
-  this is done by `dc_provider_new_from_email_with_dns()` now #3256
-
-### Changes
-- introduce multiple self addresses with the "configured" address always being the primary one #2896
-- Further improve finding the correct server after logging in #3208
-- `get_connectivity_html()` returns HTML as non-scalable #3213
-- add update-serial to `DC_EVENT_WEBXDC_STATUS_UPDATE` #3215
-- Speed up message receiving via IMAP a bit #3225
-- mark messages as seen on IMAP in batches #3223
-- remove Received: based draft detection heuristic #3230
-- Use pkgconfig for building Python package #2590
-- don't start io on unconfigured context #2664
-- do not assign group IDs to ad-hoc groups #2798
-- dynamic libraries use dylib extension on Darwin #3226
-- refactorings #3217 #3219 #3224 #3235 #3239 #3244 #3254
-- improve documentation #3214 #3220 #3237
-- improve tests and ci #3212 #3233 #3241 #3242 #3252 #3250 #3255 #3260
-
-### Fixes
-- Take `delete_device_after` into account when calculating ephemeral loop timeout #3211 #3221
-- Fix a bug where a blocked contact could send a contact request #3218
-- Make sure, videochat-room-names are always URL-safe #3231
-- Try removing account folder multiple times in case of failure #3229
-- Ignore messages from all spam folders if there are many #3246
-- Hide location-only messages instead of displaying empty bubbles #3248
-
-
-## 1.77.0
+## Unreleased
 
 ### API changes
 - change semantics of `dc_get_webxdc_status_updates()` second parameter
   and remove update-id from `DC_EVENT_WEBXDC_STATUS_UPDATE` #3081
 
+### Fixes
+- Hopefully fix a bug where outgoing messages appear twice with Amazon SES #3077
+- do not delete messages without Message-IDs as duplicates #3095
+- Assign replies from a different email address to the correct chat #3119
+- Assing outgoing private replies to the correct chat #3177
+- start ephemeral timer when seen status is synchronized via IMAP #3122
+- do not delete duplicate messages on IMAP immediately to accidentally deleting
+  the last copy #3138
+- speed up loading of chat messages #3171
+- clear more columns when message expires due to `delete_device_after` setting #3181
+- do not try to use stale SMTP connections #3180
+- retry message sending automatically if loop is not interrupted #3183
+
 ### Changes
 - add more SMTP logging #3093
 - place common headers like `From:` before the large `Autocrypt:` header #3079
@@ -96,32 +27,13 @@
 - improve speed by caching config values #3131 #3145
 - optimize `markseen_msgs` #3141
 - automatically accept chats with outgoing messages #3143
-- `dc_receive_imf` refactorings #3154 #3156 #3159
+- `dc_receive_imf` refactorings #3154 #3156
 - add index to speedup deletion of expired ephemeral messages #3155
 - muted chats stay archived on new messages #3184
-- support `min_api` from Webxdc manifests #3206
-- do not read whole webxdc file into memory #3109
-- improve tests, refactorings #3073 #3096 #3102 #3108 #3139 #3128 #3133 #3142 #3153 #3151 #3174 #3170 #3148 #3179 #3185
-- improve documentation #2983 #3112 #3103 #3118 #3120
+
 
 ### Fixes
-- speed up loading of chat messages by a factor of 20 #3171 #3194 #3173
-- fix an issue where the app crashes when trying to export a backup #3195
-- hopefully fix a bug where outgoing messages appear twice with Amazon SES #3077
-- do not delete messages without Message-IDs as duplicates #3095
-- assign replies from a different email address to the correct chat #3119
-- assing outgoing private replies to the correct chat #3177
-- start ephemeral timer when seen status is synchronized via IMAP #3122
-- do not create empty contact requests with "setup changed" messages;
-  instead, send a "setup changed" message into all chats we share with the peer #3187
-- do not delete duplicate messages on IMAP immediately to accidentally deleting
-  the last copy #3138
-- clear more columns when message expires due to `delete_device_after` setting #3181
-- do not try to use stale SMTP connections #3180
-- slightly improve finding the correct server after logging in #3207
-- retry message sending automatically if loop is not interrupted #3183
-- fix a bug where sometimes the file extension of a long filename containing a dot was cropped #3098
-
+- Fix a bug where sometimes the file extension of a long filename containing a dot was cropped #3098
 
 ## 1.76.0
 

CMakeLists.txt

@@ -4,18 +4,10 @@ include(GNUInstallDirs)
 
 find_program(CARGO cargo)
 
-if(APPLE)
-       set(DYNAMIC_EXT "dylib")
-elseif(UNIX)
-       set(DYNAMIC_EXT "so")
-else()
-       set(DYNAMIC_EXT "dll")
-endif()
-
 add_custom_command(
 	OUTPUT
 	"target/release/libdeltachat.a"
-	"target/release/libdeltachat.${DYNAMIC_EXT}"
+	"target/release/libdeltachat.so"
 	"target/release/pkgconfig/deltachat.pc"
         COMMAND
         PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -40,11 +32,11 @@ add_custom_target(
 	ALL
 	DEPENDS
 	"target/release/libdeltachat.a"
-	"target/release/libdeltachat.${DYNAMIC_EXT}"
+	"target/release/libdeltachat.so"
 	"target/release/pkgconfig/deltachat.pc"
 )
 
 install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

Cargo.lock

@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.57"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
 
 [[package]]
 name = "arrayvec"
@@ -177,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "2.0.4"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43"
+checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -210,7 +210,7 @@ dependencies = [
 [[package]]
 name = "async-imap"
 version = "0.5.0"
-source = "git+https://github.com/async-email/async-imap#d07ea4019f2ca724244f7a4503a8ac4946a722b3"
+source = "git+https://github.com/async-email/async-imap#7ddd1c1c7d5013a4b3369235f9f9bc233e9d7398"
 dependencies = [
  "async-native-tls",
  "async-std",
@@ -224,7 +224,7 @@ dependencies = [
  "once_cell",
  "ouroboros",
  "pin-utils",
- "stop-token",
+ "stop-token 0.2.0",
  "thiserror",
 ]
 
@@ -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#3e7a8f3de19fdeb19d14cf123a8696c49685d3fa"
 dependencies = [
  "async-native-tls",
  "async-std",
@@ -310,6 +310,9 @@ dependencies = [
  "nom 5.1.2",
  "pin-project",
  "pin-utils",
+ "serde",
+ "serde_derive",
+ "serde_json",
  "thiserror",
 ]
 
@@ -421,24 +424,24 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.65"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.4.4",
  "object",
  "rustc-demangle",
 ]
 
 [[package]]
 name = "base-x"
-version = "0.2.10"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
 
 [[package]]
 name = "base64"
@@ -597,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.9.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
+checksum = "ee1e0e2125faccb856bf10b0a9dfa89c4c718d05ef85580dfefbdf1c422ef801"
 
 [[package]]
 name = "byteorder"
@@ -711,9 +714,9 @@ dependencies = [
 
 [[package]]
 name = "clear_on_drop"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38508a63f4979f0048febc9966fadbd48e5dab31fd0ec6a3f151bbf4a74f7423"
+checksum = "c9cc5db465b294c3fa986d5bbb0f3017cd850bff6dd6c52f9ccff8b4d21b7b08"
 dependencies = [
  "cc",
 ]
@@ -1067,7 +1070,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.81.0"
+version = "1.76.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1123,6 +1126,7 @@ dependencies = [
  "sha-1 0.10.0",
  "sha2 0.10.2",
  "smallvec",
+ "stop-token 0.7.0",
  "strum",
  "strum_macros",
  "surf",
@@ -1146,7 +1150,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.81.0"
+version = "1.76.0"
 dependencies = [
  "anyhow",
  "async-std",
@@ -1385,9 +1389,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1531,9 +1535,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
+checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -1543,14 +1547,14 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.23"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
  "cfg-if 1.0.0",
  "crc32fast",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.4.4",
 ]
 
 [[package]]
@@ -1754,9 +1758,9 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
+checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1892,9 +1896,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
 
 [[package]]
 name = "human-panic"
@@ -1945,9 +1949,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.2"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28edd9d7bc256be2502e325ac0628bde30b7001b9b52e0abe31a1a9dc2701212"
+checksum = "db207d030ae38f1eb6f240d5a1c1c88ff422aa005d10f8c6c6fc5e75286ab30e"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2004,9 +2008,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.5.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c"
 
 [[package]]
 name = "itertools"
@@ -2031,15 +2035,15 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744c24117572563a98a7e9168a5ac1ee4a1ca7f702211258797bbe0ed0346c3c"
+checksum = "a55ad40a2d27923f63b6fbde5934926176c69ac5e23da6ac05ebfaca984e163f"
 
 [[package]]
 name = "js-sys"
-version = "0.3.57"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2116,9 +2120,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.124"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
+checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
 
 [[package]]
 name = "libm"
@@ -2146,9 +2150,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
 
 [[package]]
 name = "lock_api"
@@ -2244,6 +2248,16 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+dependencies = [
+ "adler",
+ "autocfg 1.1.0",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.5.1"
@@ -2386,9 +2400,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
 dependencies = [
  "autocfg 1.1.0",
  "num-integer",
@@ -2427,9 +2441,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.28.3"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
+checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
 dependencies = [
  "memchr",
 ]
@@ -2679,9 +2693,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -2691,9 +2705,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
 [[package]]
 name = "plotters"
@@ -2732,7 +2746,7 @@ dependencies = [
  "bitflags",
  "crc32fast",
  "deflate",
- "miniz_oxide",
+ "miniz_oxide 0.5.1",
 ]
 
 [[package]]
@@ -2807,9 +2821,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.37"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
@@ -2833,9 +2847,9 @@ dependencies = [
 
 [[package]]
 name = "qrcodegen"
-version = "1.8.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
+checksum = "135e6754eed8ca897dd70584d895e72e36860b3e163b6bcedce48571cbaef343"
 
 [[package]]
 name = "quick-error"
@@ -2860,9 +2874,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
 dependencies = [
  "proc-macro2",
 ]
@@ -2993,9 +3007,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.5.2"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
  "autocfg 1.1.0",
  "crossbeam-deque",
@@ -3005,13 +3019,14 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
+ "lazy_static",
  "num_cpus",
 ]
 
@@ -3157,9 +3172,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.34.5"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d275ec42d7bd48e2863912dd8075a4d7376c6f1433b922a0175578b5c7725ce"
+checksum = "cd3cc851a13d30a34cb747ba2a0c5101a4b2e8b1677a29b213ee465365ea495e"
 dependencies = [
  "bitflags",
  "errno",
@@ -3485,9 +3500,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "smallvec"
@@ -3587,6 +3602,16 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
+[[package]]
+name = "stop-token"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d5e0f9b25bdd9bf18e33d1f4dd0194c77034b66b4a4842b0bf7f5cf53ca733a"
+dependencies = [
+ "async-std",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "stop-token"
 version = "0.7.0"
@@ -3660,9 +3685,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.92"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
+checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3817,9 +3842,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3832,18 +3857,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.18.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
  "pin-project-lite",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
  "serde",
 ]
@@ -3928,9 +3953,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
 [[package]]
 name = "unicode-linebreak"
@@ -4066,9 +4091,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.80"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -4076,9 +4101,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.80"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -4091,9 +4116,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -4103,9 +4128,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.80"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4113,9 +4138,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.80"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4126,15 +4151,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.80"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "web-sys"
-version = "0.3.57"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4142,9 +4167,9 @@ dependencies = [
 
 [[package]]
 name = "weezl"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c97e489d8f836838d497091de568cf16b117486d529ec5579233521065bd5e4"
+checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e"
 
 [[package]]
 name = "wepoll-ffi"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.81.0"
+version = "1.76.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -8,11 +8,9 @@ rust-version = "1.56"
 
 [profile.dev]
 debug = 0
-panic = 'abort'
 
 [profile.release]
 lto = true
-panic = 'abort'
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
@@ -21,7 +19,7 @@ ansi_term = { version = "0.12.1", optional = true }
 anyhow = "1"
 async-imap = { git = "https://github.com/async-email/async-imap" }
 async-native-tls = { version = "0.3" }
-async-smtp = { git = "https://github.com/async-email/async-smtp", branch="master", default-features=false, features = ["smtp-transport", "socks5"] }
+async-smtp = { git = "https://github.com/async-email/async-smtp", branch="master", features = ["socks5"] }
 async-std-resolver = "0.21"
 async-std = { version = "1" }
 async-tar = { version = "0.4", default-features=false }
@@ -64,6 +62,7 @@ serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 smallvec = "1"
+stop-token = "0.7"
 strum = "0.24"
 strum_macros = "0.24"
 surf = { version = "2.3", default-features = false, features = ["h1-client"] }

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](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+- **Node.js** \[[📂 source](https://github.com/deltachat/deltachat-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).await.ok());
+        black_box(chat::get_chat_msgs(&context, *c, 0, None).await.ok());
     }
 }
 
@@ -29,7 +29,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         c.bench_function("chat::get_chat_msgs (load messages from 10 chats)", |b| {
             b.to_async(AsyncStdExecutor)
-                .iter(|| get_chat_msgs_benchmark(black_box(path.as_ref()), black_box(&chats)))
+                .iter(|| get_chat_msgs_benchmark(black_box(&path.as_ref()), black_box(&chats)))
         });
     } else {
         println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");

benches/get_chatlist.rs

@@ -5,7 +5,7 @@ use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 
 async fn get_chat_list_benchmark(context: &Context) {
-    Chatlist::try_load(context, 0, None, None).await.unwrap();
+    Chatlist::try_load(&context, 0, None, None).await.unwrap();
 }
 
 fn criterion_benchmark(c: &mut Criterion) {

benches/receive_emails.rs

@@ -31,7 +31,7 @@ Hello {i}",
             i = i,
             i_dec = i - 1,
         );
-        dc_receive_imf(&context, black_box(imf_raw.as_bytes()), false)
+        dc_receive_imf(&context, black_box(imf_raw.as_bytes()), "INBOX", false)
             .await
             .unwrap();
     }

deltachat-ffi/Cargo.toml

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

deltachat-ffi/deltachat.h

@@ -1174,7 +1174,8 @@ 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 Deprecated, set this to 0.
+ * @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.
  * @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);
@@ -1800,25 +1801,6 @@ void            dc_delete_msgs               (dc_context_t* context, const uint3
 void            dc_forward_msgs              (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt, uint32_t chat_id);
 
 
-/**
- * Resend messages and make information available for newly added chat members.
- * Resending sends out the original message, however, recipients and webxdc-status may differ.
- * Clients that already have the original message can still ignore the resent message as
- * they have tracked the state by dedicated updates.
- *
- * Some messages cannot be resent, eg. info-messages, drafts, already pending messages or messages that are not sent by SELF.
- * In this case, the return value indicates an error and the error string from dc_get_last_error() should be shown to the user.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_ids An array of uint32_t containing all message IDs that should be resend.
- *     All messages must belong to the same chat.
- * @param msg_cnt The number of messages IDs in the msg_ids array.
- * @return 1=all messages are queued for resending, 0=error
- */
-int             dc_resend_msgs               (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt);
-
-
 /**
  * Mark messages as presented to the user.
  * Typically, UIs call this function on scrolling through the message list,
@@ -3446,6 +3428,7 @@ int64_t          dc_chat_get_remaining_mute_duration (const dc_chat_t* chat);
  */
 
 
+#define         DC_MSG_ID_MARKER1            1
 #define         DC_MSG_ID_DAYMARKER          9
 #define         DC_MSG_ID_LAST_SPECIAL       9
 
@@ -3728,15 +3711,9 @@ 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.
@@ -4652,10 +4629,9 @@ int             dc_contact_is_verified       (dc_contact_t* contact);
 
 
 /**
- * Create a provider struct for the given e-mail address by local lookup.
+ * Create a provider struct for the given e-mail address.
  *
- * Lookup is done from the local database by extracting the domain from the e-mail address.
- * Therefore the provider for custom domains cannot be identified.
+ * The provider is extracted from the e-mail address and it's information is returned.
  *
  * @memberof dc_provider_t
  * @param context The context object.
@@ -4667,23 +4643,6 @@ int             dc_contact_is_verified       (dc_contact_t* contact);
 dc_provider_t*  dc_provider_new_from_email            (const dc_context_t* context, const char* email);
 
 
-/**
- * Create a provider struct for the given e-mail address by local and DNS lookup.
- *
- * First lookup is done from the local database as of dc_provider_new_from_email().
- * If the first lookup fails, an additional DNS lookup is done,
- * trying to figure out the provider belonging to custom domains.
- *
- * @memberof dc_provider_t
- * @param context The context object.
- * @param email The user's e-mail address to extract the provider info form.
- * @return A dc_provider_t struct which can be used with the dc_provider_get_*
- *     accessor functions. If no provider info is found, NULL will be
- *     returned.
- */
-dc_provider_t*  dc_provider_new_from_email_with_dns    (const dc_context_t* context, const char* email);
-
-
 /**
  * URL of the overview page.
  *
@@ -5647,16 +5606,11 @@ void dc_event_unref(dc_event_t* event);
 /**
  * webxdc status update received.
  * To get the received status update, use dc_get_webxdc_status_updates() with
- * `serial` set to the last known update
- * (in case of special bots, `status_update_serial` from `data2`
- * may help to calculate the last known update for dc_get_webxdc_status_updates();
- * UIs must not peek at this parameter to avoid races in the status replication
- * eg. when events arrive while initial updates are played back).
- *
+ * `serial` set to the last known update.
  * To send status updates, use dc_send_webxdc_status_update().
  *
  * @param data1 (int) msg_id
- * @param data2 (int) status_update_serial - must not be used by UI implementations.
+ * @param data2 (int) 0
  */
 #define DC_EVENT_WEBXDC_STATUS_UPDATE                2120
 
@@ -6264,7 +6218,9 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced by the domain of the configured e-mail address.
 #define DC_STR_STORAGE_ON_DOMAIN          105
 
-/// @deprecated Deprecated 2022-04-16, this string is no longer needed.
+/// "One moment…"
+///
+/// Used in the connectivity view when some information are not yet there.
 #define DC_STR_ONE_MOMENT                 106
 
 /// "Connected"
@@ -6353,11 +6309,6 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced with the group name.
 #define DC_STR_SECURE_JOIN_GROUP_QR_DESC  120
 
-/// "Not connected"
-///
-/// Used as status in the connectivity view.
-#define DC_STR_NOT_CONNECTED              121
-
 /**
  * @}
  */

deltachat-ffi/src/dc_array.rs

@@ -1,5 +1,5 @@
 use crate::chat::ChatItem;
-use crate::constants::DC_MSG_ID_DAYMARKER;
+use crate::constants::{DC_MSG_ID_DAYMARKER, DC_MSG_ID_MARKER1};
 use crate::location::Location;
 use crate::message::MsgId;
 
@@ -18,6 +18,7 @@ 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,
@@ -30,6 +31,7 @@ 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

@@ -503,7 +503,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::SecurejoinJoinerProgress { contact_id, .. } => {
             contact_id.to_u32() as libc::c_int
         }
-        EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcStatusUpdate(msg_id) => msg_id.to_u32() as libc::c_int,
     }
 }
 
@@ -535,8 +535,9 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::ImexFileWritten(_)
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
-        | EventType::SelfavatarChanged => 0,
-        EventType::ChatModified(_) => 0,
+        | EventType::SelfavatarChanged
+        | EventType::WebxdcStatusUpdate(_)
+        | EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
         | EventType::MsgDelivered { msg_id, .. }
@@ -545,10 +546,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         EventType::SecurejoinInviterProgress { progress, .. }
         | EventType::SecurejoinJoinerProgress { progress, .. } => *progress as libc::c_int,
         EventType::ChatEphemeralTimerModified { timer, .. } => timer.to_u32() as libc::c_int,
-        EventType::WebxdcStatusUpdate {
-            status_update_serial,
-            ..
-        } => status_update_serial.to_u32() as libc::c_int,
     }
 }
 
@@ -590,7 +587,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::SecurejoinJoinerProgress { .. }
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
-        | EventType::WebxdcStatusUpdate { .. }
+        | EventType::WebxdcStatusUpdate(_)
         | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -657,7 +654,7 @@ pub unsafe extern "C" fn dc_get_next_event(events: *mut dc_event_emitter_t) -> *
 #[no_mangle]
 pub unsafe extern "C" fn dc_stop_io(context: *mut dc_context_t) {
     if context.is_null() {
-        eprintln!("ignoring careless call to dc_stop_io()");
+        eprintln!("ignoring careless call to dc_shutdown()");
         return;
     }
     let ctx = &*context;
@@ -1027,17 +1024,22 @@ 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)
+            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags, marker_flag)
                 .await
                 .unwrap_or_log_default(ctx, "failed to get chat msgs")
                 .into(),
@@ -1746,27 +1748,6 @@ pub unsafe extern "C" fn dc_forward_msgs(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_resend_msgs(
-    context: *mut dc_context_t,
-    msg_ids: *const u32,
-    msg_cnt: libc::c_int,
-) -> libc::c_int {
-    if context.is_null() || msg_ids.is_null() || msg_cnt <= 0 {
-        eprintln!("ignoring careless call to dc_resend_msgs()");
-        return 0;
-    }
-    let ctx = &*context;
-    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
-
-    if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) {
-        error!(ctx, "Resending failed: {}", err);
-        0
-    } else {
-        1
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_markseen_msgs(
     context: *mut dc_context_t,
@@ -1914,7 +1895,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.as_deref()).await {
+        match Contact::get_all(ctx, flags, query).await {
             Ok(contacts) => Box::into_raw(Box::new(dc_array_t::from(
                 contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>(),
             ))),
@@ -3968,25 +3949,6 @@ pub unsafe extern "C" fn dc_provider_new_from_email(
     }
     let addr = to_string_lossy(addr);
 
-    let ctx = &*context;
-
-    match block_on(provider::get_provider_info(ctx, addr.as_str(), true)) {
-        Some(provider) => provider,
-        None => ptr::null_mut(),
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_new_from_email_with_dns(
-    context: *const dc_context_t,
-    addr: *const libc::c_char,
-) -> *const dc_provider_t {
-    if context.is_null() || addr.is_null() {
-        eprintln!("ignoring careless call to dc_provider_new_from_email_with_dns()");
-        return ptr::null();
-    }
-    let addr = to_string_lossy(addr);
-
     let ctx = &*context;
     let socks5_enabled = block_on(async move {
         ctx.get_config_bool(config::Config::Socks5Enabled)

draft/webxdc-dev-reference.md

@@ -1,14 +1,12 @@
 # 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** is a **ZIP-file** with the extension `.xdc`
+- a **Webxdc app** 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 is started, `index.html` is opened in a restricted webview
+- if the Webxdc app is started, `index.html` is opened in a restricted webview
   that allow accessing resources only from the ZIP-file
 
 
@@ -28,7 +26,7 @@ no need to add `webxdc.js` to your ZIP-file):
 window.webxdc.sendUpdate(update, descr);
 ```
 
-A Webxdc is usually shared in a chat and run independently on each peer.
+Webxdc apps are 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:  
@@ -37,9 +35,7 @@ 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.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;
+    - `update.summary`: optional, short text, shown beside app icon;
        it is recommended to use some aggregated value,  eg. "8 votes", "Highscore: 123"
 
 - `descr`: short, human-readable description what this update is about.
@@ -58,13 +54,12 @@ and you won't get the update by `setUpdateListener()`.
 ### setUpdateListener()
 
 ```js
-let promise = window.webxdc.setUpdateListener((update) => {}, serial);
+window.webxdc.setUpdateListener((update) => {}, serial);
 ```
 
 With `setUpdateListener()` you define a callback that receives the updates
 sent by `sendUpdate()`. The callback is called for updates sent by you or other peers.
 The `serial` specifies the last serial that you know about (defaults to 0). 
-The returned promise resolves when the listener has processed all the update messages known at the time when  `setUpdateListener` was called. 
 
 Each `update` which is passed to the callback comes with the following properties: 
 
@@ -78,12 +73,9 @@ 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 `sendUpdate()`)
+- `update.info`: optional, short, informational message (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()`)
+- `update.summary`: optional, short text, shown beside app icon (see `send_update`)
 
 
 ### selfAddr
@@ -117,21 +109,17 @@ some basic information are read and used from there.
 the `manifest.toml` has the following format
 
 ```toml
-name = "My Name"
-source_code_url = "https://example.org/orga/repo"
+name = "My 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.
+- **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.
 
 
-## Webxdc Icon
+## App Icon
 
 If the ZIP-root contains an `icon.png` or `icon.jpg`,
-these files are used as the icon for the Webxdc.
+these files are used as the icon for the app.
 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.
@@ -171,7 +159,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 Webxdc -
+You can also use that repository as a template for your own app -
 just clone and start adapting things to your need.
 
 
@@ -181,18 +169,13 @@ 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) or in the [webxdc GitHub organization](https://github.com/webxdc)
+- Even more with [Topic #webxdc on Github](https://github.com/topics/webxdc)
 
 
 ## Closing Remarks
 
 - older devices might not have the newest js features in their webview,
   you may want to transpile your code down to an older js version eg. with https://babeljs.io
-- 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

@@ -21,6 +21,7 @@ use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::sql;
+use deltachat::EventType;
 use deltachat::{config, provider};
 use std::fs;
 use std::time::{Duration, SystemTime};
@@ -92,13 +93,16 @@ async fn reset_tables(context: &Context, bits: i32) {
         println!("(8) Rest but server config reset.");
     }
 
-    context.emit_msgs_changed_without_ids();
+    context.emit_event(EventType::MsgsChanged {
+        chat_id: ChatId::new(0),
+        msg_id: MsgId::new(0),
+    });
 }
 
 async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
     let data = dc_read_file(context, filename).await?;
 
-    if let Err(err) = dc_receive_imf(context, &data, false).await {
+    if let Err(err) = dc_receive_imf(context, &data, "import", false).await {
         println!("dc_receive_imf errored: {:?}", err);
     }
     Ok(())
@@ -160,7 +164,10 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
     }
     println!("Import: {} items read from \"{}\".", read_cnt, &real_spec);
     if read_cnt > 0 {
-        context.emit_msgs_changed_without_ids();
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: ChatId::new(0),
+            msg_id: MsgId::new(0),
+        });
     }
     true
 }
@@ -399,7 +406,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  html <msg-id>\n\
                  listfresh\n\
                  forward <msg-id> <chat-id>\n\
-                 resend <msg-id>\n\
                  markseen <msg-id>\n\
                  delmsg <msg-id>\n\
                  ===========================Contact commands==\n\
@@ -639,13 +645,14 @@ 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).await?;
+                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER, None).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();
@@ -1099,13 +1106,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             msg_ids[0] = MsgId::new(arg1.parse()?);
             chat::forward_msgs(&context, &msg_ids, chat_id).await?;
         }
-        "resend" => {
-            ensure!(!arg1.is_empty(), "Arguments <msg-id> expected");
-
-            let mut msg_ids = [MsgId::new(0); 1];
-            msg_ids[0] = MsgId::new(arg1.parse()?);
-            chat::resend_msgs(&context, &msg_ids).await?;
-        }
         "markseen" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
             let mut msg_ids = vec![MsgId::new(0)];

examples/repl/main.rs

@@ -207,12 +207,11 @@ const CHAT_COMMANDS: [&str; 36] = [
     "accept",
     "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 8] = [
+const MESSAGE_COMMANDS: [&str; 7] = [
     "listmsgs",
     "msginfo",
     "listfresh",
     "forward",
-    "resend",
     "markseen",
     "delmsg",
     "download",

node/.prettierrc.yml

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

node/CONTRIBUTORS.md

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

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

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

@@ -1,78 +0,0 @@
-{
-  # 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

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

node/constants.js

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

@@ -1,34 +0,0 @@
-/* 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

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

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

@@ -1,106 +0,0 @@
-/* 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

@@ -1,42 +0,0 @@
-/* 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

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

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

@@ -1,955 +0,0 @@
-/* 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

@@ -1,205 +0,0 @@
-/* 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

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

@@ -1,82 +0,0 @@
-/* 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

@@ -1,52 +0,0 @@
-/* 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

@@ -1,370 +0,0 @@
-/* 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

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

@@ -1,6 +0,0 @@
-/**
- * @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

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

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

@@ -1,73 +0,0 @@
-#!/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

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

@@ -1,46 +0,0 @@
-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 + '.tar.gz',
-}
-
-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

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

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

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

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

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

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

@@ -1,65 +0,0 @@
-{
-  "dependencies": {
-    "debug": "^4.1.1",
-    "napi-macros": "^2.0.0",
-    "node-gyp-build": "^4.1.0",
-    "split2": "^3.1.1"
-  },
-  "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",
-    "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.81.0"
-}

python/examples/test_examples.py

@@ -22,7 +22,7 @@ def test_echo_quit_plugin(acfactory, lp):
     botproc = acfactory.run_bot_process(echo_and_quit)
 
     lp.sec("creating a temp account to contact the bot")
-    ac1, = acfactory.get_online_accounts(1)
+    ac1 = acfactory.get_one_online_account()
 
     lp.sec("sending a message to the bot")
     bot_contact = ac1.create_contact(botproc.addr)
@@ -42,7 +42,7 @@ def test_group_tracking_plugin(acfactory, lp):
     lp.sec("creating one group-tracking bot and two temp accounts")
     botproc = acfactory.run_bot_process(group_tracking, ffi=False)
 
-    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1, ac2 = acfactory.get_two_online_accounts(quiet=True)
 
     botproc.fnmatch_lines("""
         *ac_configure_completed*

python/install_python_bindings.py

@@ -24,7 +24,7 @@ if __name__ == "__main__":
 
     print("running:", " ".join(cmd))
     subprocess.check_call(cmd)
-    subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib src/deltachat/*.dll" , shell=True)
+    subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
 
     if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
         subprocess.check_call([

python/mypy.ini

@@ -1,8 +1,5 @@
 [mypy]
 
-[mypy-py.*]
-ignore_missing_imports = True
-
 [mypy-deltachat.capi.*]
 ignore_missing_imports = True
 
@@ -20,7 +17,3 @@ ignore_missing_imports = True
 
 [mypy-_pytest.*]
 ignore_missing_imports = True
-
-[mypy-imap_tools.*]
-ignore_missing_imports = True
-

python/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2", "cffi>=1.0.0", "pkgconfig"]
+requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2", "cffi>=1.0.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]

python/setup.py

@@ -11,11 +11,8 @@ def main():
         description='Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat',
         long_description=long_description,
         author='holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors',
-        install_requires=['cffi>=1.0.0', 'pluggy', 'imap-tools', 'requests'],
-        setup_requires=[
-            'setuptools_scm', # required for compatibility with `python3 setup.py sdist`
-            'pkgconfig',
-        ],
+        install_requires=['cffi>=1.0.0', 'pluggy', 'imapclient', 'requests'],
+        setup_requires=['setuptools_scm'], # required for compatibility with `python3 setup.py sdist`
         packages=setuptools.find_packages('src'),
         package_dir={'': 'src'},
         cffi_modules=['src/deltachat/_build.py:ffibuilder'],

python/src/deltachat/__init__.py

@@ -2,7 +2,7 @@ import sys
 
 from . import capi, const, hookspec # noqa
 from .capi import ffi  # noqa
-from .account import Account, get_core_info  # noqa
+from .account import Account  # noqa
 from .message import Message  # noqa
 from .contact import Contact  # noqa
 from .chat import Chat        # noqa

python/src/deltachat/_build.py

@@ -8,9 +8,9 @@ import shutil
 import subprocess
 import tempfile
 import textwrap
+import types
 
 import cffi
-import pkgconfig  # type: ignore
 
 
 def local_build_flags(projdir, target):
@@ -19,31 +19,36 @@ def local_build_flags(projdir, target):
     :param projdir: The root directory of the deltachat-core-rust project.
     :param target: The rust build target, `debug` or `release`.
     """
-    flags = {}
+    flags = types.SimpleNamespace()
     if platform.system() == 'Darwin':
-        flags['libraries'] = ['resolv', 'dl']
-        flags['extra_link_args'] = [
+        flags.libs = ['resolv', 'dl']
+        flags.extra_link_args = [
                 '-framework', 'CoreFoundation',
                 '-framework', 'CoreServices',
                 '-framework', 'Security',
         ]
     elif platform.system() == 'Linux':
-        flags['libraries'] = ['rt', 'dl', 'm']
-        flags['extra_link_args'] = []
+        flags.libs = ['rt', 'dl', 'm']
+        flags.extra_link_args = []
     else:
         raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
     target_dir = os.environ.get("CARGO_TARGET_DIR")
     if target_dir is None:
         target_dir = os.path.join(projdir, 'target')
-    flags['extra_objects'] = [os.path.join(target_dir, target, 'libdeltachat.a')]
-    assert os.path.exists(flags['extra_objects'][0]), flags['extra_objects']
-    flags['include_dirs'] = [os.path.join(projdir, 'deltachat-ffi')]
+    flags.objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
+    assert os.path.exists(flags.objs[0]), flags.objs
+    flags.incs = [os.path.join(projdir, 'deltachat-ffi')]
     return flags
 
 
 def system_build_flags():
     """Construct build flags for building against an installed libdeltachat."""
-    return pkgconfig.parse('deltachat')
+    flags = types.SimpleNamespace()
+    flags.libs = ['deltachat']
+    flags.objs = []
+    flags.incs = []
+    flags.extra_link_args = []
+    return flags
 
 
 def extract_functions(flags):
@@ -64,7 +69,7 @@ def extract_functions(flags):
             src_fp.write('#include <deltachat.h>')
         cc.preprocess(source=src_name,
                       output_file=dst_name,
-                      include_dirs=flags['include_dirs'],
+                      include_dirs=flags.incs,
                       macros=[('PY_CFFI', '1')])
         with open(dst_name, "r") as dst_fp:
             return dst_fp.read()
@@ -100,7 +105,7 @@ def find_header(flags):
         try:
             os.chdir(tmpdir)
             cc.compile(sources=["where.c"],
-                       include_dirs=flags['include_dirs'],
+                       include_dirs=flags.incs,
                        macros=[("PY_CFFI_INC", "1")])
         finally:
             os.chdir(cwd)
@@ -178,7 +183,10 @@ def ffibuilder():
                 return DC_EVENT_DATA2_IS_STRING(e);
             }
         """,
-        **flags,
+        include_dirs=flags.incs,
+        libraries=flags.libs,
+        extra_objects=flags.objs,
+        extra_link_args=flags.extra_link_args,
     )
     builder.cdef("""
         typedef int... time_t;

python/src/deltachat/account.py

@@ -22,29 +22,6 @@ class MissingCredentials(ValueError):
     """ Account is missing `addr` and `mail_pw` config values. """
 
 
-def get_core_info():
-    """ get some system info. """
-    from tempfile import NamedTemporaryFile
-
-    with NamedTemporaryFile() as path:
-        path.close()
-        return get_dc_info_as_dict(ffi.gc(
-            lib.dc_context_new(as_dc_charpointer(""), as_dc_charpointer(path.name), ffi.NULL),
-            lib.dc_context_unref,
-        ))
-
-
-def get_dc_info_as_dict(dc_context):
-    lines = from_dc_charpointer(lib.dc_get_info(dc_context))
-    info_dict = {}
-    for line in lines.split("\n"):
-        if not line.strip():
-            continue
-        key, value = line.split("=", 1)
-        info_dict[key.lower()] = value
-    return info_dict
-
-
 class Account(object):
     """ Each account is tied to a sqlite database file which is fully managed
     by the underlying deltachat core library.  All public Account methods are
@@ -90,9 +67,6 @@ class Account(object):
         """ re-enable logging. """
         self._logging = True
 
-    def __repr__(self):
-        return "<Account path={}>".format(self.db_path)
-
     # def __del__(self):
     #    self.shutdown()
 
@@ -107,7 +81,14 @@ class Account(object):
 
     def get_info(self) -> Dict[str, str]:
         """ return dictionary of built config parameters. """
-        return get_dc_info_as_dict(self._dc_context)
+        lines = from_dc_charpointer(lib.dc_get_info(self._dc_context))
+        d = {}
+        for line in lines.split("\n"):
+            if not line.strip():
+                continue
+            key, value = line.split("=", 1)
+            d[key.lower()] = value
+        return d
 
     def dump_account_info(self, logfile):
         def log(*args, **kwargs):
@@ -148,8 +129,6 @@ class Account(object):
         namebytes = name.encode("utf8")
         if namebytes == b"addr" and self.is_configured():
             raise ValueError("can not change 'addr' after account is configured.")
-        if isinstance(value, (int, bool)):
-            value = str(int(value))
         if value is not None:
             valuebytes = value.encode("utf8")
         else:
@@ -190,7 +169,7 @@ class Account(object):
         :returns: None
         """
         for key, value in kwargs.items():
-            self.set_config(key, value)
+            self.set_config(key, str(value))
 
     def is_configured(self) -> bool:
         """ determine if the account is configured already; an initial connection
@@ -590,8 +569,6 @@ class Account(object):
         """ add an account plugin which implements one or more of
         the :class:`deltachat.hookspec.PerAccount` hooks.
         """
-        if name and self._pm.has_plugin(name=name):
-            self._pm.unregister(name=name)
         self._pm.register(plugin, name=name)
         self._pm.check_pending()
         return plugin
@@ -695,25 +672,28 @@ class Account(object):
         if self._dc_context is None:
             return
 
-        # mark the event thread for shutdown (latest on next incoming event)
-        self._event_thread.mark_shutdown()
-
-        # stop_io also causes an info event which will wake up
-        # the EventThread's inner loop and let it notice the shutdown marker.
         self.stop_io()
 
+        self.log("remove dc_context references")
+
+        # if _dc_context is unref'ed the event thread should quickly
+        # receive the termination signal. However, some python code might
+        # still hold a reference and so we use a secondary signal
+        # to make sure the even thread terminates if it receives any new
+        # event, indepedently from waiting for the core to send NULL to
+        # get_next_event().
+        self._event_thread.mark_shutdown()
+        self._dc_context = None
+
         self.log("wait for event thread to finish")
         try:
-            self._event_thread.wait(timeout=5)
+            self._event_thread.wait(timeout=2)
         except RuntimeError as e:
             self.log("Waiting for event thread failed: {}".format(e))
 
         if self._event_thread.is_alive():
             self.log("WARN: event thread did not terminate yet, ignoring.")
 
-        self.log("remove dc_context references, making the Account unusable")
-        self._dc_context = None
-
         self._shutdown_event.set()
 
         hook = hookspec.Global._get_plugin_manager().hook

python/src/deltachat/chat.py

@@ -5,7 +5,7 @@ import calendar
 import json
 from datetime import datetime, timezone
 import os
-from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer, iter_array
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
 from .capi import lib, ffi
 from . import const
 from .message import Message
@@ -517,7 +517,7 @@ class Chat(object):
                     lib.dc_array_get_timestamp(dc_array, i),
                     timezone.utc
                 ),
-                marker=from_optional_dc_charpointer(lib.dc_array_get_marker(dc_array, i)),
+                marker=from_dc_charpointer(lib.dc_array_get_marker(dc_array, i)),
             )
             for i in range(lib.dc_array_get_cnt(dc_array))
         ]

python/src/deltachat/direct_imap.py

@@ -4,20 +4,63 @@ and for cleaning up inbox/mvbox for each test function run.
 """
 
 import io
+import email
 import ssl
 import pathlib
-from contextlib import contextmanager
-from imap_tools import MailBox, MailBoxTls, errors, AND, Header, MailMessageFlags, MailMessage
+from imapclient import IMAPClient
+from imapclient.exceptions import IMAPClientError
 import imaplib
+import deltachat
 from deltachat import const, Account
-from typing import List
 
 
+SEEN = b'\\Seen'
+DELETED = b'\\Deleted'
 FLAGS = b'FLAGS'
 FETCH = b'FETCH'
 ALL = "1:*"
 
 
+@deltachat.global_hookimpl
+def dc_account_extra_configure(account):
+    """ Reset the account (we reuse accounts across tests)
+    and make 'account.direct_imap' available for direct IMAP ops.
+    """
+    try:
+
+        if not hasattr(account, "direct_imap"):
+            imap = DirectImap(account)
+
+            for folder in imap.list_folders():
+                if folder.lower() == "inbox" or folder.lower() == "deltachat":
+                    assert imap.select_folder(folder)
+                    imap.delete(ALL, expunge=True)
+                else:
+                    imap.conn.delete_folder(folder)
+                    # We just deleted the folder, so we have to make DC forget about it, too
+                    if account.get_config("configured_sentbox_folder") == folder:
+                        account.set_config("configured_sentbox_folder", None)
+                    if account.get_config("configured_spam_folder") == folder:
+                        account.set_config("configured_spam_folder", None)
+
+            setattr(account, "direct_imap", imap)
+
+    except Exception as e:
+        # Uncaught exceptions here would lead to a timeout without any note written to the log
+        # start with DC_EVENT_WARNING so that the line is printed in yellow and won't be overlooked when reading
+        account.log("DC_EVENT_WARNING =================== DIRECT_IMAP CAN'T RESET ACCOUNT: ===================")
+        account.log("DC_EVENT_WARNING =================== " + str(e) + " ===================")
+
+
+@deltachat.global_hookimpl
+def dc_account_after_shutdown(account):
+    """ shutdown the imap connection if there is one. """
+    imap = getattr(account, "direct_imap", None)
+    if imap is not None:
+        imap.shutdown()
+        del account.direct_imap
+
+
 class DirectImap:
     def __init__(self, account: Account) -> None:
         self.account = account
@@ -45,30 +88,37 @@ class DirectImap:
             ssl_context.verify_mode = ssl.CERT_NONE
 
         if security == const.DC_SOCKET_STARTTLS:
-            self.conn = MailBoxTls(host, port, ssl_context=ssl_context)
-        elif security == const.DC_SOCKET_PLAIN or security == const.DC_SOCKET_SSL:
-            self.conn = MailBox(host, port, ssl_context=ssl_context)
+            self.conn = IMAPClient(host, port, ssl=False)
+            self.conn.starttls(ssl_context)
+        elif security == const.DC_SOCKET_PLAIN:
+            self.conn = IMAPClient(host, port, ssl=False)
+        elif security == const.DC_SOCKET_SSL:
+            self.conn = IMAPClient(host, port, ssl_context=ssl_context)
         self.conn.login(user, pw)
 
         self.select_folder("INBOX")
 
     def shutdown(self):
+        try:
+            self.conn.idle_done()
+        except (OSError, IMAPClientError):
+            pass
         try:
             self.conn.logout()
-        except (OSError, imaplib.IMAP4.abort):
+        except (OSError, IMAPClientError):
             print("Could not logout direct_imap conn")
 
     def create_folder(self, foldername):
         try:
-            self.conn.folder.create(foldername)
-        except errors.MailboxFolderCreateError as e:
+            self.conn.create_folder(foldername)
+        except imaplib.IMAP4.error as e:
             print("Can't create", foldername, "probably it already exists:", str(e))
 
-    def select_folder(self, foldername: str) -> tuple:
+    def select_folder(self, foldername):
         assert not self._idling
-        return self.conn.folder.set(foldername)
+        return self.conn.select_folder(foldername)
 
-    def select_config_folder(self, config_name: str):
+    def select_config_folder(self, config_name):
         """ Return info about selected folder if it is
         configured, otherwise None. """
         if "_" not in config_name:
@@ -77,36 +127,50 @@ class DirectImap:
         if foldername:
             return self.select_folder(foldername)
 
-    def list_folders(self) -> List[str]:
+    def list_folders(self):
         """ return list of all existing folder names"""
         assert not self._idling
-        return [folder.name for folder in self.conn.folder.list()]
+        folders = []
+        for meta, sep, foldername in self.conn.list_folders():
+            folders.append(foldername)
+        return folders
 
-    def delete(self, uid_list: str, expunge=True):
+    def delete(self, range, expunge=True):
         """ delete a range of messages (imap-syntax).
         If expunge is true, perform the expunge-operation
         to make sure the messages are really gone and not
         just flagged as deleted.
         """
-        self.conn.client.uid('STORE', uid_list, '+FLAGS', r'(\Deleted)')
+        self.conn.set_flags(range, [DELETED])
         if expunge:
             self.conn.expunge()
 
-    def get_all_messages(self) -> List[MailMessage]:
+    def get_all_messages(self):
         assert not self._idling
-        return [mail for mail in self.conn.fetch()]
 
-    def get_unread_messages(self) -> List[str]:
+        # Flush unsolicited responses. IMAPClient has problems
+        # dealing with them: https://github.com/mjs/imapclient/issues/334
+        # When this NOOP was introduced, next FETCH returned empty
+        # result instead of a single message, even though IMAP server
+        # can only return more untagged responses than required, not
+        # less.
+        self.conn.noop()
+
+        return self.conn.fetch(ALL, [FLAGS])
+
+    def get_unread_messages(self):
         assert not self._idling
-        return [msg.uid for msg in self.conn.fetch(AND(seen=False))]
+        res = self.conn.fetch(ALL, [FLAGS])
+        return [uid for uid in res
+                if SEEN not in res[uid][FLAGS]]
 
     def mark_all_read(self):
         messages = self.get_unread_messages()
         if messages:
-            res = self.conn.flag(messages, MailMessageFlags.SEEN, True)
+            res = self.conn.set_flags(messages, [SEEN])
             print("marked seen:", messages, res)
 
-    def get_unread_cnt(self) -> int:
+    def get_unread_cnt(self):
         return len(self.get_unread_messages())
 
     def dump_imap_structures(self, dir, logfile):
@@ -128,84 +192,73 @@ class DirectImap:
             log("---------", imapfolder, len(messages), "messages ---------")
             # get message content without auto-marking it as seen
             # fetching 'RFC822' would mark it as seen.
-            for msg in self.conn.fetch(mark_seen=False):
-                body = getattr(msg.obj, "text", None)
-                if not body:
-                    body = getattr(msg.obj, "html", None)
-                if not body:
-                    log("Message", msg.uid, "has empty body")
+            requested = [b'BODY.PEEK[]', FLAGS]
+            for uid, data in self.conn.fetch(messages, requested).items():
+                body_bytes = data[b'BODY[]']
+                if not body_bytes:
+                    log("Message", uid, "has empty body")
                     continue
 
+                flags = data[FLAGS]
                 path = pathlib.Path(str(dir)).joinpath("IMAP", self.logid, imapfolder)
                 path.mkdir(parents=True, exist_ok=True)
-                fn = path.joinpath(str(msg.uid))
-                fn.write_bytes(body)
-                log("Message", msg.uid, fn)
-                log("Message", msg.uid, msg.flags, "Message-Id:", msg.obj.get("Message-Id"))
+                fn = path.joinpath(str(uid))
+                fn.write_bytes(body_bytes)
+                log("Message", uid, fn)
+                email_message = email.message_from_bytes(body_bytes)
+                log("Message", uid, flags, "Message-Id:", email_message.get("Message-Id"))
 
         if empty_folders:
             log("--------- EMPTY FOLDERS:", empty_folders)
 
         print(stream.getvalue(), file=logfile)
 
-    @contextmanager
-    def idle(self):
-        """ return Idle ContextManager. """
-        idle_manager = IdleManager(self)
-        try:
-            yield idle_manager
-        finally:
-            idle_manager.done()
+    def idle_start(self):
+        """ switch this connection to idle mode. non-blocking. """
+        assert not self._idling
+        res = self.conn.idle()
+        self._idling = True
+        return res
 
-    def append(self, folder: str, msg: str):
+    def idle_check(self, terminate=False):
+        """ (blocking) wait for next idle message from server. """
+        assert self._idling
+        self.account.log("imap-direct: calling idle_check")
+        res = self.conn.idle_check()
+        if terminate:
+            self.idle_done()
+        self.account.log("imap-direct: idle_check returned {!r}".format(res))
+        return res
+
+    def idle_wait_for_seen(self):
+        """ Return first message with SEEN flag
+        from a running idle-stream REtiurn.
+        """
+        while 1:
+            for item in self.idle_check():
+                if item[1] == FETCH:
+                    if item[2][0] == FLAGS:
+                        if SEEN in item[2][1]:
+                            return item[0]
+
+    def idle_done(self):
+        """ send idle-done to server if we are currently in idle mode. """
+        if self._idling:
+            res = self.conn.idle_done()
+            self._idling = False
+            return res
+
+    def append(self, folder, msg):
         """Upload a message to *folder*.
         Trailing whitespace or a linebreak at the beginning will be removed automatically.
         """
         if msg.startswith("\n"):
             msg = msg[1:]
         msg = '\n'.join([s.lstrip() for s in msg.splitlines()])
-        self.conn.append(bytes(msg, encoding='ascii'), folder)
+        self.conn.append(folder, msg)
 
-    def get_uid_by_message_id(self, message_id) -> str:
-        msgs = [msg.uid for msg in self.conn.fetch(AND(header=Header('MESSAGE-ID', message_id)))]
+    def get_uid_by_message_id(self, message_id):
+        msgs = self.conn.search(['HEADER', 'MESSAGE-ID', message_id])
         if len(msgs) == 0:
             raise Exception("Did not find message " + message_id + ", maybe you forgot to select the correct folder?")
         return msgs[0]
-
-
-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]:
-        """ (blocking) wait for next idle message from server. """
-        self.log("imap-direct: calling idle_check")
-        res = self.direct_imap.conn.idle.poll(timeout=timeout)
-        self.log("imap-direct: idle_check returned {!r}".format(res))
-        return res
-
-    def wait_for_new_message(self, timeout=None) -> bytes:
-        while 1:
-            for item in self.check(timeout=timeout):
-                if b'EXISTS' in item or b'RECENT' in item:
-                    return item
-
-    def wait_for_seen(self, timeout=None) -> int:
-        """ Return first message with SEEN flag from a running idle-stream.
-        """
-        while 1:
-            for item in self.check(timeout=timeout):
-                if FETCH in item:
-                    self.log(str(item))
-                    if FLAGS in item and rb'\Seen' in item:
-                        return int(item.split(b' ')[1])
-
-    def done(self):
-        """ send idle-done to server if we are currently in idle mode. """
-        res = self.direct_imap.conn.idle.stop()
-        return res

python/src/deltachat/events.py

@@ -1,8 +1,5 @@
 import threading
-import sys
-import traceback
 import time
-import io
 import re
 import os
 from queue import Queue, Empty
@@ -32,12 +29,10 @@ class FFIEventLogger:
     # to prevent garbled logging
     _loglock = threading.RLock()
 
-    def __init__(self, account, logid=None, init_time=None) -> None:
+    def __init__(self, account) -> None:
         self.account = account
-        self.logid = logid or self.account.get_config("displayname")
-        if init_time is None:
-            init_time = time.time()
-        self.init_time = init_time
+        self.logid = self.account.get_config("displayname")
+        self.init_time = time.time()
 
     @account_hookimpl
     def ac_process_ffi_event(self, ffi_event: FFIEvent) -> None:
@@ -161,14 +156,14 @@ class FFIEventTracker:
                 print("** SECUREJOINT-INVITER PROGRESS {}".format(target), self.account)
                 break
 
-    def wait_idle_inbox_ready(self):
+    def wait_all_initial_fetches(self):
         """Has to be called after start_io() to wait for fetch_existing_msgs to run
         so that new messages are not mistaken for old ones:
         - ac1 and ac2 are created
         - ac1 sends a message to ac2
         - ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
         - therefore no DC_EVENT_INCOMING_MSG is sent"""
-        self.get_info_contains("INBOX: Idle entering")
+        self.get_info_contains("Done fetching existing messages")
 
     def wait_next_incoming_message(self):
         """ wait for and return next incoming message. """
@@ -230,7 +225,9 @@ class EventThread(threading.Thread):
         )
         while not self._marked_for_shutdown:
             event = lib.dc_get_next_event(event_emitter)
-            if event == ffi.NULL or self._marked_for_shutdown:
+            if event == ffi.NULL:
+                break
+            if self._marked_for_shutdown:
                 break
             evt = lib.dc_event_get_id(event)
             data1 = lib.dc_event_get_data1_int(event)
@@ -244,23 +241,15 @@ class EventThread(threading.Thread):
 
             lib.dc_event_unref(event)
             ffi_event = FFIEvent(name=evt_name, data1=data1, data2=data2)
-            with self.swallow_and_log_exception("ac_process_ffi_event {}".format(ffi_event)):
+            try:
                 self.account._pm.hook.ac_process_ffi_event(account=self, ffi_event=ffi_event)
-            for name, kwargs in self._map_ffi_event(ffi_event):
-                hook = getattr(self.account._pm.hook, name)
-                info = "call {} kwargs={} failed".format(name, kwargs)
-                with self.swallow_and_log_exception(info):
+                for name, kwargs in self._map_ffi_event(ffi_event):
+                    self.account.log("calling hook name={} kwargs={}".format(name, kwargs))
+                    hook = getattr(self.account._pm.hook, name)
                     hook(**kwargs)
-
-    @contextmanager
-    def swallow_and_log_exception(self, info):
-        try:
-            yield
-        except Exception as ex:
-            logfile = io.StringIO()
-            traceback.print_exception(*sys.exc_info(), file=logfile)
-            self.account.log("{}\nException {}\nTraceback:\n{}"
-                             .format(info, ex, logfile.getvalue()))
+            except Exception:
+                if self.account._dc_context is not None:
+                    raise
 
     def _map_ffi_event(self, ffi_event: FFIEvent):
         name = ffi_event.name

python/src/deltachat/testplugin.py

@@ -8,43 +8,35 @@ import threading
 import fnmatch
 import time
 import weakref
-from queue import Queue
-from typing import List, Callable
+import tempfile
+from typing import List, Dict, Callable
 
 import pytest
 import requests
-import pathlib
 
-from . import Account, const, account_hookimpl, get_core_info
+from . import Account, const
+from .capi import lib
 from .events import FFIEventLogger, FFIEventTracker
 from _pytest._code import Source
+from deltachat import direct_imap
 
 import deltachat
 
 
 def pytest_addoption(parser):
-    group = parser.getgroup("deltachat testplugin options")
-    group.addoption(
+    parser.addoption(
         "--liveconfig", action="store", default=None,
         help="a file with >=2 lines where each line "
              "contains NAME=VALUE config settings for one account"
     )
-    group.addoption(
+    parser.addoption(
         "--ignored", action="store_true",
         help="Also run tests marked with the ignored marker",
     )
-    group.addoption(
+    parser.addoption(
         "--strict-tls", action="store_true",
         help="Never accept invalid TLS certificates for test accounts",
     )
-    group.addoption(
-        "--extra-info", action="store_true",
-        help="show more info on failures (imap server state, config)"
-    )
-    group.addoption(
-        "--debug-setup", action="store_true",
-        help="show events during configure and start io phases of online accounts"
-    )
 
 
 def pytest_configure(config):
@@ -99,12 +91,9 @@ def pytest_configure(config):
 
         @pytest.hookimpl(hookwrapper=True)
         def pytest_runtest_teardown(self, item):
-            logging = item.config.getoption("--extra-info")
-            if logging:
-                self.enable_logging(item)
+            self.enable_logging(item)
             yield
-            if logging:
-                self.disable_logging(item)
+            self.disable_logging(item)
 
     la = LoggingAspect()
     config.pluginmanager.register(la)
@@ -112,12 +101,20 @@ def pytest_configure(config):
 
 
 def pytest_report_header(config, startdir):
-    info = get_core_info()
-    summary = ['Deltachat core={} sqlite={} journal_mode={}'.format(
-        info['deltachat_core_version'],
-        info['sqlite_version'],
-        info['journal_mode'],
-    )]
+    summary = []
+
+    t = tempfile.mktemp()
+    try:
+        ac = Account(t)
+        info = ac.get_info()
+        ac.shutdown()
+    finally:
+        os.remove(t)
+    summary.extend(['Deltachat core={} sqlite={} journal_mode={}'.format(
+         info['deltachat_core_version'],
+         info['sqlite_version'],
+         info['journal_mode'],
+     )])
 
     cfg = config.option.liveconfig
     if cfg:
@@ -129,97 +126,57 @@ def pytest_report_header(config, startdir):
     return summary
 
 
-@pytest.fixture(scope="session")
-def testprocess(request):
-    return TestProcess(pytestconfig=request.config)
+class SessionLiveConfigFromFile:
+    def __init__(self, fn) -> None:
+        self.fn = fn
+        self.configlist = []
+        for line in open(fn):
+            if line.strip() and not line.strip().startswith('#'):
+                d = {}
+                for part in line.split():
+                    name, value = part.split("=")
+                    d[name] = value
+                self.configlist.append(d)
+
+    def get(self, index: int):
+        return self.configlist[index]
+
+    def exists(self) -> bool:
+        return bool(self.configlist)
 
 
-class TestProcess:
-    """ A pytest session-scoped instance to help with managing "live" account configurations.
-    """
-    def __init__(self, pytestconfig):
-        self.pytestconfig = pytestconfig
-        self._addr2files = {}
-        self._configlist = []
+class SessionLiveConfigFromURL:
+    configlist: List[Dict[str, str]]
 
-    def get_liveconfig_producer(self):
-        """ provide live account configs, cached on a per-test-process scope
-        so that test functions can re-use already known live configs.
-        Depending on the --liveconfig option this comes from
-        a HTTP provider or a file with a line specifying each accounts config.
-        """
-        liveconfig_opt = self.pytestconfig.getoption("--liveconfig")
-        if not liveconfig_opt:
-            pytest.skip("specify DCC_NEW_TMP_EMAIL or --liveconfig to provide live accounts")
-
-        if not liveconfig_opt.startswith("http"):
-            for line in open(liveconfig_opt):
-                if line.strip() and not line.strip().startswith('#'):
-                    d = {}
-                    for part in line.split():
-                        name, value = part.split("=")
-                        d[name] = value
-                    self._configlist.append(d)
-
-            yield from iter(self._configlist)
-        else:
-            MAX_LIVE_CREATED_ACCOUNTS = 10
-            for index in range(MAX_LIVE_CREATED_ACCOUNTS):
-                try:
-                    yield self._configlist[index]
-                except IndexError:
-                    res = requests.post(liveconfig_opt)
-                    if res.status_code != 200:
-                        pytest.fail("newtmpuser count={} code={}: '{}'".format(
-                                    index, res.status_code, res.text))
-                    d = res.json()
-                    config = dict(addr=d["email"], mail_pw=d["password"])
-                    print("newtmpuser {}: addr={}".format(index, config["addr"]))
-                    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()
+    def __init__(self, url: str) -> None:
+        self.configlist = []
+        self.url = url
 
+    def get(self, index: int):
         try:
-            filescache = self._addr2files[cache_addr]
-        except KeyError:
-            print("CACHE FAIL for", cache_addr)
-            return False
+            return self.configlist[index]
+        except IndexError:
+            assert index == len(self.configlist), index
+            res = requests.post(self.url)
+            if res.status_code != 200:
+                pytest.skip("creating newtmpuser failed with code {}: '{}'".format(res.status_code, res.text))
+            d = res.json()
+            config = dict(addr=d["email"], mail_pw=d["password"])
+            self.configlist.append(config)
+            return config
+
+    def exists(self) -> bool:
+        return bool(self.configlist)
+
+
+@pytest.fixture(scope="session")
+def session_liveconfig(request):
+    liveconfig_opt = request.config.option.liveconfig
+    if liveconfig_opt:
+        if liveconfig_opt.startswith("http"):
+            return SessionLiveConfigFromURL(liveconfig_opt)
         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)
+            return SessionLiveConfigFromFile(liveconfig_opt)
 
 
 @pytest.fixture
@@ -252,349 +209,256 @@ def data(request):
     return Data()
 
 
-class ACSetup:
-    """ accounts setup helper to deal with multiple configure-process
-    and io & imap initialization phases. From tests, use the higher level
-    public ACFactory methods instead of its private helper class.
-    """
-    CONFIGURING = "CONFIGURING"
-    CONFIGURED = "CONFIGURED"
-    IDLEREADY = "IDLEREADY"
+@pytest.fixture
+def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
 
-    def __init__(self, testprocess, init_time):
-        self._configured_events = Queue()
-        self._account2state = {}
-        self._imap_cleaned = set()
-        self.testprocess = testprocess
-        self.init_time = init_time
+    class AccountMaker:
+        _finalizers: List[Callable[[], None]]
+        _accounts: List[Account]
 
-    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:
-            @account_hookimpl
-            def ac_configure_completed(this, success):
-                self._configured_events.put((account, success))
-
-        account.add_account_plugin(PendingTracker(), name="pending_tracker")
-        self._account2state[account] = self.CONFIGURING
-        account.configure(reconfigure=reconfigure)
-        self.log("started configure on", account)
-
-    def wait_one_configured(self, account):
-        """ wait until this account has successfully configured. """
-        if self._account2state[account] == self.CONFIGURING:
-            while 1:
-                acc = self._pop_config_success()
-                if acc == account:
-                    break
-            self.init_imap(acc)
-            self.init_logging(acc)
-            acc._evtracker.consume_events()
-
-    def bring_online(self):
-        """ Wait for all accounts to become ready to receive messages.
-
-        This will initialize logging, start IO and the direct_imap attribute
-        for each account which either is CONFIGURED already or which is CONFIGURING
-        and successfully completing the configuration process.
-        """
-        print("wait_all_configured finds accounts=", self._account2state)
-        for acc, state in self._account2state.items():
-            if state == self.CONFIGURED:
-                self._onconfigure_start_io(acc)
-                self._account2state[acc] = self.IDLEREADY
-
-        while self.CONFIGURING in self._account2state.values():
-            acc = self._pop_config_success()
-            self._onconfigure_start_io(acc)
-            self._account2state[acc] = self.IDLEREADY
-        print("finished, account2state", self._account2state)
-
-    def _pop_config_success(self):
-        acc, success = self._configured_events.get()
-        if not success:
-            pytest.fail("configuring online account failed: {}".format(acc))
-        self._account2state[acc] = self.CONFIGURED
-        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()
-        acc._evtracker.consume_events()
-        acc.log("inbox IDLE ready")
-
-    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="logger-" + acc._logid)
-
-    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")
-        if addr not in self._imap_cleaned:
-            imap = acc.direct_imap
-            for folder in imap.list_folders():
-                if folder.lower() == "inbox" or folder.lower() == "deltachat":
-                    assert imap.select_folder(folder)
-                    imap.delete("1:*", expunge=True)
-                else:
-                    imap.conn.folder.delete(folder)
-            acc.log("imap cleaned for addr {}".format(addr))
-            self._imap_cleaned.add(addr)
-
-
-class ACFactory:
-    _finalizers: List[Callable[[], None]]
-    _accounts: List[Account]
-
-    def __init__(self, request, testprocess, tmpdir, data) -> None:
-        self.init_time = time.time()
-        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(testprocess, self.init_time)
-        self._preconfigured_keys = ["alice", "bob", "charlie",
+        def __init__(self) -> None:
+            self.live_count = 0
+            self.offline_count = 0
+            self._finalizers = []
+            self._accounts = []
+            self.init_time = time.time()
+            self._generated_keys = ["alice", "bob", "charlie",
                                     "dom", "elena", "fiona"]
-        self.set_logging_default(False)
-        request.addfinalizer(self.finalize)
+            self.set_logging_default(False)
+            deltachat.register_global_plugin(direct_imap)
 
-    def log(self, *args):
-        print("[acfactory]", "{:.3f}".format(time.time() - self.init_time), *args)
+        def finalize(self):
+            while self._finalizers:
+                fin = self._finalizers.pop()
+                fin()
 
-    def finalize(self):
-        while self._finalizers:
-            fin = self._finalizers.pop()
-            fin()
-
-        while self._accounts:
-            acc = self._accounts.pop()
-            if acc is not None:
-                imap = getattr(acc, "direct_imap", None)
-                if imap is not None:
-                    imap.shutdown()
-                    del acc.direct_imap
+            while self._accounts:
+                acc = self._accounts.pop()
                 acc.shutdown()
                 acc.disable_logging()
+            deltachat.unregister_global_plugin(direct_imap)
 
-    def get_next_liveconfig(self):
-        """ Base function to get functional online configurations
-        where we can make valid SMTP and IMAP connections with.
-        """
-        configdict = next(self._liveconfig_producer).copy()
-        if "e2ee_enabled" not in configdict:
-            configdict["e2ee_enabled"] = "1"
-
-        if self.pytestconfig.getoption("--strict-tls"):
-            # Enable strict certificate checks for online accounts
-            configdict["imap_certificate_checks"] = str(const.DC_CERTCK_STRICT)
-            configdict["smtp_certificate_checks"] = str(const.DC_CERTCK_STRICT)
-
-        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)
-        # 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))
-        if self.pytestconfig.getoption("--debug-setup"):
-            self._acsetup.init_logging(ac)
-        self._accounts.append(ac)
-        return ac
-
-    def set_logging_default(self, logging):
-        self._logging = bool(logging)
-
-    def remove_preconfigured_keys(self):
-        self._preconfigured_keys = []
-
-    def _preconfigure_key(self, account, addr):
-        # Only set a preconfigured key if we haven't used it yet for another account.
-        try:
-            keyname = self._preconfigured_keys.pop(0)
-        except IndexError:
-            pass
-        else:
-            fname_pub = self.data.read_path("key/{name}-public.asc".format(name=keyname))
-            fname_sec = self.data.read_path("key/{name}-secret.asc".format(name=keyname))
-            if fname_pub and fname_sec:
-                account._preconfigure_keypair(addr, fname_pub, fname_sec)
-                return True
-            else:
-                print("WARN: could not use preconfigured keys for {!r}".format(addr))
-
-    def get_pseudo_configured_account(self):
-        # do a pseudo-configured account
-        ac = self.get_unconfigured_account()
-        acname = ac._logid
-        addr = "{}@offline.org".format(acname)
-        ac.update_config(dict(
-            addr=addr, displayname=acname, mail_pw="123",
-            configured_addr=addr, configured_mail_pw="123",
-            configured="1",
-        ))
-        self._preconfigure_key(ac, addr)
-        self._acsetup.init_logging(ac)
-        return ac
-
-    def new_online_configuring_account(self, cloned_from=None, cache=False, **kwargs):
-        if cloned_from is None:
-            configdict = self.get_next_liveconfig()
-        else:
-            # XXX we might want to transfer the key to the new account
-            configdict = dict(
-                addr=cloned_from.get_config("addr"),
-                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)
+        def make_account(self, path, logid, quiet=False):
+            ac = Account(path, logging=self._logging)
+            ac._evtracker = ac.add_account_plugin(FFIEventTracker(ac))
+            ac.addr = ac.get_self_contact().addr
+            ac.set_config("displayname", logid)
+            if not quiet:
+                logger = FFIEventLogger(ac)
+                logger.init_time = self.init_time
+                ac.add_account_plugin(logger)
+            self._accounts.append(ac)
             return ac
-        ac = self.prepare_account_from_liveconfig(configdict)
-        self._acsetup.start_configure(ac)
-        return ac
 
-    def prepare_account_from_liveconfig(self, configdict):
-        ac = self.get_unconfigured_account()
-        assert "addr" in configdict and "mail_pw" in configdict, configdict
-        configdict.setdefault("bcc_self", False)
-        configdict.setdefault("mvbox_move", False)
-        configdict.setdefault("sentbox_watch", False)
-        ac.update_config(configdict)
-        self._preconfigure_key(ac, configdict["addr"])
-        return ac
+        def set_logging_default(self, logging):
+            self._logging = bool(logging)
 
-    def wait_configured(self, account):
-        """ Wait until the specified account has successfully completed configure. """
-        self._acsetup.wait_one_configured(account)
+        def get_unconfigured_account(self):
+            self.offline_count += 1
+            tmpdb = tmpdir.join("offlinedb%d" % self.offline_count)
+            return self.make_account(tmpdb.strpath, logid="ac{}".format(self.offline_count))
 
-    def bring_accounts_online(self):
-        print("bringing accounts online")
-        self._acsetup.bring_online()
-        print("all accounts online")
+        def _preconfigure_key(self, account, addr):
+            # Only set a key if we haven't used it yet for another account.
+            if self._generated_keys:
+                keyname = self._generated_keys.pop(0)
+                fname_pub = data.read_path("key/{name}-public.asc".format(name=keyname))
+                fname_sec = data.read_path("key/{name}-secret.asc".format(name=keyname))
+                if fname_pub and fname_sec:
+                    account._preconfigure_keypair(addr, fname_pub, fname_sec)
+                    return True
+                else:
+                    print("WARN: could not use preconfigured keys for {!r}".format(addr))
 
-    def get_online_accounts(self, 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 get_configured_offline_account(self):
+            ac = self.get_unconfigured_account()
 
-    def run_bot_process(self, module, ffi=True):
-        fn = module.__file__
+            # do a pseudo-configured account
+            addr = "addr{}@offline.org".format(self.offline_count)
+            ac.set_config("addr", addr)
+            self._preconfigure_key(ac, addr)
+            lib.dc_set_config(ac._dc_context, b"configured_addr", addr.encode("ascii"))
+            ac.set_config("mail_pw", "123")
+            lib.dc_set_config(ac._dc_context, b"configured_mail_pw", b"123")
+            lib.dc_set_config(ac._dc_context, b"configured", b"1")
+            return ac
 
-        bot_cfg = self.get_next_liveconfig()
-        bot_ac = self.prepare_account_from_liveconfig(bot_cfg)
+        def get_online_config(self, pre_generated_key=True, quiet=False):
+            if not session_liveconfig:
+                pytest.skip("specify DCC_NEW_TMP_EMAIL or --liveconfig")
+            configdict = session_liveconfig.get(self.live_count)
+            self.live_count += 1
+            if "e2ee_enabled" not in configdict:
+                configdict["e2ee_enabled"] = "1"
 
-        # Forget ac as it will be opened by the bot subprocess
-        # but keep something in the list to not confuse account generation
-        self._accounts[self._accounts.index(bot_ac)] = None
+            if pytestconfig.getoption("--strict-tls"):
+                # Enable strict certificate checks for online accounts
+                configdict["imap_certificate_checks"] = str(const.DC_CERTCK_STRICT)
+                configdict["smtp_certificate_checks"] = str(const.DC_CERTCK_STRICT)
 
-        args = [
-            sys.executable,
-            "-u",
-            fn,
-            "--email", bot_cfg["addr"],
-            "--password", bot_cfg["mail_pw"],
-            bot_ac.db_path,
-        ]
-        if ffi:
-            args.insert(-1, "--show-ffi")
-        print("$", " ".join(args))
-        popen = subprocess.Popen(
-            args=args,
-            stdin=subprocess.DEVNULL,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,  # combine stdout/stderr in one stream
-            bufsize=0,                 # line buffering
-            close_fds=True,            # close all FDs other than 0/1/2
-            universal_newlines=True    # give back text
-        )
-        bot = BotProcess(popen, addr=bot_cfg["addr"])
-        self._finalizers.append(bot.kill)
-        return bot
+            tmpdb = tmpdir.join("livedb%d" % self.live_count)
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count), quiet=quiet)
+            if pre_generated_key:
+                self._preconfigure_key(ac, configdict['addr'])
+            return ac, dict(configdict)
 
-    def dump_imap_summary(self, logfile):
-        for ac in self._accounts:
-            ac.dump_account_info(logfile=logfile)
-            imap = getattr(ac, "direct_imap", None)
-            if imap is not None:
-                imap.dump_imap_structures(self.tmpdir, logfile=logfile)
+        def get_online_configuring_account(self, sentbox=False, move=False,
+                                           pre_generated_key=True, quiet=False, config={}):
+            ac, configdict = self.get_online_config(
+                pre_generated_key=pre_generated_key, quiet=quiet)
+            configdict.update(config)
+            configdict["mvbox_move"] = str(int(move))
+            configdict["sentbox_watch"] = str(int(sentbox))
+            ac.update_config(configdict)
+            ac._configtracker = ac.configure()
+            return ac
 
-    def get_accepted_chat(self, ac1: Account, ac2: Account):
-        ac2.create_chat(ac1)
-        return ac1.create_chat(ac2)
+        def get_one_online_account(self, pre_generated_key=True, move=False):
+            ac1 = self.get_online_configuring_account(
+                pre_generated_key=pre_generated_key, move=move)
+            self.wait_configure_and_start_io([ac1])
+            return ac1
 
-    def introduce_each_other(self, accounts, sending=True):
-        to_wait = []
-        for i, acc in enumerate(accounts):
-            for acc2 in accounts[i + 1:]:
-                chat = self.get_accepted_chat(acc, acc2)
-                if sending:
-                    chat.send_text("hi")
-                    to_wait.append(acc2)
-                    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()
+        def get_two_online_accounts(self, move=False, quiet=False):
+            ac1 = self.get_online_configuring_account(move=move, quiet=quiet)
+            ac2 = self.get_online_configuring_account(quiet=quiet)
+            self.wait_configure_and_start_io([ac1, ac2])
+            return ac1, ac2
 
+        def get_many_online_accounts(self, num, move=True):
+            accounts = [self.get_online_configuring_account(move=move, quiet=True)
+                        for i in range(num)]
+            self.wait_configure_and_start_io(accounts)
+            for acc in accounts:
+                acc.add_account_plugin(FFIEventLogger(acc))
+            return accounts
 
-@pytest.fixture
-def acfactory(request, tmpdir, testprocess, data):
-    am = ACFactory(request=request, tmpdir=tmpdir, testprocess=testprocess, data=data)
+        def clone_online_account(self, account, pre_generated_key=True):
+            """ Clones addr, mail_pw, mvbox_move, sentbox_watch and the
+            direct_imap object of an online account. This simulates the user setting
+            up a new device without importing a backup.
+
+            `pre_generated_key` only means that a key from python/tests/data/key is
+            used in order to speed things up.
+            """
+            self.live_count += 1
+            tmpdb = tmpdir.join("livedb%d" % self.live_count)
+            ac = self.make_account(tmpdb.strpath, logid="ac{}".format(self.live_count))
+            if pre_generated_key:
+                self._preconfigure_key(ac, account.get_config("addr"))
+            ac.update_config(dict(
+                addr=account.get_config("addr"),
+                mail_pw=account.get_config("mail_pw"),
+                mvbox_move=account.get_config("mvbox_move"),
+                sentbox_watch=account.get_config("sentbox_watch"),
+            ))
+            if hasattr(account, "direct_imap"):
+                # Attach the existing direct_imap. If we did not do this, a new one would be created and
+                # delete existing messages (see dc_account_extra_configure(configure))
+                ac.direct_imap = account.direct_imap
+            ac._configtracker = ac.configure()
+            return ac
+
+        def wait_configure_and_start_io(self, accounts=None):
+            if accounts is None:
+                accounts = self._accounts[:]
+            started_accounts = []
+            for acc in accounts:
+                if acc not in started_accounts:
+                    self.wait_configure(acc)
+                    acc.set_config("bcc_self", "0")
+                    if acc.is_configured():
+                        acc.start_io()
+                        started_accounts.append(acc)
+                    print("{}: {} account was started".format(
+                        acc.get_config("displayname"), acc.get_config("addr")))
+            for acc in started_accounts:
+                acc._evtracker.wait_all_initial_fetches()
+
+        def wait_configure(self, acc):
+            if hasattr(acc, "_configtracker"):
+                acc._configtracker.wait_finish()
+                acc._evtracker.consume_events()
+                acc.get_device_chat().mark_noticed()
+                del acc._configtracker
+
+        def run_bot_process(self, module, ffi=True):
+            fn = module.__file__
+
+            bot_ac, bot_cfg = self.get_online_config()
+
+            # Avoid starting ac so we don't interfere with the bot operating on
+            # the same database.
+            self._accounts.remove(bot_ac)
+
+            args = [
+                sys.executable,
+                "-u",
+                fn,
+                "--email", bot_cfg["addr"],
+                "--password", bot_cfg["mail_pw"],
+                bot_ac.db_path,
+            ]
+            if ffi:
+                args.insert(-1, "--show-ffi")
+            print("$", " ".join(args))
+            popen = subprocess.Popen(
+                args=args,
+                stdin=subprocess.DEVNULL,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,  # combine stdout/stderr in one stream
+                bufsize=0,                 # line buffering
+                close_fds=True,            # close all FDs other than 0/1/2
+                universal_newlines=True    # give back text
+            )
+            bot = BotProcess(popen, bot_cfg)
+            self._finalizers.append(bot.kill)
+            return bot
+
+        def dump_imap_summary(self, logfile):
+            for ac in self._accounts:
+                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(tmpdir, logfile=logfile)
+
+        def get_accepted_chat(self, ac1: Account, ac2: Account):
+            ac2.create_chat(ac1)
+            return ac1.create_chat(ac2)
+
+        def introduce_each_other(self, accounts, sending=True):
+            to_wait = []
+            for i, acc in enumerate(accounts):
+                for acc2 in accounts[i + 1:]:
+                    chat = self.get_accepted_chat(acc, acc2)
+                    if sending:
+                        chat.send_text("hi")
+                        to_wait.append(acc2)
+                        acc2.create_chat(acc).send_text("hi back")
+                        to_wait.append(acc)
+            for acc in to_wait:
+                acc._evtracker.wait_next_incoming_message()
+
+    am = AccountMaker()
+    request.addfinalizer(am.finalize)
     yield am
     if hasattr(request.node, "rep_call") and request.node.rep_call.failed:
-        if testprocess.pytestconfig.getoption("--extra-info"):
-            logfile = io.StringIO()
-            am.dump_imap_summary(logfile=logfile)
-            print(logfile.getvalue())
-            # request.node.add_report_section("call", "imap-server-state", s)
+        logfile = io.StringIO()
+        am.dump_imap_summary(logfile=logfile)
+        print(logfile.getvalue())
+        # request.node.add_report_section("call", "imap-server-state", s)
 
 
 class BotProcess:
     stdout_queue: queue.Queue
 
-    def __init__(self, popen, addr) -> None:
+    def __init__(self, popen, bot_cfg) -> None:
         self.popen = popen
-        self.addr = addr
+        self.addr = bot_cfg["addr"]
 
         # we read stdout as quickly as we can in a thread and make
         # the (unicode) lines available for readers through a queue.

python/tests/bench_test_setup.py

@@ -1,20 +0,0 @@
-"""
-run with:
-
-     pytest -vv --durations=10 bench_empty.py
-
-to see timings of test setups.
-"""
-
-import pytest
-
-BENCH_NUM = 3
-
-
-class TestEmpty:
-    def test_prepare_setup_measurings(self, acfactory):
-        acfactory.get_online_accounts(BENCH_NUM)
-
-    @pytest.mark.parametrize("num", range(0, BENCH_NUM + 1))
-    def test_setup_online_accounts(self, acfactory, num):
-        acfactory.get_online_accounts(num)

python/tests/stress_test_db.py

@@ -17,7 +17,7 @@ def test_db_busy_error(acfactory, tmpdir):
             print("%3.2f %s" % (time.time() - starttime, string))
 
     # make a number of accounts
-    accounts = acfactory.get_many_online_accounts(3)
+    accounts = acfactory.get_many_online_accounts(3, quiet=True)
     log("created %s accounts" % len(accounts))
 
     # put a bigfile into each account

python/tests/test_0_complex_or_slow.py

@@ -1,481 +0,0 @@
-import sys
-import pytest
-
-
-class TestGroupStressTests:
-    def test_group_many_members_add_leave_remove(self, acfactory, lp):
-        accounts = acfactory.get_online_accounts(5)
-        acfactory.introduce_each_other(accounts)
-        ac1, ac5 = accounts.pop(), accounts.pop()
-
-        lp.sec("ac1: creating group chat with 3 other members")
-        chat = ac1.create_group_chat("title1", contacts=accounts)
-
-        lp.sec("ac1: send message to new group chat")
-        msg1 = chat.send_text("hello")
-        assert msg1.is_encrypted()
-        gossiped_timestamp = chat.get_summary()["gossiped_timestamp"]
-        assert gossiped_timestamp > 0
-
-        assert chat.num_contacts() == 3 + 1
-
-        lp.sec("ac2: checking that the chat arrived correctly")
-        ac2 = accounts[0]
-        msg2 = ac2._evtracker.wait_next_incoming_message()
-        assert msg2.text == "hello"
-        print("chat is", msg2.chat)
-        assert msg2.chat.num_contacts() == 4
-
-        lp.sec("ac3: checking that 'ac4' is a known contact")
-        ac3 = accounts[1]
-        msg3 = ac3._evtracker.wait_next_incoming_message()
-        assert msg3.text == "hello"
-        ac3_contacts = ac3.get_contacts()
-        assert len(ac3_contacts) == 4
-        ac4_contacts = ac3.get_contacts(query=accounts[2].get_config("addr"))
-        assert len(ac4_contacts) == 1
-
-        lp.sec("ac2: removing one contact")
-        to_remove = ac2.create_contact(accounts[-1])
-        msg2.chat.remove_contact(to_remove)
-
-        lp.sec("ac1: receiving system message about contact removal")
-        sysmsg = ac1._evtracker.wait_next_incoming_message()
-        assert to_remove.addr in sysmsg.text
-        assert sysmsg.chat.num_contacts() == 3
-
-        # Receiving message about removed contact does not reset gossip
-        assert chat.get_summary()["gossiped_timestamp"] == gossiped_timestamp
-
-        lp.sec("ac1: sending another message to the chat")
-        chat.send_text("hello2")
-        msg = ac2._evtracker.wait_next_incoming_message()
-        assert msg.text == "hello2"
-        assert chat.get_summary()["gossiped_timestamp"] == gossiped_timestamp
-
-        lp.sec("ac1: adding fifth member to the chat")
-        chat.add_contact(ac5)
-        # Adding contact to chat resets gossiped_timestamp
-        assert chat.get_summary()["gossiped_timestamp"] >= gossiped_timestamp
-
-        lp.sec("ac2: receiving system message about contact addition")
-        sysmsg = ac2._evtracker.wait_next_incoming_message()
-        assert ac5.get_config("configured_addr") in sysmsg.text
-        assert sysmsg.chat.num_contacts() == 4
-
-        lp.sec("ac5: waiting for message about addition to the chat")
-        sysmsg = ac5._evtracker.wait_next_incoming_message()
-        msg = sysmsg.chat.send_text("hello!")
-        # Message should be encrypted because keys of other members are gossiped
-        assert msg.is_encrypted()
-
-    def test_synchronize_member_list_on_group_rejoin(self, acfactory, lp):
-        """
-        Test that user recreates group member list when it joins the group again.
-        ac1 creates a group with two other accounts: ac2 and ac3
-        Then it removes ac2, removes ac3 and adds ac2 back.
-        ac2 did not see that ac3 is removed, so it should rebuild member list from scratch.
-        """
-        lp.sec("setting up accounts, accepted with each other")
-        accounts = acfactory.get_online_accounts(3)
-        acfactory.introduce_each_other(accounts)
-        ac1, ac2, ac3 = accounts
-
-        lp.sec("ac1: creating group chat with 2 other members")
-        chat = ac1.create_group_chat("title1", contacts=[ac2, ac3])
-        assert not chat.is_promoted()
-
-        lp.sec("ac1: send message to new group chat")
-        msg = chat.send_text("hello")
-        assert chat.is_promoted() and msg.is_encrypted()
-
-        assert chat.num_contacts() == 3
-
-        lp.sec("checking that the chat arrived correctly")
-        for ac in accounts[1:]:
-            msg = ac._evtracker.wait_next_incoming_message()
-            assert msg.text == "hello"
-            print("chat is", msg.chat)
-            assert msg.chat.num_contacts() == 3
-
-        lp.sec("ac1: removing ac2")
-        chat.remove_contact(ac2)
-
-        lp.sec("ac2: wait for a message about removal from the chat")
-        msg = ac2._evtracker.wait_next_incoming_message()
-
-        lp.sec("ac1: removing ac3")
-        chat.remove_contact(ac3)
-
-        lp.sec("ac1: adding ac2 back")
-        # Group is promoted, message is sent automatically
-        assert chat.is_promoted()
-        chat.add_contact(ac2)
-
-        lp.sec("ac2: check that ac3 is removed")
-        msg = ac2._evtracker.wait_next_incoming_message()
-
-        assert chat.num_contacts() == 2
-        assert msg.chat.num_contacts() == 2
-        acfactory.dump_imap_summary(sys.stdout)
-
-
-def test_qr_verified_group_and_chatting(acfactory, lp):
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-    lp.sec("ac1: create verified-group QR, ac2 scans and joins")
-    chat1 = ac1.create_group_chat("hello", verified=True)
-    assert chat1.is_protected()
-    qr = chat1.get_join_qr()
-    lp.sec("ac2: start QR-code based join-group protocol")
-    chat2 = ac2.qr_join_chat(qr)
-    assert chat2.id >= 10
-    ac1._evtracker.wait_securejoin_inviter_progress(1000)
-
-    lp.sec("ac2: read member added message")
-    msg = ac2._evtracker.wait_next_incoming_message()
-    assert msg.is_encrypted()
-    assert "added" in msg.text.lower()
-
-    lp.sec("ac1: send message")
-    msg_out = chat1.send_text("hello")
-    assert msg_out.is_encrypted()
-
-    lp.sec("ac2: read message and check it's verified chat")
-    msg = ac2._evtracker.wait_next_incoming_message()
-    assert msg.text == "hello"
-    assert msg.chat.is_protected()
-    assert msg.is_encrypted()
-
-    lp.sec("ac2: send message and let ac1 read it")
-    chat2.send_text("world")
-    msg = ac1._evtracker.wait_next_incoming_message()
-    assert msg.text == "world"
-    assert msg.is_encrypted()
-
-    lp.sec("ac1: create QR code and let ac3 scan it, starting the securejoin")
-    qr = ac1.get_setup_contact_qr()
-
-    lp.sec("ac3: start QR-code based setup contact protocol")
-    ch = ac3.qr_setup_contact(qr)
-    assert ch.id >= 10
-    ac1._evtracker.wait_securejoin_inviter_progress(1000)
-
-    lp.sec("ac1: add ac3 to verified group")
-    chat1.add_contact(ac3)
-    msg = ac2._evtracker.wait_next_incoming_message()
-    assert msg.is_encrypted()
-    assert msg.is_system_message()
-    assert not msg.error
-
-    lp.sec("ac2: send message and let ac3 read it")
-    chat2.send_text("hi")
-    # Skip system message about added member
-    ac3._evtracker.wait_next_incoming_message()
-    msg = ac3._evtracker.wait_next_incoming_message()
-    assert msg.text == "hi"
-    assert msg.is_encrypted()
-
-
-@pytest.mark.parametrize("mvbox_move", [False, True])
-def test_fetch_existing(acfactory, lp, mvbox_move):
-    """Delta Chat reads the recipients from old emails sent by the user and adds them as contacts.
-    This way, we can already offer them some email addresses they can write to.
-
-    Also, the newest existing emails from each folder are fetched during onboarding.
-
-    Additionally tests that bcc_self messages moved to the mvbox/sentbox are marked as read."""
-
-    def assert_folders_configured(ac):
-        """There was a bug that scan_folders() set the configured folders to None under some circumstances.
-        So, check that they are still configured:"""
-        assert ac.get_config("configured_sentbox_folder") == "Sent"
-        if mvbox_move:
-            assert ac.get_config("configured_mvbox_folder")
-
-    ac1 = acfactory.new_online_configuring_account(mvbox_move=mvbox_move)
-    ac2 = acfactory.new_online_configuring_account()
-    acfactory.wait_configured(ac1)
-    ac1.direct_imap.create_folder("Sent")
-    ac1.set_config("sentbox_watch", "1")
-
-    # We need to reconfigure to find the new "Sent" folder.
-    # `scan_folders()`, which runs automatically shortly after `start_io()` is invoked,
-    # would also find the "Sent" folder, but it would be too late:
-    # The sentbox thread, started by `start_io()`, would have seen that there is no
-    # ConfiguredSentboxFolder and do nothing.
-    acfactory._acsetup.start_configure(ac1, reconfigure=True)
-    acfactory.bring_accounts_online()
-    assert_folders_configured(ac1)
-
-    assert ac1.direct_imap.select_config_folder("mvbox" if mvbox_move else "inbox")
-    with ac1.direct_imap.idle() as idle1:
-        lp.sec("send out message with bcc to ourselves")
-        ac1.set_config("bcc_self", "1")
-        chat = acfactory.get_accepted_chat(ac1, ac2)
-        chat.send_text("message text")
-        assert_folders_configured(ac1)
-
-        lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
-        assert idle1.wait_for_seen()
-    assert_folders_configured(ac1)
-
-    lp.sec("create a cloned ac1 and fetch contact history during configure")
-    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
-    ac1_clone.set_config("fetch_existing_msgs", "1")
-    acfactory.wait_configured(ac1_clone)
-    ac1_clone.start_io()
-    assert_folders_configured(ac1_clone)
-
-    lp.sec("check that ac2 contact was fetchted during configure")
-    ac1_clone._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
-    ac2_addr = ac2.get_config("addr")
-    assert any(c.addr == ac2_addr for c in ac1_clone.get_contacts())
-    assert_folders_configured(ac1_clone)
-
-    lp.sec("check that messages changed events arrive for the correct message")
-    msg = ac1_clone._evtracker.wait_next_messages_changed()
-    assert msg.text == "message text"
-    assert_folders_configured(ac1)
-    assert_folders_configured(ac1_clone)
-
-
-def test_fetch_existing_msgs_group_and_single(acfactory, lp):
-    """There was a bug concerning fetch-existing-msgs:
-
-    A sent a message to you, adding you to a group. This created a contact request.
-    You wrote a message to A, creating a chat.
-    ...but the group stayed blocked.
-    So, after fetch-existing-msgs you have one contact request and one chat with the same person.
-
-    See https://github.com/deltachat/deltachat-core-rust/issues/2097"""
-    ac1 = acfactory.new_online_configuring_account()
-    ac2 = acfactory.new_online_configuring_account()
-
-    acfactory.bring_accounts_online()
-
-    lp.sec("receive a message")
-    ac2.create_group_chat("group name", contacts=[ac1]).send_text("incoming, unencrypted group message")
-    ac1._evtracker.wait_next_incoming_message()
-
-    lp.sec("send out message with bcc to ourselves")
-    with ac1.direct_imap.idle() as idle1:
-        ac1.set_config("bcc_self", "1")
-        ac1_ac2_chat = ac1.create_chat(ac2)
-        ac1_ac2_chat.send_text("outgoing, encrypted direct message, creating a chat")
-        # wait until the bcc_self message arrives
-        assert idle1.wait_for_seen()
-
-    lp.sec("Clone online account and let it fetch the existing messages")
-    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
-    ac1_clone.set_config("fetch_existing_msgs", "1")
-    acfactory.wait_configured(ac1_clone)
-
-    ac1_clone.start_io()
-    ac1_clone._evtracker.wait_idle_inbox_ready()
-
-    chats = ac1_clone.get_chats()
-    assert len(chats) == 4  # two newly created chats + self-chat + device-chat
-    group_chat = [c for c in chats if c.get_name() == "group name"][0]
-    assert group_chat.is_group()
-    private_chat, = [c for c in chats if c.get_name() == ac1_ac2_chat.get_name()]
-    assert not private_chat.is_group()
-
-    group_messages = group_chat.get_messages()
-    assert len(group_messages) == 1
-    assert group_messages[0].text == "incoming, unencrypted group message"
-    private_messages = private_chat.get_messages()
-    # We can't decrypt the message in this chat, so the chat is empty:
-    assert len(private_messages) == 0
-
-
-def test_undecipherable_group(acfactory, lp):
-    """Test how group messages that cannot be decrypted are
-    handled.
-
-    Group name is encrypted and plaintext subject is set to "..." in
-    this case, so we should assign the messages to existing chat
-    instead of creating a new one. Since there is no existing group
-    chat, the messages should be assigned to 1-1 chat with the sender
-    of the message.
-    """
-
-    lp.sec("creating and configuring three accounts")
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-
-    acfactory.introduce_each_other([ac1, ac2, ac3])
-
-    lp.sec("ac3 reinstalls DC and generates a new key")
-    ac3.stop_io()
-    acfactory.remove_preconfigured_keys()
-    ac4 = acfactory.new_online_configuring_account(cloned_from=ac3)
-    acfactory.wait_configured(ac4)
-    # Create contacts to make sure incoming messages are not treated as contact requests
-    chat41 = ac4.create_chat(ac1)
-    chat42 = ac4.create_chat(ac2)
-    ac4.start_io()
-    ac4._evtracker.wait_idle_inbox_ready()
-
-    lp.sec("ac1: creating group chat with 2 other members")
-    chat = ac1.create_group_chat("title", contacts=[ac2, ac3])
-
-    lp.sec("ac1: send message to new group chat")
-    msg = chat.send_text("hello")
-
-    lp.sec("ac2: checking that the chat arrived correctly")
-    msg = ac2._evtracker.wait_next_incoming_message()
-    assert msg.text == "hello"
-    assert msg.is_encrypted(), "Message is not encrypted"
-
-    # ac4 cannot decrypt the message.
-    # Error message should be assigned to the chat with ac1.
-    lp.sec("ac4: checking that message is assigned to the sender chat")
-    error_msg = ac4._evtracker.wait_next_incoming_message()
-    assert error_msg.error  # There is an error decrypting the message
-    assert error_msg.chat == chat41
-
-    lp.sec("ac2: sending a reply to the chat")
-    msg.chat.send_text("reply")
-    reply = ac1._evtracker.wait_next_incoming_message()
-    assert reply.text == "reply"
-    assert reply.is_encrypted(), "Reply is not encrypted"
-
-    lp.sec("ac4: checking that reply is assigned to ac2 chat")
-    error_reply = ac4._evtracker.wait_next_incoming_message()
-    assert error_reply.error  # There is an error decrypting the message
-    assert error_reply.chat == chat42
-
-    # Test that ac4 replies to error messages don't appear in the
-    # group chat on ac1 and ac2.
-    lp.sec("ac4: replying to ac1 and ac2")
-
-    # Otherwise reply becomes a contact request.
-    chat41.send_text("I can't decrypt your message, ac1!")
-    chat42.send_text("I can't decrypt your message, ac2!")
-
-    msg = ac1._evtracker.wait_next_incoming_message()
-    assert msg.error is None
-    assert msg.text == "I can't decrypt your message, ac1!"
-    assert msg.is_encrypted(), "Message is not encrypted"
-    assert msg.chat == ac1.create_chat(ac3)
-
-    msg = ac2._evtracker.wait_next_incoming_message()
-    assert msg.error is None
-    assert msg.text == "I can't decrypt your message, ac2!"
-    assert msg.is_encrypted(), "Message is not encrypted"
-    assert msg.chat == ac2.create_chat(ac4)
-
-
-def test_ephemeral_timer(acfactory, lp):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    lp.sec("ac1: create chat with ac2")
-    chat1 = ac1.create_chat(ac2)
-    chat2 = ac2.create_chat(ac1)
-
-    lp.sec("ac1: set ephemeral timer to 60")
-    chat1.set_ephemeral_timer(60)
-
-    lp.sec("ac1: check that ephemeral timer is set for chat")
-    assert chat1.get_ephemeral_timer() == 60
-    chat1_summary = chat1.get_summary()
-    assert chat1_summary["ephemeral_timer"] == {'Enabled': {'duration': 60}}
-
-    lp.sec("ac2: receive system message about ephemeral timer modification")
-    ac2._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-    system_message1 = ac2._evtracker.wait_next_incoming_message()
-    assert chat2.get_ephemeral_timer() == 60
-    assert system_message1.is_system_message()
-
-    # Disabled until markers are implemented
-    # assert "Ephemeral timer: 60\n" in system_message1.get_message_info()
-
-    lp.sec("ac2: send message to ac1")
-    sent_message = chat2.send_text("message")
-    assert sent_message.ephemeral_timer == 60
-    assert "Ephemeral timer: 60\n" in sent_message.get_message_info()
-
-    # Timer is started immediately for sent messages
-    assert sent_message.ephemeral_timestamp is not None
-    assert "Expires: " in sent_message.get_message_info()
-
-    lp.sec("ac1: waiting for message from ac2")
-    text_message = ac1._evtracker.wait_next_incoming_message()
-    assert text_message.text == "message"
-    assert text_message.ephemeral_timer == 60
-    assert "Ephemeral timer: 60\n" in text_message.get_message_info()
-
-    # Timer should not start until message is displayed
-    assert text_message.ephemeral_timestamp is None
-    assert "Expires: " not in text_message.get_message_info()
-    text_message.mark_seen()
-    text_message = ac1.get_message_by_id(text_message.id)
-    assert text_message.ephemeral_timestamp is not None
-    assert "Expires: " in text_message.get_message_info()
-
-    lp.sec("ac2: set ephemeral timer to 0")
-    chat2.set_ephemeral_timer(0)
-    ac2._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-
-    lp.sec("ac1: receive system message about ephemeral timer modification")
-    ac1._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-    system_message2 = ac1._evtracker.wait_next_incoming_message()
-    assert system_message2.ephemeral_timer is None
-    assert "Ephemeral timer: " not in system_message2.get_message_info()
-    assert chat1.get_ephemeral_timer() == 0
-
-
-def test_multidevice_sync_seen(acfactory, lp):
-    """Test that message marked as seen on one device is marked as seen on another."""
-    ac1 = acfactory.new_online_configuring_account()
-    ac2 = acfactory.new_online_configuring_account()
-    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
-    acfactory.bring_accounts_online()
-
-    ac1.set_config("bcc_self", "1")
-    ac1_clone.set_config("bcc_self", "1")
-
-    ac1_chat = ac1.create_chat(ac2)
-    ac1_clone_chat = ac1_clone.create_chat(ac2)
-    ac2_chat = ac2.create_chat(ac1)
-
-    lp.sec("Send a message from ac2 to ac1 and check that it's 'fresh'")
-    ac2_chat.send_text("Hi")
-    ac1_message = ac1._evtracker.wait_next_incoming_message()
-    ac1_clone_message = ac1_clone._evtracker.wait_next_incoming_message()
-    assert ac1_chat.count_fresh_messages() == 1
-    assert ac1_clone_chat.count_fresh_messages() == 1
-    assert ac1_message.is_in_fresh
-    assert ac1_clone_message.is_in_fresh
-
-    lp.sec("ac1 marks message as seen on the first device")
-    ac1.mark_seen_messages([ac1_message])
-    assert ac1_message.is_in_seen
-
-    lp.sec("ac1 clone detects that message is marked as seen")
-    ev = ac1_clone._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
-    assert ev.data1 == ac1_clone_chat.id
-    assert ac1_clone_message.is_in_seen
-
-    lp.sec("Send an ephemeral message from ac2 to ac1")
-    ac2_chat.set_ephemeral_timer(60)
-    ac1._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-    ac1._evtracker.wait_next_incoming_message()
-    ac1_clone._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-    ac1_clone._evtracker.wait_next_incoming_message()
-
-    ac2_chat.send_text("Foobar")
-    ac1_message = ac1._evtracker.wait_next_incoming_message()
-    ac1_clone_message = ac1_clone._evtracker.wait_next_incoming_message()
-    assert "Ephemeral timer: 60\n" in ac1_message.get_message_info()
-    assert "Expires: " not in ac1_clone_message.get_message_info()
-    assert "Ephemeral timer: 60\n" in ac1_message.get_message_info()
-    assert "Expires: " not in ac1_clone_message.get_message_info()
-
-    ac1.mark_seen_messages([ac1_message])
-    assert ac1_message.is_in_seen
-    assert "Expires: " in ac1_message.get_message_info()
-    ev = ac1_clone._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
-    assert ev.data1 == ac1_clone_chat.id
-    assert ac1_clone_message.is_in_seen
-    # Test that the timer is started on the second device after synchronizing the seen status.
-    assert "Expires: " in ac1_clone_message.get_message_info()

python/tests/test_3_offline.py

@@ -1,634 +0,0 @@
-from __future__ import print_function
-import pytest
-import os
-import time
-from deltachat import const, Account
-from deltachat.message import Message
-from deltachat.hookspec import account_hookimpl
-from deltachat.capi import ffi, lib
-from deltachat.cutil import iter_array
-from datetime import datetime, timedelta, timezone
-
-
-@pytest.mark.parametrize("msgtext,res", [
-    ("Member Me (tmp1@x.org) removed by tmp2@x.org.",
-        ("removed", "tmp1@x.org", "tmp2@x.org")),
-    ("Member With space (tmp1@x.org) removed by tmp2@x.org.",
-        ("removed", "tmp1@x.org", "tmp2@x.org")),
-    ("Member With space (tmp1@x.org) removed by Another member (tmp2@x.org).",
-        ("removed", "tmp1@x.org", "tmp2@x.org")),
-    ("Member With space (tmp1@x.org) removed by me",
-        ("removed", "tmp1@x.org", "me")),
-    ("Group left by some one (tmp1@x.org).",
-        ("removed", "tmp1@x.org", "tmp1@x.org")),
-    ("Group left by tmp1@x.org.",
-        ("removed", "tmp1@x.org", "tmp1@x.org")),
-    ("Member tmp1@x.org added by tmp2@x.org.", ("added", "tmp1@x.org", "tmp2@x.org")),
-    ("Member nothing bla bla", None),
-    ("Another unknown system message", None),
-])
-def test_parse_system_add_remove(msgtext, res):
-    from deltachat.message import parse_system_add_remove
-
-    out = parse_system_add_remove(msgtext)
-    assert out == res
-
-
-class TestOfflineAccountBasic:
-    def test_wrong_db(self, tmpdir):
-        p = tmpdir.join("hello.db")
-        p.write("123")
-        account = Account(p.strpath)
-        assert not account.is_open()
-
-    def test_os_name(self, tmpdir):
-        p = tmpdir.join("hello.db")
-        # we can't easily test if os_name is used in X-Mailer
-        # outgoing messages without a full Online test
-        # but we at least check Account accepts the arg
-        ac1 = Account(p.strpath, os_name="solarpunk")
-        ac1.get_info()
-
-    def test_preconfigure_keypair(self, acfactory, data):
-        ac = acfactory.get_unconfigured_account()
-        alice_public = data.read_path("key/alice-public.asc")
-        alice_secret = data.read_path("key/alice-secret.asc")
-        assert alice_public and alice_secret
-        ac._preconfigure_keypair("alice@example.org", alice_public, alice_secret)
-
-    def test_getinfo(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        d = ac1.get_info()
-        assert d["arch"]
-        assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "0"
-
-    def test_is_not_configured(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        assert not ac1.is_configured()
-        with pytest.raises(ValueError):
-            ac1.check_is_configured()
-
-    def test_wrong_config_keys(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        with pytest.raises(KeyError):
-            ac1.set_config("lqkwje", "value")
-        with pytest.raises(KeyError):
-            ac1.get_config("lqkwje")
-
-    def test_set_config_int_conversion(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        ac1.set_config("mvbox_move", False)
-        assert ac1.get_config("mvbox_move") == "0"
-        ac1.set_config("mvbox_move", True)
-        assert ac1.get_config("mvbox_move") == "1"
-        ac1.set_config("mvbox_move", 0)
-        assert ac1.get_config("mvbox_move") == "0"
-        ac1.set_config("mvbox_move", 1)
-        assert ac1.get_config("mvbox_move") == "1"
-
-    def test_update_config(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        ac1.update_config(dict(mvbox_move=False))
-        assert ac1.get_config("mvbox_move") == "0"
-
-    def test_has_savemime(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        assert "save_mime_headers" in ac1.get_config("sys.config_keys").split()
-
-    def test_has_bccself(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "0"
-
-    def test_selfcontact_if_unconfigured(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        assert not ac1.get_self_contact().addr
-
-    def test_selfcontact_configured(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        me = ac1.get_self_contact()
-        assert me.display_name
-        assert me.addr
-
-    def test_get_config_fails(self, acfactory):
-        ac1 = acfactory.get_unconfigured_account()
-        with pytest.raises(KeyError):
-            ac1.get_config("123123")
-
-    def test_empty_group_bcc_self_enabled(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac1.set_config("bcc_self", "1")
-        chat = ac1.create_group_chat(name="group1")
-        msg = chat.send_text("msg1")
-        assert msg in chat.get_messages()
-
-    def test_empty_group_bcc_self_disabled(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac1.set_config("bcc_self", "0")
-        chat = ac1.create_group_chat(name="group1")
-        msg = chat.send_text("msg1")
-        assert msg in chat.get_messages()
-
-
-class TestOfflineContact:
-    def test_contact_attr(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact("some1@example.org", name="some1")
-        contact2 = ac1.create_contact("some1@example.org", name="some1")
-        str(contact1)
-        repr(contact1)
-        assert contact1 == contact2
-        assert contact1.id
-        assert contact1.addr == "some1@example.org"
-        assert contact1.display_name == "some1"
-        assert not contact1.is_blocked()
-        assert not contact1.is_verified()
-
-    def test_get_blocked(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact("some1@example.org", name="some1")
-        contact2 = ac1.create_contact("some2@example.org", name="some2")
-        ac1.create_contact("some3@example.org", name="some3")
-        assert ac1.get_blocked_contacts() == []
-        contact1.block()
-        assert ac1.get_blocked_contacts() == [contact1]
-        contact2.block()
-        blocked = ac1.get_blocked_contacts()
-        assert len(blocked) == 2 and contact1 in blocked and contact2 in blocked
-        contact2.unblock()
-        assert ac1.get_blocked_contacts() == [contact1]
-
-    def test_create_self_contact(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact(ac1.get_config("addr"))
-        assert contact1.id == 1
-
-    def test_get_contacts_and_delete(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact("some1@example.org", name="some1")
-        contacts = ac1.get_contacts()
-        assert len(contacts) == 1
-        assert contact1 in contacts
-
-        assert not ac1.get_contacts(query="some2")
-        assert ac1.get_contacts(query="some1")
-        assert not ac1.get_contacts(only_verified=True)
-        assert len(ac1.get_contacts(with_self=True)) == 2
-
-        assert ac1.delete_contact(contact1)
-        assert contact1 not in ac1.get_contacts()
-
-    def test_get_contacts_and_delete_fails(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact("some1@example.com", name="some1")
-        msg = contact1.create_chat().send_text("one message")
-        assert not ac1.delete_contact(contact1)
-        assert not msg.filemime
-
-    def test_create_chat_flexibility(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        chat1 = ac1.create_chat(ac2)
-        chat2 = ac1.create_chat(ac2.get_self_contact().addr)
-        assert chat1 == chat2
-        ac3 = acfactory.get_unconfigured_account()
-        with pytest.raises(ValueError):
-            ac1.create_chat(ac3)
-
-    def test_contact_rename(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact = ac1.create_contact("some1@example.com", name="some1")
-        chat = ac1.create_chat(contact)
-        assert chat.get_name() == "some1"
-        ac1.create_contact("some1@example.com", name="renamed")
-        ev = ac1._evtracker.get_matching("DC_EVENT_CHAT_MODIFIED")
-        assert ev.data1 == chat.id
-        assert chat.get_name() == "renamed"
-
-
-class TestOfflineChat:
-    @pytest.fixture
-    def ac1(self, acfactory):
-        return acfactory.get_pseudo_configured_account()
-
-    @pytest.fixture
-    def chat1(self, ac1):
-        return ac1.create_contact("some1@example.org", name="some1").create_chat()
-
-    def test_display(self, chat1):
-        str(chat1)
-        repr(chat1)
-
-    def test_is_group(self, chat1):
-        assert not chat1.is_group()
-
-    def test_chat_by_id(self, chat1):
-        chat2 = chat1.account.get_chat_by_id(chat1.id)
-        assert chat2 == chat1
-        with pytest.raises(ValueError):
-            chat1.account.get_chat_by_id(123123)
-
-    def test_chat_idempotent(self, chat1, ac1):
-        contact1 = chat1.get_contacts()[0]
-        chat2 = contact1.create_chat()
-        assert chat2.id == chat1.id
-        assert chat2.get_name() == chat1.get_name()
-        assert chat1 == chat2
-        assert not (chat1 != chat2)
-
-        for ichat in ac1.get_chats():
-            if ichat.id == chat1.id:
-                break
-        else:
-            pytest.fail("could not find chat")
-
-    def test_group_chat_add_second_account(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        chat = ac1.create_group_chat(name="title1")
-        with pytest.raises(ValueError):
-            chat.add_contact(ac2.get_self_contact())
-        contact = chat.add_contact(ac2)
-        assert contact.addr == ac2.get_config("addr")
-        assert contact.name == ac2.get_config("displayname")
-        assert contact.account == ac1
-        chat.remove_contact(ac2)
-
-    def test_group_chat_creation(self, ac1):
-        contact1 = ac1.create_contact("some1@example.org", name="some1")
-        contact2 = ac1.create_contact("some2@example.org", name="some2")
-        chat = ac1.create_group_chat(name="title1", contacts=[contact1, contact2])
-        assert chat.get_name() == "title1"
-        assert contact1 in chat.get_contacts()
-        assert contact2 in chat.get_contacts()
-        assert not chat.is_promoted()
-        chat.set_name("title2")
-        assert chat.get_name() == "title2"
-
-        d = chat.get_summary()
-        print(d)
-        assert d["id"] == chat.id
-        assert d["type"] == chat.get_type()
-        assert d["name"] == chat.get_name()
-        assert d["archived"] == chat.is_archived()
-        # assert d["param"] == chat.param
-        assert d["color"] == chat.get_color()
-        assert d["profile_image"] == "" if chat.get_profile_image() is None else chat.get_profile_image()
-        assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
-
-    def test_group_chat_creation_with_translation(self, ac1):
-        ac1.set_stock_translation(const.DC_STR_MSGGRPNAME, "abc %1$s xyz %2$s")
-        ac1._evtracker.consume_events()
-        with pytest.raises(ValueError):
-            ac1.set_stock_translation(const.DC_STR_FILE, "xyz %1$s")
-        ac1._evtracker.get_matching("DC_EVENT_WARNING")
-        with pytest.raises(ValueError):
-            ac1.set_stock_translation(const.DC_STR_CONTACT_NOT_VERIFIED, "xyz %2$s")
-        ac1._evtracker.get_matching("DC_EVENT_WARNING")
-        with pytest.raises(ValueError):
-            ac1.set_stock_translation(500, "xyz %1$s")
-        ac1._evtracker.get_matching("DC_EVENT_WARNING")
-        chat = ac1.create_group_chat(name="homework", contacts=[])
-        assert chat.get_name() == "homework"
-        chat.send_text("Now we have a group for homework")
-        assert chat.is_promoted()
-        chat.set_name("Homework")
-        assert chat.get_messages()[-1].text == "abc homework xyz Homework by me."
-
-    @pytest.mark.parametrize("verified", [True, False])
-    def test_group_chat_qr(self, acfactory, ac1, verified):
-        ac2 = acfactory.get_pseudo_configured_account()
-        chat = ac1.create_group_chat(name="title1", verified=verified)
-        assert chat.is_group()
-        qr = chat.get_join_qr()
-        assert ac2.check_qr(qr).is_ask_verifygroup
-
-    def test_removing_blocked_user_from_group(self, ac1, lp):
-        """
-        Test that blocked contact is not unblocked when removed from a group.
-        See https://github.com/deltachat/deltachat-core-rust/issues/2030
-        """
-        lp.sec("Create a group chat with a contact")
-        contact = ac1.create_contact("some1@example.org")
-        group = ac1.create_group_chat("title", contacts=[contact])
-        group.send_text("First group message")
-
-        lp.sec("ac1 blocks contact")
-        contact.block()
-        assert contact.is_blocked()
-
-        lp.sec("ac1 removes contact from their group")
-        group.remove_contact(contact)
-        assert contact.is_blocked()
-
-        lp.sec("ac1 adding blocked contact unblocks it")
-        group.add_contact(contact)
-        assert not contact.is_blocked()
-
-    def test_get_set_profile_image_simple(self, ac1, data):
-        chat = ac1.create_group_chat(name="title1")
-        p = data.get_path("d.png")
-        chat.set_profile_image(p)
-        p2 = chat.get_profile_image()
-        assert open(p, "rb").read() == open(p2, "rb").read()
-        chat.remove_profile_image()
-        assert chat.get_profile_image() is None
-
-    def test_mute(self, ac1):
-        chat = ac1.create_group_chat(name="title1")
-        assert not chat.is_muted()
-        assert chat.get_mute_duration() == 0
-        chat.mute()
-        assert chat.is_muted()
-        assert chat.get_mute_duration() == -1
-        chat.unmute()
-        assert not chat.is_muted()
-        chat.mute(50)
-        assert chat.is_muted()
-        assert chat.get_mute_duration() <= 50
-        with pytest.raises(ValueError):
-            chat.mute(-51)
-
-        # Regression test, this caused Rust panic previously
-        chat.mute(2**63 - 1)
-        assert chat.is_muted()
-        assert chat.get_mute_duration() == -1
-
-    def test_delete_and_send_fails(self, ac1, chat1):
-        chat1.delete()
-        ac1._evtracker.wait_next_messages_changed()
-        with pytest.raises(ValueError):
-            chat1.send_text("msg1")
-
-    def test_prepare_message_and_send(self, ac1, chat1):
-        msg = chat1.prepare_message(Message.new_empty(chat1.account, "text"))
-        msg.set_text("hello world")
-        assert msg.text == "hello world"
-        assert msg.id > 0
-        chat1.send_prepared(msg)
-        assert "Sent" in msg.get_message_info()
-        str(msg)
-        repr(msg)
-        assert msg == ac1.get_message_by_id(msg.id)
-
-    def test_prepare_file(self, ac1, chat1):
-        blobdir = ac1.get_blobdir()
-        p = os.path.join(blobdir, "somedata.txt")
-        with open(p, "w") as f:
-            f.write("some data")
-        message = chat1.prepare_message_file(p)
-        assert message.id > 0
-        message.set_text("hello world")
-        assert message.is_out_preparing()
-        assert message.text == "hello world"
-        chat1.send_prepared(message)
-        assert "Sent" in message.get_message_info()
-
-    def test_message_eq_contains(self, chat1):
-        msg = chat1.send_text("msg1")
-        assert msg in chat1.get_messages()
-        assert not (msg not in chat1.get_messages())
-        str(msg)
-        repr(msg)
-
-    def test_message_send_text(self, chat1):
-        msg = chat1.send_text("msg1")
-        assert msg
-        assert msg.is_text()
-        assert not msg.is_audio()
-        assert not msg.is_video()
-        assert not msg.is_gif()
-        assert not msg.is_file()
-        assert not msg.is_image()
-
-        assert not msg.is_in_fresh()
-        assert not msg.is_in_noticed()
-        assert not msg.is_in_seen()
-        assert msg.is_out_pending()
-        assert not msg.is_out_failed()
-        assert not msg.is_out_delivered()
-        assert not msg.is_out_mdn_received()
-
-    def test_message_image(self, chat1, data, lp):
-        with pytest.raises(ValueError):
-            chat1.send_image(path="notexists")
-        fn = data.get_path("d.png")
-        lp.sec("sending image")
-        chat1.account._evtracker.consume_events()
-        msg = chat1.send_image(fn)
-        chat1.account._evtracker.get_matching("DC_EVENT_NEW_BLOB_FILE")
-        assert msg.is_image()
-        assert msg
-        assert msg.id > 0
-        assert os.path.exists(msg.filename)
-        assert msg.filemime == "image/png"
-
-    @pytest.mark.parametrize("typein,typeout", [
-            (None, "application/octet-stream"),
-            ("text/plain", "text/plain"),
-            ("image/png", "image/png"),
-    ])
-    def test_message_file(self, ac1, chat1, data, lp, typein, typeout):
-        lp.sec("sending file")
-        fn = data.get_path("r.txt")
-        msg = chat1.send_file(fn, typein)
-        assert msg
-        assert msg.id > 0
-        assert msg.is_file()
-        assert os.path.exists(msg.filename)
-        assert msg.filename.endswith(msg.basename)
-        assert msg.filemime == typeout
-        msg2 = chat1.send_file(fn, typein)
-        assert msg2 != msg
-        assert msg2.filename != msg.filename
-
-    def test_create_contact(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        email = "hello <hello@example.org>"
-        contact1 = ac1.create_contact(email)
-        assert contact1.addr == "hello@example.org"
-        assert contact1.name == "hello"
-        contact1 = ac1.create_contact(email, name="world")
-        assert contact1.name == "world"
-        contact2 = ac1.create_contact("display1 <x@example.org>", "real")
-        assert contact2.name == "real"
-
-    def test_create_chat_simple(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        contact1 = ac1.create_contact("some1@example.org", name="some1")
-        contact1.create_chat().send_text("hello")
-
-    def test_chat_message_distinctions(self, ac1, chat1):
-        past1s = datetime.now(timezone.utc) - timedelta(seconds=1)
-        msg = chat1.send_text("msg1")
-        ts = msg.time_sent
-        assert msg.time_received is None
-        assert ts.strftime("Y")
-        assert past1s < ts
-        contact = msg.get_sender_contact()
-        assert contact == ac1.get_self_contact()
-
-    def test_set_config_after_configure_is_forbidden(self, ac1):
-        assert ac1.get_config("mail_pw")
-        assert ac1.is_configured()
-        with pytest.raises(ValueError):
-            ac1.set_config("addr", "123@example.org")
-
-    def test_import_export_one_contact(self, acfactory, tmpdir):
-        backupdir = tmpdir.mkdir("backup")
-        ac1 = acfactory.get_pseudo_configured_account()
-        chat = ac1.create_contact("some1 <some1@example.org>").create_chat()
-        # send a text message
-        msg = chat.send_text("msg1")
-        # send a binary file
-        bin = tmpdir.join("some.bin")
-        with bin.open("w") as f:
-            f.write("\00123" * 10000)
-        msg = chat.send_file(bin.strpath)
-        contact = msg.get_sender_contact()
-        assert contact == ac1.get_self_contact()
-        assert not backupdir.listdir()
-        ac1.stop_io()
-        path = ac1.export_all(backupdir.strpath)
-        assert os.path.exists(path)
-        ac2 = acfactory.get_unconfigured_account()
-        ac2.import_all(path)
-        contacts = ac2.get_contacts(query="some1")
-        assert len(contacts) == 1
-        contact2 = contacts[0]
-        assert contact2.addr == "some1@example.org"
-        chat2 = contact2.create_chat()
-        messages = chat2.get_messages()
-        assert len(messages) == 2
-        assert messages[0].text == "msg1"
-        assert os.path.exists(messages[1].filename)
-
-    def test_set_get_draft(self, chat1):
-        msg = Message.new_empty(chat1.account, "text")
-        msg1 = chat1.prepare_message(msg)
-        msg1.set_text("hello")
-        chat1.set_draft(msg1)
-        msg1.set_text("obsolete")
-        msg2 = chat1.get_draft()
-        assert msg2.text == "hello"
-        chat1.set_draft(None)
-        assert chat1.get_draft() is None
-
-    def test_qr_setup_contact(self, acfactory, lp):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac2 = acfactory.get_pseudo_configured_account()
-        qr = ac1.get_setup_contact_qr()
-        assert qr.startswith("OPENPGP4FPR:")
-        res = ac2.check_qr(qr)
-        assert res.is_ask_verifycontact()
-        assert not res.is_ask_verifygroup()
-        assert res.contact_id == 10
-
-    def test_quote(self, chat1):
-        """Offline quoting test"""
-        msg = Message.new_empty(chat1.account, "text")
-        msg.set_text("Multi\nline\nmessage")
-        assert msg.quoted_text is None
-
-        # Prepare message to assign it a Message-Id.
-        # Messages without Message-Id cannot be quoted.
-        msg = chat1.prepare_message(msg)
-
-        reply_msg = Message.new_empty(chat1.account, "text")
-        reply_msg.set_text("reply")
-        reply_msg.quote = msg
-        assert reply_msg.quoted_text == "Multi\nline\nmessage"
-
-    def test_group_chat_many_members_add_remove(self, ac1, lp):
-        lp.sec("ac1: creating group chat with 10 other members")
-        chat = ac1.create_group_chat(name="title1")
-        # promote chat
-        chat.send_text("hello")
-        assert chat.is_promoted()
-
-        # activate local plugin
-        in_list = []
-
-        class InPlugin:
-            @account_hookimpl
-            def ac_member_added(self, chat, contact, actor):
-                in_list.append(("added", chat, contact, actor))
-
-            @account_hookimpl
-            def ac_member_removed(self, chat, contact, actor):
-                in_list.append(("removed", chat, contact, actor))
-
-        ac1.add_account_plugin(InPlugin())
-
-        # perform add contact many times
-        contacts = []
-        for i in range(10):
-            lp.sec("create contact")
-            contact = ac1.create_contact("some{}@example.org".format(i))
-            contacts.append(contact)
-            lp.sec("add contact")
-            chat.add_contact(contact)
-
-        assert chat.num_contacts() == 11
-
-        # let's make sure the events perform plugin hooks
-        def wait_events(cond):
-            now = time.time()
-            while time.time() < now + 5:
-                if cond():
-                    break
-                time.sleep(0.1)
-            else:
-                pytest.fail("failed to get events")
-
-        wait_events(lambda: len(in_list) == 10)
-
-        assert len(in_list) == 10
-        chat_contacts = chat.get_contacts()
-        for in_cmd, in_chat, in_contact, in_actor in in_list:
-            assert in_cmd == "added"
-            assert in_chat == chat
-            assert in_contact in chat_contacts
-            assert in_actor is None
-            chat_contacts.remove(in_contact)
-
-        assert chat_contacts[0].id == 1  # self contact
-
-        in_list[:] = []
-
-        lp.sec("ac1: removing two contacts and checking things are right")
-        chat.remove_contact(contacts[9])
-        chat.remove_contact(contacts[3])
-        assert chat.num_contacts() == 9
-
-        wait_events(lambda: len(in_list) == 2)
-        assert len(in_list) == 2
-        assert in_list[0][0] == "removed"
-        assert in_list[0][1] == chat
-        assert in_list[0][2] == contacts[9]
-        assert in_list[1][0] == "removed"
-        assert in_list[1][1] == chat
-        assert in_list[1][2] == contacts[3]
-
-    def test_audit_log_view_without_daymarker(self, ac1, lp):
-        lp.sec("ac1: test audit log (show only system messages)")
-        chat = ac1.create_group_chat(name="audit log sample data")
-        # promote chat
-        chat.send_text("hello")
-        assert chat.is_promoted()
-
-        lp.sec("create test data")
-        chat.add_contact(ac1.create_contact("some-1@example.org"))
-        chat.set_name("audit log test group")
-        chat.send_text("a message in between")
-
-        lp.sec("check message count of all messages")
-        assert len(chat.get_messages()) == 4
-
-        lp.sec("check message count of only system messages (without daymarkers)")
-        dc_array = ffi.gc(
-            lib.dc_get_chat_msgs(ac1._dc_context, chat.id, const.DC_GCM_INFO_ONLY, 0),
-            lib.dc_array_unref
-        )
-        assert len(list(iter_array(dc_array, lambda x: x))) == 2

python/tests/test_4_lowlevel.py

@@ -1,215 +0,0 @@
-
-import os
-
-from queue import Queue
-from deltachat import capi, cutil, const
-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, create_dict_from_files_in_path, write_dict_to_dir
-# from deltachat.account import EventLogger
-
-
-class TestACSetup:
-
-    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_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, 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)
-        pc.start_configure(ac1)
-        ac2 = acfactory.get_unconfigured_account()
-        monkeypatch.setattr(ac2, "configure", lambda **kwargs: None)
-        pc.start_configure(ac2)
-        assert pc._account2state[ac1] == pc.CONFIGURING
-        assert pc._account2state[ac2] == pc.CONFIGURING
-        pc._configured_events.put((ac1, True))
-        pc.wait_one_configured(ac1)
-        assert pc._account2state[ac1] == pc.CONFIGURED
-        assert pc._account2state[ac2] == pc.CONFIGURING
-        pc._configured_events.put((ac2, True))
-        pc.bring_online()
-        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)
-    capi.lib.dc_context_unref(ctx)
-
-
-def test_dc_close_events(tmpdir, acfactory):
-    ac1 = acfactory.get_unconfigured_account()
-
-    # register after_shutdown function
-    shutdowns = Queue()
-
-    class ShutdownPlugin:
-        @global_hookimpl
-        def dc_account_after_shutdown(self, account):
-            assert account._dc_context is None
-            shutdowns.put(account)
-    register_global_plugin(ShutdownPlugin())
-    assert hasattr(ac1, "_dc_context")
-    ac1.shutdown()
-    shutdowns.get(timeout=2)
-
-
-def test_wrong_db(tmpdir):
-    p = tmpdir.join("hello.db")
-    # write an invalid database file
-    p.write("x123" * 10)
-
-    context = lib.dc_context_new(ffi.NULL, p.strpath.encode("ascii"), ffi.NULL)
-    assert not lib.dc_context_is_open(context)
-
-
-def test_empty_blobdir(tmpdir):
-    db_fname = tmpdir.join("hello.db")
-    # Apparently some client code expects this to be the same as passing NULL.
-    ctx = ffi.gc(
-        lib.dc_context_new(ffi.NULL, db_fname.strpath.encode("ascii"), b""),
-        lib.dc_context_unref,
-    )
-    assert ctx != ffi.NULL
-
-
-def test_event_defines():
-    assert const.DC_EVENT_INFO == 100
-    assert const.DC_CONTACT_ID_SELF
-
-
-def test_sig():
-    sig = capi.lib.dc_event_has_string_data
-    assert not sig(const.DC_EVENT_MSGS_CHANGED)
-    assert sig(const.DC_EVENT_INFO)
-    assert sig(const.DC_EVENT_WARNING)
-    assert sig(const.DC_EVENT_ERROR)
-    assert sig(const.DC_EVENT_SMTP_CONNECTED)
-    assert sig(const.DC_EVENT_IMAP_CONNECTED)
-    assert sig(const.DC_EVENT_SMTP_MESSAGE_SENT)
-    assert sig(const.DC_EVENT_IMEX_FILE_WRITTEN)
-
-
-def test_markseen_invalid_message_ids(acfactory):
-    ac1 = acfactory.get_pseudo_configured_account()
-    contact1 = ac1.create_contact("some1@example.com", name="some1")
-    chat = contact1.create_chat()
-    chat.send_text("one messae")
-    ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
-    msg_ids = [9]
-    lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
-    ac1._evtracker.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
-
-
-def test_get_special_message_id_returns_empty_message(acfactory):
-    ac1 = acfactory.get_pseudo_configured_account()
-    for i in range(1, 10):
-        msg = ac1.get_message_by_id(i)
-        assert msg.id == 0
-
-
-def test_provider_info_none():
-    ctx = ffi.gc(
-        lib.dc_context_new(ffi.NULL, ffi.NULL, ffi.NULL),
-        lib.dc_context_unref,
-    )
-    assert lib.dc_provider_new_from_email(ctx, cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
-
-
-def test_get_info_open(tmpdir):
-    db_fname = tmpdir.join("test.db")
-    ctx = ffi.gc(
-        lib.dc_context_new(ffi.NULL, db_fname.strpath.encode("ascii"), ffi.NULL),
-        lib.dc_context_unref,
-    )
-    info = cutil.from_dc_charpointer(lib.dc_get_info(ctx))
-    assert 'deltachat_core_version' in info
-    assert 'database_dir' in info
-
-
-def test_logged_hook_failure(acfactory):
-    ac1 = acfactory.get_pseudo_configured_account()
-    cap = []
-    ac1.log = cap.append
-    with ac1._event_thread.swallow_and_log_exception("some"):
-        0/0
-    assert cap
-    assert "some" in str(cap)
-    assert "ZeroDivisionError" in str(cap)
-    assert "Traceback" in str(cap)
-
-
-def test_logged_ac_process_ffi_failure(acfactory):
-    from deltachat import account_hookimpl
-
-    ac1 = acfactory.get_pseudo_configured_account()
-
-    class FailPlugin:
-        @account_hookimpl
-        def ac_process_ffi_event(ffi_event):
-            0/0
-
-    cap = Queue()
-    ac1.log = cap.put
-    ac1.add_account_plugin(FailPlugin())
-    # cause any event eg contact added/changed
-    ac1.create_contact("something@example.org")
-    res = cap.get(timeout=10)
-    assert "ac_process_ffi_event" in res
-    assert "ZeroDivisionError" in res
-    assert "Traceback" in res

python/tests/test_increation.py

@@ -33,7 +33,7 @@ def wait_msgs_changed(account, msgs_list):
 
 class TestOnlineInCreation:
     def test_increation_not_blobdir(self, tmpdir, acfactory, lp):
-        ac1, ac2 = acfactory.get_online_accounts(2)
+        ac1, ac2 = acfactory.get_two_online_accounts()
         chat = ac1.create_chat(ac2)
 
         lp.sec("Creating in-creation file outside of blobdir")
@@ -43,7 +43,7 @@ class TestOnlineInCreation:
             chat.prepare_message_file(src.strpath)
 
     def test_no_increation_copies_to_blobdir(self, tmpdir, acfactory, lp):
-        ac1, ac2 = acfactory.get_online_accounts(2)
+        ac1, ac2 = acfactory.get_two_online_accounts()
         chat = ac1.create_chat(ac2)
 
         lp.sec("Creating file outside of blobdir")
@@ -56,7 +56,7 @@ class TestOnlineInCreation:
         assert os.path.exists(blob_src), "file.txt not copied to blobdir"
 
     def test_forward_increation(self, acfactory, data, lp):
-        ac1, ac2 = acfactory.get_online_accounts(2)
+        ac1, ac2 = acfactory.get_two_online_accounts()
 
         chat = ac1.create_chat(ac2)
         wait_msgs_changed(ac1, [(0, 0)])  # why no chat id?

python/tests/test_lowlevel.py

@@ -0,0 +1,105 @@
+from __future__ import print_function
+
+from queue import Queue
+from deltachat import capi, cutil, const
+from deltachat import register_global_plugin
+from deltachat.hookspec import global_hookimpl
+from deltachat.capi import ffi
+from deltachat.capi import lib
+# from deltachat.account import EventLogger
+
+
+def test_empty_context():
+    ctx = capi.lib.dc_context_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL)
+    capi.lib.dc_context_unref(ctx)
+
+
+def test_dc_close_events(tmpdir, acfactory):
+    ac1 = acfactory.get_unconfigured_account()
+
+    # register after_shutdown function
+    shutdowns = Queue()
+
+    class ShutdownPlugin:
+        @global_hookimpl
+        def dc_account_after_shutdown(self, account):
+            assert account._dc_context is None
+            shutdowns.put(account)
+    register_global_plugin(ShutdownPlugin())
+    assert hasattr(ac1, "_dc_context")
+    ac1.shutdown()
+    shutdowns.get(timeout=2)
+
+
+def test_wrong_db(tmpdir):
+    p = tmpdir.join("hello.db")
+    # write an invalid database file
+    p.write("x123" * 10)
+
+    context = lib.dc_context_new(ffi.NULL, p.strpath.encode("ascii"), ffi.NULL)
+    assert not lib.dc_context_is_open(context)
+
+
+def test_empty_blobdir(tmpdir):
+    db_fname = tmpdir.join("hello.db")
+    # Apparently some client code expects this to be the same as passing NULL.
+    ctx = ffi.gc(
+        lib.dc_context_new(ffi.NULL, db_fname.strpath.encode("ascii"), b""),
+        lib.dc_context_unref,
+    )
+    assert ctx != ffi.NULL
+
+
+def test_event_defines():
+    assert const.DC_EVENT_INFO == 100
+    assert const.DC_CONTACT_ID_SELF
+
+
+def test_sig():
+    sig = capi.lib.dc_event_has_string_data
+    assert not sig(const.DC_EVENT_MSGS_CHANGED)
+    assert sig(const.DC_EVENT_INFO)
+    assert sig(const.DC_EVENT_WARNING)
+    assert sig(const.DC_EVENT_ERROR)
+    assert sig(const.DC_EVENT_SMTP_CONNECTED)
+    assert sig(const.DC_EVENT_IMAP_CONNECTED)
+    assert sig(const.DC_EVENT_SMTP_MESSAGE_SENT)
+    assert sig(const.DC_EVENT_IMEX_FILE_WRITTEN)
+
+
+def test_markseen_invalid_message_ids(acfactory):
+    ac1 = acfactory.get_configured_offline_account()
+
+    contact1 = ac1.create_contact("some1@example.com", name="some1")
+    chat = contact1.create_chat()
+    chat.send_text("one messae")
+    ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
+    msg_ids = [9]
+    lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
+    ac1._evtracker.ensure_event_not_queued("DC_EVENT_WARNING|DC_EVENT_ERROR")
+
+
+def test_get_special_message_id_returns_empty_message(acfactory):
+    ac1 = acfactory.get_configured_offline_account()
+    for i in range(1, 10):
+        msg = ac1.get_message_by_id(i)
+        assert msg.id == 0
+
+
+def test_provider_info_none():
+    ctx = ffi.gc(
+        lib.dc_context_new(ffi.NULL, ffi.NULL, ffi.NULL),
+        lib.dc_context_unref,
+    )
+    assert lib.dc_provider_new_from_email(ctx, cutil.as_dc_charpointer("email@unexistent.no")) == ffi.NULL
+
+
+def test_get_info_open(tmpdir):
+    db_fname = tmpdir.join("test.db")
+    ctx = ffi.gc(
+        lib.dc_context_new(ffi.NULL, db_fname.strpath.encode("ascii"), ffi.NULL),
+        lib.dc_context_unref,
+    )
+    info = cutil.from_dc_charpointer(lib.dc_get_info(ctx))
+    assert 'deltachat_core_version' in info
+    assert 'database_dir' in info

python/tox.ini

@@ -8,7 +8,7 @@ envlist =
 
 [testenv]
 commands = 
-    pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
+    pytest -n6 --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
     python tests/package_wheels.py {toxworkdir}/wheelhouse
 passenv = 
     TRAVIS 

rust-toolchain

@@ -1 +1 @@
-1.60.0
+1.59.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.59.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.59.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 json
+import sys
 import re
 import pathlib
 import subprocess
@@ -41,24 +41,6 @@ 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")
@@ -70,7 +52,6 @@ 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")
 
@@ -93,7 +74,6 @@ 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

@@ -54,11 +54,7 @@ impl Accounts {
         ensure!(dir.exists().await, "directory does not exist");
 
         let config_file = dir.join(CONFIG_NAME);
-        ensure!(
-            config_file.exists().await,
-            "{:?} does not exist",
-            config_file
-        );
+        ensure!(config_file.exists().await, "accounts.toml does not exist");
 
         let config = Config::from_file(config_file)
             .await
@@ -148,27 +144,9 @@ impl Accounts {
         drop(ctx);
 
         if let Some(cfg) = self.config.get_account(id).await {
-            // Spend up to 1 minute trying to remove the files.
-            // Files may remain locked up to 30 seconds due to r2d2 bug:
-            // https://github.com/sfackler/r2d2/issues/99
-            let mut counter = 0;
-            loop {
-                counter += 1;
-
-                if let Err(err) = fs::remove_dir_all(async_std::path::PathBuf::from(&cfg.dir))
-                    .await
-                    .context("failed to remove account data")
-                {
-                    if counter > 60 {
-                        return Err(err);
-                    }
-
-                    // Wait 1 second and try again.
-                    async_std::task::sleep(std::time::Duration::from_millis(1000)).await;
-                } else {
-                    break;
-                }
-            }
+            fs::remove_dir_all(async_std::path::PathBuf::from(&cfg.dir))
+                .await
+                .context("failed to remove account data")?;
         }
         self.config.remove_account(id).await?;
 

src/blob.rs

@@ -940,7 +940,7 @@ mod tests {
     }
 
     #[async_std::test]
-    async fn test_recode_image_1() {
+    async fn test_recode_image() {
         let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
         // BALANCED_IMAGE_SIZE > 1000, the original image size, so the image is not scaled down:
         send_image_check_mediaquality(Some("0"), bytes, 1000, 1000, 0, 1000, 1000)
@@ -957,10 +957,7 @@ mod tests {
         )
         .await
         .unwrap();
-    }
 
-    #[async_std::test]
-    async fn test_recode_image_2() {
         // The "-rotated" files are rotated by 270 degrees using the Exif metadata
         let bytes = include_bytes!("../test-data/image/rectangle2000x1800-rotated.jpg");
         let img_rotated = send_image_check_mediaquality(
@@ -981,24 +978,18 @@ mod tests {
             .write_to(&mut buf, image::ImageFormat::Jpeg)
             .unwrap();
         let bytes = buf.into_inner();
-
-        // Do this in parallel to speed up the test a bit
-        // (it still takes very long though)
-        let bytes2 = bytes.clone();
-        let join_handle = async_std::task::spawn(async move {
-            let img_rotated = send_image_check_mediaquality(
-                Some("0"),
-                &bytes2,
-                BALANCED_IMAGE_SIZE * 1800 / 2000,
-                BALANCED_IMAGE_SIZE,
-                0,
-                BALANCED_IMAGE_SIZE * 1800 / 2000,
-                BALANCED_IMAGE_SIZE,
-            )
-            .await
-            .unwrap();
-            assert_correct_rotation(&img_rotated);
-        });
+        let img_rotated = send_image_check_mediaquality(
+            Some("0"),
+            &bytes,
+            BALANCED_IMAGE_SIZE * 1800 / 2000,
+            BALANCED_IMAGE_SIZE,
+            0,
+            BALANCED_IMAGE_SIZE * 1800 / 2000,
+            BALANCED_IMAGE_SIZE,
+        )
+        .await
+        .unwrap();
+        assert_correct_rotation(&img_rotated);
 
         let img_rotated = send_image_check_mediaquality(
             Some("1"),
@@ -1013,11 +1004,6 @@ mod tests {
         .unwrap();
         assert_correct_rotation(&img_rotated);
 
-        join_handle.await;
-    }
-
-    #[async_std::test]
-    async fn test_recode_image_3() {
         let bytes = include_bytes!("../test-data/image/rectangle200x180-rotated.jpg");
         let img_rotated = send_image_check_mediaquality(Some("0"), bytes, 200, 180, 270, 180, 200)
             .await

src/chat.rs

@@ -18,7 +18,7 @@ use crate::constants::{
     Blocked, Chattype, DC_CHAT_ID_ALLDONE_HINT, DC_CHAT_ID_ARCHIVED_LINK, DC_CHAT_ID_LAST_SPECIAL,
     DC_CHAT_ID_TRASH, DC_GCM_ADDDAYMARKER, DC_GCM_INFO_ONLY, DC_RESEND_USER_AVATAR_DAYS,
 };
-use crate::contact::{Contact, ContactId, Origin, VerifiedStatus};
+use crate::contact::{addr_cmp, Contact, ContactId, Origin, VerifiedStatus};
 use crate::context::Context;
 use crate::dc_receive_imf::ReceivedMsg;
 use crate::dc_tools::{
@@ -26,9 +26,10 @@ use crate::dc_tools::{
     dc_create_smeared_timestamps, dc_get_abs_path, dc_gm2local_offset, improve_single_line_input,
     time, IsNoneOrEmpty,
 };
-use crate::ephemeral::Timer as EphemeralTimer;
+use crate::ephemeral::{delete_expired_messages, schedule_ephemeral_task, Timer as EphemeralTimer};
 use crate::events::EventType;
 use crate::html::new_html_mimepart;
+use crate::job::{self, Action};
 use crate::message::{self, Message, MessageState, MsgId, Viewtype};
 use crate::mimefactory::MimeFactory;
 use crate::mimeparser::SystemMessage;
@@ -47,6 +48,10 @@ pub enum ChatItem {
         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 {
@@ -210,7 +215,10 @@ impl ChatId {
                 }
             }
         };
-        context.emit_msgs_changed_without_ids();
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: ChatId::new(0),
+            msg_id: MsgId::new(0),
+        });
         Ok(chat_id)
     }
 
@@ -437,7 +445,6 @@ impl ChatId {
                 cmd,
                 dc_create_smeared_timestamp(context).await,
                 None,
-                None,
             )
             .await?;
         }
@@ -485,7 +492,10 @@ impl ChatId {
             })
             .await?;
 
-        context.emit_msgs_changed_without_ids();
+        context.emit_event(EventType::MsgsChanged {
+            msg_id: MsgId::new(0),
+            chat_id: ChatId::new(0),
+        });
 
         Ok(())
     }
@@ -540,10 +550,14 @@ impl ChatId {
             .execute("DELETE FROM chats WHERE id=?;", paramsv![self])
             .await?;
 
-        context.emit_msgs_changed_without_ids();
+        context.emit_event(EventType::MsgsChanged {
+            msg_id: MsgId::new(0),
+            chat_id: ChatId::new(0),
+        });
 
-        context.set_config(Config::LastHousekeeping, None).await?;
-        context.interrupt_inbox(InterruptInfo::new(false)).await;
+        job::kill_action(context, Action::Housekeeping).await?;
+        let j = job::Job::new(Action::Housekeeping, 0, Params::new(), 10);
+        job::add(context, j).await?;
 
         if chat.is_self_talk() {
             let mut msg = Message::new(Viewtype::Text);
@@ -568,9 +582,9 @@ impl ChatId {
         };
 
         if changed {
-            context.emit_msgs_changed(
-                self,
-                if msg.is_some() {
+            context.emit_event(EventType::MsgsChanged {
+                chat_id: self,
+                msg_id: if msg.is_some() {
                     match self.get_draft_msg_id(context).await? {
                         Some(msg_id) => msg_id,
                         None => MsgId::new(0),
@@ -578,7 +592,7 @@ impl ChatId {
                 } else {
                     MsgId::new(0)
                 },
-            );
+            });
         }
 
         Ok(())
@@ -842,9 +856,7 @@ 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_mutual = String::new();
-        let mut ret_nopreference = String::new();
-        let mut ret_reset = String::new();
+        let mut ret = String::new();
 
         for contact_id in get_chat_contacts(context, self)
             .await?
@@ -855,7 +867,7 @@ impl ChatId {
             let addr = contact.get_addr();
             let peerstate = Peerstate::from_addr(context, addr).await?;
 
-            match peerstate
+            let stock_message = match peerstate
                 .filter(|peerstate| {
                     peerstate
                         .peek_key(PeerstateVerifiedStatus::Unverified)
@@ -863,36 +875,15 @@ impl ChatId {
                 })
                 .map(|peerstate| peerstate.prefer_encrypt)
             {
-                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),
+                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,
             };
-        }
-
-        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.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;
+            ret += &format!("{} {}", addr, stock_message);
         }
 
         Ok(ret)
@@ -1262,7 +1253,11 @@ impl Chat {
             }
         }
 
-        let from = context.get_primary_self_addr().await?;
+        let from = context
+            .get_config(Config::ConfiguredAddr)
+            .await?
+            .context("Cannot prepare message for sending, address is not configured.")?;
+
         let new_rfc724_mid = {
             let grpid = match self.typ {
                 Chattype::Group => Some(self.grpid.as_str()),
@@ -1481,7 +1476,7 @@ impl Chat {
                 .await?;
             msg.id = MsgId::new(u32::try_from(raw_id)?);
         }
-        context.interrupt_ephemeral_task().await;
+        schedule_ephemeral_task(context).await;
         Ok(msg.id)
     }
 }
@@ -1803,7 +1798,10 @@ pub async fn prepare_msg(context: &Context, chat_id: ChatId, msg: &mut Message)
     );
 
     let msg_id = prepare_msg_common(context, chat_id, msg, MessageState::OutPreparing).await?;
-    context.emit_msgs_changed(msg.chat_id, msg.id);
+    context.emit_event(EventType::MsgsChanged {
+        chat_id: msg.chat_id,
+        msg_id: msg.id,
+    });
 
     Ok(msg_id)
 }
@@ -1971,14 +1969,20 @@ pub async fn send_msg_sync(context: &Context, chat_id: ChatId, msg: &mut Message
             .await
             .context("failed to send message, queued for later sending")?;
 
-        context.emit_msgs_changed(msg.chat_id, msg.id);
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: msg.chat_id,
+            msg_id: msg.id,
+        });
     }
     Ok(msg.id)
 }
 
 async fn send_msg_inner(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result<MsgId> {
     if prepare_send_msg(context, chat_id, msg).await?.is_some() {
-        context.emit_msgs_changed(msg.chat_id, msg.id);
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: msg.chat_id,
+            msg_id: msg.id,
+        });
 
         if msg.param.exists(Param::SetLatitude) {
             context.emit_event(EventType::LocationChanged(Some(ContactId::SELF)));
@@ -2042,7 +2046,10 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
 
     let mut recipients = mimefactory.recipients();
 
-    let from = context.get_primary_self_addr().await?;
+    let from = context
+        .get_config(Config::ConfiguredAddr)
+        .await?
+        .unwrap_or_default();
     let lowercase_from = from.to_lowercase();
 
     // Send BCC to self if it is enabled and we are not going to
@@ -2195,6 +2202,7 @@ 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| {
@@ -2244,8 +2252,12 @@ 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;
@@ -2561,7 +2573,10 @@ pub async fn create_group_chat(
         add_to_chat_contacts_table(context, chat_id, ContactId::SELF).await?;
     }
 
-    context.emit_msgs_changed_without_ids();
+    context.emit_event(EventType::MsgsChanged {
+        msg_id: MsgId::new(0),
+        chat_id: ChatId::new(0),
+    });
 
     if protect == ProtectionStatus::Protected {
         // this part is to stay compatible to verified groups,
@@ -2615,7 +2630,10 @@ pub async fn create_broadcast_list(context: &Context) -> Result<ChatId> {
         .await?;
     let chat_id = ChatId::new(u32::try_from(row_id)?);
 
-    context.emit_msgs_changed_without_ids();
+    context.emit_event(EventType::MsgsChanged {
+        msg_id: MsgId::new(0),
+        chat_id: ChatId::new(0),
+    });
     Ok(chat_id)
 }
 
@@ -2704,8 +2722,11 @@ pub(crate) async fn add_contact_to_chat_ex(
         context.sync_qr_code_tokens(Some(chat_id)).await?;
         context.send_sync_msg().await?;
     }
-
-    if context.is_self_addr(contact.get_addr()).await? {
+    let self_addr = context
+        .get_config(Config::ConfiguredAddr)
+        .await?
+        .unwrap_or_default();
+    if addr_cmp(contact.get_addr(), &self_addr) {
         // ourself is added using ContactId::SELF, do not add this address explicitly.
         // if SELF is not in the group, members cannot be added at all.
         warn!(
@@ -2978,7 +2999,10 @@ pub async fn set_chat_name(context: &Context, chat_id: ChatId, new_name: &str) -
                     msg.param.set(Param::Arg, &chat.name);
                 }
                 msg.id = send_msg(context, chat_id, &mut msg).await?;
-                context.emit_msgs_changed(chat_id, msg.id);
+                context.emit_event(EventType::MsgsChanged {
+                    chat_id,
+                    msg_id: msg.id,
+                });
             }
             context.emit_event(EventType::ChatModified(chat_id));
             success = true;
@@ -3040,7 +3064,10 @@ pub async fn set_chat_profile_image(
     chat.update_param(context).await?;
     if chat.is_promoted() && !chat.is_mailing_list() {
         msg.id = send_msg(context, chat_id, &mut msg).await?;
-        context.emit_msgs_changed(chat_id, msg.id);
+        context.emit_event(EventType::MsgsChanged {
+            chat_id,
+            msg_id: msg.id,
+        });
     }
     context.emit_event(EventType::ChatModified(chat_id));
     Ok(())
@@ -3063,7 +3090,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
             .query_map(
                 format!(
                     "SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id",
-                    sql::repeat_vars(msg_ids.len())
+                    sql::repeat_vars(msg_ids.len())?
                 ),
                 rusqlite::params_from_iter(msg_ids),
                 |row| row.get::<_, MsgId>(0),
@@ -3135,53 +3162,10 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
         }
     }
     for (chat_id, msg_id) in created_chats.iter().zip(created_msgs.iter()) {
-        context.emit_msgs_changed(*chat_id, *msg_id);
-    }
-    Ok(())
-}
-
-pub async fn resend_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
-    let mut chat_id = None;
-    let mut msgs: Vec<Message> = Vec::new();
-    for msg_id in msg_ids {
-        let msg = Message::load_from_db(context, *msg_id).await?;
-        if let Some(chat_id) = chat_id {
-            ensure!(
-                chat_id == msg.chat_id,
-                "messages to resend needs to be in the same chat"
-            );
-        } else {
-            chat_id = Some(msg.chat_id);
-        }
-        ensure!(
-            msg.from_id == ContactId::SELF,
-            "can resend only own messages"
-        );
-        ensure!(!msg.is_info(), "cannot resend info messages");
-        msgs.push(msg)
-    }
-
-    if let Some(chat_id) = chat_id {
-        let chat = Chat::load_from_db(context, chat_id).await?;
-        for mut msg in msgs {
-            if msg.get_showpadlock() && !chat.is_protected() {
-                msg.param.remove(Param::GuaranteeE2ee);
-                msg.update_param(context).await;
-            }
-            match msg.get_state() {
-                MessageState::OutFailed | MessageState::OutDelivered | MessageState::OutMdnRcvd => {
-                    message::update_msg_state(context, msg.id, MessageState::OutPending).await?
-                }
-                _ => bail!("unexpected message state"),
-            }
-            context.emit_event(EventType::MsgsChanged {
-                chat_id: msg.chat_id,
-                msg_id: msg.id,
-            });
-            if create_send_msg_job(context, msg.id).await?.is_some() {
-                context.interrupt_smtp(InterruptInfo::new(false)).await;
-            }
-        }
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: *chat_id,
+            msg_id: *msg_id,
+        });
     }
     Ok(())
 }
@@ -3321,9 +3305,9 @@ pub async fn add_device_msg_with_importance(
 
     if !msg_id.is_unset() {
         if important {
-            context.emit_incoming_msg(chat_id, msg_id);
+            context.emit_event(EventType::IncomingMsg { chat_id, msg_id });
         } else {
-            context.emit_msgs_changed(chat_id, msg_id);
+            context.emit_event(EventType::MsgsChanged { chat_id, msg_id });
         }
     }
 
@@ -3383,9 +3367,7 @@ pub(crate) async fn add_info_msg_with_cmd(
     chat_id: ChatId,
     text: &str,
     cmd: SystemMessage,
-    timestamp_sort: i64,
-    // Timestamp to show to the user (if this is None, `timestamp_sort` will be shown to the user)
-    timestamp_sent_rcvd: Option<i64>,
+    timestamp: i64,
     parent: Option<&Message>,
 ) -> Result<MsgId> {
     let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
@@ -3398,15 +3380,12 @@ pub(crate) async fn add_info_msg_with_cmd(
 
     let row_id =
     context.sql.insert(
-        "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,timestamp_sent,timestamp_rcvd,type,state,txt,rfc724_mid,ephemeral_timer, param,mime_in_reply_to)
-        VALUES (?,?,?, ?,?,?,?,?, ?,?,?, ?,?);",
+        "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,type,state,txt,rfc724_mid,ephemeral_timer, param,mime_in_reply_to) VALUES (?,?,?, ?,?,?, ?,?,?, ?,?);",
         paramsv![
             chat_id,
             ContactId::INFO,
             ContactId::INFO,
-            timestamp_sort,
-            timestamp_sent_rcvd.unwrap_or(0),
-            timestamp_sent_rcvd.unwrap_or(0),
+            timestamp,
             Viewtype::Text,
             MessageState::InNoticed,
             text,
@@ -3418,8 +3397,7 @@ pub(crate) async fn add_info_msg_with_cmd(
     ).await?;
 
     let msg_id = MsgId::new(row_id.try_into()?);
-    context.emit_msgs_changed(chat_id, msg_id);
-
+    context.emit_event(EventType::MsgsChanged { chat_id, msg_id });
     Ok(msg_id)
 }
 
@@ -3437,7 +3415,6 @@ pub(crate) async fn add_info_msg(
         SystemMessage::Unknown,
         timestamp,
         None,
-        None,
     )
     .await
 }
@@ -3658,7 +3635,7 @@ mod tests {
     #[async_std::test]
     async fn test_add_contact_to_chat_ex_add_self() {
         // Adding self to a contact should succeed, even though it's pointless.
-        let t = TestContext::new_alice().await;
+        let t = TestContext::new().await;
         let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo")
             .await
             .unwrap();
@@ -4252,6 +4229,7 @@ mod tests {
                     num
                 )
                 .as_bytes(),
+                "INBOX",
                 false,
             )
             .await?;
@@ -4523,7 +4501,6 @@ mod tests {
             SystemMessage::EphemeralTimerChanged,
             10000,
             None,
-            None,
         )
         .await?;
 
@@ -4561,7 +4538,7 @@ mod tests {
         assert!(chat.is_protected());
         assert!(chat.is_unpromoted());
 
-        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
+        let msgs = get_chat_msgs(&t, chat_id, 0, None).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         let msg = t.get_last_msg_in(chat_id).await;
@@ -4591,7 +4568,7 @@ mod tests {
         assert!(!chat.is_protected());
         assert!(!chat.is_unpromoted());
 
-        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
+        let msgs = get_chat_msgs(&t, chat_id, 0, None).await.unwrap();
         assert_eq!(msgs.len(), 3);
 
         // enable protection on promoted chat, the info-message is sent via send_msg() this time
@@ -4688,7 +4665,10 @@ 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).await?.len(), 1);
+        assert_eq!(
+            get_chat_msgs(&alice, alice_chat_id, 0, None).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;
@@ -4698,7 +4678,9 @@ mod tests {
         assert_eq!(msg.match_indices("Gr.").count(), 1);
 
         // Bob receives this message, he may detect group by `References:`- or `Chat-Group:`-header
-        dc_receive_imf(&bob, msg.as_bytes(), false).await.unwrap();
+        dc_receive_imf(&bob, msg.as_bytes(), "INBOX", false)
+            .await
+            .unwrap();
         let msg = bob.get_last_msg().await;
 
         let bob_chat = Chat::load_from_db(&bob, msg.chat_id).await?;
@@ -4717,11 +4699,16 @@ mod tests {
         assert_eq!(msg.match_indices("Chat-").count(), 0);
 
         // Alice receives this message - she can still detect the group by the `References:`-header
-        dc_receive_imf(&alice, msg.as_bytes(), false).await.unwrap();
+        dc_receive_imf(&alice, msg.as_bytes(), "INBOX", false)
+            .await
+            .unwrap();
         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).await?.len(), 2);
+        assert_eq!(
+            get_chat_msgs(&alice, alice_chat_id, 0, None).await?.len(),
+            2
+        );
         Ok(())
     }
 
@@ -4739,6 +4726,7 @@ mod tests {
                  Date: Fri, 23 Apr 2021 10:00:57 +0000\n\
                  \n\
                  hello\n",
+            "INBOX",
             false,
         )
         .await?;
@@ -4749,7 +4737,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).await?;
+        let msgs = get_chat_msgs(&t, chat.id, 0, None).await?;
         assert_eq!(msgs.len(), 1);
         let msg_id = match msgs.first().unwrap() {
             ChatItem::Message { msg_id } => *msg_id,
@@ -4786,6 +4774,7 @@ mod tests {
                  Date: Sun, 22 Mar 2021 19:37:57 +0000\n\
                  \n\
                  hello\n",
+            "INBOX",
             false,
         )
         .await?;
@@ -4799,7 +4788,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).await?;
+        let msgs = get_chat_msgs(&t, chat_id, 0, None).await?;
         assert_eq!(msgs.len(), 1);
         let msg_id = match msgs.first().unwrap() {
             ChatItem::Message { msg_id } => *msg_id,
@@ -4833,6 +4822,7 @@ mod tests {
                  Date: Sun, 22 Mar 2021 19:37:57 +0000\n\
                  \n\
                  hello\n",
+            "INBOX",
             false,
         )
         .await?;
@@ -4879,6 +4869,7 @@ mod tests {
                  Date: Sun, 22 Mar 2021 19:37:57 +0000\n\
                  \n\
                  hello\n",
+            "INBOX",
             false,
         )
         .await?;
@@ -4887,7 +4878,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).await?;
+        let msgs = get_chat_msgs(&alice, chat_id, 0, None).await?;
         assert_eq!(msgs.len(), 1);
 
         // Alice disables receiving classic emails.
@@ -4899,28 +4890,12 @@ 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).await?;
+        let msgs = get_chat_msgs(&alice, chat_id, 0, None).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;
@@ -5174,141 +5149,6 @@ mod tests {
         Ok(())
     }
 
-    #[async_std::test]
-    async fn test_resend_own_message() -> Result<()> {
-        // Alice creates group with Bob and sends an initial message
-        let alice = TestContext::new_alice().await;
-        let alice_grp = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
-        add_contact_to_chat(
-            &alice,
-            alice_grp,
-            Contact::create(&alice, "", "bob@example.net").await?,
-        )
-        .await?;
-        let sent1 = alice.send_text(alice_grp, "alice->bob").await;
-
-        // Alice adds Claire to group and resends her own initial message
-        add_contact_to_chat(
-            &alice,
-            alice_grp,
-            Contact::create(&alice, "", "claire@example.org").await?,
-        )
-        .await?;
-        let sent2 = alice.pop_sent_msg().await;
-        resend_msgs(&alice, &[sent1.sender_msg_id]).await?;
-        let sent3 = alice.pop_sent_msg().await;
-
-        // Bob receives all messages
-        let bob = TestContext::new_bob().await;
-        bob.recv_msg(&sent1).await;
-        let msg = bob.get_last_msg().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).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).await?.len(), 2);
-        bob.recv_msg(&sent3).await;
-        assert_eq!(get_chat_contacts(&bob, msg.chat_id).await?.len(), 3);
-        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;
-        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).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");
-
-        Ok(())
-    }
-
-    #[async_std::test]
-    async fn test_resend_foreign_message_fails() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let alice_grp = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
-        add_contact_to_chat(
-            &alice,
-            alice_grp,
-            Contact::create(&alice, "", "bob@example.net").await?,
-        )
-        .await?;
-        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;
-        assert!(resend_msgs(&bob, &[msg.id]).await.is_err());
-
-        Ok(())
-    }
-
-    #[async_std::test]
-    async fn test_resend_opportunistically_encryption() -> Result<()> {
-        // Alice creates group with Bob and sends an initial message
-        let alice = TestContext::new_alice().await;
-        let alice_grp = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
-        add_contact_to_chat(
-            &alice,
-            alice_grp,
-            Contact::create(&alice, "", "bob@example.net").await?,
-        )
-        .await?;
-        let sent1 = alice.send_text(alice_grp, "alice->bob").await;
-
-        // 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;
-        assert!(!msg.get_showpadlock());
-
-        msg.chat_id.accept(&bob).await?;
-        let sent2 = bob.send_text(msg.chat_id, "bob->alice").await;
-        let msg = bob.get_last_msg().await;
-        assert!(msg.get_showpadlock());
-
-        // Bob adds Claire and resends his last message: this will drop encryption in opportunistic chats
-        add_contact_to_chat(
-            &bob,
-            msg.chat_id,
-            Contact::create(&bob, "", "claire@example.org").await?,
-        )
-        .await?;
-        let _sent3 = bob.pop_sent_msg().await;
-        resend_msgs(&bob, &[sent2.sender_msg_id]).await?;
-        let _sent4 = bob.pop_sent_msg().await;
-
-        Ok(())
-    }
-
-    #[async_std::test]
-    async fn test_resend_info_message_fails() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let alice_grp = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
-        add_contact_to_chat(
-            &alice,
-            alice_grp,
-            Contact::create(&alice, "", "bob@example.net").await?,
-        )
-        .await?;
-        alice.send_text(alice_grp, "alice->bob").await;
-
-        add_contact_to_chat(
-            &alice,
-            alice_grp,
-            Contact::create(&alice, "", "claire@example.org").await?,
-        )
-        .await?;
-        let sent2 = alice.pop_sent_msg().await;
-        assert!(resend_msgs(&alice, &[sent2.sender_msg_id]).await.is_err());
-
-        Ok(())
-    }
-
     #[async_std::test]
     async fn test_can_send_group() -> Result<()> {
         let alice = TestContext::new_alice().await;
@@ -5413,59 +5253,4 @@ 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\n"
-        );
-
-        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\n"
-        );
-
-        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\n"
-        );
-
-        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\n"
-        );
-
-        Ok(())
-    }
 }

src/chatlist.rs

@@ -9,6 +9,7 @@ use crate::constants::{
 };
 use crate::contact::{Contact, ContactId};
 use crate::context::Context;
+use crate::ephemeral::delete_expired_messages;
 use crate::message::{Message, MessageState, MsgId};
 use crate::stock_str;
 use crate::summary::Summary;
@@ -348,10 +349,6 @@ impl Chatlist {
     pub fn get_index_for_id(&self, id: ChatId) -> Option<usize> {
         self.ids.iter().position(|(chat_id, _)| chat_id == &id)
     }
-
-    pub fn iter(&self) -> impl Iterator<Item = &(ChatId, Option<MsgId>)> {
-        self.ids.iter()
-    }
 }
 
 /// Returns the number of archived chats
@@ -503,6 +500,7 @@ mod tests {
                  Date: Sun, 22 Mar 2021 22:37:57 +0000\n\
                  \n\
                  hello foo\n",
+            "INBOX",
             false,
         )
         .await?;
@@ -563,6 +561,7 @@ mod tests {
                  Date: Sun, 22 Mar 2021 22:38:57 +0000\n\
                  \n\
                  hello foo\n",
+            "INBOX",
             false,
         )
         .await?;

src/config.rs

@@ -1,15 +1,16 @@
 //! # Key-value configuration management.
 
-use anyhow::{ensure, Context as _, Result};
+use anyhow::{ensure, Result};
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
 use crate::blob::BlobObject;
+use crate::chat::ChatId;
 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::events::EventType;
+use crate::message::MsgId;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
 use crate::provider::{get_provider_by_id, Provider};
 
@@ -112,7 +113,6 @@ pub enum Config {
     DeleteDeviceAfter,
 
     SaveMimeHeaders,
-    /// The primary email address. Also see `SecondaryAddrs`.
     ConfiguredAddr,
     ConfiguredMailServer,
     ConfiguredMailUser,
@@ -131,14 +131,11 @@ pub enum Config {
     ConfiguredInboxFolder,
     ConfiguredMvboxFolder,
     ConfiguredSentboxFolder,
+    ConfiguredSpamFolder,
     ConfiguredTimestamp,
     ConfiguredProvider,
     Configured,
 
-    /// All secondary self addresses separated by spaces
-    /// (`addr1@example.org addr2@exapmle.org addr3@example.org`)
-    SecondaryAddrs,
-
     #[strum(serialize = "sys.version")]
     SysVersion,
 
@@ -296,8 +293,11 @@ impl Context {
             }
             Config::DeleteDeviceAfter => {
                 let ret = self.sql.set_raw_config(key, value).await;
-                // Interrupt ephemeral loop to delete old messages immediately.
-                self.interrupt_ephemeral_task().await;
+                // Force chatlist reload to delete old messages immediately.
+                self.emit_event(EventType::MsgsChanged {
+                    msg_id: MsgId::new(0),
+                    chat_id: ChatId::new(0),
+                });
                 ret?
             }
             Config::Displayname => {
@@ -333,73 +333,6 @@ impl Context {
     }
 }
 
-// Separate impl block for self address handling
-impl Context {
-    /// Determine whether the specified addr maps to the/a self addr.
-    /// Returns `false` if no addresses are configured.
-    pub(crate) async fn is_self_addr(&self, addr: &str) -> Result<bool> {
-        Ok(self
-            .get_config(Config::ConfiguredAddr)
-            .await?
-            .iter()
-            .any(|a| addr_cmp(addr, a))
-            || self
-                .get_secondary_self_addrs()
-                .await?
-                .iter()
-                .any(|a| addr_cmp(addr, a)))
-    }
-
-    /// Sets `primary_new` as the new primary self address and saves the old
-    /// primary address (if exists) as a secondary address.
-    ///
-    /// This should only be used by test code and during configure.
-    pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
-        // 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
-        secondary_addrs.retain(|a| !addr_cmp(a, primary_new));
-        self.set_config(
-            Config::SecondaryAddrs,
-            Some(secondary_addrs.join(" ").as_str()),
-        )
-        .await?;
-
-        self.set_config(Config::ConfiguredAddr, Some(primary_new))
-            .await?;
-
-        Ok(())
-    }
-
-    /// Returns all primary and secondary self addresses.
-    pub(crate) async fn get_all_self_addrs(&self) -> Result<Vec<String>> {
-        let primary_addrs = self.get_config(Config::ConfiguredAddr).await?.into_iter();
-        let secondary_addrs = self.get_secondary_self_addrs().await?.into_iter();
-
-        Ok(primary_addrs.chain(secondary_addrs).collect())
-    }
-
-    /// Returns all secondary self addresses.
-    pub(crate) async fn get_secondary_self_addrs(&self) -> Result<Vec<String>> {
-        let secondary_addrs = self
-            .get_config(Config::SecondaryAddrs)
-            .await?
-            .unwrap_or_default();
-        Ok(secondary_addrs
-            .split_ascii_whitespace()
-            .map(|s| s.to_string())
-            .collect())
-    }
-
-    /// Returns the primary self address.
-    /// Returns an error if no self addr is configured.
-    pub async fn get_primary_self_addr(&self) -> Result<String> {
-        self.get_config(Config::ConfiguredAddr)
-            .await?
-            .context("No self addr configured")
-    }
-}
-
 /// Returns all available configuration keys concated together.
 fn get_config_keys_string() -> String {
     let keys = Config::iter().fold(String::new(), |mut acc, key| {
@@ -484,57 +417,4 @@ mod tests {
         assert_eq!(t.get_config_bool(c).await?, false);
         Ok(())
     }
-
-    #[async_std::test]
-    async fn test_self_addrs() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-
-        assert!(alice.is_self_addr("alice@example.org").await?);
-        assert_eq!(alice.get_all_self_addrs().await?, vec!["alice@example.org"]);
-        assert!(!alice.is_self_addr("alice@alice.com").await?);
-
-        // Test adding the same primary address
-        alice.set_primary_self_addr("alice@example.org").await?;
-        alice.set_primary_self_addr("Alice@Example.Org").await?;
-        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()`,
-        // 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?);
-        assert!(alice.is_self_addr("alice@alice.com").await?);
-        assert_eq!(
-            alice.get_all_self_addrs().await?,
-            vec![" Alice@alice.com ", "Alice@Example.Org"]
-        );
-
-        // Check that the entry is not duplicated
-        alice.set_primary_self_addr("alice@alice.com").await?;
-        alice.set_primary_self_addr("alice@alice.com").await?;
-        assert_eq!(
-            alice.get_all_self_addrs().await?,
-            vec!["alice@alice.com", "Alice@Example.Org"]
-        );
-
-        // Test switching back
-        alice.set_primary_self_addr("alice@example.org").await?;
-        assert_eq!(
-            alice.get_all_self_addrs().await?,
-            vec!["alice@example.org", "alice@alice.com"]
-        );
-
-        // Test setting a new primary self address, the previous self address
-        // should be kept as a secondary self address
-        alice.set_primary_self_addr("alice@alice.xyz").await?;
-        assert_eq!(
-            alice.get_all_self_addrs().await?,
-            vec!["alice@alice.xyz", "alice@example.org", "alice@alice.com"]
-        );
-        assert!(alice.is_self_addr("alice@example.org").await?);
-        assert!(alice.is_self_addr("alice@alice.com").await?);
-        assert!(alice.is_self_addr("Alice@alice.xyz").await?);
-
-        Ok(())
-    }
 }

src/configure.rs

@@ -60,7 +60,7 @@ impl Context {
         use futures::future::FutureExt;
 
         ensure!(
-            self.scheduler.read().await.is_none(),
+            !self.scheduler.read().await.is_running(),
             "cannot configure, already running"
         );
         ensure!(
@@ -85,7 +85,7 @@ impl Context {
     async fn inner_configure(&self) -> Result<()> {
         info!(self, "Configure ...");
 
-        let mut param = LoginParam::load_candidate_params(self).await?;
+        let mut param = LoginParam::from_database(self, "").await?;
         let success = configure(self, &mut param).await;
         self.set_config(Config::NotifyAboutWrongPw, None).await?;
 
@@ -453,14 +453,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     drop(imap);
 
     progress!(ctx, 910);
-
-    if ctx.get_config(Config::ConfiguredAddr).await?.as_deref() != Some(&param.addr) {
-        // Switched account, all server UIDs we know are invalid
-        job::schedule_resync(ctx).await?;
-    }
-
     // the trailing underscore is correct
-    param.save_as_configured_params(ctx).await?;
+    param.save_to_database(ctx, "configured_").await?;
     ctx.set_config(Config::ConfiguredTimestamp, Some(&time().to_string()))
         .await?;
 
@@ -705,11 +699,11 @@ pub enum Error {
         error: quick_xml::Error,
     },
 
+    #[error("Failed to get URL: {0}")]
+    ReadUrl(#[from] self::read_url::Error),
+
     #[error("Number of redirection is exceeded")]
     Redirection,
-
-    #[error("{0:#}")]
-    Other(#[from] anyhow::Error),
 }
 
 #[cfg(test)]

src/configure/read_url.rs

@@ -1,40 +1,20 @@
 use crate::context::Context;
 
-use anyhow::format_err;
-use anyhow::Context as _;
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("URL request error")]
+    GetError(surf::Error),
+}
 
-pub async fn read_url(context: &Context, url: &str) -> anyhow::Result<String> {
-    match read_url_inner(context, url).await {
-        Ok(s) => {
-            info!(context, "Successfully read url {}", url);
-            Ok(s)
-        }
-        Err(e) => {
-            info!(context, "Can't read URL {}: {:#}", url, e);
-            Err(format_err!("Can't read URL {}: {:#}", url, e))
+pub async fn read_url(context: &Context, url: &str) -> Result<String, Error> {
+    info!(context, "Requesting URL {}", url);
+
+    match surf::get(url).recv_string().await {
+        Ok(res) => Ok(res),
+        Err(err) => {
+            info!(context, "Can\'t read URL {}: {}", url, err);
+
+            Err(Error::GetError(err))
         }
     }
 }
-
-pub async fn read_url_inner(context: &Context, mut url: &str) -> anyhow::Result<String> {
-    let mut _temp; // For the borrow checker
-
-    // Follow up to 10 http-redirects
-    for _i in 0..10 {
-        let mut response = surf::get(url).send().await.map_err(|e| e.into_inner())?;
-        if response.status().is_redirection() {
-            _temp = response
-                .header("location")
-                .context("Redirection doesn't have a target location")?
-                .last()
-                .to_string();
-            info!(context, "Following redirect to {}", _temp);
-            url = &_temp;
-            continue;
-        }
-
-        return response.body_string().await.map_err(|e| e.into_inner());
-    }
-
-    Err(format_err!("Followed 10 redirections"))
-}

src/configure/server_params.rs

@@ -52,8 +52,10 @@ impl ServerParams {
     fn expand_hostnames(self, param_domain: &str) -> Vec<ServerParams> {
         if self.hostname.is_empty() {
             vec![
-                // Try "imap.ex.org"/"smtp.ex.org" and "mail.ex.org" first because if a server exists
-                // under this address, it's likely the correct one.
+                Self {
+                    hostname: param_domain.to_string(),
+                    ..self.clone()
+                },
                 Self {
                     hostname: match self.protocol {
                         Protocol::Imap => "imap.".to_string() + param_domain,
@@ -63,12 +65,6 @@ impl ServerParams {
                 },
                 Self {
                     hostname: "mail.".to_string() + param_domain,
-                    ..self.clone()
-                },
-                // Try "ex.org" last because if it's wrong and the server is configured to
-                // not answer at all, configuration may be stuck for several minutes.
-                Self {
-                    hostname: param_domain.to_string(),
                     ..self
                 },
             ]
@@ -300,48 +296,5 @@ mod tests {
                 strict_tls: Some(true)
             }],
         );
-
-        // Test that "example.net" is tried after "*.example.net".
-        let v = expand_param_vector(
-            vec![ServerParams {
-                protocol: Protocol::Imap,
-                hostname: "".to_string(),
-                port: 10480,
-                socket: Socket::Ssl,
-                username: "foobar".to_string(),
-                strict_tls: Some(true),
-            }],
-            "foobar@example.net",
-            "example.net",
-        );
-        assert_eq!(
-            v,
-            vec![
-                ServerParams {
-                    protocol: Protocol::Imap,
-                    hostname: "imap.example.net".to_string(),
-                    port: 10480,
-                    socket: Socket::Ssl,
-                    username: "foobar".to_string(),
-                    strict_tls: Some(true)
-                },
-                ServerParams {
-                    protocol: Protocol::Imap,
-                    hostname: "mail.example.net".to_string(),
-                    port: 10480,
-                    socket: Socket::Ssl,
-                    username: "foobar".to_string(),
-                    strict_tls: Some(true)
-                },
-                ServerParams {
-                    protocol: Protocol::Imap,
-                    hostname: "example.net".to_string(),
-                    port: 10480,
-                    socket: Socket::Ssl,
-                    username: "foobar".to_string(),
-                    strict_tls: Some(true)
-                }
-            ],
-        );
     }
 }

src/constants.rs

@@ -162,6 +162,7 @@ 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

@@ -24,7 +24,6 @@ use crate::message::MessageState;
 use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
-use crate::sql::{self, params_iter};
 use crate::{chat, stock_str};
 
 /// Contact ID, including reserved IDs.
@@ -399,10 +398,11 @@ impl Contact {
 
         let addr_normalized = addr_normalize(addr);
 
-        if context.is_self_addr(addr_normalized).await? {
-            return Ok(Some(ContactId::SELF));
+        if let Some(addr_self) = context.get_config(Config::ConfiguredAddr).await? {
+            if addr_cmp(addr_normalized, &addr_self) {
+                return Ok(Some(ContactId::SELF));
+            }
         }
-
         let id = context
             .sql
             .query_get_value(
@@ -452,8 +452,12 @@ impl Contact {
         ensure!(origin != Origin::Unknown, "Missing valid origin");
 
         let addr = addr_normalize(addr).to_string();
+        let addr_self = context
+            .get_config(Config::ConfiguredAddr)
+            .await?
+            .unwrap_or_default();
 
-        if context.is_self_addr(&addr).await? {
+        if addr_cmp(&addr, &addr_self) {
             return Ok((ContactId::SELF, sth_modified));
         }
 
@@ -686,38 +690,40 @@ impl Contact {
     pub async fn get_all(
         context: &Context,
         listflags: u32,
-        query: Option<&str>,
+        query: Option<impl AsRef<str>>,
     ) -> Result<Vec<ContactId>> {
-        let self_addrs = context.get_all_self_addrs().await?;
+        let self_addr = context
+            .get_config(Config::ConfiguredAddr)
+            .await?
+            .unwrap_or_default();
+
         let mut add_self = false;
         let mut ret = Vec::new();
         let flag_verified_only = (listflags & DC_GCL_VERIFIED_ONLY) != 0;
         let flag_add_self = (listflags & DC_GCL_ADD_SELF) != 0;
 
         if flag_verified_only || query.is_some() {
-            let s3str_like_cmd = format!("%{}%", query.unwrap_or(""));
+            let s3str_like_cmd = format!("%{}%", query.as_ref().map(|s| s.as_ref()).unwrap_or(""));
             context
                 .sql
                 .query_map(
-                    format!(
-                        "SELECT c.id FROM contacts c \
+                    "SELECT c.id FROM contacts c \
                  LEFT JOIN acpeerstates ps ON c.addr=ps.addr  \
-                 WHERE c.addr NOT IN ({})
-                 AND c.id>? \
-                 AND c.origin>=? \
+                 WHERE c.addr!=?1 \
+                 AND c.id>?2 \
+                 AND c.origin>=?3 \
                  AND c.blocked=0 \
-                 AND (iif(c.name='',c.authname,c.name) LIKE ? OR c.addr LIKE ?) \
-                 AND (1=? OR LENGTH(ps.verified_key_fingerprint)!=0)  \
+                 AND (iif(c.name='',c.authname,c.name) LIKE ?4 OR c.addr LIKE ?5) \
+                 AND (1=?6 OR LENGTH(ps.verified_key_fingerprint)!=0)  \
                  ORDER BY LOWER(iif(c.name='',c.authname,c.name)||c.addr),c.id;",
-                        sql::repeat_vars(self_addrs.len())
-                    ),
-                    rusqlite::params_from_iter(params_iter(&self_addrs).chain(params_iterv![
+                    paramsv![
+                        self_addr,
                         ContactId::LAST_SPECIAL,
                         Origin::IncomingReplyTo,
                         s3str_like_cmd,
                         s3str_like_cmd,
                         if flag_verified_only { 0i32 } else { 1i32 },
-                    ])),
+                    ],
                     |row| row.get::<_, ContactId>(0),
                     |ids| {
                         for id in ids {
@@ -728,20 +734,16 @@ impl Contact {
                 )
                 .await?;
 
-            if let Some(query) = query {
-                let self_addr = context
-                    .get_config(Config::ConfiguredAddr)
-                    .await?
-                    .unwrap_or_default();
-                let self_name = context
-                    .get_config(Config::Displayname)
-                    .await?
-                    .unwrap_or_default();
-                let self_name2 = stock_str::self_msg(context);
+            let self_name = context
+                .get_config(Config::Displayname)
+                .await?
+                .unwrap_or_default();
+            let self_name2 = stock_str::self_msg(context);
 
-                if self_addr.contains(query)
-                    || self_name.contains(query)
-                    || self_name2.await.contains(query)
+            if let Some(query) = query {
+                if self_addr.contains(query.as_ref())
+                    || self_name.contains(query.as_ref())
+                    || self_name2.await.contains(query.as_ref())
                 {
                     add_self = true;
                 }
@@ -754,19 +756,13 @@ impl Contact {
             context
                 .sql
                 .query_map(
-                    format!(
-                        "SELECT id FROM contacts
-                 WHERE addr NOT IN ({})
-                 AND id>?
-                 AND origin>=?
+                    "SELECT id FROM contacts
+                 WHERE addr!=?1
+                 AND id>?2
+                 AND origin>=?3
                  AND blocked=0
                  ORDER BY LOWER(iif(name='',authname,name)||addr),id;",
-                        sql::repeat_vars(self_addrs.len())
-                    ),
-                    rusqlite::params_from_iter(params_iter(&self_addrs).chain(params_iterv![
-                        ContactId::LAST_SPECIAL,
-                        Origin::IncomingReplyTo
-                    ])),
+                    paramsv![self_addr, ContactId::LAST_SPECIAL, Origin::IncomingReplyTo],
                     |row| row.get::<_, ContactId>(0),
                     |ids| {
                         for id in ids {
@@ -874,7 +870,7 @@ impl Contact {
 
         let mut ret = String::new();
         if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
-            let loginparam = LoginParam::load_configured_params(context).await?;
+            let loginparam = LoginParam::from_database(context, "configured_").await?;
             let peerstate = Peerstate::from_addr(context, &contact.addr).await?;
 
             if let Some(peerstate) = peerstate.filter(|peerstate| {
@@ -889,7 +885,7 @@ impl Contact {
                 };
 
                 ret += &format!(
-                    "{}.\n{}:",
+                    "{}\n{}:",
                     stock_message,
                     stock_str::finger_prints(context).await
                 );
@@ -1082,7 +1078,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.to_lowercase())
+        str_to_color(&self.addr)
     }
 
     /// Gets the contact's status.
@@ -1130,6 +1126,26 @@ impl Contact {
         Ok(VerifiedStatus::Unverified)
     }
 
+    pub async fn addr_equals_contact(
+        context: &Context,
+        addr: &str,
+        contact_id: ContactId,
+    ) -> Result<bool> {
+        if addr.is_empty() {
+            return Ok(false);
+        }
+
+        let contact = Contact::load_from_db(context, contact_id).await?;
+        if !contact.addr.is_empty() {
+            let normalized_addr = addr_normalize(addr);
+            if contact.addr == normalized_addr {
+                return Ok(true);
+            }
+        }
+
+        Ok(false)
+    }
+
     pub async fn get_real_cnt(context: &Context) -> Result<usize> {
         if !context.sql.is_open().await {
             return Ok(0);
@@ -1396,23 +1412,38 @@ pub fn normalize_name(full_name: &str) -> String {
 fn cat_fingerprint(
     ret: &mut String,
     addr: &str,
-    fingerprint_verified: &str,
-    fingerprint_unverified: &str,
+    fingerprint_verified: impl AsRef<str>,
+    fingerprint_unverified: impl AsRef<str>,
 ) {
     *ret += &format!(
         "\n\n{}:\n{}",
         addr,
-        if !fingerprint_verified.is_empty() {
-            fingerprint_verified
+        if !fingerprint_verified.as_ref().is_empty() {
+            fingerprint_verified.as_ref()
         } else {
-            fingerprint_unverified
+            fingerprint_unverified.as_ref()
         },
     );
-    if !fingerprint_verified.is_empty()
-        && !fingerprint_unverified.is_empty()
-        && fingerprint_verified != fingerprint_unverified
+    if !fingerprint_verified.as_ref().is_empty()
+        && !fingerprint_unverified.as_ref().is_empty()
+        && fingerprint_verified.as_ref() != fingerprint_unverified.as_ref()
     {
-        *ret += &format!("\n\n{} (alternative):\n{}", addr, fingerprint_unverified);
+        *ret += &format!(
+            "\n\n{} (alternative):\n{}",
+            addr,
+            fingerprint_unverified.as_ref()
+        );
+    }
+}
+
+impl Context {
+    /// determine whether the specified addr maps to the/a self addr
+    pub async fn is_self_addr(&self, addr: &str) -> Result<bool> {
+        if let Some(self_addr) = self.get_config(Config::ConfiguredAddr).await? {
+            Ok(addr_cmp(&self_addr, addr))
+        } else {
+            Ok(false)
+        }
     }
 }
 
@@ -1511,8 +1542,6 @@ mod tests {
     async fn test_get_contacts() -> Result<()> {
         let context = TestContext::new().await;
 
-        assert!(context.get_all_self_addrs().await?.is_empty());
-
         // Bob is not in the contacts yet.
         let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).await?;
         assert_eq!(contacts.len(), 0);
@@ -1946,25 +1975,6 @@ 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;
@@ -1980,7 +1990,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
@@ -2153,7 +2163,7 @@ Chat-Version: 1.0
 Date: Sun, 22 Mar 2020 22:37:55 +0000
 
 Hi."#;
-        dc_receive_imf(&alice, mime, false).await?;
+        dc_receive_imf(&alice, mime, "Inbox", false).await?;
         let msg = alice.get_last_msg().await;
 
         let timestamp = msg.get_timestamp();

src/context.rs

@@ -10,6 +10,7 @@ use async_std::{
     channel::{self, Receiver, Sender},
     path::{Path, PathBuf},
     sync::{Arc, Mutex, RwLock},
+    task,
 };
 
 use crate::chat::{get_chat_cnt, ChatId};
@@ -54,7 +55,8 @@ pub struct InnerContext {
     pub(crate) translated_stockstrings: RwLock<HashMap<usize, String>>,
     pub(crate) events: Events,
 
-    pub(crate) scheduler: RwLock<Option<Scheduler>>,
+    pub(crate) scheduler: RwLock<Scheduler>,
+    pub(crate) ephemeral_task: RwLock<Option<(task::JoinHandle<()>, Sender<()>)>>,
 
     /// Recently loaded quota information, if any.
     /// Set to `None` if quota was never tried to load.
@@ -173,7 +175,8 @@ impl Context {
             wrong_pw_warning_mutex: Mutex::new(()),
             translated_stockstrings: RwLock::new(HashMap::new()),
             events: Events::default(),
-            scheduler: RwLock::new(None),
+            scheduler: RwLock::new(Scheduler::Stopped),
+            ephemeral_task: RwLock::new(None),
             quota: RwLock::new(None),
             creation_time: std::time::SystemTime::now(),
             last_full_folder_scan: Mutex::new(None),
@@ -189,33 +192,25 @@ impl Context {
 
     /// Starts the IO scheduler.
     pub async fn start_io(&self) {
-        if let Ok(false) = self.is_configured().await {
-            warn!(self, "can not start io on a context that is not configured");
+        info!(self, "starting IO");
+        if self.inner.is_io_running().await {
+            info!(self, "IO is already running");
             return;
         }
 
-        info!(self, "starting IO");
-        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),
+        {
+            let l = &mut *self.inner.scheduler.write().await;
+            if let Err(err) = l.start(self.clone()).await {
+                error!(self, "Failed to start IO: {}", err)
             }
         }
     }
 
     /// Stops the IO scheduler.
     pub async fn stop_io(&self) {
-        // Sending an event wakes up event pollers (get_next_event)
-        // so the caller of stop_io() can arrange for proper termination.
-        // For this, the caller needs to instruct the event poller
-        // to terminate on receiving the next event and then call stop_io()
-        // which will emit the below event(s)
         info!(self, "stopping IO");
 
-        if let Some(scheduler) = self.inner.scheduler.write().await.take() {
-            scheduler.stop(self).await;
-        }
+        self.inner.stop_io().await;
     }
 
     /// Returns a reference to the underlying SQL instance.
@@ -244,24 +239,6 @@ impl Context {
         });
     }
 
-    /// Emits a generic MsgsChanged event (without chat or message id)
-    pub fn emit_msgs_changed_without_ids(&self) {
-        self.emit_event(EventType::MsgsChanged {
-            chat_id: ChatId::new(0),
-            msg_id: MsgId::new(0),
-        });
-    }
-
-    /// Emits a MsgsChanged event with specified chat and message ids
-    pub fn emit_msgs_changed(&self, chat_id: ChatId, msg_id: MsgId) {
-        self.emit_event(EventType::MsgsChanged { chat_id, msg_id });
-    }
-
-    /// Emits an IncomingMsg event with specified chat and message ids
-    pub fn emit_incoming_msg(&self, chat_id: ChatId, msg_id: MsgId) {
-        self.emit_event(EventType::IncomingMsg { chat_id, msg_id });
-    }
-
     /// Returns a receiver for emitted events.
     ///
     /// Multiple emitters can be created, but note that in this case each emitted event will
@@ -337,9 +314,8 @@ impl Context {
 
     pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
         let unset = "0";
-        let l = LoginParam::load_candidate_params(self).await?;
-        let l2 = LoginParam::load_configured_params(self).await?;
-        let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
+        let l = LoginParam::from_database(self, "").await?;
+        let l2 = LoginParam::from_database(self, "configured_").await?;
         let displayname = self.get_config(Config::Displayname).await?;
         let chats = get_chat_cnt(self).await? as usize;
         let unblocked_msgs = message::get_unblocked_msg_cnt(self).await as usize;
@@ -424,7 +400,6 @@ impl Context {
         res.insert("socks5_enabled", socks5_enabled.to_string());
         res.insert("entered_account_settings", l.to_string());
         res.insert("used_account_settings", l2.to_string());
-        res.insert("secondary_addrs", secondary_addrs);
         res.insert(
             "fetch_existing_msgs",
             self.get_config_int(Config::FetchExistingMsgs)
@@ -631,6 +606,11 @@ impl Context {
         Ok(mvbox.as_deref() == Some(folder_name))
     }
 
+    pub async fn is_spam_folder(&self, folder_name: &str) -> Result<bool> {
+        let spam = self.get_config(Config::ConfiguredSpamFolder).await?;
+        Ok(spam.as_deref() == Some(folder_name))
+    }
+
     pub(crate) fn derive_blobdir(dbfile: &PathBuf) -> PathBuf {
         let mut blob_fname = OsString::new();
         blob_fname.push(dbfile.file_name().unwrap_or_default());
@@ -646,6 +626,29 @@ impl Context {
     }
 }
 
+impl InnerContext {
+    async fn is_io_running(&self) -> bool {
+        self.scheduler.read().await.is_running()
+    }
+
+    async fn stop_io(&self) {
+        if self.is_io_running().await {
+            let token = {
+                let lock = &*self.scheduler.read().await;
+                lock.pre_stop().await
+            };
+            {
+                let lock = &mut *self.scheduler.write().await;
+                lock.stop(token).await;
+            }
+        }
+
+        if let Some(ephemeral_task) = self.ephemeral_task.write().await.take() {
+            ephemeral_task.cancel().await;
+        }
+    }
+}
+
 impl Default for RunningState {
     fn default() -> Self {
         RunningState {
@@ -713,7 +716,9 @@ mod tests {
             dc_create_outgoing_rfc724_mid(None, contact.get_addr())
         );
         println!("{}", msg);
-        dc_receive_imf(t, msg.as_bytes(), false).await.unwrap();
+        dc_receive_imf(t, msg.as_bytes(), "INBOX", false)
+            .await
+            .unwrap();
     }
 
     #[async_std::test]
@@ -726,20 +731,23 @@ 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).await.unwrap().len(), 1);
+        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).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).await.unwrap().len(), 2);
+        assert_eq!(
+            get_chat_msgs(&t, claire.id, 0, None).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).await.unwrap().len(), 3);
+        assert_eq!(get_chat_msgs(&t, dave.id, 0, None).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);
 
@@ -754,7 +762,10 @@ 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).await.unwrap().len(), 3);
+        assert_eq!(
+            get_chat_msgs(&t, claire.id, 0, None).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
 
@@ -771,7 +782,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).await.unwrap().len(), 1);
+        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).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()