Fix node package ci

.github/mergeable.yml

@@ -16,11 +16,11 @@ mergeable:
                 required: ['CHANGELOG.md']
             - do: dependent
               changed:
-                file: 'deltachat-ffi/src/**'
+                file: 'deltachat-ffi/**'
                 required: ['CHANGELOG.md']
     fail:
       - do: checks
         status: 'action_required' 
         payload:
-          title: Changelog might need an update
+          title: Changlog might need an update
           summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   RUSTFLAGS: -Dwarnings
-   
+
 jobs:
 
   fmt:
@@ -45,7 +45,7 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --examples --benches --features repl -- -D warnings
+          args: --workspace --tests --examples --benches
 
   docs:
     name: Rust doc comments
@@ -77,19 +77,19 @@ jobs:
         include:
           # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.61.0
+            rust: 1.60.0
             python: 3.9
           - os: windows-latest
-            rust: 1.61.0
+            rust: 1.60.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.56.1
+          # Minimum Supported Rust Version = 1.56.0
           #
           # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built.
           - os: ubuntu-latest
-            rust: 1.56.1
+            rust: 1.56.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
@@ -116,14 +116,9 @@ jobs:
         command: test
         args: --all
 
-    - name: test cargo vendor
-      uses: actions-rs/cargo@v1
-      with:
-        command: vendor
-
     - name: install python
       if: ${{ matrix.python }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
 
@@ -136,7 +131,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: build
-        args: -p deltachat_ffi --features jsonrpc
+        args: -p deltachat_ffi
 
     - name: run python tests
       if: ${{ matrix.python }}
@@ -146,18 +141,3 @@ jobs:
         DCC_RS_DEV: ${{ github.workspace }}
       working-directory: python
       run: tox -e lint,mypy,doc,py3
-
-    - name: install pypy
-      if: ${{ matrix.python }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: 'pypy${{ matrix.python }}'
-
-    - name: run pypy tests
-      if: ${{ matrix.python }}
-      env:
-        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-        DCC_RS_TARGET: debug
-        DCC_RS_DEV: ${{ github.workspace }}
-      working-directory: python
-      run: tox -e pypy3

.github/workflows/jsonrpc.yml

@@ -1,45 +0,0 @@
-name: JSON-RPC API Test
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Add Rust cache
-        uses: Swatinem/rust-cache@v1.3.0
-      - name: npm install
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm install
-      - name: Build TypeScript, run Rust tests, generate bindings
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run build
-      - name: Run integration tests
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run test
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      - name: Run linter
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run prettier:check

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

@@ -29,4 +29,4 @@ jobs:
         host: "download.delta.chat"
         port: 22
         local: "deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz"
-        remote: "/var/www/html/download/node/preview/"
+        remote: "/var/www/html/download/node/"

.github/workflows/node-package.yml

@@ -1,15 +1,14 @@
-name: 'node.js build'
+name: 'node.js'
 on:
   pull_request:
   push:
     tags:
     - '*'
-    - '!py-*'
 
 
 jobs:
   prebuild:
-    name: 'prebuild'
+    name: 'Prebuild'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -75,20 +74,6 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
       - name: System info
         run: |
           rustc -vV
@@ -96,7 +81,6 @@ jobs:
           cargo -vV
           npm --version
           node --version
-          echo $DELTACHAT_NODE_TAR_GZ
       - name: Download ubuntu prebuild
         uses: actions/download-artifact@v1
         with:
@@ -116,20 +100,18 @@ jobs:
           tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
           tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
           tree node/prebuilds
-          rm -rf ubuntu-18.04 macos-latest windows-latest
       - name: install dependencies without running scripts
         run: |
           npm install --ignore-scripts
-      - name: build constants
-        run: |
-          npm run build:core:constants
       - name: build typescript part
         run: |
           npm run build:bindings:ts
+      - name: Set DELTACHAT_NODE_TAR_GZ env variable
+        run: |
+          echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ github.ref_name }}" >> $GITHUB_ENV
       - name: package
         shell: bash
         run: |
-          mv node/README.md README.md
           npm pack .
           ls -lah
           mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
@@ -137,10 +119,9 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: deltachat-node.tgz
-          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
+          path: $DELTACHAT_NODE_TAR_GZ
       # Upload to download.delta.chat/node/preview/
       - name: Upload deltachat-node preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
         id: upload-preview
         shell: bash
         run: |
@@ -148,12 +129,6 @@ jobs:
           chmod 600 __TEMP_INPUT_KEY_FILE
           scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
         continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload to download.delta.chat/node/
       - name: Upload deltachat-node build to download.delta.chat/node/
         if: ${{ steps.tag.outputs.tag }}

.github/workflows/node-tests.yml

@@ -1,67 +0,0 @@
-name: 'node.js tests'
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - staging
-      - trying
-
-jobs:
-  tests:
-    name: 'tests'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          cd node
-          npm install --verbose
-
-      - name: Test
-        if: runner.os != 'Windows'
-        run: |
-          cd node
-          npm run test
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      - name: Run tests on Windows, except lint
-        if: runner.os == 'Windows'
-        run: |
-          cd node
-          npm run test:mocha
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}

.npmignore

@@ -40,17 +40,3 @@ node/old_docs.md
 .vscode/
 .github/
 node/.prettierrc.yml
-
-deltachat-jsonrpc/TODO.md
-deltachat-jsonrpc/README.MD
-deltachat-jsonrpc/.gitignore
-deltachat-jsonrpc/typescript/.gitignore
-deltachat-jsonrpc/typescript/.prettierignore
-deltachat-jsonrpc/typescript/accounts/
-deltachat-jsonrpc/typescript/index.html
-deltachat-jsonrpc/typescript/node-demo.js
-deltachat-jsonrpc/typescript/report_api_coverage.mjs
-deltachat-jsonrpc/typescript/test
-deltachat-jsonrpc/typescript/example.ts
-
-.DS_Store

CHANGELOG.md

@@ -1,244 +1,5 @@
 # Changelog
 
-## Unreleased
-
-### API-Changes
-- breaking change: replace `dc_accounts_event_emitter_t` with `dc_event_emitter_t` #3422
-
-  Type `dc_accounts_event_emitter_t` is removed.
-  `dc_accounts_get_event_emitter()` returns `dc_event_emitter_t` now, so
-  `dc_get_next_event()` should be used instead of `dc_accounts_get_next_event`
-  and `dc_event_emitter_unref()` should be used instead of
-  `dc_accounts_event_emitter_unref`.
-- add `dc_contact_was_seen_recently()` #3560
-- jsonrpc: add functions: #3586, #3587
-  - `deleteChat()`
-  - `getChatEncryptionInfo()`
-  - `getChatSecurejoinQrCodeSvg()`
-  - `leaveGroup()`
-  - `removeContactFromChat()`
-  - `addContactToChat()`
-  - `deleteMessages()`
-  - `getMessageInfo()`
-- jsonrpc: add `is_broadcast` property to `ChatListItemFetchResult` #3584
-- jsonrpc: add `was_seen_recently` property to `ChatListItemFetchResult`, `FullChat` and `Contact` #3584
-- jsonrpc: add `webxdc_info` property to `Message` #3588
-
-### Changes
-- order contact lists by "last seen";
-  this affects `dc_get_chat_contacts()`, `dc_get_contacts()` and `dc_get_blocked_contacts()` #3562
-- add `internet_access` flag to `dc_msg_get_webxdc_info()` #3516
-- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3105
-- `DC_EVENT_WEBXDC_BUSY_UPDATING` is emitted when a new update has to be sent by an webxdc #3320
-- `DC_EVENT_WEBXDC_UP_TO_DATE` is emitted when a webxdc has sent all updates #3320
-
-### Fixes
-- do not emit notifications for blocked chats #3557
-- Show attached .eml files correctly #3561
-- Auto accept contact requests if `Config::Bot` is set for a client #3567 
-- Don't prepend the subject to chat messages in mailinglists
-- fix `set_core_version.py` script to also update version in `deltachat-jsonrpc/typescript/package.json` #3585
-- Reject webxcd-updates from contacts who are not group members #3568
-
-
-## 1.93.0
-
-### API-Changes
-- added a JSON RPC API, accessible through a WebSocket server, the CFFI bindings and the Node.js bindings #3463 #3554 #3542
-- JSON RPC methods in CFFI #3463:
- - `dc_jsonrpc_instance_t* dc_jsonrpc_init(dc_accounts_t* account_manager);`
- - `void dc_jsonrpc_unref(dc_jsonrpc_instance_t* jsonrpc_instance);`
- - `void dc_jsonrpc_request(dc_jsonrpc_instance_t* jsonrpc_instance, char* request);`
- - `char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);`
-- node: JSON RPC methods #3463:
- - `AccountManager.prototype.startJsonRpcHandler(callback: ((response: string) => void)): void`
- - `AccountManager.prototype.jsonRpcRequest(message: string): void`
-
-### Changes
-- use [pathlib](https://docs.python.org/3/library/pathlib.html) in provider update script #3543
-- `dc_get_chat_media()` can return media globally #3528
-- node: add `getMailinglistAddr()` #3524
-- avoid duplicate encoded-words package and test `cargo vendor` in ci #3549
-- python: don't raise an error if addr changes #3530
-- improve coverage script #3530
-
-### Fixes
-- improved error handling for account setup from qrcode #3474
-- python: enable certificate checks in cloned accounts #3443
-
-
-## 1.92.0
-
-### API-Changes
-- add `dc_chat_get_mailinglist_addr()` #3520
-
-
-## 1.91.0
-
-### Added
-- python bindings: extra method to get an account running
-
-### Changes
-- refactorings #3437
-
-### Fixes
-- mark "group image changed" as system message on receiver side #3517
-
-
-## 1.90.0
-
-### Changes
-- handle drafts from mailto links in scanned QR #3492
-- do not overflow ratelimiter leaky bucket #3496
-- (AEAP) Add device message after you changed your address #3505
-- (AEAP) Revert #3491, instead only replace contacts in verified groups #3510
-- improve python bindings and tests #3502 #3503
-
-### Fixes
-- don't squash text parts of NDN into attachments #3497
-- do not treat non-failed DSNs as NDNs #3506
-
-
-## 1.89.0
-
-### Changes
-
-- (AEAP) When one of your contacts changed their address, they are
-  only replaced in the chat where you got a message from them
-  for now #3491
-
-### Fixes
-- replace musl libc name resolution errors with a better message #3485
-- handle updates for not yet downloaded webxdc instances #3487
-
-
-## 1.88.0
-
-### Changes
-- Implemented "Automatic e-mail address Porting" (AEAP). You can
-  configure a new address in DC now, and when receivers get messages
-  they will automatically recognize your moving to a new address. #3385
-- switch from `async-std` to `tokio` as the async runtime #3449
-- upgrade to `pgp@0.8.0` #3467
-- add IMAP ID extension support #3468
-- configure DeltaChat folder by selecting it, so it is configured even if not LISTed #3371
-- build PyPy wheels #6683
-- improve default error if NDN does not provide an error #3456
-- increase ratelimit from 3 to 6 messages per 60 seconds #3481
-
-### Fixes
-- mailing list: remove square-brackets only for first name #3452
-- do not use footers from mailinglists as the contact status #3460
-- don't ignore KML parsing errors #3473
-
-
-## 1.87.0
-
-### Changes
-- limit the rate of MDN sending #3402
-- ignore ratelimits for bots #3439
-- remove `msgs_mdns` references to deleted messages during housekeeping #3387
-- format message lines starting with `>` as quotes #3434
-- node: remove `split2` dependency #3418
-- node: add git installation info to readme #3418
-- limit the rate of webxdc update sending #3417
-
-### Fixes
-- set a default error if NDN does not provide an error #3410
-- python: avoid exceptions when messages/contacts/chats are compared with `None`
-- node: wait for the event loop to stop before destroying contexts #3431 #3451
-- emit configuration errors via event on failure #3433
-- report configure and imex success/failure after freeing ongoing process #3442
-
-### API-Changes
-- python: added `Message.get_status_updates()`  #3416
-- python: added `Message.send_status_update()`  #3416
-- python: added `Message.is_webxdc()`  #3416
-- python: added `Message.is_videochat_invitation()`  #3416
-- python: added support for "videochat" and "webxdc" view types to `Message.new_empty()`  #3416
-
-
-## 1.86.0
-
-### API-Changes
-- python: added optional `closed` parameter to `Account` constructor #3394
-- python: added optional `passphrase` parameter to `Account.export_all()` and `Account.import_all()` #3394
-- python: added `Account.open()` #3394
-- python: added `Chat.is_single()` #3394
-- python: added `Chat.is_mailinglist()` #3394
-- python: added `Chat.is_broadcast()` #3394
-- python: added `Chat.is_multiuser()` #3394
-- python: added `Chat.is_self_talk()` #3394
-- python: added `Chat.is_device_talk()` #3394
-- python: added `Chat.is_pinned()` #3394
-- python: added `Chat.pin()` #3394
-- python: added `Chat.unpin()` #3394
-- python: added `Chat.archive()` #3394
-- python: added `Chat.unarchive()` #3394
-- python: added `Message.get_summarytext()` #3394
-- python: added optional `closed` parameter to `ACFactory.get_unconfigured_account()` (pytest plugin) #3394
-- python: added optional `passphrase` parameter to `ACFactory.get_pseudo_configured_account()` (pytest plugin) #3394
-
-### Changes
-- clean up series of webxdc info messages;
-  `DC_EVENT_MSGS_CHANGED` is emitted on changes of existing info messages #3395
-- update provider database #3399
-- refactorings #3375 #3403 #3398 #3404
-
-### Fixes
-- do not reset our database if imported backup cannot be decrypted #3397
-- node: remove `npx` from build script, this broke flathub build #3396
-
-
-## 1.85.0
-
-### Changes
-- refactorings #3373 #3345 #3380 #3382
-- node: move split2 to devDependencies
-- python: build Python 3.10 wheels #3392
-- update Rust dependencies
-
-### Fixes
-- delete outgoing MDNs found in the Sent folder on Gmail #3372
-- fix searching one-to-one chats #3377
-- do not add legacy info-messages on resending webxdc #3389
-
-
-## 1.84.0
-
-### Changes
-- refactorings #3354 #3347 #3353 #3346
-
-### Fixes
-- do not unnecessarily SELECT folders if there are no operations planned on
-  them #3333
-- trim chat encryption info #3350
-- fix failure to decrypt first message to self after key synchronization
-  via Autocrypt Setup Message #3352
-- Keep pgp key when you change your own email address #3351
-- Do not ignore Sent and Spam folders on Gmail #3369
-- handle decryption errors explicitly and don't get confused by encrypted mail attachments #3374
-
-
-## 1.83.0
-
-### Fixes
-- fix node prebuild & package ci #3337
-
-
-## 1.82.0
-
-### API-Changes
-- re-add removed `DC_MSG_ID_MARKER1` as in use on iOS #3330
-
-### Changes
-- refactorings #3328
-
-### Fixes
-- fix node package ci #3331
-- fix race condition in ongoing process (import/export, configuration) allocation #3322
-
-
 ## 1.81.0
 
 ### API-Changes
@@ -263,8 +24,12 @@
 - 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
+- fix race condition in ongoing process (import/export, configuration) allocation
 - repair encrypted mails "mixed up" by Google Workspace "Append footer" function #3315
 
+### Removed
+- node: remove unmaintained coverage scripts
+
 
 ## 1.80.0
 

CMakeLists.txt

@@ -21,7 +21,7 @@ add_custom_command(
         PREFIX=${CMAKE_INSTALL_PREFIX}
         LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
         INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-        ${CARGO} build --release --no-default-features --features jsonrpc
+        ${CARGO} build --release --no-default-features
 
 	# Build in `deltachat-ffi` directory instead of using
 	# `--package deltachat_ffi` to avoid feature resolver version

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.93.0"
+version = "1.81.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -9,7 +9,6 @@ rust-version = "1.56"
 [profile.dev]
 debug = 0
 panic = 'abort'
-opt-level = 1
 
 [profile.release]
 lto = true
@@ -20,23 +19,24 @@ deltachat_derive = { path = "./deltachat_derive" }
 
 ansi_term = { version = "0.12.1", optional = true }
 anyhow = "1"
-async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
-async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
-trust-dns-resolver = "0.21"
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
-tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
+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-std-resolver = "0.21"
+async-std = { version = "1" }
+async-tar = { version = "0.4", default-features=false }
+async-trait = "0.1"
 backtrace = "0.3"
 base64 = "0.13"
 bitflags = "1.3"
-chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
+chrono = "0.4"
 dirs = { version = "4", optional=true }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.3", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -46,19 +46,19 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.13.1"
+once_cell = "1.10.0"
 percent-encoding = "2.0"
-pgp = { version = "0.8", default-features = false }
+pgp = { version = "0.7", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-quick-xml = "0.23"
+quick-xml = "0.22"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
-rand = "0.8"
-regex = "1.6"
+rand = "0.7"
+regex = "1.5"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustyline = { version = "10", optional = true }
-sanitize-filename = "0.4"
+rustyline = { version = "9", optional = true }
+sanitize-filename = "0.3"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
@@ -66,36 +66,32 @@ sha2 = "0.10"
 smallvec = "1"
 strum = "0.24"
 strum_macros = "0.24"
+surf = { version = "2.3", default-features = false, features = ["h1-client"] }
 thiserror = "1"
 toml = "0.5"
 url = "2"
-uuid = { version = "1", features = ["serde", "v4"] }
-fast-socks5 = "0.8"
+uuid = { version = "0.8", features = ["serde", "v4"] }
+fast-socks5 = "0.4"
 humansize = "1"
 qrcodegen = "1.7.0"
 tagger = "4.3.3"
 textwrap = "0.15.0"
-async-channel = "1.6.1"
-futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.9", features = ["fs"] }
-reqwest = { version = "0.11.11", features = ["json"] }
-async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }
+zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.3.6", features = ["async_tokio"] }
+async-std = { version = "1", features = ["unstable", "attributes"] }
+criterion = { version = "0.3.4", features = ["async_std"] }
 futures-lite = "1.12"
 log = "0.4"
 pretty_env_logger = "0.4"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = "3"
-tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 
 [workspace]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc"
 ]
 
 [[example]]
@@ -137,10 +133,5 @@ harness = false
 default = ["vendored"]
 internals = []
 repl = ["internals", "rustyline", "log", "pretty_env_logger", "ansi_term", "dirs"]
-vendored = [
-  "async-native-tls/vendored",
-  "async-smtp/native-tls-vendored",
-  "rusqlite/bundled-sqlcipher-vendored-openssl",
-  "reqwest/native-tls-vendored"
-]
+vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored", "rusqlite/bundled-sqlcipher-vendored-openssl"]
 nightly = ["pgp/nightly"]

README.md

@@ -102,6 +102,9 @@ $ cargo build -p deltachat_ffi --release
 
 ## Debugging environment variables 
 
+- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
+  printed
+
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
 
 - `RUST_LOG=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and

benches/contacts.rs

@@ -1,14 +1,14 @@
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::Events;
 use tempfile::tempdir;
 
 async fn address_book_benchmark(n: u32, read_count: u32) {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     let book = (0..n)
         .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))
@@ -24,16 +24,12 @@ async fn address_book_benchmark(n: u32, read_count: u32) {
 }
 
 fn criterion_benchmark(c: &mut Criterion) {
-    let rt = tokio::runtime::Runtime::new().unwrap();
-
     c.bench_function("create 500 contacts", |b| {
-        b.to_async(&rt)
-            .iter(|| async { address_book_benchmark(black_box(500), black_box(0)).await })
+        b.iter(|| block_on(async { address_book_benchmark(black_box(500), black_box(0)).await }))
     });
 
     c.bench_function("create 100 contacts and read it 1000 times", |b| {
-        b.to_async(&rt)
-            .iter(|| async { address_book_benchmark(black_box(100), black_box(1000)).await })
+        b.iter(|| block_on(async { address_book_benchmark(black_box(100), black_box(1000)).await }))
     });
 }
 

benches/create_account.rs

@@ -1,11 +1,12 @@
+use async_std::path::PathBuf;
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
-use std::path::PathBuf;
 use tempfile::tempdir;
 
 async fn create_accounts(n: u32) {
     let dir = tempdir().unwrap();
-    let p: PathBuf = dir.path().join("accounts");
+    let p: PathBuf = dir.path().join("accounts").into();
 
     let mut accounts = Accounts::new(p.clone()).await.unwrap();
 
@@ -17,8 +18,7 @@ async fn create_accounts(n: u32) {
 
 fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("create 1 account", |b| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        b.to_async(&rt).iter(|| create_accounts(black_box(1)))
+        b.iter(|| block_on(async { create_accounts(black_box(1)).await }))
     });
 }
 

benches/get_chat_msgs.rs

@@ -1,15 +1,15 @@
-use std::path::Path;
+use async_std::path::Path;
 
+use criterion::async_executor::AsyncStdExecutor;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::Events;
 
 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
     let id = 100;
-    let context = Context::new(dbfile, id, Events::new()).await.unwrap();
+    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());
@@ -20,19 +20,15 @@ fn criterion_benchmark(c: &mut Criterion) {
     // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
     // messages, such as your primary account.
     if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
-        let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new())
-                .await
-                .unwrap();
+        let chats: Vec<_> = async_std::task::block_on(async {
+            let context = Context::new((&path).into(), 100).await.unwrap();
             let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
             let len = chatlist.len();
             (0..len).map(|i| chatlist.get_chat_id(i).unwrap()).collect()
         });
 
         c.bench_function("chat::get_chat_msgs (load messages from 10 chats)", |b| {
-            b.to_async(&rt)
+            b.to_async(AsyncStdExecutor)
                 .iter(|| get_chat_msgs_benchmark(black_box(path.as_ref()), black_box(&chats)))
         });
     } else {

benches/get_chatlist.rs

@@ -1,10 +1,8 @@
-use std::path::Path;
-
+use criterion::async_executor::AsyncStdExecutor;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::Events;
 
 async fn get_chat_list_benchmark(context: &Context) {
     Chatlist::try_load(context, 0, None, None).await.unwrap();
@@ -14,14 +12,10 @@ fn criterion_benchmark(c: &mut Criterion) {
     // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
     // messages, such as your primary account.
     if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let context = rt.block_on(async {
-            Context::new(Path::new(&path), 100, Events::new())
-                .await
-                .unwrap()
-        });
+        let context =
+            async_std::task::block_on(async { Context::new(path.into(), 100).await.unwrap() });
         c.bench_function("chatlist:try_load (Get Chatlist)", |b| {
-            b.to_async(&rt)
+            b.to_async(AsyncStdExecutor)
                 .iter(|| get_chat_list_benchmark(black_box(&context)))
         });
     } else {

benches/receive_emails.rs

@@ -1,12 +1,13 @@
-use std::path::PathBuf;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use async_std::{path::PathBuf, task::block_on};
+use criterion::{
+    async_executor::AsyncStdExecutor, black_box, criterion_group, criterion_main, BatchSize,
+    Criterion,
+};
 use deltachat::{
     config::Config,
     context::Context,
+    dc_receive_imf::dc_receive_imf,
     imex::{imex, ImexMode},
-    receive_imf::receive_imf,
-    Events,
 };
 use tempfile::tempdir;
 
@@ -30,7 +31,7 @@ Hello {i}",
             i = i,
             i_dec = i - 1,
         );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
+        dc_receive_imf(&context, black_box(imf_raw.as_bytes()), false)
             .await
             .unwrap();
     }
@@ -41,13 +42,13 @@ async fn create_context() -> Context {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     let backup: PathBuf = std::env::current_dir()
         .unwrap()
-        .join("delta-chat-backup.tar");
-
-    if backup.exists() {
+        .join("delta-chat-backup.tar")
+        .into();
+    if backup.exists().await {
         println!("Importing backup");
         imex(&context, ImexMode::ImportBackup, &backup, None)
             .await
@@ -70,15 +71,11 @@ async fn create_context() -> Context {
 fn criterion_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("Receive messages");
     group.bench_function("Receive 100 simple text msgs", |b| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let context = rt.block_on(create_context());
-
-        b.to_async(&rt).iter(|| {
-            let ctx = context.clone();
-            async move {
-                recv_all_emails(black_box(ctx)).await;
-            }
-        });
+        b.to_async(AsyncStdExecutor).iter_batched(
+            || block_on(create_context()),
+            |context| recv_all_emails(black_box(context)),
+            BatchSize::LargeInput,
+        );
     });
     group.finish();
 }

benches/search_msgs.rs

@@ -1,13 +1,12 @@
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
-use deltachat::Events;
 use std::path::Path;
 
-async fn search_benchmark(dbfile: impl AsRef<Path>) {
+async fn search_benchmark(path: impl AsRef<Path>) {
+    let dbfile = path.as_ref();
     let id = 100;
-    let context = Context::new(dbfile.as_ref(), id, Events::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     for _ in 0..10u32 {
         context.search_msgs(None, "hello").await.unwrap();
@@ -18,10 +17,8 @@ fn criterion_benchmark(c: &mut Criterion) {
     // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
     // messages, such as your primary account.
     if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
         c.bench_function("search hello", |b| {
-            b.to_async(&rt).iter(|| search_benchmark(black_box(&path)))
+            b.iter(|| block_on(async { search_benchmark(black_box(&path)).await }))
         });
     } else {
         println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.93.0"
+version = "1.81.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -16,20 +16,17 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { path = "../", default-features = false }
-deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
 libc = "0.2"
 human-panic = "1"
 num-traits = "0.2"
 serde_json = "1.0"
-tokio = { version = "1", features = ["rt-multi-thread"] }
+async-std = "1"
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.13.1"
 
 [features]
 default = ["vendored"]
 vendored = ["deltachat/vendored"]
 nightly = ["deltachat/nightly"]
-jsonrpc = ["deltachat-jsonrpc"]
 

deltachat-ffi/build.rs

@@ -1,3 +1,4 @@
+use std::io::Write;
 use std::path::PathBuf;
 use std::{env, fs};
 
@@ -27,9 +28,8 @@ fn main() {
     );
 
     fs::create_dir_all(target_path.join("pkgconfig")).unwrap();
-    fs::write(
-        target_path.join("pkgconfig").join("deltachat.pc"),
-        pkg_config.as_bytes(),
-    )
-    .unwrap();
+    fs::File::create(target_path.join("pkgconfig").join("deltachat.pc"))
+        .unwrap()
+        .write_all(pkg_config.as_bytes())
+        .unwrap();
 }

deltachat-ffi/deltachat.h

@@ -22,10 +22,8 @@ typedef struct _dc_lot      dc_lot_t;
 typedef struct _dc_provider dc_provider_t;
 typedef struct _dc_event    dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
-typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
+typedef struct _dc_accounts_event_emitter dc_accounts_event_emitter_t;
 
-// Alias for backwards compatibility, use dc_event_emitter_t instead.
-typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 
 /**
  * @mainpage Getting started
@@ -393,8 +391,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    If no type is prefixed, the videochat is handled completely in a browser.
  * - `bot`          = Set to "1" if this is a bot.
  *                    Prevents adding the "Device messages" and "Saved messages" chats,
- *                    adds Auto-Submitted header to outgoing messages
- *                    and accepts contact requests automatically (calling dc_accept_chat() is not needed for bots).
+ *                    adds Auto-Submitted header to outgoing messages.
  * - `fetch_existing_msgs` = 1=fetch most recent existing messages on configure (default),
  *                    0=do not fetch existing messages on configure.
  *                    In both cases, existing recipients are added to the contact database.
@@ -1266,7 +1263,7 @@ void            dc_marknoticed_chat          (dc_context_t* context, uint32_t ch
 
 
 /**
- * Returns all message IDs of the given types in a given chat or any chat.
+ * Returns all message IDs of the given types in a chat.
  * Typically used to show a gallery.
  * The result must be dc_array_unref()'d
  *
@@ -1276,8 +1273,7 @@ void            dc_marknoticed_chat          (dc_context_t* context, uint32_t ch
  *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
- * @param chat_id >0: get messages with media from this chat ID.
- *    0: get messages with media from any chat of the currently used account.
+ * @param chat_id The chat ID to get all messages with media from.
  * @param msg_type Specify a message type to query here, one of the @ref DC_MSG constants.
  * @param msg_type2 Alternative message type to search for. 0 to skip.
  * @param msg_type3 Alternative message type to search for. 0 to skip.
@@ -1288,6 +1284,7 @@ dc_array_t*     dc_get_chat_media            (dc_context_t* context, uint32_t ch
 
 /**
  * Search next/previous message based on a given message and a list of types.
+ * The
  * Typically used to implement the "next" and "previous" buttons
  * in a gallery or in a media player.
  *
@@ -1388,9 +1385,6 @@ void            dc_block_chat                (dc_context_t* context, uint32_t ch
  *
  * Use it to accept "contact request" chats as indicated by dc_chat_is_contact_request().
  *
- * If the dc_set_config()-option `bot` is set,
- * all chats are accepted automatically and calling this function has no effect.
- *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
  * @param chat_id The ID of the chat to accept.
@@ -1797,11 +1791,6 @@ void            dc_delete_msgs               (dc_context_t* context, const uint3
 /**
  * Forward messages to another chat.
  *
- * All types of messages can be forwarded,
- * however, they will be flagged as such (dc_msg_is_forwarded() is set).
- *
- * Original sender, info-state and webxdc updates are not forwarded on purpose.
- *
  * @memberof dc_context_t
  * @param context The context object.
  * @param msg_ids An array of uint32_t containing all message IDs that should be forwarded.
@@ -2298,7 +2287,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  * - DC_QR_FPR_MISMATCH with dc_lot_t::id=Contact ID:
  *   scanned fingerprint does not match last seen fingerprint.
  *
- * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::text1=Formatted fingerprint
+ * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::test1=Formatted fingerprint
  *   the scanned QR code contains a fingerprint but no e-mail address;
  *   suggest the user to establish an encrypted connection first.
  *
@@ -2311,8 +2300,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   if so, call dc_set_config_from_qr().
  *
  * - DC_QR_ADDR with dc_lot_t::id=Contact ID:
- *   e-mail address scanned, optionally, a draft message could be set in
- *   dc_lot_t::text1 in which case dc_lot_t::text1_meaning will be DC_TEXT1_DRAFT;
+ *   e-mail address scanned,
  *   ask the user if they want to start chatting;
  *   if so, call dc_create_chat_by_contact_id().
  *
@@ -2516,9 +2504,9 @@ int         dc_set_location                 (dc_context_t* context, double latit
  *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
  *     0 for "all up to now".
  * @return An array of locations, NULL is never returned.
- *     The array is sorted descending;
+ *     The array is sorted decending;
  *     the first entry in the array is the location with the newest timestamp.
- *     Note that this is only related to the recent position of the user
+ *     Note that this is only realated to the recent postion of the user
  *     if dc_array_is_independent() returns 0.
  *     The returned array must be freed using dc_array_unref().
  *
@@ -2842,7 +2830,7 @@ void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);
  *
  * The library will emit various @ref DC_EVENT events as "new message", "message read" etc.
  * To get these events, you have to create an event emitter using this function
- * and call dc_get_next_event() on the emitter.
+ * and call dc_accounts_get_next_event() on the emitter.
  *
  * This is similar to dc_get_event_emitter(), which, however,
  * must not be called for accounts handled by the account manager.
@@ -2850,13 +2838,13 @@ void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);
  * @memberof dc_accounts_t
  * @param accounts The account manager as created by dc_accounts_new().
  * @return Returns the event emitter, NULL on errors.
- *     Must be freed using dc_event_emitter_unref() after usage.
+ *     Must be freed using dc_accounts_event_emitter_unref() after usage.
  *
  * Note: Use only one event emitter per account manager.
  * Having more than one event emitter running at the same time on the same account manager
  * will result in events randomly delivered to the one or to the other.
  */
-dc_event_emitter_t* dc_accounts_get_event_emitter (dc_accounts_t* accounts);
+dc_accounts_event_emitter_t* dc_accounts_get_event_emitter (dc_accounts_t* accounts);
 
 
 /**
@@ -3263,19 +3251,6 @@ uint32_t        dc_chat_get_id               (const dc_chat_t* chat);
 int             dc_chat_get_type             (const dc_chat_t* chat);
 
 
-/**
- * Returns the address where messages are sent to if the chat is a mailing list.
- * If you just want to know if a mailing list can be written to,
- * use dc_chat_can_send() instead.
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return The mailing list address. Must be released using dc_str_unref() after usage.
- *     If there is no such address, an empty string is returned, NULL is never returned.
- */
-char*           dc_chat_get_mailinglist_addr (const dc_chat_t* chat);
-
-
 /**
  * Get name of a chat. For one-to-one chats, this is the name of the contact.
  * For group chats, this is the name given e.g. to dc_create_group_chat() or
@@ -3763,11 +3738,6 @@ char*             dc_msg_get_webxdc_blob      (const dc_msg_t* msg, const char*
  *   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.
- * - internet_access:
- *   true if the Webxdc should get full internet access, including Webrtc.
- *   currently, this is only true for encrypted Webxdc's in the self chat
- *   that have requested internet access in the manifest.
- *   this is useful for development and maybe for internal integrations at some point.
  *
  * @memberof dc_msg_t
  * @param msg The webxdc instance.
@@ -4009,7 +3979,7 @@ int             dc_msg_is_sent                (const dc_msg_t* msg);
  *
  * For privacy reasons, we do not provide the name or the e-mail address of the
  * original author (in a typical GUI, you select the messages text and click on
- * "forwarded"; you won't expect other data to be send to the new recipient,
+ * "forwared"; you won't expect other data to be send to the new recipient,
  * esp. as the new recipient may not be in any relationship to the original author)
  *
  * @memberof dc_msg_t
@@ -4649,22 +4619,6 @@ char*           dc_contact_get_status        (const dc_contact_t* contact);
  */
 int64_t         dc_contact_get_last_seen     (const dc_contact_t* contact);
 
-
-/**
- * Check if the contact was seen recently.
- *
- * The UI may highlight these contacts,
- * eg. draw a little green dot on the avatars of the users recently seen.
- * DC_CONTACT_ID_SELF and other special contact IDs are defined as never seen recently (they should not get a dot).
- * To get the time a contact was seen, use dc_contact_get_last_seen().
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 1=contact seen recently, 0=contact not seen recently.
- */
-int             dc_contact_was_seen_recently (const dc_contact_t* contact);
-
-
 /**
  * Check if a contact is blocked.
  *
@@ -5219,61 +5173,13 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
  */
 
 
-
-/**
- * @class dc_jsonrpc_instance_t
- *
- * Opaque object for using the json rpc api from the cffi bindings.
- */
-
-/**
- * Create the jsonrpc instance that is used to call the jsonrpc.
- *
- * @memberof dc_accounts_t
- * @param account_manager The accounts object as created by dc_accounts_new().
- * @return Returns the jsonrpc instance, NULL on errors.
- *     Must be freed using dc_jsonrpc_unref() after usage.
- *
- */
-dc_jsonrpc_instance_t* dc_jsonrpc_init(dc_accounts_t* account_manager);
-
-/**
- * Free a jsonrpc instance.
- *
- * @memberof dc_jsonrpc_instance_t
- * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
- *     If NULL is given, nothing is done and an error is logged.
- */
-void dc_jsonrpc_unref(dc_jsonrpc_instance_t* jsonrpc_instance);
-
-/**
- * Makes an asynchronous jsonrpc request,
- * returns immediately and once the result is ready it can be retrieved via dc_jsonrpc_next_response()
- * the jsonrpc specification defines an invocation id that can then be used to match request and response.
- *
- * @memberof dc_jsonrpc_instance_t
- * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
- * @param request JSON-RPC request as string
- */
-void dc_jsonrpc_request(dc_jsonrpc_instance_t* jsonrpc_instance, const char* request);
-
-/**
- * Get the next json_rpc response, blocks until there is a new event, so call this in a loop from a thread.
- *
- * @memberof dc_jsonrpc_instance_t
- * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
- * @return JSON-RPC response as string, must be freed using dc_str_unref() after usage.
- *     If NULL is returned, the accounts_t belonging to the jsonrpc instance is unref'd and no more events will come;
- *     in this case, free the jsonrpc instance using dc_jsonrpc_unref().
- */
-char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);
-
 /**
  * @class dc_event_emitter_t
  *
  * Opaque object that is used to get events from a single context.
- * You can get an event emitter from a context using dc_get_event_emitter()
- * or dc_accounts_get_event_emitter().
+ * You can get an event emitter from a context using dc_get_event_emitter().
+ * If you are using the dc_accounts_t account manager,
+ * dc_accounts_event_emitter_t must be used instead.
  */
 
 /**
@@ -5289,8 +5195,6 @@ char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);
  */
 dc_event_t* dc_get_next_event(dc_event_emitter_t* emitter);
 
-// Alias for backwards compatibility, use dc_get_next_event instead.
-#define dc_accounts_get_next_event dc_get_next_event
 
 /**
  * Free a context event emitter object.
@@ -5301,8 +5205,39 @@ dc_event_t* dc_get_next_event(dc_event_emitter_t* emitter);
  */
 void  dc_event_emitter_unref(dc_event_emitter_t* emitter);
 
-// Alias for backwards compatibility, use dc_event_emtitter_unref instead.
-#define dc_accounts_event_emitter_unref dc_event_emitter_unref
+
+/**
+ * @class dc_accounts_event_emitter_t
+ *
+ * Opaque object that is used to get events from the dc_accounts_t account manager.
+ * You get an event emitter from the account manager using dc_accounts_get_event_emitter().
+ * If you are not using the dc_accounts_t account manager but just a single dc_context_t object,
+ * dc_event_emitter_t must be used instead.
+ */
+
+/**
+ * Get the next event from an accounts event emitter object.
+ *
+ * @memberof dc_accounts_event_emitter_t
+ * @param emitter Event emitter object as returned from dc_accounts_get_event_emitter().
+ * @return An event as an dc_event_t object.
+ *     You can query the event for information using dc_event_get_id(), dc_event_get_data1_int() and so on;
+ *     if you are done with the event, you have to free the event using dc_event_unref().
+ *     If NULL is returned, the contexts belonging to the event emitter are unref'd and no more events will come;
+ *     in this case, free the event emitter using dc_accounts_event_emitter_unref().
+ */
+dc_event_t* dc_accounts_get_next_event (dc_accounts_event_emitter_t* emitter);
+
+
+/**
+ * Free an accounts event emitter object.
+ *
+ * @memberof dc_accounts_event_emitter_t
+ * @param emitter Event emitter object as returned from dc_accounts_get_event_emitter().
+ *     If NULL is given, nothing is done and an error is logged.
+ */
+void dc_accounts_event_emitter_unref(dc_accounts_event_emitter_t* emitter);
+
 
 /**
  * @class dc_event_t
@@ -5374,7 +5309,7 @@ char* dc_event_get_data2_str(dc_event_t* event);
  * To get the context object belonging to the event, use dc_accounts_get_account().
  *
  * @memberof dc_event_t
- * @param event The event object as returned from dc_get_next_event().
+ * @param event The event object as returned from dc_accounts_get_next_event().
  * @return The account ID belonging to the event, 0 for account manager errors.
  */
 uint32_t dc_event_get_account_id(dc_event_t* event);
@@ -5724,30 +5659,8 @@ void dc_event_unref(dc_event_t* event);
  * @param data1 (int) msg_id
  * @param data2 (int) status_update_serial - must not be used by UI implementations.
  */
-#define DC_EVENT_WEBXDC_STATUS_UPDATE             2120
+#define DC_EVENT_WEBXDC_STATUS_UPDATE                2120
 
-/**
- * Message deleted which contained a webxdc instance.
- *
- * @param data1 (int) msg_id
- */
-#define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121
-
-
-/**
- * Webxdc has some updates that need to be sent
- *
- * @param data1 (int) msg_id
- */
-#define DC_EVENT_WEBXDC_BUSY_UPDATING             2122
-
-
-/**
- * Webxdc has finished sending updates
- *
- * @param data1 (int) msg_id
- */
-#define DC_EVENT_WEBXDC_UP_TO_DATE                2123
 
 /**
  * @}
@@ -6446,24 +6359,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used as status in the connectivity view.
 #define DC_STR_NOT_CONNECTED              121
 
-/// %1$s changed their address from %2$s to %3$s"
-///
-/// Used as an info message to chats with contacts that changed their address.
-#define DC_STR_AEAP_ADDR_CHANGED          122
-
-/// "You changed your email address from %1$s to %2$s.
-/// If you now send a message to a group, contacts there will automatically
-/// replace the old with your new address.\n\nIt's highly advised to set up 
-/// your old email provider to forward all emails to your new email address. 
-/// Otherwise you might miss messages of contacts who did not get your new 
-/// address yet." + the link to the AEAP blog post
-/// 
-/// As soon as there is a post about AEAP, the UIs should add it:
-/// set_stock_translation(123, getString(aeap_explanation) + "\n\n" + AEAP_BLOG_LINK)
-///
-/// Used in a device message that explains AEAP.
-#define DC_STR_AEAP_EXPLANATION_AND_LINK  123
-
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -1,4 +1,4 @@
-#![warn(unused, clippy::all)]
+#![deny(clippy::all)]
 #![allow(
     non_camel_case_types,
     non_snake_case,
@@ -11,24 +11,23 @@
 
 #[macro_use]
 extern crate human_panic;
+extern crate num_traits;
+extern crate serde_json;
 
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::fmt::Write;
-use std::future::Future;
 use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
-use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 
 use anyhow::Context as _;
+use async_std::sync::RwLock;
+use async_std::task::{block_on, spawn};
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use num_traits::{FromPrimitive, ToPrimitive};
-use once_cell::sync::Lazy;
 use rand::Rng;
-use tokio::runtime::Runtime;
-use tokio::sync::RwLock;
 
 use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
@@ -41,7 +40,6 @@ use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
-use tokio::task::JoinHandle;
 
 mod dc_array;
 mod lot;
@@ -65,23 +63,6 @@ use deltachat::chatlist::Chatlist;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;
 
-static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));
-
-fn block_on<T>(fut: T) -> T::Output
-where
-    T: Future,
-{
-    RT.block_on(fut)
-}
-
-fn spawn<T>(fut: T) -> JoinHandle<T::Output>
-where
-    T: Future + Send + 'static,
-    T::Output: Send + 'static,
-{
-    RT.spawn(fut)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_context_new(
     _os_name: *const libc::c_char,
@@ -98,7 +79,7 @@ pub unsafe extern "C" fn dc_context_new(
     let ctx = if blobdir.is_null() || *blobdir == 0 {
         // generate random ID as this functionality is not yet available on the C-api.
         let id = rand::thread_rng().gen();
-        block_on(Context::new(as_path(dbfile), id, Events::new()))
+        block_on(Context::new(as_path(dbfile).to_path_buf().into(), id))
     } else {
         eprintln!("blobdir can not be defined explicitly anymore");
         return ptr::null_mut();
@@ -122,7 +103,10 @@ pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *
     }
 
     let id = rand::thread_rng().gen();
-    match block_on(Context::new_closed(as_path(dbfile), id, Events::new())) {
+    match block_on(Context::new_closed(
+        as_path(dbfile).to_path_buf().into(),
+        id,
+    )) {
         Ok(context) => Box::into_raw(Box::new(context)),
         Err(err) => {
             eprintln!("failed to create context: {:#}", err);
@@ -396,7 +380,7 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
     let redirect = to_string_lossy(redirect);
 
     block_on(async move {
-        match oauth2::get_oauth2_url(ctx, &addr, &redirect)
+        match oauth2::dc_get_oauth2_url(ctx, &addr, &redirect)
             .await
             .log_err(ctx, "dc_get_oauth2_url failed")
         {
@@ -474,40 +458,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
     }
 
     let event = &*event;
-    match event.typ {
-        EventType::Info(_) => 100,
-        EventType::SmtpConnected(_) => 101,
-        EventType::ImapConnected(_) => 102,
-        EventType::SmtpMessageSent(_) => 103,
-        EventType::ImapMessageDeleted(_) => 104,
-        EventType::ImapMessageMoved(_) => 105,
-        EventType::NewBlobFile(_) => 150,
-        EventType::DeletedBlobFile(_) => 151,
-        EventType::Warning(_) => 300,
-        EventType::Error(_) => 400,
-        EventType::ErrorSelfNotInGroup(_) => 410,
-        EventType::MsgsChanged { .. } => 2000,
-        EventType::IncomingMsg { .. } => 2005,
-        EventType::MsgsNoticed { .. } => 2008,
-        EventType::MsgDelivered { .. } => 2010,
-        EventType::MsgFailed { .. } => 2012,
-        EventType::MsgRead { .. } => 2015,
-        EventType::ChatModified(_) => 2020,
-        EventType::ChatEphemeralTimerModified { .. } => 2021,
-        EventType::ContactsChanged(_) => 2030,
-        EventType::LocationChanged(_) => 2035,
-        EventType::ConfigureProgress { .. } => 2041,
-        EventType::ImexProgress(_) => 2051,
-        EventType::ImexFileWritten(_) => 2052,
-        EventType::SecurejoinInviterProgress { .. } => 2060,
-        EventType::SecurejoinJoinerProgress { .. } => 2061,
-        EventType::ConnectivityChanged => 2100,
-        EventType::SelfavatarChanged => 2110,
-        EventType::WebxdcStatusUpdate { .. } => 2120,
-        EventType::WebxdcInstanceDeleted { .. } => 2121,
-        EventType::WebxdcBusyUpdating { .. } => 2022,
-        EventType::WebxdcUpToDate { .. } => 2023,
-    }
+    event.as_id()
 }
 
 #[no_mangle]
@@ -553,9 +504,6 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
             contact_id.to_u32() as libc::c_int
         }
         EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
-        EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
-        EventType::WebxdcBusyUpdating { msg_id } => msg_id.to_u32() as libc::c_int,
-        EventType::WebxdcUpToDate { msg_id } => msg_id.to_u32() as libc::c_int,
     }
 }
 
@@ -587,9 +535,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::ImexFileWritten(_)
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
-        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::WebxdcBusyUpdating { .. }
-        | EventType::WebxdcUpToDate { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
@@ -646,9 +591,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
         | EventType::WebxdcStatusUpdate { .. }
-        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::WebxdcBusyUpdating { .. }
-        | EventType::WebxdcUpToDate { .. }
         | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -706,13 +648,10 @@ pub unsafe extern "C" fn dc_get_next_event(events: *mut dc_event_emitter_t) -> *
     }
     let events = &*events;
 
-    block_on(async move {
-        events
-            .recv()
-            .await
-            .map(|ev| Box::into_raw(Box::new(ev)))
-            .unwrap_or_else(ptr::null_mut)
-    })
+    events
+        .recv_sync()
+        .map(|ev| Box::into_raw(Box::new(ev)))
+        .unwrap_or_else(ptr::null_mut)
 }
 
 #[no_mangle]
@@ -752,7 +691,7 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
     }
     let ctx = &*context;
     block_on(async move {
-        let addr = tools::EmailAddress::new(&to_string_lossy(addr))?;
+        let addr = dc_tools::EmailAddress::new(&to_string_lossy(addr))?;
         let public = key::SignedPublicKey::from_asc(&to_string_lossy(public_data))?.0;
         let secret = key::SignedSecretKey::from_asc(&to_string_lossy(secret_data))?.0;
         let keypair = key::KeyPair {
@@ -1220,11 +1159,6 @@ pub unsafe extern "C" fn dc_get_chat_media(
         return ptr::null_mut();
     }
     let ctx = &*context;
-    let chat_id = if chat_id == 0 {
-        None
-    } else {
-        Some(ChatId::new(chat_id))
-    };
     let msg_type = from_prim(msg_type).expect(&format!("invalid msg_type = {}", msg_type));
     let or_msg_type2 =
         from_prim(or_msg_type2).expect(&format!("incorrect or_msg_type2 = {}", or_msg_type2));
@@ -1233,10 +1167,16 @@ pub unsafe extern "C" fn dc_get_chat_media(
 
     block_on(async move {
         Box::into_raw(Box::new(
-            chat::get_chat_media(ctx, chat_id, msg_type, or_msg_type2, or_msg_type3)
-                .await
-                .unwrap_or_log_default(ctx, "Failed get_chat_media")
-                .into(),
+            chat::get_chat_media(
+                ctx,
+                ChatId::new(chat_id),
+                msg_type,
+                or_msg_type2,
+                or_msg_type3,
+            )
+            .await
+            .unwrap_or_log_default(ctx, "Failed get_chat_media")
+            .into(),
         ))
     })
 }
@@ -2256,7 +2196,7 @@ pub unsafe extern "C" fn dc_get_securejoin_qr(
         Some(ChatId::new(chat_id))
     };
 
-    block_on(securejoin::get_securejoin_qr(ctx, chat_id))
+    block_on(securejoin::dc_get_securejoin_qr(ctx, chat_id))
         .unwrap_or_else(|_| "".to_string())
         .strdup()
 }
@@ -2294,7 +2234,7 @@ pub unsafe extern "C" fn dc_join_securejoin(
     let ctx = &*context;
 
     block_on(async move {
-        securejoin::join_securejoin(ctx, &to_string_lossy(qr))
+        securejoin::dc_join_securejoin(ctx, &to_string_lossy(qr))
             .await
             .map(|chatid| chatid.to_u32())
             .log_err(ctx, "failed dc_join_securejoin() call")
@@ -2420,7 +2360,7 @@ pub unsafe extern "C" fn dc_get_last_error(context: *mut dc_context_t) -> *mut l
         return "".strdup();
     }
     let ctx = &*context;
-    ctx.get_last_error().strdup()
+    block_on(ctx.get_last_error()).strdup()
 }
 
 // dc_array_t
@@ -2793,16 +2733,6 @@ pub unsafe extern "C" fn dc_chat_get_name(chat: *mut dc_chat_t) -> *mut libc::c_
     ffi_chat.chat.get_name().strdup()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *mut libc::c_char {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_get_mailinglist_addr()");
-        return "".strdup();
-    }
-    let ffi_chat = &*chat;
-    ffi_chat.chat.get_mailinglist_addr().strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut libc::c_char {
     if chat.is_null() {
@@ -3616,8 +3546,7 @@ pub unsafe extern "C" fn dc_msg_latefiling_mediasize(
         ffi_msg
             .message
             .latefiling_mediasize(ctx, width, height, duration)
-    })
-    .ok_or_log_msg(ctx, "Cannot set media size");
+    });
 }
 
 #[no_mangle]
@@ -3871,16 +3800,6 @@ pub unsafe extern "C" fn dc_contact_get_last_seen(contact: *mut dc_contact_t) ->
     ffi_contact.contact.last_seen()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_was_seen_recently(contact: *mut dc_contact_t) -> libc::c_int {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_was_seen_recently()");
-        return 0;
-    }
-    let ffi_contact = &*contact;
-    ffi_contact.contact.was_seen_recently() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_contact_is_blocked(contact: *mut dc_contact_t) -> libc::c_int {
     if contact.is_null() {
@@ -4140,11 +4059,11 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {
 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
 /// `dc_accounts_t` in multiple threads at once.
 pub struct AccountsWrapper {
-    inner: Arc<RwLock<Accounts>>,
+    inner: RwLock<Accounts>,
 }
 
 impl Deref for AccountsWrapper {
-    type Target = Arc<RwLock<Accounts>>;
+    type Target = RwLock<Accounts>;
 
     fn deref(&self) -> &Self::Target {
         &self.inner
@@ -4153,7 +4072,7 @@ impl Deref for AccountsWrapper {
 
 impl AccountsWrapper {
     fn new(accounts: Accounts) -> Self {
-        let inner = Arc::new(RwLock::new(accounts));
+        let inner = RwLock::new(accounts);
         Self { inner }
     }
 }
@@ -4173,7 +4092,7 @@ pub unsafe extern "C" fn dc_accounts_new(
         return ptr::null_mut();
     }
 
-    let accs = block_on(Accounts::new(as_path(dbfile).into()));
+    let accs = block_on(Accounts::new(as_path(dbfile).to_path_buf().into()));
 
     match accs {
         Ok(accs) => Box::into_raw(Box::new(AccountsWrapper::new(accs))),
@@ -4345,7 +4264,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
     block_on(async move {
         let mut accounts = accounts.write().await;
         match accounts
-            .migrate_account(std::path::PathBuf::from(dbfile))
+            .migrate_account(async_std::path::PathBuf::from(dbfile))
             .await
         {
             Ok(id) => id,
@@ -4428,10 +4347,12 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
     block_on(async move { accounts.write().await.maybe_network_lost().await });
 }
 
+pub type dc_accounts_event_emitter_t = deltachat::accounts::EventEmitter;
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
     accounts: *mut dc_accounts_t,
-) -> *mut dc_event_emitter_t {
+) -> *mut dc_accounts_event_emitter_t {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_get_event_emitter()");
         return ptr::null_mut();
@@ -4443,76 +4364,29 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
     Box::into_raw(Box::new(emitter))
 }
 
-#[cfg(feature = "jsonrpc")]
-mod jsonrpc {
-    use super::*;
-    use deltachat_jsonrpc::api::CommandApi;
-    use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
-
-    pub struct dc_jsonrpc_instance_t {
-        receiver: OutReceiver,
-        handle: RpcSession<CommandApi>,
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_init(
-        account_manager: *mut dc_accounts_t,
-    ) -> *mut dc_jsonrpc_instance_t {
-        if account_manager.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_init()");
-            return ptr::null_mut();
-        }
-
-        let cmd_api =
-            deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());
-
-        let (request_handle, receiver) = RpcClient::new();
-        let handle = RpcSession::new(request_handle, cmd_api);
-
-        let instance = dc_jsonrpc_instance_t { receiver, handle };
-
-        Box::into_raw(Box::new(instance))
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_unref(jsonrpc_instance: *mut dc_jsonrpc_instance_t) {
-        if jsonrpc_instance.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_unref()");
-            return;
-        }
-
-        Box::from_raw(jsonrpc_instance);
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_request(
-        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-        request: *const libc::c_char,
-    ) {
-        if jsonrpc_instance.is_null() || request.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_request()");
-            return;
-        }
-
-        let api = &*jsonrpc_instance;
-        let handle = &api.handle;
-        let request = to_string_lossy(request);
-        spawn(async move {
-            handle.handle_incoming(&request).await;
-        });
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_next_response(
-        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-    ) -> *mut libc::c_char {
-        if jsonrpc_instance.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_next_response()");
-            return ptr::null_mut();
-        }
-        let api = &*jsonrpc_instance;
-        block_on(api.receiver.recv())
-            .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
-            .unwrap_or(ptr::null_mut())
+#[no_mangle]
+pub unsafe extern "C" fn dc_accounts_event_emitter_unref(
+    emitter: *mut dc_accounts_event_emitter_t,
+) {
+    if emitter.is_null() {
+        eprintln!("ignoring careless call to dc_accounts_event_emitter_unref()");
+        return;
     }
+    let _ = Box::from_raw(emitter);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_accounts_get_next_event(
+    emitter: *mut dc_accounts_event_emitter_t,
+) -> *mut dc_event_t {
+    if emitter.is_null() {
+        eprintln!("ignoring careless call to dc_accounts_get_next_event()");
+        return ptr::null_mut();
+    }
+    let emitter = &mut *emitter;
+
+    emitter
+        .recv_sync()
+        .map(|ev| Box::into_raw(Box::new(ev)))
+        .unwrap_or_else(ptr::null_mut)
 }

deltachat-ffi/src/lot.rs

@@ -51,7 +51,7 @@ impl Lot {
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                 Qr::Account { domain } => Some(domain),
                 Qr::WebrtcInstance { domain, .. } => Some(domain),
-                Qr::Addr { draft, .. } => draft.as_deref(),
+                Qr::Addr { .. } => None,
                 Qr::Url { url } => Some(url),
                 Qr::Text { text } => Some(text),
                 Qr::WithdrawVerifyContact { .. } => None,
@@ -79,13 +79,7 @@ impl Lot {
                 Some(SummaryPrefix::Username(_username)) => Meaning::Text1Username,
                 Some(SummaryPrefix::Me(_text)) => Meaning::Text1Self,
             },
-            Self::Qr(qr) => match qr {
-                Qr::Addr {
-                    draft: Some(_draft),
-                    ..
-                } => Meaning::Text1Draft,
-                _ => Meaning::None,
-            },
+            Self::Qr(_qr) => Meaning::None,
             Self::Error(_err) => Meaning::None,
         }
     }
@@ -124,7 +118,7 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Addr { contact_id, .. } => contact_id.to_u32(),
+                Qr::Addr { contact_id } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
                 Qr::Text { .. } => Default::default(),
                 Qr::WithdrawVerifyContact { contact_id, .. } => contact_id.to_u32(),

deltachat-ffi/src/string.rs

@@ -55,7 +55,7 @@ pub(crate) enum CStringError {
 /// # Example
 ///
 /// ```
-/// use deltachat::tools::{dc_strdup, OsStrExt};
+/// use deltachat::dc_tools::{dc_strdup, OsStrExt};
 /// let path = std::path::Path::new("/some/path");
 /// let path_c = path.to_c_string().unwrap();
 /// unsafe {

deltachat-jsonrpc/.gitignore

@@ -1,3 +0,0 @@
-accounts/
-
-.cargo

deltachat-jsonrpc/Cargo.toml

@@ -1,39 +0,0 @@
-[package]
-name = "deltachat-jsonrpc"
-version = "1.93.0"
-description = "DeltaChat JSON-RPC API"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
-edition = "2021"
-default-run = "deltachat-jsonrpc-server"
-license = "MPL-2.0"
-
-[[bin]]
-name = "deltachat-jsonrpc-server"
-path = "src/webserver.rs"
-required-features = ["webserver"]
-
-[dependencies]
-anyhow = "1"
-deltachat = { path = ".." }
-num-traits = "0.2"
-serde = { version = "1.0", features = ["derive"] }
-tempfile = "3.3.0"
-log = "0.4"
-async-channel = { version = "1.6.1" }
-futures = { version = "0.3.24" }
-serde_json = "1.0.85"
-yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
-typescript-type-def = { version = "0.5.3", features = ["json_value"] }
-tokio = { version = "1.19.2" }
-
-# optional dependencies
-axum = { version = "0.5.9", optional = true, features = ["ws"] }
-env_logger = { version = "0.9.0", optional = true }
-
-[dev-dependencies]
-tokio = { version = "1.19.2", features = ["full", "rt-multi-thread"] }
-
-
-[features]
-default = []
-webserver = ["env_logger", "axum", "tokio/full", "yerpc/support-axum"]

deltachat-jsonrpc/README.md

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

deltachat-jsonrpc/TODO.md

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

deltachat-jsonrpc/src/api/events.rs

@@ -1,166 +0,0 @@
-use deltachat::{Event, EventType};
-use serde::Serialize;
-use serde_json::{json, Value};
-use typescript_type_def::TypeDef;
-
-pub fn event_to_json_rpc_notification(event: Event) -> Value {
-    let (field1, field2): (Value, Value) = match &event.typ {
-        // events with a single string in field1
-        EventType::Info(txt)
-        | EventType::SmtpConnected(txt)
-        | EventType::ImapConnected(txt)
-        | EventType::SmtpMessageSent(txt)
-        | EventType::ImapMessageDeleted(txt)
-        | EventType::ImapMessageMoved(txt)
-        | EventType::NewBlobFile(txt)
-        | EventType::DeletedBlobFile(txt)
-        | EventType::Warning(txt)
-        | EventType::Error(txt)
-        | EventType::ErrorSelfNotInGroup(txt) => (json!(txt), Value::Null),
-        EventType::ImexFileWritten(path) => (json!(path.to_str()), Value::Null),
-        // single number
-        EventType::MsgsNoticed(chat_id) | EventType::ChatModified(chat_id) => {
-            (json!(chat_id), Value::Null)
-        }
-        EventType::ImexProgress(progress) => (json!(progress), Value::Null),
-        // both fields contain numbers
-        EventType::MsgsChanged { chat_id, msg_id }
-        | EventType::IncomingMsg { chat_id, msg_id }
-        | EventType::MsgDelivered { chat_id, msg_id }
-        | EventType::MsgFailed { chat_id, msg_id }
-        | EventType::MsgRead { chat_id, msg_id } => (json!(chat_id), json!(msg_id)),
-        EventType::ChatEphemeralTimerModified { chat_id, timer } => (json!(chat_id), json!(timer)),
-        EventType::SecurejoinInviterProgress {
-            contact_id,
-            progress,
-        }
-        | EventType::SecurejoinJoinerProgress {
-            contact_id,
-            progress,
-        } => (json!(contact_id), json!(progress)),
-        // field 1 number or null
-        EventType::ContactsChanged(maybe_number) | EventType::LocationChanged(maybe_number) => (
-            match maybe_number {
-                Some(number) => json!(number),
-                None => Value::Null,
-            },
-            Value::Null,
-        ),
-        // number and maybe string
-        EventType::ConfigureProgress { progress, comment } => (
-            json!(progress),
-            match comment {
-                Some(content) => json!(content),
-                None => Value::Null,
-            },
-        ),
-        EventType::ConnectivityChanged => (Value::Null, Value::Null),
-        EventType::SelfavatarChanged => (Value::Null, Value::Null),
-        EventType::WebxdcStatusUpdate {
-            msg_id,
-            status_update_serial,
-        } => (json!(msg_id), json!(status_update_serial)),
-        EventType::WebxdcInstanceDeleted { msg_id } => (json!(msg_id), Value::Null),
-        EventType::WebxdcBusyUpdating { msg_id } => (json!(msg_id), Value::Null),
-        EventType::WebxdcUpToDate { msg_id } => (json!(msg_id), Value::Null),
-    };
-
-    let id: EventTypeName = event.typ.into();
-    json!({
-        "id": id,
-        "contextId": event.id,
-        "field1": field1,
-        "field2": field2
-    })
-}
-
-#[derive(Serialize, TypeDef)]
-pub enum EventTypeName {
-    Info,
-    SmtpConnected,
-    ImapConnected,
-    SmtpMessageSent,
-    ImapMessageDeleted,
-    ImapMessageMoved,
-    NewBlobFile,
-    DeletedBlobFile,
-    Warning,
-    Error,
-    ErrorSelfNotInGroup,
-    MsgsChanged,
-    IncomingMsg,
-    MsgsNoticed,
-    MsgDelivered,
-    MsgFailed,
-    MsgRead,
-    ChatModified,
-    ChatEphemeralTimerModified,
-    ContactsChanged,
-    LocationChanged,
-    ConfigureProgress,
-    ImexProgress,
-    ImexFileWritten,
-    SecurejoinInviterProgress,
-    SecurejoinJoinerProgress,
-    ConnectivityChanged,
-    SelfavatarChanged,
-    WebxdcStatusUpdate,
-    WebxdcInstanceDeleted,
-    WebxdcBusyUpdating,
-    WebxdcUpToDate,
-}
-
-impl From<EventType> for EventTypeName {
-    fn from(event: EventType) -> Self {
-        use EventTypeName::*;
-        match event {
-            EventType::Info(_) => Info,
-            EventType::SmtpConnected(_) => SmtpConnected,
-            EventType::ImapConnected(_) => ImapConnected,
-            EventType::SmtpMessageSent(_) => SmtpMessageSent,
-            EventType::ImapMessageDeleted(_) => ImapMessageDeleted,
-            EventType::ImapMessageMoved(_) => ImapMessageMoved,
-            EventType::NewBlobFile(_) => NewBlobFile,
-            EventType::DeletedBlobFile(_) => DeletedBlobFile,
-            EventType::Warning(_) => Warning,
-            EventType::Error(_) => Error,
-            EventType::ErrorSelfNotInGroup(_) => ErrorSelfNotInGroup,
-            EventType::MsgsChanged { .. } => MsgsChanged,
-            EventType::IncomingMsg { .. } => IncomingMsg,
-            EventType::MsgsNoticed(_) => MsgsNoticed,
-            EventType::MsgDelivered { .. } => MsgDelivered,
-            EventType::MsgFailed { .. } => MsgFailed,
-            EventType::MsgRead { .. } => MsgRead,
-            EventType::ChatModified(_) => ChatModified,
-            EventType::ChatEphemeralTimerModified { .. } => ChatEphemeralTimerModified,
-            EventType::ContactsChanged(_) => ContactsChanged,
-            EventType::LocationChanged(_) => LocationChanged,
-            EventType::ConfigureProgress { .. } => ConfigureProgress,
-            EventType::ImexProgress(_) => ImexProgress,
-            EventType::ImexFileWritten(_) => ImexFileWritten,
-            EventType::SecurejoinInviterProgress { .. } => SecurejoinInviterProgress,
-            EventType::SecurejoinJoinerProgress { .. } => SecurejoinJoinerProgress,
-            EventType::ConnectivityChanged => ConnectivityChanged,
-            EventType::SelfavatarChanged => SelfavatarChanged,
-            EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
-            EventType::WebxdcInstanceDeleted { .. } => WebxdcInstanceDeleted,
-            EventType::WebxdcBusyUpdating { .. } => WebxdcBusyUpdating,
-            EventType::WebxdcUpToDate { .. } => WebxdcUpToDate,
-        }
-    }
-}
-
-#[cfg(test)]
-#[test]
-fn generate_events_ts_types_definition() {
-    let events = {
-        let mut buf = Vec::new();
-        let options = typescript_type_def::DefinitionFileOptions {
-            root_namespace: None,
-            ..typescript_type_def::DefinitionFileOptions::default()
-        };
-        typescript_type_def::write_definition_file::<_, EventTypeName>(&mut buf, options).unwrap();
-        String::from_utf8(buf).unwrap()
-    };
-    std::fs::write("typescript/generated/events.ts", events).unwrap();
-}

deltachat-jsonrpc/src/api/mod.rs

@@ -1,819 +0,0 @@
-use anyhow::{anyhow, bail, Context, Result};
-use deltachat::{
-    chat::{add_contact_to_chat, get_chat_media, get_chat_msgs, remove_contact_from_chat, ChatId},
-    chatlist::Chatlist,
-    config::Config,
-    contact::{may_be_valid_addr, Contact, ContactId},
-    context::get_info,
-    message::{delete_msgs, get_msg_info, Message, MsgId, Viewtype},
-    provider::get_provider_info,
-    qr,
-    qr_code_generator::get_securejoin_qr_svg,
-    securejoin,
-    webxdc::StatusUpdateSerial,
-};
-use std::collections::BTreeMap;
-use std::sync::Arc;
-use std::{collections::HashMap, str::FromStr};
-use tokio::sync::RwLock;
-use yerpc::rpc;
-
-pub use deltachat::accounts::Accounts;
-
-pub mod events;
-pub mod types;
-
-use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-use crate::api::types::QrObject;
-
-use types::account::Account;
-use types::chat::FullChat;
-use types::chat_list::ChatListEntry;
-use types::contact::ContactObject;
-use types::message::MessageObject;
-use types::provider_info::ProviderInfo;
-use types::webxdc::WebxdcMessageInfo;
-
-use self::types::message::MessageViewtype;
-
-#[derive(Clone, Debug)]
-pub struct CommandApi {
-    pub(crate) accounts: Arc<RwLock<Accounts>>,
-}
-
-impl CommandApi {
-    pub fn new(accounts: Accounts) -> Self {
-        CommandApi {
-            accounts: Arc::new(RwLock::new(accounts)),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
-        CommandApi { accounts }
-    }
-
-    async fn get_context(&self, id: u32) -> Result<deltachat::context::Context> {
-        let sc = self
-            .accounts
-            .read()
-            .await
-            .get_account(id)
-            .await
-            .ok_or_else(|| anyhow!("account with id {} not found", id))?;
-        Ok(sc)
-    }
-}
-
-#[rpc(all_positional, ts_outdir = "typescript/generated")]
-impl CommandApi {
-    // ---------------------------------------------
-    //  Misc top level functions
-    // ---------------------------------------------
-
-    /// Check if an email address is valid.
-    async fn check_email_validity(&self, email: String) -> bool {
-        may_be_valid_addr(&email)
-    }
-
-    /// Get general system info.
-    async fn get_system_info(&self) -> BTreeMap<&'static str, String> {
-        get_info()
-    }
-
-    // ---------------------------------------------
-    // Account Management
-    // ---------------------------------------------
-
-    async fn add_account(&self) -> Result<u32> {
-        self.accounts.write().await.add_account().await
-    }
-
-    async fn remove_account(&self, account_id: u32) -> Result<()> {
-        self.accounts.write().await.remove_account(account_id).await
-    }
-
-    async fn get_all_account_ids(&self) -> Vec<u32> {
-        self.accounts.read().await.get_all().await
-    }
-
-    /// Select account id for internally selected state.
-    /// TODO: Likely this is deprecated as all methods take an account id now.
-    async fn select_account(&self, id: u32) -> Result<()> {
-        self.accounts.write().await.select_account(id).await
-    }
-
-    /// Get the selected account id of the internal state..
-    /// TODO: Likely this is deprecated as all methods take an account id now.
-    async fn get_selected_account_id(&self) -> Option<u32> {
-        self.accounts.read().await.get_selected_account_id().await
-    }
-
-    /// Get a list of all configured accounts.
-    async fn get_all_accounts(&self) -> Result<Vec<Account>> {
-        let mut accounts = Vec::new();
-        for id in self.accounts.read().await.get_all().await {
-            let context_option = self.accounts.read().await.get_account(id).await;
-            if let Some(ctx) = context_option {
-                accounts.push(Account::from_context(&ctx, id).await?)
-            } else {
-                println!("account with id {} doesn't exist anymore", id);
-            }
-        }
-        Ok(accounts)
-    }
-
-    // ---------------------------------------------
-    // Methods that work on individual accounts
-    // ---------------------------------------------
-
-    /// Get top-level info for an account.
-    async fn get_account_info(&self, account_id: u32) -> Result<Account> {
-        let context_option = self.accounts.read().await.get_account(account_id).await;
-        if let Some(ctx) = context_option {
-            Ok(Account::from_context(&ctx, account_id).await?)
-        } else {
-            Err(anyhow!(
-                "account with id {} doesn't exist anymore",
-                account_id
-            ))
-        }
-    }
-
-    /// Returns provider for the given domain.
-    ///
-    /// This function looks up domain in offline database.
-    ///
-    /// For compatibility, email address can be passed to this function
-    /// instead of the domain.
-    async fn get_provider_info(
-        &self,
-        account_id: u32,
-        email: String,
-    ) -> Result<Option<ProviderInfo>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let socks5_enabled = ctx
-            .get_config_bool(deltachat::config::Config::Socks5Enabled)
-            .await?;
-
-        let provider_info =
-            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), socks5_enabled).await;
-        Ok(ProviderInfo::from_dc_type(provider_info))
-    }
-
-    /// Checks if the context is already configured.
-    async fn is_configured(&self, account_id: u32) -> Result<bool> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.is_configured().await
-    }
-
-    /// Get system info for an account.
-    async fn get_info(&self, account_id: u32) -> Result<BTreeMap<&'static str, String>> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.get_info().await
-    }
-
-    async fn set_config(&self, account_id: u32, key: String, value: Option<String>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        set_config(&ctx, &key, value.as_deref()).await
-    }
-
-    async fn batch_set_config(
-        &self,
-        account_id: u32,
-        config: HashMap<String, Option<String>>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        for (key, value) in config.into_iter() {
-            set_config(&ctx, &key, value.as_deref())
-                .await
-                .with_context(|| format!("Can't set {} to {:?}", key, value))?;
-        }
-        Ok(())
-    }
-
-    /// Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
-    /// Before this function is called, `checkQr()` should confirm the type of the
-    /// QR code is `account` or `webrtcInstance`.
-    ///
-    /// Internally, the function will call dc_set_config() with the appropriate keys,
-    async fn set_config_from_qr(&self, account_id: u32, qr_content: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        qr::set_config_from_qr(&ctx, &qr_content).await
-    }
-
-    async fn check_qr(&self, account_id: u32, qr_content: String) -> Result<QrObject> {
-        let ctx = self.get_context(account_id).await?;
-        let qr = qr::check_qr(&ctx, &qr_content).await?;
-        let qr_object = QrObject::from(qr);
-        Ok(qr_object)
-    }
-
-    async fn get_config(&self, account_id: u32, key: String) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        get_config(&ctx, &key).await
-    }
-
-    async fn batch_get_config(
-        &self,
-        account_id: u32,
-        keys: Vec<String>,
-    ) -> Result<HashMap<String, Option<String>>> {
-        let ctx = self.get_context(account_id).await?;
-        let mut result: HashMap<String, Option<String>> = HashMap::new();
-        for key in keys {
-            result.insert(key.clone(), get_config(&ctx, &key).await?);
-        }
-        Ok(result)
-    }
-
-    /// Configures this account with the currently set parameters.
-    /// Setup the credential config before calling this.
-    async fn configure(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.stop_io().await;
-        let result = ctx.configure().await;
-        if result.is_err() {
-            if let Ok(true) = ctx.is_configured().await {
-                ctx.start_io().await;
-            }
-            return result;
-        }
-        ctx.start_io().await;
-        Ok(())
-    }
-
-    /// Signal an ongoing process to stop.
-    async fn stop_ongoing_process(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.stop_ongoing().await;
-        Ok(())
-    }
-
-    /// Returns the message IDs of all _fresh_ messages of any chat.
-    /// Typically used for implementing notification summaries
-    /// or badge counters e.g. on the app icon.
-    /// The list is already sorted and starts with the most recent fresh message.
-    ///
-    /// Messages belonging to muted chats or to the contact requests are not returned;
-    /// these messages should not be notified
-    /// and also badge counters should not include these messages.
-    ///
-    /// To get the number of fresh messages for a single chat, muted or not,
-    /// use `get_fresh_msg_cnt()`.
-    async fn get_fresh_msgs(&self, account_id: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx
-            .get_fresh_msgs()
-            .await?
-            .iter()
-            .map(|msg_id| msg_id.to_u32())
-            .collect())
-    }
-
-    /// Get the number of _fresh_ messages in a chat.
-    /// Typically used to implement a badge with a number in the chatlist.
-    ///
-    /// If the specified chat is muted,
-    /// the UI should show the badge counter "less obtrusive",
-    /// e.g. using "gray" instead of "red" color.
-    async fn get_fresh_msg_cnt(&self, account_id: u32, chat_id: u32) -> Result<usize> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).get_fresh_msg_cnt(&ctx).await
-    }
-
-    // ---------------------------------------------
-    //  autocrypt
-    // ---------------------------------------------
-
-    async fn autocrypt_initiate_key_transfer(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        deltachat::imex::initiate_key_transfer(&ctx).await
-    }
-
-    async fn autocrypt_continue_key_transfer(
-        &self,
-        account_id: u32,
-        message_id: u32,
-        setup_code: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        deltachat::imex::continue_key_transfer(&ctx, MsgId::new(message_id), &setup_code).await
-    }
-
-    // ---------------------------------------------
-    //   chat list
-    // ---------------------------------------------
-
-    async fn get_chatlist_entries(
-        &self,
-        account_id: u32,
-        list_flags: Option<u32>,
-        query_string: Option<String>,
-        query_contact_id: Option<u32>,
-    ) -> Result<Vec<ChatListEntry>> {
-        let ctx = self.get_context(account_id).await?;
-        let list = Chatlist::try_load(
-            &ctx,
-            list_flags.unwrap_or(0) as usize,
-            query_string.as_deref(),
-            query_contact_id.map(ContactId::new),
-        )
-        .await?;
-        let mut l: Vec<ChatListEntry> = Vec::with_capacity(list.len());
-        for i in 0..list.len() {
-            l.push(ChatListEntry(
-                list.get_chat_id(i)?.to_u32(),
-                list.get_msg_id(i)?.unwrap_or_default().to_u32(),
-            ));
-        }
-        Ok(l)
-    }
-
-    async fn get_chatlist_items_by_entries(
-        &self,
-        account_id: u32,
-        entries: Vec<ChatListEntry>,
-    ) -> Result<HashMap<u32, ChatListItemFetchResult>> {
-        // todo custom json deserializer for ChatListEntry?
-        let ctx = self.get_context(account_id).await?;
-        let mut result: HashMap<u32, ChatListItemFetchResult> =
-            HashMap::with_capacity(entries.len());
-        for entry in entries.iter() {
-            result.insert(
-                entry.0,
-                match get_chat_list_item_by_id(&ctx, entry).await {
-                    Ok(res) => res,
-                    Err(err) => ChatListItemFetchResult::Error {
-                        id: entry.0,
-                        error: format!("{:?}", err),
-                    },
-                },
-            );
-        }
-        Ok(result)
-    }
-
-    // ---------------------------------------------
-    //  chat
-    // ---------------------------------------------
-
-    async fn chatlist_get_full_chat_by_id(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-    ) -> Result<FullChat> {
-        let ctx = self.get_context(account_id).await?;
-        FullChat::try_from_dc_chat_id(&ctx, chat_id).await
-    }
-
-    async fn accept_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).accept(&ctx).await
-    }
-
-    async fn block_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).block(&ctx).await
-    }
-
-    /// Delete a chat.
-    ///
-    /// Messages are deleted from the device and the chat database entry is deleted.
-    /// After that, the event #DC_EVENT_MSGS_CHANGED is posted.
-    ///
-    /// Things that are _not done_ implicitly:
-    ///
-    /// - Messages are **not deleted from the server**.
-    /// - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
-    ///   and the user may create the chat again.
-    /// - **Groups are not left** - this would
-    ///   be unexpected as (1) deleting a normal chat also does not prevent new mails
-    ///   from arriving, (2) leaving a group requires sending a message to
-    ///   all group members - especially for groups not used for a longer time, this is
-    ///   really unexpected when deletion results in contacting all members again,
-    ///   (3) only leaving groups is also a valid usecase.
-    ///
-    /// To leave a chat explicitly, use dc_remove_contact_from_chat() with
-    /// chat_id=DC_CONTACT_ID_SELF)
-    // TODO fix doc comment after adding dc_remove_contact_from_chat
-    async fn delete_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).delete(&ctx).await
-    }
-
-    /// 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.
-    ///
-    /// returns Multi-line text
-    async fn get_chat_encryption_info(&self, account_id: u32, chat_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).get_encryption_info(&ctx).await
-    }
-
-    /// Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
-    /// The QR code is compatible to the OPENPGP4FPR format
-    /// so that a basic fingerprint comparison also works e.g. with OpenKeychain.
-    ///
-    /// The scanning device will pass the scanned content to `checkQr()` then;
-    /// if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
-    /// an out-of-band-verification can be joined using dc_join_securejoin()
-    ///
-    /// chat_id: If set to a group-chat-id,
-    ///     the Verified-Group-Invite protocol is offered in the QR code;
-    ///     works for protected groups as well as for normal groups.
-    ///     If not set, the Setup-Contact protocol is offered in the QR code.
-    ///     See https://countermitm.readthedocs.io/en/latest/new.html
-    ///     for details about both protocols.
-    // TODO fix doc comment after adding dc_join_securejoin
-    async fn get_chat_securejoin_qr_code_svg(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-    ) -> Result<(String, String)> {
-        let ctx = self.get_context(account_id).await?;
-        let chat = chat_id.map(ChatId::new);
-        Ok((
-            securejoin::get_securejoin_qr(&ctx, chat).await?,
-            get_securejoin_qr_svg(&ctx, chat).await?,
-        ))
-    }
-
-    async fn leave_group(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        remove_contact_from_chat(&ctx, ChatId::new(chat_id), ContactId::SELF).await
-    }
-
-    /// Remove a member from a group.
-    ///
-    /// If the group is already _promoted_ (any message was sent to the group),
-    /// all group members are informed by a special status message that is sent automatically by this function.
-    ///
-    /// Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-    async fn remove_contact_from_chat(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        contact_id: u32,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        remove_contact_from_chat(&ctx, ChatId::new(chat_id), ContactId::new(contact_id)).await
-    }
-
-    /// Add a member to a group.
-    ///
-    /// If the group is already _promoted_ (any message was sent to the group),
-    /// all group members are informed by a special status message that is sent automatically by this function.
-    ///
-    /// If the group has group protection enabled, only verified contacts can be added to the group.
-    ///
-    /// Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-    async fn add_contact_to_chat(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        contact_id: u32,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        add_contact_to_chat(&ctx, ChatId::new(chat_id), ContactId::new(contact_id)).await
-    }
-
-    // for now only text messages, because we only used text messages in desktop thusfar
-    async fn add_device_message(
-        &self,
-        account_id: u32,
-        label: String,
-        text: String,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some(text));
-        let message_id =
-            deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut msg)).await?;
-        Ok(message_id.to_u32())
-    }
-
-    // ---------------------------------------------
-    // message list
-    // ---------------------------------------------
-
-    async fn message_list_get_message_ids(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        flags: u32,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let msg = get_chat_msgs(&ctx, ChatId::new(chat_id), flags).await?;
-        Ok(msg
-            .iter()
-            .filter_map(|chat_item| match chat_item {
-                deltachat::chat::ChatItem::Message { msg_id } => Some(msg_id.to_u32()),
-                _ => None,
-            })
-            .collect())
-    }
-
-    async fn message_get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
-        let ctx = self.get_context(account_id).await?;
-        MessageObject::from_message_id(&ctx, message_id).await
-    }
-
-    async fn message_get_messages(
-        &self,
-        account_id: u32,
-        message_ids: Vec<u32>,
-    ) -> Result<HashMap<u32, MessageObject>> {
-        let ctx = self.get_context(account_id).await?;
-        let mut messages: HashMap<u32, MessageObject> = HashMap::new();
-        for message_id in message_ids {
-            messages.insert(
-                message_id,
-                MessageObject::from_message_id(&ctx, message_id).await?,
-            );
-        }
-        Ok(messages)
-    }
-
-    /// Delete messages. The messages are deleted on the current device and
-    /// on the IMAP server.
-    async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs(&ctx, &msgs).await
-    }
-
-    /// Get an informational text for a single message. The text is multiline and may
-    /// contain e.g. the raw text of the message.
-    ///
-    /// The max. text returned is typically longer (about 100000 characters) than the
-    /// max. text returned by dc_msg_get_text() (about 30000 characters).
-    async fn get_message_info(&self, account_id: u32, message_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        get_msg_info(&ctx, MsgId::new(message_id)).await
-    }
-
-    // ---------------------------------------------
-    //  contact
-    // ---------------------------------------------
-
-    /// Get a single contact options by ID.
-    async fn contacts_get_contact(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<ContactObject> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_id = ContactId::new(contact_id);
-
-        ContactObject::try_from_dc_contact(
-            &ctx,
-            deltachat::contact::Contact::get_by_id(&ctx, contact_id).await?,
-        )
-        .await
-    }
-
-    /// Add a single contact as a result of an explicit user action.
-    ///
-    /// Returns contact id of the created or existing contact
-    async fn contacts_create_contact(
-        &self,
-        account_id: u32,
-        email: String,
-        name: Option<String>,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        if !may_be_valid_addr(&email) {
-            bail!(anyhow!(
-                "provided email address is not a valid email address"
-            ))
-        }
-        let contact_id = Contact::create(&ctx, &name.unwrap_or_default(), &email).await?;
-        Ok(contact_id.to_u32())
-    }
-
-    /// Returns contact id of the created or existing DM chat with that contact
-    async fn contacts_create_chat_by_contact_id(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let contact = Contact::get_by_id(&ctx, ContactId::new(contact_id)).await?;
-        ChatId::create_for_contact(&ctx, contact.id)
-            .await
-            .map(|id| id.to_u32())
-    }
-
-    async fn contacts_block(&self, account_id: u32, contact_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        Contact::block(&ctx, ContactId::new(contact_id)).await
-    }
-
-    async fn contacts_unblock(&self, account_id: u32, contact_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        Contact::unblock(&ctx, ContactId::new(contact_id)).await
-    }
-
-    async fn contacts_get_blocked(&self, account_id: u32) -> Result<Vec<ContactObject>> {
-        let ctx = self.get_context(account_id).await?;
-        let blocked_ids = Contact::get_all_blocked(&ctx).await?;
-        let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len());
-        for id in blocked_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    &ctx,
-                    deltachat::contact::Contact::get_by_id(&ctx, id).await?,
-                )
-                .await?,
-            );
-        }
-        Ok(contacts)
-    }
-
-    async fn contacts_get_contact_ids(
-        &self,
-        account_id: u32,
-        list_flags: u32,
-        query: Option<String>,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts = Contact::get_all(&ctx, list_flags, query.as_deref()).await?;
-        Ok(contacts.into_iter().map(|c| c.to_u32()).collect())
-    }
-
-    /// Get a list of contacts.
-    /// (formerly called getContacts2 in desktop)
-    async fn contacts_get_contacts(
-        &self,
-        account_id: u32,
-        list_flags: u32,
-        query: Option<String>,
-    ) -> Result<Vec<ContactObject>> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_ids = Contact::get_all(&ctx, list_flags, query.as_deref()).await?;
-        let mut contacts: Vec<ContactObject> = Vec::with_capacity(contact_ids.len());
-        for id in contact_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    &ctx,
-                    deltachat::contact::Contact::get_by_id(&ctx, id).await?,
-                )
-                .await?,
-            );
-        }
-        Ok(contacts)
-    }
-
-    async fn contacts_get_contacts_by_ids(
-        &self,
-        account_id: u32,
-        ids: Vec<u32>,
-    ) -> Result<HashMap<u32, ContactObject>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let mut contacts = HashMap::with_capacity(ids.len());
-        for id in ids {
-            contacts.insert(
-                id,
-                ContactObject::try_from_dc_contact(
-                    &ctx,
-                    deltachat::contact::Contact::get_by_id(&ctx, ContactId::new(id)).await?,
-                )
-                .await?,
-            );
-        }
-        Ok(contacts)
-    }
-    // ---------------------------------------------
-    //                   chat
-    // ---------------------------------------------
-
-    /// Returns all message IDs of the given types in a chat.
-    /// Typically used to show a gallery.
-    ///
-    /// The list is already sorted and starts with the oldest message.
-    /// Clients should not try to re-sort the list as this would be an expensive action
-    /// and would result in inconsistencies between clients.
-    ///
-    /// Setting `chat_id` to `None` (`null` in typescript) means get messages with media
-    /// from any chat of the currently used account.
-    async fn chat_get_media(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-        message_type: MessageViewtype,
-        or_message_type2: Option<MessageViewtype>,
-        or_message_type3: Option<MessageViewtype>,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let chat_id = match chat_id {
-            None | Some(0) => None,
-            Some(id) => Some(ChatId::new(id)),
-        };
-        let msg_type = message_type.into();
-        let or_msg_type2 = or_message_type2.map_or(Viewtype::Unknown, |v| v.into());
-        let or_msg_type3 = or_message_type3.map_or(Viewtype::Unknown, |v| v.into());
-
-        let media = get_chat_media(&ctx, chat_id, msg_type, or_msg_type2, or_msg_type3).await?;
-        Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
-    }
-
-    // ---------------------------------------------
-    //                   webxdc
-    // ---------------------------------------------
-
-    async fn webxdc_send_status_update(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        update_str: String,
-        description: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.send_webxdc_status_update(MsgId::new(instance_msg_id), &update_str, &description)
-            .await
-    }
-
-    async fn webxdc_get_status_updates(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        last_known_serial: u32,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.get_webxdc_status_updates(
-            MsgId::new(instance_msg_id),
-            StatusUpdateSerial::new(last_known_serial),
-        )
-        .await
-    }
-
-    /// Get info from a webxdc message
-    async fn message_get_webxdc_info(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-    ) -> Result<WebxdcMessageInfo> {
-        let ctx = self.get_context(account_id).await?;
-        WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
-    }
-
-    // ---------------------------------------------
-    //           misc prototyping functions
-    //       that might get removed later again
-    // ---------------------------------------------
-
-    /// Returns the messageid of the sent message
-    async fn misc_send_text_message(
-        &self,
-        account_id: u32,
-        text: String,
-        chat_id: u32,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some(text));
-
-        let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
-        Ok(message_id.to_u32())
-    }
-}
-
-// Helper functions (to prevent code duplication)
-async fn set_config(
-    ctx: &deltachat::context::Context,
-    key: &str,
-    value: Option<&str>,
-) -> Result<(), anyhow::Error> {
-    if key.starts_with("ui.") {
-        ctx.set_ui_config(key, value).await?;
-    } else {
-        ctx.set_config(Config::from_str(key).context("unknown key")?, value)
-            .await?;
-
-        match key {
-            "sentbox_watch" | "mvbox_move" | "only_fetch_mvbox" => {
-                ctx.restart_io_if_running().await;
-            }
-            _ => {}
-        }
-    }
-    Ok(())
-}
-
-async fn get_config(
-    ctx: &deltachat::context::Context,
-    key: &str,
-) -> Result<Option<String>, anyhow::Error> {
-    if key.starts_with("ui.") {
-        ctx.get_ui_config(key).await
-    } else {
-        ctx.get_config(Config::from_str(key).context("unknown key")?)
-            .await
-    }
-}

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

@@ -1,45 +0,0 @@
-use anyhow::Result;
-use deltachat::config::Config;
-use deltachat::contact::{Contact, ContactId};
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Serialize, TypeDef)]
-#[serde(tag = "type")]
-pub enum Account {
-    #[serde(rename_all = "camelCase")]
-    Configured {
-        id: u32,
-        display_name: Option<String>,
-        addr: Option<String>,
-        // size: u32,
-        profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
-        color: String,
-    },
-    #[serde(rename_all = "camelCase")]
-    Unconfigured { id: u32 },
-}
-
-impl Account {
-    pub async fn from_context(ctx: &deltachat::context::Context, id: u32) -> Result<Self> {
-        if ctx.is_configured().await? {
-            let display_name = ctx.get_config(Config::Displayname).await?;
-            let addr = ctx.get_config(Config::Addr).await?;
-            let profile_image = ctx.get_config(Config::Selfavatar).await?;
-            let color = color_int_to_hex_string(
-                Contact::get_by_id(ctx, ContactId::SELF).await?.get_color(),
-            );
-            Ok(Account::Configured {
-                id,
-                display_name,
-                addr,
-                profile_image,
-                color,
-            })
-        } else {
-            Ok(Account::Unconfigured { id })
-        }
-    }
-}

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

@@ -1,106 +0,0 @@
-use anyhow::{anyhow, Result};
-use deltachat::chat::get_chat_contacts;
-use deltachat::chat::{Chat, ChatId};
-use deltachat::constants::Chattype;
-use deltachat::contact::{Contact, ContactId};
-use deltachat::context::Context;
-use num_traits::cast::ToPrimitive;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-use super::contact::ContactObject;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct FullChat {
-    id: u32,
-    name: String,
-    is_protected: bool,
-    profile_image: Option<String>, //BLOBS ?
-    archived: bool,
-    // subtitle  - will be moved to frontend because it uses translation functions
-    chat_type: u32,
-    is_unpromoted: bool,
-    is_self_talk: bool,
-    contacts: Vec<ContactObject>,
-    contact_ids: Vec<u32>,
-    color: String,
-    fresh_message_counter: usize,
-    // is_group - please check over chat.type in frontend instead
-    is_contact_request: bool,
-    is_device_chat: bool,
-    self_in_group: bool,
-    is_muted: bool,
-    ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
-    can_send: bool,
-    was_seen_recently: bool,
-}
-
-impl FullChat {
-    pub async fn try_from_dc_chat_id(context: &Context, chat_id: u32) -> Result<Self> {
-        let rust_chat_id = ChatId::new(chat_id);
-        let chat = Chat::load_from_db(context, rust_chat_id).await?;
-
-        let contact_ids = get_chat_contacts(context, rust_chat_id).await?;
-
-        let mut contacts = Vec::with_capacity(contact_ids.len());
-
-        for contact_id in &contact_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    context,
-                    Contact::load_from_db(context, *contact_id).await?,
-                )
-                .await?,
-            )
-        }
-
-        let profile_image = match chat.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        let color = color_int_to_hex_string(chat.get_color(context).await?);
-        let fresh_message_counter = rust_chat_id.get_fresh_msg_cnt(context).await?;
-        let ephemeral_timer = rust_chat_id.get_ephemeral_timer(context).await?.to_u32();
-
-        let can_send = chat.can_send(context).await?;
-
-        let was_seen_recently = if chat.get_type() == Chattype::Single {
-            match contact_ids.get(0) {
-                Some(contact) => Contact::load_from_db(context, *contact)
-                    .await?
-                    .was_seen_recently(),
-                None => false,
-            }
-        } else {
-            false
-        };
-
-        Ok(FullChat {
-            id: chat_id,
-            name: chat.name.clone(),
-            is_protected: chat.is_protected(),
-            profile_image, //BLOBS ?
-            archived: chat.get_visibility() == deltachat::chat::ChatVisibility::Archived,
-            chat_type: chat
-                .get_type()
-                .to_u32()
-                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
-            is_unpromoted: chat.is_unpromoted(),
-            is_self_talk: chat.is_self_talk(),
-            contacts,
-            contact_ids: contact_ids.iter().map(|id| id.to_u32()).collect(),
-            color,
-            fresh_message_counter,
-            is_contact_request: chat.is_contact_request(),
-            is_device_chat: chat.is_device_talk(),
-            self_in_group: contact_ids.contains(&ContactId::SELF),
-            is_muted: chat.is_muted(),
-            ephemeral_timer,
-            can_send,
-            was_seen_recently,
-        })
-    }
-}

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

@@ -1,141 +0,0 @@
-use anyhow::Result;
-use deltachat::constants::*;
-use deltachat::contact::{Contact, ContactId};
-use deltachat::{
-    chat::{get_chat_contacts, ChatVisibility},
-    chatlist::Chatlist,
-};
-use deltachat::{
-    chat::{Chat, ChatId},
-    message::MsgId,
-};
-use num_traits::cast::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Deserialize, Serialize, TypeDef)]
-pub struct ChatListEntry(pub u32, pub u32);
-
-#[derive(Serialize, TypeDef)]
-#[serde(tag = "type")]
-pub enum ChatListItemFetchResult {
-    #[serde(rename_all = "camelCase")]
-    ChatListItem {
-        id: u32,
-        name: String,
-        avatar_path: Option<String>,
-        color: String,
-        last_updated: Option<i64>,
-        summary_text1: String,
-        summary_text2: String,
-        summary_status: u32,
-        is_protected: bool,
-        is_group: bool,
-        fresh_message_counter: usize,
-        is_self_talk: bool,
-        is_device_talk: bool,
-        is_sending_location: bool,
-        is_self_in_group: bool,
-        is_archived: bool,
-        is_pinned: bool,
-        is_muted: bool,
-        is_contact_request: bool,
-        /// true when chat is a broadcastlist
-        is_broadcast: bool,
-        /// contact id if this is a dm chat (for view profile entry in context menu)
-        dm_chat_contact: Option<u32>,
-        was_seen_recently: bool,
-    },
-    ArchiveLink,
-    #[serde(rename_all = "camelCase")]
-    Error {
-        id: u32,
-        error: String,
-    },
-}
-
-pub(crate) async fn get_chat_list_item_by_id(
-    ctx: &deltachat::context::Context,
-    entry: &ChatListEntry,
-) -> Result<ChatListItemFetchResult> {
-    let chat_id = ChatId::new(entry.0);
-    let last_msgid = match entry.1 {
-        0 => None,
-        _ => Some(MsgId::new(entry.1)),
-    };
-
-    if chat_id.is_archived_link() {
-        return Ok(ChatListItemFetchResult::ArchiveLink);
-    }
-
-    let chat = Chat::load_from_db(ctx, chat_id).await?;
-    let summary = Chatlist::get_summary2(ctx, chat_id, last_msgid, Some(&chat)).await?;
-
-    let summary_text1 = summary.prefix.map_or_else(String::new, |s| s.to_string());
-    let summary_text2 = summary.text.to_owned();
-
-    let visibility = chat.get_visibility();
-
-    let avatar_path = chat
-        .get_profile_image(ctx)
-        .await?
-        .map(|path| path.to_str().unwrap_or("invalid/path").to_owned());
-
-    let last_updated = match last_msgid {
-        Some(id) => {
-            let last_message = deltachat::message::Message::load_from_db(ctx, id).await?;
-            Some(last_message.get_timestamp() * 1000)
-        }
-        None => None,
-    };
-
-    let chat_contacts = get_chat_contacts(ctx, chat_id).await?;
-
-    let self_in_group = chat_contacts.contains(&ContactId::SELF);
-
-    let (dm_chat_contact, was_seen_recently) = if chat.get_type() == Chattype::Single {
-        let contact = chat_contacts.get(0);
-        let was_seen_recently = match contact {
-            Some(contact) => Contact::load_from_db(ctx, *contact)
-                .await?
-                .was_seen_recently(),
-            None => false,
-        };
-        (
-            contact.map(|contact_id| contact_id.to_u32()),
-            was_seen_recently,
-        )
-    } else {
-        (None, false)
-    };
-
-    let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
-    let color = color_int_to_hex_string(chat.get_color(ctx).await?);
-
-    Ok(ChatListItemFetchResult::ChatListItem {
-        id: chat_id.to_u32(),
-        name: chat.get_name().to_owned(),
-        avatar_path,
-        color,
-        last_updated,
-        summary_text1,
-        summary_text2,
-        summary_status: summary.state.to_u32().expect("impossible"), // idea and a function to transform the constant to strings? or return string enum
-        is_protected: chat.is_protected(),
-        is_group: chat.get_type() == Chattype::Group,
-        fresh_message_counter,
-        is_self_talk: chat.is_self_talk(),
-        is_device_talk: chat.is_device_talk(),
-        is_self_in_group: self_in_group,
-        is_sending_location: chat.is_sending_locations(),
-        is_archived: visibility == ChatVisibility::Archived,
-        is_pinned: visibility == ChatVisibility::Pinned,
-        is_muted: chat.is_muted(),
-        is_contact_request: chat.is_contact_request(),
-        is_broadcast: chat.get_type() == Chattype::Broadcast,
-        dm_chat_contact,
-        was_seen_recently,
-    })
-}

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

@@ -1,52 +0,0 @@
-use anyhow::Result;
-use deltachat::contact::VerifiedStatus;
-use deltachat::context::Context;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Contact", rename_all = "camelCase")]
-pub struct ContactObject {
-    address: String,
-    color: String,
-    auth_name: String,
-    status: String,
-    display_name: String,
-    id: u32,
-    name: String,
-    profile_image: Option<String>, // BLOBS
-    name_and_addr: String,
-    is_blocked: bool,
-    is_verified: bool,
-    was_seen_recently: bool,
-}
-
-impl ContactObject {
-    pub async fn try_from_dc_contact(
-        context: &Context,
-        contact: deltachat::contact::Contact,
-    ) -> Result<Self> {
-        let profile_image = match contact.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-        let is_verified = contact.is_verified(context).await? == VerifiedStatus::BidirectVerified;
-
-        Ok(ContactObject {
-            address: contact.get_addr().to_owned(),
-            color: color_int_to_hex_string(contact.get_color()),
-            auth_name: contact.get_authname().to_owned(),
-            status: contact.get_status().to_owned(),
-            display_name: contact.get_display_name().to_owned(),
-            id: contact.id.to_u32(),
-            name: contact.get_name().to_owned(),
-            profile_image, //BLOBS
-            name_and_addr: contact.get_name_n_addr(),
-            is_blocked: contact.is_blocked(),
-            is_verified,
-            was_seen_recently: contact.was_seen_recently(),
-        })
-    }
-}

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

@@ -1,212 +0,0 @@
-use anyhow::{anyhow, Result};
-use deltachat::contact::Contact;
-use deltachat::context::Context;
-use deltachat::message::Message;
-use deltachat::message::MsgId;
-use deltachat::message::Viewtype;
-use num_traits::cast::ToPrimitive;
-use serde::Deserialize;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::contact::ContactObject;
-use super::webxdc::WebxdcMessageInfo;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Message", rename_all = "camelCase")]
-pub struct MessageObject {
-    id: u32,
-    chat_id: u32,
-    from_id: u32,
-    quoted_text: Option<String>,
-    quoted_message_id: Option<u32>,
-    text: Option<String>,
-    has_location: bool,
-    has_html: bool,
-    view_type: MessageViewtype,
-    state: u32,
-
-    timestamp: i64,
-    sort_timestamp: i64,
-    received_timestamp: i64,
-    has_deviating_timestamp: bool,
-
-    // summary - use/create another function if you need it
-    subject: String,
-    show_padlock: bool,
-    is_setupmessage: bool,
-    is_info: bool,
-    is_forwarded: bool,
-
-    duration: i32,
-    dimensions_height: i32,
-    dimensions_width: i32,
-
-    videochat_type: Option<u32>,
-    videochat_url: Option<String>,
-
-    override_sender_name: Option<String>,
-    sender: ContactObject,
-
-    setup_code_begin: Option<String>,
-
-    file: Option<String>,
-    file_mime: Option<String>,
-    file_bytes: u64,
-    file_name: Option<String>,
-
-    webxdc_info: Option<WebxdcMessageInfo>,
-}
-
-impl MessageObject {
-    pub async fn from_message_id(context: &Context, message_id: u32) -> Result<Self> {
-        let msg_id = MsgId::new(message_id);
-        let message = Message::load_from_db(context, msg_id).await?;
-
-        let quoted_message_id = message
-            .quoted_message(context)
-            .await?
-            .map(|m| m.get_id().to_u32());
-
-        let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
-        let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
-        let file_bytes = message.get_filebytes(context).await;
-        let override_sender_name = message.get_override_sender_name();
-
-        let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
-            Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?)
-        } else {
-            None
-        };
-
-        Ok(MessageObject {
-            id: message_id,
-            chat_id: message.get_chat_id().to_u32(),
-            from_id: message.get_from_id().to_u32(),
-            quoted_text: message.quoted_text(),
-            quoted_message_id,
-            text: message.get_text(),
-            has_location: message.has_location(),
-            has_html: message.has_html(),
-            view_type: message.get_viewtype().into(),
-            state: message
-                .get_state()
-                .to_u32()
-                .ok_or_else(|| anyhow!("state conversion to number failed"))?,
-
-            timestamp: message.get_timestamp(),
-            sort_timestamp: message.get_sort_timestamp(),
-            received_timestamp: message.get_received_timestamp(),
-            has_deviating_timestamp: message.has_deviating_timestamp(),
-
-            subject: message.get_subject().to_owned(),
-            show_padlock: message.get_showpadlock(),
-            is_setupmessage: message.is_setupmessage(),
-            is_info: message.is_info(),
-            is_forwarded: message.is_forwarded(),
-
-            duration: message.get_duration(),
-            dimensions_height: message.get_height(),
-            dimensions_width: message.get_width(),
-
-            videochat_type: match message.get_videochat_type() {
-                Some(vct) => Some(
-                    vct.to_u32()
-                        .ok_or_else(|| anyhow!("state conversion to number failed"))?,
-                ),
-                None => None,
-            },
-            videochat_url: message.get_videochat_url(),
-
-            override_sender_name,
-            sender,
-
-            setup_code_begin: message.get_setupcodebegin(context).await,
-
-            file: match message.get_file(context) {
-                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-                None => None,
-            }, //BLOBS
-            file_mime: message.get_filemime(),
-            file_bytes,
-            file_name: message.get_filename(),
-            webxdc_info,
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef)]
-#[serde(rename = "Viewtype")]
-pub enum MessageViewtype {
-    Unknown,
-
-    /// Text message.
-    Text,
-
-    /// Image message.
-    /// If the image is an animated GIF, the type `Viewtype.Gif` should be used.
-    Image,
-
-    /// Animated GIF message.
-    Gif,
-
-    /// Message containing a sticker, similar to image.
-    /// If possible, the ui should display the image without borders in a transparent way.
-    /// A click on a sticker will offer to install the sticker set in some future.
-    Sticker,
-
-    /// Message containing an Audio file.
-    Audio,
-
-    /// A voice message that was directly recorded by the user.
-    /// For all other audio messages, the type `Viewtype.Audio` should be used.
-    Voice,
-
-    /// Video messages.
-    Video,
-
-    /// Message containing any file, eg. a PDF.
-    File,
-
-    /// Message is an invitation to a videochat.
-    VideochatInvitation,
-
-    /// Message is an webxdc instance.
-    Webxdc,
-}
-
-impl From<Viewtype> for MessageViewtype {
-    fn from(viewtype: Viewtype) -> Self {
-        match viewtype {
-            Viewtype::Unknown => MessageViewtype::Unknown,
-            Viewtype::Text => MessageViewtype::Text,
-            Viewtype::Image => MessageViewtype::Image,
-            Viewtype::Gif => MessageViewtype::Gif,
-            Viewtype::Sticker => MessageViewtype::Sticker,
-            Viewtype::Audio => MessageViewtype::Audio,
-            Viewtype::Voice => MessageViewtype::Voice,
-            Viewtype::Video => MessageViewtype::Video,
-            Viewtype::File => MessageViewtype::File,
-            Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
-            Viewtype::Webxdc => MessageViewtype::Webxdc,
-        }
-    }
-}
-
-impl From<MessageViewtype> for Viewtype {
-    fn from(viewtype: MessageViewtype) -> Self {
-        match viewtype {
-            MessageViewtype::Unknown => Viewtype::Unknown,
-            MessageViewtype::Text => Viewtype::Text,
-            MessageViewtype::Image => Viewtype::Image,
-            MessageViewtype::Gif => Viewtype::Gif,
-            MessageViewtype::Sticker => Viewtype::Sticker,
-            MessageViewtype::Audio => Viewtype::Audio,
-            MessageViewtype::Voice => Viewtype::Voice,
-            MessageViewtype::Video => Viewtype::Video,
-            MessageViewtype::File => Viewtype::File,
-            MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
-            MessageViewtype::Webxdc => Viewtype::Webxdc,
-        }
-    }
-}

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

@@ -1,229 +0,0 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-pub mod account;
-pub mod chat;
-pub mod chat_list;
-pub mod contact;
-pub mod message;
-pub mod provider_info;
-pub mod webxdc;
-
-pub fn color_int_to_hex_string(color: u32) -> String {
-    format!("{:#08x}", color).replace("0x", "#")
-}
-
-fn maybe_empty_string_to_option(string: String) -> Option<String> {
-    if string.is_empty() {
-        None
-    } else {
-        Some(string)
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum QrObject {
-    AskVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    AskVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    FprOk {
-        contact_id: u32,
-    },
-    FprMismatch {
-        contact_id: Option<u32>,
-    },
-    FprWithoutAddr {
-        fingerprint: String,
-    },
-    Account {
-        domain: String,
-    },
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    Addr {
-        contact_id: u32,
-        draft: Option<String>,
-    },
-    Url {
-        url: String,
-    },
-    Text {
-        text: String,
-    },
-    WithdrawVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    WithdrawVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-use deltachat::provider::Provider;
-use num_traits::cast::ToPrimitive;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct ProviderInfo {
-    pub before_login_hint: String,
-    pub overview_page: String,
-    pub status: u32, // in reality this is an enum, but for simlicity and because it gets converted into a number anyway, we use an u32 here.
-}
-
-impl ProviderInfo {
-    pub fn from_dc_type(provider: Option<&Provider>) -> Option<Self> {
-        provider.map(|p| ProviderInfo {
-            before_login_hint: p.before_login_hint.to_owned(),
-            overview_page: p.overview_page.to_owned(),
-            status: p.status.to_u32().unwrap(),
-        })
-    }
-}

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

@@ -1,64 +0,0 @@
-use deltachat::{
-    context::Context,
-    message::{Message, MsgId},
-    webxdc::WebxdcInfo,
-};
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::maybe_empty_string_to_option;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "WebxdcMessageInfo", rename_all = "camelCase")]
-pub struct WebxdcMessageInfo {
-    /// The name of the app.
-    ///
-    /// Defaults to the filename if not set in the manifest.
-    name: String,
-    /// App icon file name.
-    /// Defaults to an standard icon if nothing is set in the manifest.
-    ///
-    /// To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
-    ///
-    /// App icons should should be square,
-    /// the implementations will add round corners etc. as needed.
-    icon: String,
-    /// if the Webxdc represents a document, then this is the name of the document
-    document: Option<String>,
-    /// short string describing the state of the app,
-    /// sth. as "2 votes", "Highscore: 123",
-    /// can be changed by the apps
-    summary: Option<String>,
-    /// 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.
-    source_code_url: Option<String>,
-    /// True if full internet access should be granted to the app.
-    internet_access: bool,
-}
-
-impl WebxdcMessageInfo {
-    pub async fn get_for_message(
-        context: &Context,
-        instance_message_id: MsgId,
-    ) -> anyhow::Result<Self> {
-        let message = Message::load_from_db(context, instance_message_id).await?;
-        let WebxdcInfo {
-            name,
-            icon,
-            document,
-            summary,
-            source_code_url,
-            internet_access,
-        } = message.get_webxdc_info(context).await?;
-
-        Ok(Self {
-            name,
-            icon,
-            document: maybe_empty_string_to_option(document),
-            summary: maybe_empty_string_to_option(summary),
-            source_code_url: maybe_empty_string_to_option(source_code_url),
-            internet_access,
-        })
-    }
-}

deltachat-jsonrpc/src/lib.rs

@@ -1,92 +0,0 @@
-pub mod api;
-pub use api::events;
-pub use yerpc;
-
-#[cfg(test)]
-mod tests {
-    use super::api::{Accounts, CommandApi};
-    use async_channel::unbounded;
-    use futures::StreamExt;
-    use tempfile::TempDir;
-    use yerpc::{RpcClient, RpcSession};
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
-        let tmp_dir = TempDir::new().unwrap().path().into();
-        let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
-
-        let (sender, mut receiver) = unbounded::<String>();
-
-        let (client, mut rx) = RpcClient::new();
-        let session = RpcSession::new(client, api);
-        tokio::spawn({
-            async move {
-                while let Some(message) = rx.next().await {
-                    let message = serde_json::to_string(&message)?;
-                    sender.send(message).await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        {
-            let request = r#"{"jsonrpc":"2.0","method":"add_account","params":[],"id":1}"#;
-            let response = r#"{"jsonrpc":"2.0","id":1,"result":1}"#;
-            session.handle_incoming(request).await;
-            let result = receiver.next().await;
-            println!("{:?}", result);
-            assert_eq!(result, Some(response.to_owned()));
-        }
-        {
-            let request = r#"{"jsonrpc":"2.0","method":"get_all_account_ids","params":[],"id":2}"#;
-            let response = r#"{"jsonrpc":"2.0","id":2,"result":[1]}"#;
-            session.handle_incoming(request).await;
-            let result = receiver.next().await;
-            println!("{:?}", result);
-            assert_eq!(result, Some(response.to_owned()));
-        }
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_batch_set_config() -> anyhow::Result<()> {
-        let tmp_dir = TempDir::new().unwrap().path().into();
-        let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
-
-        let (sender, mut receiver) = unbounded::<String>();
-
-        let (client, mut rx) = RpcClient::new();
-        let session = RpcSession::new(client, api);
-        tokio::spawn({
-            async move {
-                while let Some(message) = rx.next().await {
-                    let message = serde_json::to_string(&message)?;
-                    sender.send(message).await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        {
-            let request = r#"{"jsonrpc":"2.0","method":"add_account","params":[],"id":1}"#;
-            let response = r#"{"jsonrpc":"2.0","id":1,"result":1}"#;
-            session.handle_incoming(request).await;
-            let result = receiver.next().await;
-            assert_eq!(result, Some(response.to_owned()));
-        }
-        {
-            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":"","socks5_enabled":"0","socks5_host":"","socks5_port":"","socks5_user":"","socks5_password":""}]}"#;
-            let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#;
-            session.handle_incoming(request).await;
-            let result = receiver.next().await;
-            assert_eq!(result, Some(response.to_owned()));
-        }
-
-        Ok(())
-    }
-}

deltachat-jsonrpc/src/webserver.rs

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

deltachat-jsonrpc/typescript/.gitignore

@@ -1,8 +0,0 @@
-node_modules
-dist
-test_dist
-coverage
-yarn.lock
-package-lock.json
-docs
-accounts

deltachat-jsonrpc/typescript/.npmignore

@@ -1,6 +0,0 @@
-node_modules
-accounts
-docs
-coverage
-yarn*
-package-lock.json

deltachat-jsonrpc/typescript/.prettierignore

@@ -1,3 +0,0 @@
-coverage
-dist
-generated

deltachat-jsonrpc/typescript/deltachat.ts

@@ -1 +0,0 @@
-export * from "./src/lib.js";

deltachat-jsonrpc/typescript/example.html

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

deltachat-jsonrpc/typescript/example/example.ts

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

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

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

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

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

deltachat-jsonrpc/typescript/generated/client.ts

@@ -1,439 +0,0 @@
-// AUTO-GENERATED by yerpc-derive
-
-import * as T from "./types.js"
-import * as RPC from "./jsonrpc.js"
-
-type RequestMethod = (method: string, params?: RPC.Params) => Promise<unknown>;
-type NotificationMethod = (method: string, params?: RPC.Params) => void;
-
-interface Transport {
-  request: RequestMethod,
-  notification: NotificationMethod
-}
-
-export class RawClient {
-  constructor(private _transport: Transport) {}
-
-  /**
-   * Check if an email address is valid.
-   */
-  public checkEmailValidity(email: string): Promise<boolean> {
-    return (this._transport.request('check_email_validity', [email] as RPC.Params)) as Promise<boolean>;
-  }
-
-  /**
-   * Get general system info.
-   */
-  public getSystemInfo(): Promise<Record<string,string>> {
-    return (this._transport.request('get_system_info', [] as RPC.Params)) as Promise<Record<string,string>>;
-  }
-
-
-  public addAccount(): Promise<T.U32> {
-    return (this._transport.request('add_account', [] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public removeAccount(accountId: T.U32): Promise<null> {
-    return (this._transport.request('remove_account', [accountId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getAllAccountIds(): Promise<(T.U32)[]> {
-    return (this._transport.request('get_all_account_ids', [] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Select account id for internally selected state.
-   * TODO: Likely this is deprecated as all methods take an account id now.
-   */
-  public selectAccount(id: T.U32): Promise<null> {
-    return (this._transport.request('select_account', [id] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get the selected account id of the internal state..
-   * TODO: Likely this is deprecated as all methods take an account id now.
-   */
-  public getSelectedAccountId(): Promise<(T.U32|null)> {
-    return (this._transport.request('get_selected_account_id', [] as RPC.Params)) as Promise<(T.U32|null)>;
-  }
-
-  /**
-   * Get a list of all configured accounts.
-   */
-  public getAllAccounts(): Promise<(T.Account)[]> {
-    return (this._transport.request('get_all_accounts', [] as RPC.Params)) as Promise<(T.Account)[]>;
-  }
-
-  /**
-   * Get top-level info for an account.
-   */
-  public getAccountInfo(accountId: T.U32): Promise<T.Account> {
-    return (this._transport.request('get_account_info', [accountId] as RPC.Params)) as Promise<T.Account>;
-  }
-
-  /**
-   * Returns provider for the given domain.
-   *
-   * This function looks up domain in offline database.
-   *
-   * For compatibility, email address can be passed to this function
-   * instead of the domain.
-   */
-  public getProviderInfo(accountId: T.U32, email: string): Promise<(T.ProviderInfo|null)> {
-    return (this._transport.request('get_provider_info', [accountId, email] as RPC.Params)) as Promise<(T.ProviderInfo|null)>;
-  }
-
-  /**
-   * Checks if the context is already configured.
-   */
-  public isConfigured(accountId: T.U32): Promise<boolean> {
-    return (this._transport.request('is_configured', [accountId] as RPC.Params)) as Promise<boolean>;
-  }
-
-  /**
-   * Get system info for an account.
-   */
-  public getInfo(accountId: T.U32): Promise<Record<string,string>> {
-    return (this._transport.request('get_info', [accountId] as RPC.Params)) as Promise<Record<string,string>>;
-  }
-
-
-  public setConfig(accountId: T.U32, key: string, value: (string|null)): Promise<null> {
-    return (this._transport.request('set_config', [accountId, key, value] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public batchSetConfig(accountId: T.U32, config: Record<string,(string|null)>): Promise<null> {
-    return (this._transport.request('batch_set_config', [accountId, config] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
-   * Before this function is called, `checkQr()` should confirm the type of the
-   * QR code is `account` or `webrtcInstance`.
-   *
-   * Internally, the function will call dc_set_config() with the appropriate keys,
-   */
-  public setConfigFromQr(accountId: T.U32, qrContent: string): Promise<null> {
-    return (this._transport.request('set_config_from_qr', [accountId, qrContent] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public checkQr(accountId: T.U32, qrContent: string): Promise<T.Qr> {
-    return (this._transport.request('check_qr', [accountId, qrContent] as RPC.Params)) as Promise<T.Qr>;
-  }
-
-
-  public getConfig(accountId: T.U32, key: string): Promise<(string|null)> {
-    return (this._transport.request('get_config', [accountId, key] as RPC.Params)) as Promise<(string|null)>;
-  }
-
-
-  public batchGetConfig(accountId: T.U32, keys: (string)[]): Promise<Record<string,(string|null)>> {
-    return (this._transport.request('batch_get_config', [accountId, keys] as RPC.Params)) as Promise<Record<string,(string|null)>>;
-  }
-
-  /**
-   * Configures this account with the currently set parameters.
-   * Setup the credential config before calling this.
-   */
-  public configure(accountId: T.U32): Promise<null> {
-    return (this._transport.request('configure', [accountId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Signal an ongoing process to stop.
-   */
-  public stopOngoingProcess(accountId: T.U32): Promise<null> {
-    return (this._transport.request('stop_ongoing_process', [accountId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Returns the message IDs of all _fresh_ messages of any chat.
-   * Typically used for implementing notification summaries
-   * or badge counters e.g. on the app icon.
-   * The list is already sorted and starts with the most recent fresh message.
-   *
-   * Messages belonging to muted chats or to the contact requests are not returned;
-   * these messages should not be notified
-   * and also badge counters should not include these messages.
-   *
-   * To get the number of fresh messages for a single chat, muted or not,
-   * use `get_fresh_msg_cnt()`.
-   */
-  public getFreshMsgs(accountId: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('get_fresh_msgs', [accountId] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Get the number of _fresh_ messages in a chat.
-   * Typically used to implement a badge with a number in the chatlist.
-   *
-   * If the specified chat is muted,
-   * the UI should show the badge counter "less obtrusive",
-   * e.g. using "gray" instead of "red" color.
-   */
-  public getFreshMsgCnt(accountId: T.U32, chatId: T.U32): Promise<T.Usize> {
-    return (this._transport.request('get_fresh_msg_cnt', [accountId, chatId] as RPC.Params)) as Promise<T.Usize>;
-  }
-
-
-  public autocryptInitiateKeyTransfer(accountId: T.U32): Promise<string> {
-    return (this._transport.request('autocrypt_initiate_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-
-  public autocryptContinueKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
-    return (this._transport.request('autocrypt_continue_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getChatlistEntries(accountId: T.U32, listFlags: (T.U32|null), queryString: (string|null), queryContactId: (T.U32|null)): Promise<(T.ChatListEntry)[]> {
-    return (this._transport.request('get_chatlist_entries', [accountId, listFlags, queryString, queryContactId] as RPC.Params)) as Promise<(T.ChatListEntry)[]>;
-  }
-
-
-  public getChatlistItemsByEntries(accountId: T.U32, entries: (T.ChatListEntry)[]): Promise<Record<T.U32,T.ChatListItemFetchResult>> {
-    return (this._transport.request('get_chatlist_items_by_entries', [accountId, entries] as RPC.Params)) as Promise<Record<T.U32,T.ChatListItemFetchResult>>;
-  }
-
-
-  public chatlistGetFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
-    return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
-  }
-
-
-  public acceptChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('accept_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public blockChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('block_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Delete a chat.
-   *
-   * Messages are deleted from the device and the chat database entry is deleted.
-   * After that, the event #DC_EVENT_MSGS_CHANGED is posted.
-   *
-   * Things that are _not done_ implicitly:
-   *
-   * - Messages are **not deleted from the server**.
-   * - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
-   *   and the user may create the chat again.
-   * - **Groups are not left** - this would
-   *   be unexpected as (1) deleting a normal chat also does not prevent new mails
-   *   from arriving, (2) leaving a group requires sending a message to
-   *   all group members - especially for groups not used for a longer time, this is
-   *   really unexpected when deletion results in contacting all members again,
-   *   (3) only leaving groups is also a valid usecase.
-   *
-   * To leave a chat explicitly, use dc_remove_contact_from_chat() with
-   * chat_id=DC_CONTACT_ID_SELF)
-   */
-  public deleteChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('delete_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * 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.
-   *
-   * returns Multi-line text
-   */
-  public getChatEncryptionInfo(accountId: T.U32, chatId: T.U32): Promise<string> {
-    return (this._transport.request('get_chat_encryption_info', [accountId, chatId] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
-   * The QR code is compatible to the OPENPGP4FPR format
-   * so that a basic fingerprint comparison also works e.g. with OpenKeychain.
-   *
-   * The scanning device will pass the scanned content to `checkQr()` then;
-   * if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
-   * an out-of-band-verification can be joined using dc_join_securejoin()
-   *
-   * chat_id: If set to a group-chat-id,
-   *     the Verified-Group-Invite protocol is offered in the QR code;
-   *     works for protected groups as well as for normal groups.
-   *     If not set, the Setup-Contact protocol is offered in the QR code.
-   *     See https://countermitm.readthedocs.io/en/latest/new.html
-   *     for details about both protocols.
-   */
-  public getChatSecurejoinQrCodeSvg(accountId: T.U32, chatId: (T.U32|null)): Promise<[string,string]> {
-    return (this._transport.request('get_chat_securejoin_qr_code_svg', [accountId, chatId] as RPC.Params)) as Promise<[string,string]>;
-  }
-
-
-  public leaveGroup(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('leave_group', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Remove a member from a group.
-   *
-   * If the group is already _promoted_ (any message was sent to the group),
-   * all group members are informed by a special status message that is sent automatically by this function.
-   *
-   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-   */
-  public removeContactFromChat(accountId: T.U32, chatId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('remove_contact_from_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Add a member to a group.
-   *
-   * If the group is already _promoted_ (any message was sent to the group),
-   * all group members are informed by a special status message that is sent automatically by this function.
-   *
-   * If the group has group protection enabled, only verified contacts can be added to the group.
-   *
-   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-   */
-  public addContactToChat(accountId: T.U32, chatId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('add_contact_to_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public addDeviceMessage(accountId: T.U32, label: string, text: string): Promise<T.U32> {
-    return (this._transport.request('add_device_message', [accountId, label, text] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public messageListGetMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('message_list_get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public messageGetMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
-    return (this._transport.request('message_get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
-  }
-
-
-  public messageGetMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
-    return (this._transport.request('message_get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
-  }
-
-  /**
-   * Delete messages. The messages are deleted on the current device and
-   * on the IMAP server.
-   */
-  public deleteMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<null> {
-    return (this._transport.request('delete_messages', [accountId, messageIds] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get an informational text for a single message. The text is multiline and may
-   * contain e.g. the raw text of the message.
-   *
-   * The max. text returned is typically longer (about 100000 characters) than the
-   * max. text returned by dc_msg_get_text() (about 30000 characters).
-   */
-  public getMessageInfo(accountId: T.U32, messageId: T.U32): Promise<string> {
-    return (this._transport.request('get_message_info', [accountId, messageId] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * Get a single contact options by ID.
-   */
-  public contactsGetContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
-    return (this._transport.request('contacts_get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
-  }
-
-  /**
-   * Add a single contact as a result of an explicit user action.
-   *
-   * Returns contact id of the created or existing contact
-   */
-  public contactsCreateContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
-    return (this._transport.request('contacts_create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Returns contact id of the created or existing DM chat with that contact
-   */
-  public contactsCreateChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
-    return (this._transport.request('contacts_create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public contactsBlock(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('contacts_block', [accountId, contactId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public contactsUnblock(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('contacts_unblock', [accountId, contactId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public contactsGetBlocked(accountId: T.U32): Promise<(T.Contact)[]> {
-    return (this._transport.request('contacts_get_blocked', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
-  }
-
-
-  public contactsGetContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('contacts_get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Get a list of contacts.
-   * (formerly called getContacts2 in desktop)
-   */
-  public contactsGetContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
-    return (this._transport.request('contacts_get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
-  }
-
-
-  public contactsGetContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
-    return (this._transport.request('contacts_get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
-  }
-
-  /**
-   * Returns all message IDs of the given types in a chat.
-   * Typically used to show a gallery.
-   *
-   * The list is already sorted and starts with the oldest message.
-   * Clients should not try to re-sort the list as this would be an expensive action
-   * and would result in inconsistencies between clients.
-   *
-   * Setting `chat_id` to `None` (`null` in typescript) means get messages with media
-   * from any chat of the currently used account.
-   */
-  public chatGetMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('chat_get_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public webxdcSendStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
-    return (this._transport.request('webxdc_send_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public webxdcGetStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
-    return (this._transport.request('webxdc_get_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * Get info from a webxdc message
-   */
-  public messageGetWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
-    return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
-  }
-
-  /**
-   * Returns the messageid of the sent message
-   */
-  public miscSendTextMessage(accountId: T.U32, text: string, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('misc_send_text_message', [accountId, text, chatId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-}

deltachat-jsonrpc/typescript/generated/events.ts

@@ -1,3 +0,0 @@
-// AUTO-GENERATED by typescript-type-def
-
-export type EventTypeName=("Info"|"SmtpConnected"|"ImapConnected"|"SmtpMessageSent"|"ImapMessageDeleted"|"ImapMessageMoved"|"NewBlobFile"|"DeletedBlobFile"|"Warning"|"Error"|"ErrorSelfNotInGroup"|"MsgsChanged"|"IncomingMsg"|"MsgsNoticed"|"MsgDelivered"|"MsgFailed"|"MsgRead"|"ChatModified"|"ChatEphemeralTimerModified"|"ContactsChanged"|"LocationChanged"|"ConfigureProgress"|"ImexProgress"|"ImexFileWritten"|"SecurejoinInviterProgress"|"SecurejoinJoinerProgress"|"ConnectivityChanged"|"SelfavatarChanged"|"WebxdcStatusUpdate"|"WebXdInstanceDeleted");

deltachat-jsonrpc/typescript/generated/jsonrpc.ts

@@ -1,10 +0,0 @@
-// AUTO-GENERATED by typescript-type-def
-
-export type JSONValue=(null|boolean|number|string|(JSONValue)[]|{[key:string]:JSONValue;});
-export type Params=((JSONValue)[]|Record<string,JSONValue>);
-export type U32=number;
-export type Request={"jsonrpc":"2.0";"method":string;"params"?:Params;"id"?:U32;};
-export type I32=number;
-export type Error={"code":I32;"message":string;"data"?:JSONValue;};
-export type Response={"jsonrpc":"2.0";"id":(U32|null);"result"?:JSONValue;"error"?:Error;};
-export type Message=(Request|Response);

deltachat-jsonrpc/typescript/generated/types.ts

@@ -1,106 +0,0 @@
-// AUTO-GENERATED by typescript-type-def
-
-export type U32=number;
-export type Account=(({"type":"Configured";}&{"id":U32;"displayName":(string|null);"addr":(string|null);"profileImage":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
-export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
-export type Qr=(({"type":"askVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"askVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"fprOk";}&{"contact_id":U32;})|({"type":"fprMismatch";}&{"contact_id":(U32|null);})|({"type":"fprWithoutAddr";}&{"fingerprint":string;})|({"type":"account";}&{"domain":string;})|({"type":"webrtcInstance";}&{"domain":string;"instance_pattern":string;})|({"type":"addr";}&{"contact_id":U32;"draft":(string|null);})|({"type":"url";}&{"url":string;})|({"type":"text";}&{"text":string;})|({"type":"withdrawVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"withdrawVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;}));
-export type Usize=number;
-export type ChatListEntry=[U32,U32];
-export type I64=number;
-export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":string;"avatarPath":(string|null);"color":string;"lastUpdated":(I64|null);"summaryText1":string;"summaryText2":string;"summaryStatus":U32;"isProtected":boolean;"isGroup":boolean;"freshMessageCounter":Usize;"isSelfTalk":boolean;"isDeviceTalk":boolean;"isSendingLocation":boolean;"isSelfInGroup":boolean;"isArchived":boolean;"isPinned":boolean;"isMuted":boolean;"isContactRequest":boolean;
-/**
- * true when chat is a broadcastlist
- */
-"isBroadcast":boolean;
-/**
- * contact id if this is a dm chat (for view profile entry in context menu)
- */
-"dmChatContact":(U32|null);"wasSeenRecently":boolean;})|{"type":"ArchiveLink";}|({"type":"Error";}&{"id":U32;"error":string;}));
-export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;"wasSeenRecently":boolean;};
-export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;"wasSeenRecently":boolean;};
-export type Viewtype=("Unknown"|
-/**
- * Text message.
- */
-"Text"|
-/**
- * Image message.
- * If the image is an animated GIF, the type `Viewtype.Gif` should be used.
- */
-"Image"|
-/**
- * Animated GIF message.
- */
-"Gif"|
-/**
- * Message containing a sticker, similar to image.
- * If possible, the ui should display the image without borders in a transparent way.
- * A click on a sticker will offer to install the sticker set in some future.
- */
-"Sticker"|
-/**
- * Message containing an Audio file.
- */
-"Audio"|
-/**
- * A voice message that was directly recorded by the user.
- * For all other audio messages, the type `Viewtype.Audio` should be used.
- */
-"Voice"|
-/**
- * Video messages.
- */
-"Video"|
-/**
- * Message containing any file, eg. a PDF.
- */
-"File"|
-/**
- * Message is an invitation to a videochat.
- */
-"VideochatInvitation"|
-/**
- * Message is an webxdc instance.
- */
-"Webxdc");
-export type I32=number;
-export type U64=number;
-export type WebxdcMessageInfo={
-/**
- * The name of the app.
- * 
- * Defaults to the filename if not set in the manifest.
- */
-"name":string;
-/**
- * App icon file name.
- * Defaults to an standard icon if nothing is set in the manifest.
- * 
- * To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
- * 
- * App icons should should be square,
- * the implementations will add round corners etc. as needed.
- */
-"icon":string;
-/**
- * if the Webxdc represents a document, then this is the name of the document
- */
-"document":(string|null);
-/**
- * short string describing the state of the app,
- * sth. as "2 votes", "Highscore: 123",
- * can be changed by the apps
- */
-"summary":(string|null);
-/**
- * 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.
- */
-"sourceCodeUrl":(string|null);
-/**
- * True if full internet access should be granted to the app.
- */
-"internetAccess":boolean;};
-export type Message={"id":U32;"chatId":U32;"fromId":U32;"quotedText":(string|null);"quotedMessageId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);};
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,U32,null,U32,null,U32,(U32)[],U32,U32,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,string,string,U32,U32,U32,U32,(U32)[],U32,U32,Message,U32,(U32)[],Record<U32,Message>,U32,(U32)[],null,U32,U32,string,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,string,U32,U32];

deltachat-jsonrpc/typescript/package.json

@@ -1,51 +0,0 @@
-{
-  "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
-  "dependencies": {
-    "isomorphic-ws": "^4.0.1",
-    "tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
-    "yerpc": "^0.3.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.21",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.0.0",
-    "@types/node-fetch": "^2.5.7",
-    "@types/ws": "^7.2.4",
-    "c8": "^7.10.0",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.14.11",
-    "http-server": "^14.1.1",
-    "mocha": "^9.1.1",
-    "node-fetch": "^2.6.1",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.2",
-    "typedoc": "^0.23.2",
-    "typescript": "^4.5.5",
-    "ws": "^8.5.0"
-  },
-  "license": "MPL-2.0",
-  "main": "dist/deltachat.js",
-  "name": "deltachat-jsonrpc-client",
-  "scripts": {
-    "build": "run-s generate-bindings build:tsc build:bundle",
-    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
-    "build:tsc": "tsc",
-    "docs": "typedoc --out docs deltachat.ts",
-    "example": "run-s build example:build example:start",
-    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
-    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
-    "example:start": "http-server .",
-    "generate-bindings": "cargo test",
-    "prettier:check": "prettier --check **.ts",
-    "prettier:fix": "prettier --write **.ts",
-    "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
-    "test:report-coverage": "node report_api_coverage.mjs",
-    "test:run": "mocha dist/test",
-    "test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test"
-  },
-  "type": "module",
-  "types": "dist/deltachat.d.ts",
-  "version": "1.93.0"
-}

deltachat-jsonrpc/typescript/report_api_coverage.mjs

@@ -1,28 +0,0 @@
-import { readFileSync } from "fs";
-// only checks for the coverge of the api functions in bindings.ts for now
-const generatedFile = "typescript/generated/client.ts";
-const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
-const jsonCoverage =
-  json[Object.keys(json).find((k) => k.includes(generatedFile))];
-const fnMap = Object.keys(jsonCoverage.fnMap).map(
-  (key) => jsonCoverage.fnMap[key]
-);
-const htmlCoverage = readFileSync(
-  "./coverage/" + generatedFile + ".html",
-  "utf8"
-);
-const uncoveredLines = htmlCoverage
-  .split("\n")
-  .filter((line) => line.includes(`"function not covered"`));
-const uncoveredFunctions = uncoveredLines.map(
-  (line) => />([\w_]+)\(/.exec(line)[1]
-);
-console.log(
-  "\nUncovered api functions:\n" +
-    uncoveredFunctions
-      .map((uF) => fnMap.find(({ name }) => name === uF))
-      .map(
-        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`
-      )
-      .join("\n")
-);

deltachat-jsonrpc/typescript/src/client.ts

@@ -1,77 +0,0 @@
-import * as T from "../generated/types.js";
-import * as RPC from "../generated/jsonrpc.js";
-import { RawClient } from "../generated/client.js";
-import { EventTypeName } from "../generated/events.js";
-import { WebsocketTransport, BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "tiny-emitter";
-
-export type DeltaChatEvent = {
-  id: EventTypeName;
-  contextId: number;
-  field1: any;
-  field2: any;
-};
-export type Events = Record<
-  EventTypeName | "ALL",
-  (event: DeltaChatEvent) => void
->;
-
-export class BaseDeltaChat<
-  Transport extends BaseTransport<any>
-> extends TinyEmitter<Events> {
-  rpc: RawClient;
-  account?: T.Account;
-  private contextEmitters: TinyEmitter<Events>[] = [];
-  constructor(public transport: Transport) {
-    super();
-    this.rpc = new RawClient(this.transport);
-    this.transport.on("request", (request: Request) => {
-      const method = request.method;
-      if (method === "event") {
-        const event = request.params! as DeltaChatEvent;
-        this.emit(event.id, event);
-        this.emit("ALL", event);
-
-        if (this.contextEmitters[event.contextId]) {
-          this.contextEmitters[event.contextId].emit(event.id, event);
-          this.contextEmitters[event.contextId].emit("ALL", event);
-        }
-      }
-    });
-  }
-
-  async listAccounts(): Promise<T.Account[]> {
-    return await this.rpc.getAllAccounts();
-  }
-
-  getContextEvents(account_id: number) {
-    if (this.contextEmitters[account_id]) {
-      return this.contextEmitters[account_id];
-    } else {
-      this.contextEmitters[account_id] = new TinyEmitter();
-      return this.contextEmitters[account_id];
-    }
-  }
-}
-
-export type Opts = {
-  url: string;
-};
-
-export const DEFAULT_OPTS: Opts = {
-  url: "ws://localhost:20808/ws",
-};
-export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
-  opts: Opts;
-  close() {
-    this.transport.close();
-  }
-  constructor(opts?: Opts | string) {
-    if (typeof opts === "string") opts = { url: opts };
-    if (opts) opts = { ...DEFAULT_OPTS, ...opts };
-    else opts = { ...DEFAULT_OPTS };
-    const transport = new WebsocketTransport(opts.url)
-    super(transport);
-    this.opts = opts;
-  }
-}

deltachat-jsonrpc/typescript/src/lib.ts

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

deltachat-jsonrpc/typescript/test/basic.ts

@@ -1,154 +0,0 @@
-import { strictEqual } from "assert";
-import chai, { assert, expect } from "chai";
-import chaiAsPromised from "chai-as-promised";
-chai.use(chaiAsPromised);
-import { DeltaChat } from "../deltachat.js";
-
-import {
-  RpcServerHandle,
-  startServer,
-} from "./test_base.js";
-
-describe("basic tests", () => {
-  let serverHandle: RpcServerHandle;
-  let dc: DeltaChat;
-
-  before(async () => {
-    serverHandle = await startServer();
-    // make sure server is up by the time we continue
-    await new Promise((res) => setTimeout(res, 100));
-    dc = new DeltaChat(serverHandle.url)
-    // dc.on("ALL", (event) => {
-      //console.log("event", event);
-    // });
-  });
-
-  after(async () => {
-    dc && dc.close();
-    await serverHandle.close();
-  });
-
-  it("check email address validity", async () => {
-    const validAddresses = [
-      "email@example.com",
-      "36aa165ae3406424e0c61af17700f397cad3fe8ab83d682d0bddf3338a5dd52e@yggmail@yggmail",
-    ];
-    const invalidAddresses = ["email@", "example.com", "emai221"];
-
-    expect(
-      await Promise.all(
-        validAddresses.map((email) => dc.rpc.checkEmailValidity(email))
-      )
-    ).to.not.contain(false);
-
-    expect(
-      await Promise.all(
-        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email))
-      )
-    ).to.not.contain(true);
-  });
-
-  it("system info", async () => {
-    const systemInfo = await dc.rpc.getSystemInfo();
-    expect(systemInfo).to.contain.keys([
-      "arch",
-      "num_cpus",
-      "deltachat_core_version",
-      "sqlite_version",
-    ]);
-  });
-
-  describe("account managment", () => {
-    it("should create account", async () => {
-      const res = await dc.rpc.addAccount();
-      assert((await dc.rpc.getAllAccountIds()).length === 1);
-    });
-
-    it("should remove the account again", async () => {
-      await dc.rpc.removeAccount((await dc.rpc.getAllAccountIds())[0]);
-      assert((await dc.rpc.getAllAccountIds()).length === 0);
-    });
-
-    it("should create multiple accounts", async () => {
-      await dc.rpc.addAccount();
-      await dc.rpc.addAccount();
-      await dc.rpc.addAccount();
-      await dc.rpc.addAccount();
-      assert((await dc.rpc.getAllAccountIds()).length === 4);
-    });
-  });
-
-  describe("contact managment", function () {
-    let accountId: number;
-    before(async () => {
-      accountId = await dc.rpc.addAccount();
-    });
-    it("should block and unblock contact", async function () {
-      const contactId = await dc.rpc.contactsCreateContact(
-        accountId,
-        "example@delta.chat",
-        null
-      );
-      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
-        .false;
-      await dc.rpc.contactsBlock(accountId, contactId);
-      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
-        .true;
-      expect(await dc.rpc.contactsGetBlocked(accountId)).to.have.length(1);
-      await dc.rpc.contactsUnblock(accountId, contactId);
-      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
-        .false;
-      expect(await dc.rpc.contactsGetBlocked(accountId)).to.have.length(0);
-    });
-  });
-
-  describe("configuration", function () {
-    let accountId: number;
-    before(async () => {
-      accountId = await dc.rpc.addAccount();
-    });
-
-    it("set and retrive", async function () {
-      await dc.rpc.setConfig(accountId, "addr", "valid@email");
-      assert((await dc.rpc.getConfig(accountId, "addr")) == "valid@email");
-    });
-    it("set invalid key should throw", async function () {
-      await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to.be
-        .eventually.rejected;
-    });
-    it("get invalid key should throw", async function () {
-      await expect(dc.rpc.getConfig(accountId, "invalid_key")).to.be.eventually
-        .rejected;
-    });
-    it("set and retrive ui.*", async function () {
-      await dc.rpc.setConfig(accountId, "ui.chat_bg", "color:red");
-      assert((await dc.rpc.getConfig(accountId, "ui.chat_bg")) == "color:red");
-    });
-    it("set and retrive (batch)", async function () {
-      const config = { addr: "valid@email", mail_pw: "1234" };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
-      expect(retrieved).to.deep.equal(config);
-    });
-    it("set and retrive ui.* (batch)", async function () {
-      const config = {
-        "ui.chat_bg": "color:green",
-        "ui.enter_key_sends": "true",
-      };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
-      expect(retrieved).to.deep.equal(config);
-    });
-    it("set and retrive mixed(ui and core) (batch)", async function () {
-      const config = {
-        "ui.chat_bg": "color:yellow",
-        "ui.enter_key_sends": "false",
-        addr: "valid2@email",
-        mail_pw: "123456",
-      };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
-      expect(retrieved).to.deep.equal(config);
-    });
-  });
-});

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,202 +0,0 @@
-import { assert, expect } from "chai";
-import { DeltaChat, DeltaChatEvent, EventTypeName } from "../deltachat.js";
-import {
-  RpcServerHandle,
-  createTempUser,
-  startServer,
-} from "./test_base.js";
-
-const EVENT_TIMEOUT = 20000
-
-describe("online tests", function () {
-  let serverHandle: RpcServerHandle;
-  let dc: DeltaChat;
-  let account1: { email: string; password: string };
-  let account2: { email: string; password: string };
-  let accountId1: number, accountId2: number;
-
-  before(async function () {
-    this.timeout(12000)
-    if (!process.env.DCC_NEW_TMP_EMAIL) {
-      if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
-        console.error(
-          "CAN NOT RUN COVERAGE correctly: Missing DCC_NEW_TMP_EMAIL environment variable!\n\n",
-          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test"
-        );
-        process.exit(1);
-      }
-      console.log(
-        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests"
-      );
-      this.skip();
-    }
-    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.url)
-
-    dc.on("ALL", ({ id, contextId }) => {
-      if (id !== "Info") console.log(contextId, id);
-    });
-
-    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
-    if (!account1 || !account1.email || !account1.password) {
-      console.log(
-        "We didn't got back an account from the api, skip intergration tests"
-      );
-      this.skip();
-    }
-
-    account2 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
-    if (!account2 || !account2.email || !account2.password) {
-      console.log(
-        "We didn't got back an account2 from the api, skip intergration tests"
-      );
-      this.skip();
-    }
-  });
-
-  after(async () => {
-    dc && dc.close();
-    serverHandle && (await serverHandle.close());
-  });
-
-  let accountsConfigured = false;
-
-  it("configure test accounts", async function () {
-    this.timeout(40000);
-
-    accountId1 = await dc.rpc.addAccount();
-    await dc.rpc.setConfig(accountId1, "addr", account1.email);
-    await dc.rpc.setConfig(accountId1, "mail_pw", account1.password);
-    await dc.rpc.configure(accountId1);
-
-    accountId2 = await dc.rpc.addAccount();
-    await dc.rpc.batchSetConfig(accountId2, {
-      addr: account2.email,
-      mail_pw: account2.password,
-    });
-    await dc.rpc.configure(accountId2)
-    accountsConfigured = true;
-  });
-
-  it("send and recieve text message", async function () {
-    if (!accountsConfigured) {
-      this.skip();
-    }
-    this.timeout(15000);
-
-    const contactId = await dc.rpc.contactsCreateContact(
-      accountId1,
-      account2.email,
-      null
-    );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
-    const eventPromise = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId2),
-      waitForEvent(dc, "IncomingMsg", accountId2),
-    ]);
-
-    await dc.rpc.miscSendTextMessage(accountId1, "Hello", chatId);
-    const { field1: chatIdOnAccountB } = await eventPromise;
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.messageListGetMessageIds(
-      accountId2,
-      chatIdOnAccountB,
-      0
-    );
-
-    expect(messageList).have.length(1);
-    const message = await dc.rpc.messageGetMessage(accountId2, messageList[0]);
-    expect(message.text).equal("Hello");
-  });
-
-  it("send and recieve text message roundtrip, encrypted on answer onwards", async function () {
-    if (!accountsConfigured) {
-      this.skip();
-    }
-    this.timeout(10000);
-
-    // send message from A to B
-    const contactId = await dc.rpc.contactsCreateContact(
-      accountId1,
-      account2.email,
-      null
-    );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
-    const eventPromise = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId2),
-      waitForEvent(dc, "IncomingMsg", accountId2),
-    ]);
-    dc.rpc.miscSendTextMessage(accountId1, "Hello2", chatId);
-    // wait for message from A
-    console.log("wait for message from A");
-
-    const event = await eventPromise;
-    const { field1: chatIdOnAccountB } = event;
-
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.messageListGetMessageIds(
-      accountId2,
-      chatIdOnAccountB,
-      0
-    );
-    const message = await dc.rpc.messageGetMessage(
-      accountId2,
-      messageList.reverse()[0]
-    );
-    expect(message.text).equal("Hello2");
-    // Send message back from B to A
-    const eventPromise2 = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId1),
-      waitForEvent(dc, "IncomingMsg", accountId1),
-    ]);
-    dc.rpc.miscSendTextMessage(accountId2, "super secret message", chatId);
-    // Check if answer arives at A and if it is encrypted
-    await eventPromise2;
-
-    const messageId = (
-      await dc.rpc.messageListGetMessageIds(accountId1, chatId, 0)
-    ).reverse()[0];
-    const message2 = await dc.rpc.messageGetMessage(accountId1, messageId);
-    expect(message2.text).equal("super secret message");
-    expect(message2.showPadlock).equal(true);
-  });
-
-  it("get provider info for example.com", async () => {
-    const acc = await dc.rpc.addAccount();
-    const info = await dc.rpc.getProviderInfo(acc, "example.com");
-    expect(info).to.be.not.null;
-    expect(info?.overviewPage).to.equal(
-      "https://providers.delta.chat/example-com"
-    );
-    expect(info?.status).to.equal(3);
-  });
-
-  it("get provider info - domain and email should give same result", async () => {
-    const acc = await dc.rpc.addAccount();
-    const info_domain = await dc.rpc.getProviderInfo(acc, "example.com");
-    const info_email = await dc.rpc.getProviderInfo(acc, "hi@example.com");
-    expect(info_email).to.deep.equal(info_domain);
-  });
-});
-
-async function waitForEvent(
-  dc: DeltaChat,
-  eventType: EventTypeName,
-  accountId: number,
-  timeout: number = EVENT_TIMEOUT
-): Promise<DeltaChatEvent> {
-  return new Promise((resolve, reject) => {
-    const rejectTimeout = setTimeout(
-      () => reject(new Error('Timeout reached before event came in')),
-      timeout
-    )
-    const callback = (event: DeltaChatEvent) => {
-      if (event.contextId == accountId) {
-        dc.off(eventType, callback);
-        clearTimeout(rejectTimeout)
-        resolve(event);
-      }
-    };
-    dc.on(eventType, callback);
-  });
-}

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -1,94 +0,0 @@
-import { tmpdir } from "os";
-import { join, resolve } from "path";
-import { mkdtemp, rm } from "fs/promises";
-import { existsSync } from "fs";
-import { spawn, exec } from "child_process";
-import fetch from "node-fetch";
-
-export const RPC_SERVER_PORT = 20808;
-
-export type RpcServerHandle = {
-  url: string,
-  close: () => Promise<void>
-}
-
-export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcServerHandle> {
-  const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
-
-  const pathToServerBinary = resolve(join(await getTargetDir(), "debug/deltachat-jsonrpc-server"));
-  console.log('using server binary: ' + pathToServerBinary);
-
-  if (!existsSync(pathToServerBinary)) {
-    throw new Error(
-      "server executable does not exist, you need to build it first" +
-        "\nserver executable not found at " +
-        pathToServerBinary
-    );
-  }
-
-  const server = spawn(pathToServerBinary, {
-    cwd: tmpDir,
-    env: {
-      RUST_LOG: process.env.RUST_LOG || "info",
-      DC_PORT: '' + port
-    },
-  });
-  let shouldClose = false;
-
-  server.on("exit", () => {
-    if (shouldClose) {
-      return;
-    }
-    throw new Error("Server quit");
-  });
-
-  server.stderr.pipe(process.stderr);
-  server.stdout.pipe(process.stdout)
-
-  const url = `ws://localhost:${port}/ws`
-
-  return {
-    url,
-    close: async () => {
-      shouldClose = true;
-      if (!server.kill()) {
-        console.log("server termination failed");
-      }
-      await rm(tmpDir, { recursive: true });
-    },
-  };
-}
-
-export async function createTempUser(url: string) {
-  const response = await fetch(url, {
-    method: "POST", 
-    headers: {
-      "cache-control": "no-cache",
-    },
-  });
-  if (!response.ok) throw new Error('Received invalid response')
-  return response.json(); 
-}
-
-function getTargetDir(): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      "cargo metadata --no-deps --format-version 1",
-      (error, stdout, _stderr) => {
-        if (error) {
-          console.log("error", error);
-          reject(error);
-        } else {
-          try {
-            const json = JSON.parse(stdout);
-            resolve(json.target_directory);
-          } catch (error) {
-            console.log("json error", error);
-            reject(error);
-          }
-        }
-      }
-    );
-  });
-}
-

deltachat-jsonrpc/typescript/tsconfig.json

@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "alwaysStrict": true,
-    "strict": true,
-    "sourceMap": true,
-    "strictNullChecks": true,
-    "rootDir": ".",
-    "outDir": "dist",
-    "lib": ["ES2017", "dom"],
-    "target": "ES2017",
-    "module": "es2020",
-    "declaration": true,
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "isolatedModules": true
-  },
-  "include": ["*.ts", "example/*.ts", "test/*.ts"],
-  "compileOnSave": false
-}

draft/aeap-mvp.md

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

draft/aeap-mvp.rst

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

draft/webxdc-dev-reference.md

@@ -1,12 +1,6 @@
 # Webxdc Developer Reference
 
-This document gives a quick overview about the Webxdc specification,
-It is meant for both, developing Webxdc apps
-and developing Webxdc implementations.
-
-The [Webxdc guidebook](https://deltachat.github.io/webxdc_docs/) shows more detailed information
-when developing Webxdc apps.
-
+(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
 
@@ -40,9 +34,8 @@ To get a shared state, the peers use `sendUpdate()` to send updates to each othe
 - `update`: an object with the following properties:  
     - `update.payload`: any javascript primitive, array or object.
     - `update.info`: 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
-       and if there are series of info messages, older ones may be dropped.
+       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
@@ -144,37 +137,9 @@ round corners etc. will be added by the implementations as needed.
 If no icon is set, a default icon will be used.
 
 
-## Other APIs and Tags Usage Hints
-
-- `localStorage`, `sessionStorage`, `indexedDB` are okay to be used
-- `visibilitychange`-events are okay to be used
-- `window.navigator.language` is okay to be used, on desktop it is the system language
-- `<a href="localfile.html">` and other internal links are okay to be used
-- `<a href="mailto:addr@example.org?body=...">`- mailto links are okay to be used
-- `<meta name="viewport" ...>` usage is okay to be used
-  and useful esp. different webviews have different defaults
-
-
-### Discouraged Things
-
-- `document.cookie` is known not to work on desktop and iOS
-  use `localStorage` instead
-- `unload`-, `beforeunload`- and `pagehide`-events are known not to work on iOS and are flaky on other systems
-  (also partly discouraged by [mozilla](https://developer.mozilla.org/en-US/docs/Web/API/Window/unload_event))
-  use `visibilitychange` instead
-- `<title>` and `document.title` is ignored by Webxdc;
-  use the `name` property from `manifest.toml` instead
-- newest js features may not work on all webviews,
-  you may want to transpile your code down to an older js version
-  eg. with <https://babeljs.io>
-- `<a href="https://example.org/foo">` and other external links are blocked by definition;
-  instead, embed content or use `mailto:` link to offer a way for contact
-- `<input type="file">` is discouraged currently; this may change in future
-
-
 ## Webxdc Examples
 
-The following example shows an input field and every input is show on all peers.
+The following example shows an input field and  every input is show on all peers.
 
 ```html
 <!DOCTYPE html>
@@ -204,10 +169,30 @@ The following example shows an input field and every input is show on all peers.
 </html>
 ```
 
-More examples at [github.com/webxdc](https://github.com/webxdc) and
-[topic #webxdc](https://github.com/topics/webxdc)
-
-[github.com/webxdc/hello](https://github.com/webxdc/hello)
-offers an **Webxdc Tool** that can be used in many browsers without any installation needed.
+[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 -
 just clone and start adapting things to your need.
+
+
+### Advanced Examples
+
+- [2048](https://github.com/adbenitez/2048.xdc)
+- [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)
+
+
+## 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

@@ -1,11 +1,9 @@
-#![allow(clippy::format_push_string)]
 extern crate dirs;
 
-use std::path::Path;
 use std::str::FromStr;
-use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, ensure, Result};
+use async_std::path::Path;
 use deltachat::chat::{
     self, Chat, ChatId, ChatItem, ChatVisibility, MuteDuration, ProtectionStatus,
 };
@@ -13,6 +11,8 @@ use deltachat::chatlist::*;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
+use deltachat::dc_receive_imf::*;
+use deltachat::dc_tools::*;
 use deltachat::download::DownloadState;
 use deltachat::imex::*;
 use deltachat::location;
@@ -20,11 +20,10 @@ use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::receive_imf::*;
 use deltachat::sql;
-use deltachat::tools::*;
 use deltachat::{config, provider};
-use tokio::fs;
+use std::fs;
+use std::time::{Duration, SystemTime};
 
 /// Reset database tables.
 /// Argument is a bitmask, executing single or multiple actions in one call.
@@ -97,10 +96,10 @@ async fn reset_tables(context: &Context, bits: i32) {
 }
 
 async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
-    let data = read_file(context, filename).await?;
+    let data = dc_read_file(context, filename).await?;
 
-    if let Err(err) = receive_imf(context, &data, false).await {
-        println!("receive_imf errored: {:?}", err);
+    if let Err(err) = dc_receive_imf(context, &data, false).await {
+        println!("dc_receive_imf errored: {:?}", err);
     }
     Ok(())
 }
@@ -129,20 +128,24 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
         }
         real_spec = rs.unwrap();
     }
-    if let Some(suffix) = get_filesuffix_lc(&real_spec) {
+    if let Some(suffix) = dc_get_filesuffix_lc(&real_spec) {
         if suffix == "eml" && poke_eml_file(context, &real_spec).await.is_ok() {
             read_cnt += 1
         }
     } else {
         /* import a directory */
         let dir_name = std::path::Path::new(&real_spec);
-        let dir = fs::read_dir(dir_name).await;
+        let dir = std::fs::read_dir(dir_name);
         if dir.is_err() {
             error!(context, "Import: Cannot open directory \"{}\".", &real_spec,);
             return false;
         } else {
-            let mut dir = dir.unwrap();
-            while let Ok(Some(entry)) = dir.next_entry().await {
+            let dir = dir.unwrap();
+            for entry in dir {
+                if entry.is_err() {
+                    break;
+                }
+                let entry = entry.unwrap();
                 let name_f = entry.file_name();
                 let name = name_f.to_string_lossy();
                 if name.ends_with(".eml") {
@@ -188,7 +191,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         DownloadState::Failure => " [⬇ Download failed]",
     };
 
-    let temp2 = timestamp_to_str(msg.get_timestamp());
+    let temp2 = dc_timestamp_to_str(msg.get_timestamp());
     let msgtext = msg.get_text();
     println!(
         "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{}{}{} [{}]",
@@ -216,14 +219,6 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
                 msg.get_videochat_url().unwrap_or_default(),
                 msg.get_videochat_type().unwrap_or_default()
             )
-        } else if msg.get_viewtype() == Viewtype::Webxdc {
-            match msg.get_webxdc_info(context).await {
-                Ok(info) => format!(
-                    "[WEBXDC: {}, icon={}, document={}, summary={}, source_code_url={}]",
-                    info.name, info.icon, info.document, info.summary, info.source_code_url
-                ),
-                Err(err) => format!("[get_webxdc_info() failed: {}]", err),
-            }
         } else {
             "".to_string()
         },
@@ -497,7 +492,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             let setup_code = create_setup_code(&context);
             let file_name = blobdir.join("autocrypt-setup-message.html");
             let file_content = render_setup_file(&context, &setup_code).await?;
-            fs::write(&file_name, file_content).await?;
+            async_std::fs::write(&file_name, file_content).await?;
             println!(
                 "Setup message written to: {}\nSetup code: {}",
                 file_name.display(),
@@ -537,7 +532,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 .join("connectivity.html");
             match context.get_connectivity_html().await {
                 Ok(html) => {
-                    fs::write(&file, html).await?;
+                    fs::write(&file, html)?;
                     println!("Report written to: {:#?}", file);
                 }
                 Err(err) => {
@@ -602,7 +597,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                             _ => "",
                         }
                     };
-                    let timestr = timestamp_to_str(summary.timestamp);
+                    let timestr = dc_timestamp_to_str(summary.timestamp);
                     println!(
                         "{}{}{} [{}]{}",
                         summary
@@ -815,7 +810,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 println!(
                     "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
                     location.location_id,
-                    timestamp_to_str(location.timestamp),
+                    dc_timestamp_to_str(location.timestamp),
                     location.latitude,
                     location.longitude,
                     location.accuracy,
@@ -897,7 +892,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected.");
             ensure!(!arg1.is_empty(), "No html-file given.");
             let path: &Path = arg1.as_ref();
-            let html = &*fs::read(&path).await?;
+            let html = &*fs::read(&path)?;
             let html = String::from_utf8_lossy(html);
 
             let mut msg = Message::new(Viewtype::Text);
@@ -983,9 +978,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
         "listmedia" => {
+            ensure!(sel_chat.is_some(), "No chat selected.");
+
             let images = chat::get_chat_media(
                 &context,
-                sel_chat.map(|c| c.id),
+                sel_chat.as_ref().unwrap().get_id(),
                 Viewtype::Image,
                 Viewtype::Gif,
                 Viewtype::Video,
@@ -1082,7 +1079,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 .unwrap_or_default()
                 .join(format!("msg-{}.html", id.to_u32()));
             let html = id.get_html(&context).await?.unwrap_or_default();
-            fs::write(&file, html).await?;
+            fs::write(&file, html)?;
             println!("HTML written to: {:#?}", file);
         }
         "listfresh" => {
@@ -1236,8 +1233,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "fileinfo" => {
             ensure!(!arg1.is_empty(), "Argument <file> missing.");
 
-            if let Ok(buf) = read_file(&context, &arg1).await {
-                let (width, height) = get_filemeta(&buf)?;
+            if let Ok(buf) = dc_read_file(&context, &arg1).await {
+                let (width, height) = dc_get_filemeta(&buf)?;
                 println!("width={}, height={}", width, height);
             } else {
                 bail!("Command failed.");

examples/repl/main.rs

@@ -9,20 +9,20 @@ extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
 use std::io::{self, Write};
-use std::path::Path;
 use std::process::Command;
 
 use ansi_term::Color;
 use anyhow::{bail, Error};
+use async_std::path::Path;
 use deltachat::chat::ChatId;
 use deltachat::config;
 use deltachat::context::*;
 use deltachat::oauth2::*;
-use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::{EventType, Events};
+use deltachat::EventType;
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
+use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
 use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
 use rustyline::hint::{Hinter, HistoryHinter};
@@ -30,11 +30,11 @@ use rustyline::validate::Validator;
 use rustyline::{
     Cmd, CompletionType, Config, Context as RustyContext, EditMode, Editor, Helper, KeyEvent,
 };
-use tokio::fs;
-use tokio::runtime::Handle;
 
 mod cmdline;
 use self::cmdline::*;
+use deltachat::qr_code_generator::get_securejoin_qr_svg;
+use std::fs;
 
 /// Event Handler
 fn receive_event(event: EventType) {
@@ -298,10 +298,10 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         println!("Error: Bad arguments, expected [db-name].");
         bail!("No db-name specified");
     }
-    let context = Context::new(Path::new(&args[1]), 0, Events::new()).await?;
+    let context = Context::new(Path::new(&args[1]).to_path_buf(), 0).await?;
 
     let events = context.get_event_emitter();
-    tokio::task::spawn(async move {
+    async_std::task::spawn(async move {
         while let Some(event) = events.recv().await {
             receive_event(event.typ);
         }
@@ -313,17 +313,17 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         .history_ignore_space(true)
         .completion_type(CompletionType::List)
         .edit_mode(EditMode::Emacs)
+        .output_stream(OutputStreamType::Stdout)
         .build();
     let mut selected_chat = ChatId::default();
-
-    let ctx = context.clone();
-    let input_loop = tokio::task::spawn_blocking(move || {
+    let (reader_s, reader_r) = async_std::channel::bounded(100);
+    let input_loop = async_std::task::spawn_blocking(move || {
         let h = DcHelper {
             completer: FilenameCompleter::new(),
             highlighter: MatchingBracketHighlighter::new(),
             hinter: HistoryHinter {},
         };
-        let mut rl = Editor::with_config(config)?;
+        let mut rl = Editor::with_config(config);
         rl.set_helper(Some(h));
         rl.bind_sequence(KeyEvent::alt('N'), Cmd::HistorySearchForward);
         rl.bind_sequence(KeyEvent::alt('P'), Cmd::HistorySearchBackward);
@@ -339,30 +339,16 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                 Ok(line) => {
                     // TODO: ignore "set mail_pw"
                     rl.add_history_entry(line.as_str());
-                    let contine = Handle::current().block_on(async {
-                        match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await {
-                            Ok(ExitResult::Continue) => true,
-                            Ok(ExitResult::Exit) => {
-                                println!("Exiting ...");
-                                false
-                            }
-                            Err(err) => {
-                                println!("Error: {}", err);
-                                true
-                            }
-                        }
-                    });
-
-                    if !contine {
-                        break;
-                    }
+                    async_std::task::block_on(reader_s.send(line)).unwrap();
                 }
                 Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
                     println!("Exiting...");
+                    drop(reader_s);
                     break;
                 }
                 Err(err) => {
                     println!("Error: {}", err);
+                    drop(reader_s);
                     break;
                 }
             }
@@ -373,8 +359,15 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         Ok::<_, Error>(())
     });
 
+    while let Ok(line) = reader_r.recv().await {
+        match handle_cmd(line.trim(), context.clone(), &mut selected_chat).await {
+            Ok(ExitResult::Continue) => {}
+            Ok(ExitResult::Exit) => break,
+            Err(err) => println!("Error: {}", err),
+        }
+    }
     context.stop_io().await;
-    input_loop.await??;
+    input_loop.await?;
 
     Ok(())
 }
@@ -407,7 +400,7 @@ async fn handle_cmd(
         "oauth2" => {
             if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
                 let oauth2_url =
-                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
+                    dc_get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
                 if oauth2_url.is_none() {
                     println!("OAuth2 not available for {}.", &addr);
                 } else {
@@ -424,7 +417,7 @@ async fn handle_cmd(
         "getqr" | "getbadqr" => {
             ctx.start_io().await;
             let group = arg1.parse::<u32>().ok().map(ChatId::new);
-            let mut qr = get_securejoin_qr(&ctx, group).await?;
+            let mut qr = dc_get_securejoin_qr(&ctx, group).await?;
             if !qr.is_empty() {
                 if arg0 == "getbadqr" && qr.len() > 40 {
                     qr.replace_range(12..22, "0000000000")
@@ -444,7 +437,7 @@ async fn handle_cmd(
             let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
             match get_securejoin_qr_svg(&ctx, group).await {
                 Ok(svg) => {
-                    fs::write(&file, svg).await?;
+                    fs::write(&file, svg)?;
                     println!("QR code svg written to: {:#?}", file);
                 }
                 Err(err) => {
@@ -455,7 +448,7 @@ async fn handle_cmd(
         "joinqr" => {
             ctx.start_io().await;
             if !arg0.is_empty() {
-                join_securejoin(&ctx, arg1).await?;
+                dc_join_securejoin(&ctx, arg1).await?;
             }
         }
         "exit" | "quit" => return Ok(ExitResult::Exit),
@@ -465,12 +458,11 @@ async fn handle_cmd(
     Ok(ExitResult::Continue)
 }
 
-#[tokio::main]
-async fn main() -> Result<(), Error> {
+fn main() -> Result<(), Error> {
     let _ = pretty_env_logger::try_init();
 
     let args = std::env::args().collect();
-    start(args).await?;
+    async_std::task::block_on(async move { start(args).await })?;
 
     Ok(())
 }

examples/simple.rs

@@ -6,7 +6,7 @@ use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
-use deltachat::{EventType, Events};
+use deltachat::EventType;
 
 fn cb(event: EventType) {
     match event {
@@ -29,21 +29,21 @@ fn cb(event: EventType) {
 }
 
 /// Run with `RUST_LOG=simple=info cargo run --release --example simple --features repl -- email pw`.
-#[tokio::main]
+#[async_std::main]
 async fn main() {
     pretty_env_logger::try_init_timed().ok();
 
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     log::info!("creating database {:?}", dbfile);
-    let ctx = Context::new(&dbfile, 0, Events::new())
+    let ctx = Context::new(dbfile.into(), 0)
         .await
         .expect("Failed to create context");
     let info = ctx.get_info().await;
     log::info!("info: {:#?}", info);
 
     let events = ctx.get_event_emitter();
-    let events_spawn = tokio::task::spawn(async move {
+    let events_spawn = async_std::task::spawn(async move {
         while let Some(event) = events.recv().await {
             cb(event.typ);
         }
@@ -80,7 +80,7 @@ async fn main() {
     }
 
     // wait for the message to be sent out
-    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+    async_std::task::sleep(std::time::Duration::from_secs(1)).await;
 
     log::info!("fetching chats..");
     let chats = Chatlist::try_load(&ctx, 0, None, None).await.unwrap();
@@ -96,5 +96,5 @@ async fn main() {
     ctx.stop_io().await;
     log::info!("closing");
     drop(ctx);
-    events_spawn.await.unwrap();
+    events_spawn.await;
 }

node/README.md

@@ -60,19 +60,6 @@ building from source or clone this repository and follow this steps:
 > not inside this folder. (We need this in order to include the rust source
 > code in the npm package.)
 
-### Use a git branch in deltachat-desktop
-
-You can directly install a core branch, but make sure:
-- that you have typescript in your project dependencies, as it is likely required
-- you know that there are **no prebuilds** and so core is built during installation which is why it takes so long
-
-```
-npm install https://github.com/deltachat/deltachat-core-rust.git#branch
-```
-
-If you want prebuilds for a branch that has a core pr, you might find an npm tar.gz package for that branch at <https://download.delta.chat/node/preview/>.
-The github ci also posts a link to it in the checks for each pr.
-
 ### Use build-from-source in deltachat-desktop
 
 If you want to use the manually built node bindings in the desktop client (for
@@ -117,7 +104,7 @@ $ fnm install 17 --arch x64
 $ fnm use 17
 $ node -p process.arch
 # result should be x64
-$ rustup target add x86_64-apple-darwin
+$ 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
@@ -234,7 +221,7 @@ We have the following scripts for building, testing and coverage:
 The following steps are needed to make a release:
 
 1. Wait until `pack-module` github action is completed
-2. Run `npm publish https://download.delta.chat/node/deltachat-node-1.x.x.tar.gz` to publish it to npm. You probably need write rights to npm.
+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
 

node/lib/chat.ts

@@ -39,10 +39,6 @@ export class Chat {
     return binding.dcn_chat_get_name(this.dc_chat)
   }
 
-  getMailinglistAddr(): string {
-    return binding.dcn_chat_get_mailinglist_addr(this.dc_chat)
-  }
-
   getProfileImage(): string {
     return binding.dcn_chat_get_profile_image(this.dc_chat)
   }
@@ -96,7 +92,6 @@ export class Chat {
       color: this.color,
       id: this.getId(),
       name: this.getName(),
-      mailinglistAddr: this.getMailinglistAddr(),
       profileImage: this.getProfileImage(),
       type: this.getType(),
       isSelfTalk: this.isSelfTalk(),

node/lib/contact.ts

@@ -72,10 +72,6 @@ export class Contact {
     return binding.dcn_contact_get_last_seen(this.dc_contact)
   }
 
-  wasSeenRecently() {
-    return Boolean(binding.dcn_contact_was_seen_recently(this.dc_contact))
-  }
-
   getName(): string {
     return binding.dcn_contact_get_name(this.dc_contact)
   }

node/lib/deltachat.ts

@@ -19,11 +19,10 @@ interface NativeAccount {}
 export class AccountManager extends EventEmitter {
   dcn_accounts: NativeAccount
   accountDir: string
-  jsonRpcStarted = false
 
   constructor(cwd: string, os = 'deltachat-node') {
-    super()
     debug('DeltaChat constructor')
+    super()
 
     this.accountDir = cwd
     this.dcn_accounts = binding.dcn_accounts_new(os, this.accountDir)
@@ -115,31 +114,6 @@ export class AccountManager extends EventEmitter {
     debug('Started event handler')
   }
 
-  startJsonRpcHandler(callback: ((response: string) => void) | null) {
-    if (this.dcn_accounts === null) {
-      throw new Error('dcn_account is null')
-    }
-    if (!callback) {
-      throw new Error('no callback set')
-    }
-    if (this.jsonRpcStarted) {
-      throw new Error('jsonrpc was started already')
-    }
-
-    binding.dcn_accounts_start_jsonrpc(this.dcn_accounts, callback.bind(this))
-    debug('Started JSON-RPC handler')
-    this.jsonRpcStarted = true
-  }
-
-  jsonRpcRequest(message: string) {
-    if (!this.jsonRpcStarted) {
-      throw new Error(
-        'jsonrpc is not active, start it with startJsonRpcHandler first'
-      )
-    }
-    binding.dcn_json_rpc_request(this.dcn_accounts, message)
-  }
-
   startIO() {
     binding.dcn_accounts_start_io(this.dcn_accounts)
   }

node/lib/types.ts

@@ -12,7 +12,6 @@ export interface ChatJSON {
   color: string
   id: number
   name: string
-  mailinglistAddr: string
   profileImage: string
   type: number
   isSelfTalk: boolean

node/scripts/generate-constants.js

@@ -1,65 +1,73 @@
 #!/usr/bin/env node
+
 const fs = require('fs')
 const path = require('path')
+const split = require('split2')
 
 const data = []
-const header = path.resolve(__dirname, '../../deltachat-ffi/deltachat.h')
+const regex = /^#define\s+(\w+)\s+(\w+)/i
+const header = path.resolve(
+  __dirname,
+  '../../deltachat-ffi/deltachat.h'
+)
 
 console.log('Generating constants...')
 
-const header_data = fs.readFileSync(header, 'UTF-8')
-const regex = /^#define\s+(\w+)\s+(\w+)/gm
-while (null != (match = regex.exec(header_data))) {
-  const key = match[1]
-  const value = parseInt(match[2])
-  if (!isNaN(value)) {
-    data.push({ key, value })
-  }
-}
+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
 
-delete header_data
+      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 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')
 
-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`
+    )
 
-// 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
+    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/postLinksToDetails.js

@@ -17,7 +17,7 @@ const STATUS_DATA = {
   state: 'success',
   description: '⏩ Click on "Details" to download →',
   context: 'Download the node-bindings.tar.gz',
-  target_url: base_url + file_url,
+  target_url: base_url + file_url + '.tar.gz',
 }
 
 const http = require('https')

node/scripts/rebuild-core.js

@@ -9,7 +9,7 @@ const buildArgs = [
   'build',
   '--release',
   '--features',
-  'vendored,jsonrpc',
+  'vendored',
   '-p',
   'deltachat_ffi'
 ]

node/src/module.c

@@ -34,9 +34,6 @@ typedef struct dcn_accounts_t {
   dc_accounts_t* dc_accounts;
   napi_threadsafe_function threadsafe_event_handler;
   uv_thread_t event_handler_thread;
-  napi_threadsafe_function threadsafe_jsonrpc_handler;
-  uv_thread_t jsonrpc_thread;
-  dc_jsonrpc_instance_t* jsonrpc_instance;
   int gc;
 } dcn_accounts_t;
 
@@ -101,6 +98,14 @@ static void finalize_provider(napi_env env, void* data, void* hint) {
   }
 }
 
+static void finalize_account(napi_env env, void* data, void* hint) {
+  if (data) {
+    dc_accounts_t* dcn_accounts = (dc_accounts_t*)data;
+    //TRACE("cleaning up provider");
+    dc_accounts_unref(dcn_accounts);
+  }
+}
+
 /**
  * Helpers.
  */
@@ -321,7 +326,7 @@ static void call_js_event_handler(napi_env env, napi_value js_callback, void* _c
 
   if (status != napi_ok) {
     TRACE("Unable to call event_handler callback2");
-    const napi_extended_error_info* error_result;
+    napi_extended_error_info* error_result;
     NAPI_STATUS_THROWS(napi_get_last_error_info(env, &error_result));
   }
 }
@@ -343,7 +348,7 @@ NAPI_METHOD(dcn_start_event_handler) {
     callback,
     0,
     async_resource_name,
-    1000, // max_queue_size
+    1,
     1,
     NULL,
     NULL,
@@ -366,11 +371,6 @@ NAPI_METHOD(dcn_context_unref) {
 
   TRACE("Unrefing dc_context");
   dcn_context->gc = 1;
-  if (dcn_context->event_handler_thread != 0) {
-    dc_stop_io(dcn_context->dc_context);
-    uv_thread_join(&dcn_context->event_handler_thread);
-    dcn_context->event_handler_thread = 0;
-  }
   dc_context_unref(dcn_context->dc_context);
   dcn_context->dc_context = NULL;
 
@@ -1628,18 +1628,6 @@ NAPI_METHOD(dcn_chat_get_name) {
   NAPI_RETURN_AND_UNREF_STRING(name);
 }
 
-NAPI_METHOD(dcn_chat_get_mailinglist_addr) {
-  NAPI_ARGV(1);
-  NAPI_DC_CHAT();
-
-  //TRACE("calling..");
-  char* addr = dc_chat_get_mailinglist_addr(dc_chat);
-  //TRACE("result %s", name);
-
-  NAPI_RETURN_AND_UNREF_STRING(addr);
-}
-
-
 NAPI_METHOD(dcn_chat_get_profile_image) {
   NAPI_ARGV(1);
   NAPI_DC_CHAT();
@@ -1930,13 +1918,6 @@ NAPI_METHOD(dcn_contact_get_last_seen) {
   NAPI_RETURN_INT64(timestamp);
 }
 
-NAPI_METHOD(dcn_contact_was_seen_recently) {
-  NAPI_ARGV(1);
-  NAPI_DC_CONTACT();
-  int seen_recently = dc_contact_was_seen_recently(dc_contact);
-  NAPI_RETURN_UINT32(seen_recently);
-}
-
 NAPI_METHOD(dcn_contact_is_blocked) {
   NAPI_ARGV(1);
   NAPI_DC_CONTACT();
@@ -2941,17 +2922,6 @@ NAPI_METHOD(dcn_accounts_unref) {
 
   TRACE("Unrefing dc_accounts");
   dcn_accounts->gc = 1;
-  if (dcn_accounts->event_handler_thread != 0) {
-    dc_accounts_stop_io(dcn_accounts->dc_accounts);
-    uv_thread_join(&dcn_accounts->event_handler_thread);
-    dcn_accounts->event_handler_thread = 0;
-  }
-  if (dcn_accounts->jsonrpc_instance) {
-    dc_jsonrpc_request(dcn_accounts->jsonrpc_instance, "{}");
-    uv_thread_join(&dcn_accounts->jsonrpc_thread);
-    dc_jsonrpc_unref(dcn_accounts->jsonrpc_instance);
-    dcn_accounts->jsonrpc_instance = NULL;
-  }
   dc_accounts_unref(dcn_accounts->dc_accounts);
   dcn_accounts->dc_accounts = NULL;
 
@@ -3110,19 +3080,21 @@ static void accounts_event_handler_thread_func(void* arg)
 {
   dcn_accounts_t* dcn_accounts = (dcn_accounts_t*)arg;
 
+
+
   TRACE("event_handler_thread_func starting");
 
-  dc_event_emitter_t * dc_event_emitter = dc_accounts_get_event_emitter(dcn_accounts->dc_accounts);
+  dc_accounts_event_emitter_t * dc_accounts_event_emitter = dc_accounts_get_event_emitter(dcn_accounts->dc_accounts);
   dc_event_t* event;
   while (true) {
-    if (dc_event_emitter == NULL) {
+    if (dc_accounts_event_emitter == NULL) {
       TRACE("event emitter is null, bailing");
       break;
     }
-    event = dc_get_next_event(dc_event_emitter);
+    event = dc_accounts_get_next_event(dc_accounts_event_emitter);
     if (event == NULL) {
-      TRACE("no more events");
-      break;
+      //TRACE("received NULL event, skipping");
+      continue;
     }
 
     if (!dcn_accounts->threadsafe_event_handler) {
@@ -3145,7 +3117,7 @@ static void accounts_event_handler_thread_func(void* arg)
     }
   }
 
-  dc_event_emitter_unref(dc_event_emitter);
+  dc_accounts_event_emitter_unref(dc_accounts_event_emitter);
 
   TRACE("event_handler_thread_func ended");
 
@@ -3199,7 +3171,7 @@ static void call_accounts_js_event_handler(napi_env env, napi_value js_callback,
     if (status != napi_ok) {
       napi_throw_error(env, NULL, "Unable to create argv[3] for event_handler arguments");
     }
-    dc_str_unref(data2_string);
+    free(data2_string);
   } else {
     status = napi_create_int32(env, dc_event_get_data2_int(dc_event), &argv[3]);
     if (status != napi_ok) {
@@ -3223,7 +3195,7 @@ static void call_accounts_js_event_handler(napi_env env, napi_value js_callback,
 
   if (status != napi_ok) {
     TRACE("Unable to call event_handler callback2");
-    const napi_extended_error_info* error_result;
+    napi_extended_error_info* error_result;
     NAPI_STATUS_THROWS(napi_get_last_error_info(env, &error_result));
   }
 }
@@ -3244,7 +3216,7 @@ NAPI_METHOD(dcn_accounts_start_event_handler) {
     callback,
     0,
     async_resource_name,
-    1000, // max_queue_size
+    1,
     1,
     NULL,
     NULL,
@@ -3260,124 +3232,6 @@ NAPI_METHOD(dcn_accounts_start_event_handler) {
   NAPI_RETURN_UNDEFINED();
 }
 
-// JSON RPC
-
-static void accounts_jsonrpc_thread_func(void* arg)
-{
-  dcn_accounts_t* dcn_accounts = (dcn_accounts_t*)arg;
-  TRACE("accounts_jsonrpc_thread_func starting");
-  char* response;
-  while (true) {
-    response = dc_jsonrpc_next_response(dcn_accounts->jsonrpc_instance);
-    if (response == NULL) {
-      // done or broken
-      break;
-    }
-
-    if (!dcn_accounts->threadsafe_jsonrpc_handler) {
-      TRACE("threadsafe_jsonrpc_handler not set, bailing");
-      break;
-    }
-    // Don't process events if we're being garbage collected!
-    if (dcn_accounts->gc == 1) {
-      TRACE("dc_accounts has been destroyed, bailing");
-      break;
-    }
-
-    napi_status status = napi_call_threadsafe_function(dcn_accounts->threadsafe_jsonrpc_handler, response, napi_tsfn_blocking);
-
-    if (status == napi_closing) {
-      TRACE("JS function got released, bailing");
-      break;
-    }
-  }
-  TRACE("accounts_jsonrpc_thread_func ended");
-  napi_release_threadsafe_function(dcn_accounts->threadsafe_jsonrpc_handler, napi_tsfn_release);
-}
-
-static void call_accounts_js_jsonrpc_handler(napi_env env, napi_value js_callback, void* _context, void* data)
-{
-  char* response = (char*)data;
-  napi_value global;
-  napi_status status = napi_get_global(env, &global);
-  if (status != napi_ok) {
-    napi_throw_error(env, NULL, "Unable to get global");
-  }
-
-  napi_value argv[1];
-  if (response != 0) {
-    status = napi_create_string_utf8(env, response, NAPI_AUTO_LENGTH, &argv[0]);
-  } else {
-    status = napi_create_string_utf8(env, "", NAPI_AUTO_LENGTH, &argv[0]);
-  }
-  if (status != napi_ok) {
-    napi_throw_error(env, NULL, "Unable to create argv for js jsonrpc_handler arguments");
-  } 
-  dc_str_unref(response);
-
-  TRACE("calling back into js");
-  napi_value result;
-  status = napi_call_function(
-    env,
-    global,
-    js_callback,
-    1,
-    argv,
-    &result);
-  if (status != napi_ok) {
-    TRACE("Unable to call jsonrpc_handler callback2");
-    const napi_extended_error_info* error_result;
-    NAPI_STATUS_THROWS(napi_get_last_error_info(env, &error_result));
-  }
-}
-
-NAPI_METHOD(dcn_accounts_start_jsonrpc) {
-  NAPI_ARGV(2);
-  NAPI_DCN_ACCOUNTS();
-  napi_value callback = argv[1];
-
-  TRACE("calling..");
-  napi_value async_resource_name;
-  NAPI_STATUS_THROWS(napi_create_string_utf8(env, "dc_accounts_jsonrpc_callback", NAPI_AUTO_LENGTH, &async_resource_name));
-
-  TRACE("creating threadsafe function..");
-
-  NAPI_STATUS_THROWS(napi_create_threadsafe_function(
-    env,
-    callback,
-    0,
-    async_resource_name,
-    1000, // max_queue_size
-    1,
-    NULL,
-    NULL,
-    NULL,
-    call_accounts_js_jsonrpc_handler,
-    &dcn_accounts->threadsafe_jsonrpc_handler));
-  TRACE("done");
-
-  dcn_accounts->gc = 0;
-  dcn_accounts->jsonrpc_instance = dc_jsonrpc_init(dcn_accounts->dc_accounts);
-
-  TRACE("creating uv thread..");
-  uv_thread_create(&dcn_accounts->jsonrpc_thread, accounts_jsonrpc_thread_func, dcn_accounts);
-
-  NAPI_RETURN_UNDEFINED();
-}
-
-NAPI_METHOD(dcn_json_rpc_request) {
-  NAPI_ARGV(2);
-  NAPI_DCN_ACCOUNTS();
-  if (!dcn_accounts->jsonrpc_instance) {
-    const char* msg = "dcn_accounts->jsonrpc_instance is null, have you called dcn_accounts_start_jsonrpc()?";
-    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg));
-  }
-  NAPI_ARGV_UTF8_MALLOC(request, 1);
-  dc_jsonrpc_request(dcn_accounts->jsonrpc_instance, request);
-  free(request);
-  NAPI_RETURN_UNDEFINED();
-}
-
 
 NAPI_INIT() {
   /**
@@ -3514,7 +3368,6 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(dcn_chat_get_visibility);
   NAPI_EXPORT_FUNCTION(dcn_chat_get_id);
   NAPI_EXPORT_FUNCTION(dcn_chat_get_name);
-  NAPI_EXPORT_FUNCTION(dcn_chat_get_mailinglist_addr);
   NAPI_EXPORT_FUNCTION(dcn_chat_get_profile_image);
   NAPI_EXPORT_FUNCTION(dcn_chat_get_type);
   NAPI_EXPORT_FUNCTION(dcn_chat_is_self_talk);
@@ -3649,9 +3502,4 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(dcn_send_webxdc_status_update);
   NAPI_EXPORT_FUNCTION(dcn_get_webxdc_status_updates);
   NAPI_EXPORT_FUNCTION(dcn_msg_get_webxdc_blob);
-
-
-  /** jsonrpc **/
-  NAPI_EXPORT_FUNCTION(dcn_accounts_start_jsonrpc);
-  NAPI_EXPORT_FUNCTION(dcn_json_rpc_request);
 }

node/src/napi-macros-extensions.h

@@ -23,7 +23,7 @@
   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 dcn_acounts is null"; \
+    const char* msg = "Provided dnc_acounts is null"; \
     NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
   } \
   if (!dcn_accounts->dc_accounts) { \

node/test/test.js

@@ -2,7 +2,7 @@
 import DeltaChat, { Message } from '../dist'
 import binding from '../binding'
 
-import { deepEqual, deepStrictEqual, strictEqual } from 'assert'
+import { strictEqual } from 'assert'
 import chai, { expect } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 import { EventId2EventName, C } from '../dist/constants'
@@ -84,95 +84,6 @@ describe('static tests', function () {
   })
 })
 
-describe('JSON RPC', function () {
-  it('smoketest', async function () {
-    const { dc } = DeltaChat.newTemporary()
-    let promise_resolve
-    const promise = new Promise((res, _rej) => {
-      promise_resolve = res
-    })
-    dc.startJsonRpcHandler(promise_resolve)
-    dc.jsonRpcRequest(
-      JSON.stringify({
-        jsonrpc: '2.0',
-        method: 'get_all_account_ids',
-        params: [],
-        id: 2,
-      })
-    )
-    deepStrictEqual(
-      {
-        jsonrpc: '2.0',
-        id: 2,
-        result: [1],
-      },
-      JSON.parse(await promise)
-    )
-    dc.close()
-  })
-
-  it('basic test', async function () {
-    const { dc } = DeltaChat.newTemporary()
-
-    const promises = {}
-    dc.startJsonRpcHandler((msg) => {
-      const response = JSON.parse(msg)
-      promises[response.id](response)
-      delete promises[response.id]
-    })
-    const call = (request) => {
-      dc.jsonRpcRequest(JSON.stringify(request))
-      return new Promise((res, _rej) => {
-        promises[request.id] = res
-      })
-    }
-
-    deepStrictEqual(
-      {
-        jsonrpc: '2.0',
-        id: 2,
-        result: [1],
-      },
-      await call({
-        jsonrpc: '2.0',
-        method: 'get_all_account_ids',
-        params: [],
-        id: 2,
-      })
-    )
-
-    deepStrictEqual(
-      {
-        jsonrpc: '2.0',
-        id: 3,
-        result: 2,
-      },
-      await call({
-        jsonrpc: '2.0',
-        method: 'add_account',
-        params: [],
-        id: 3,
-      })
-    )
-
-    deepStrictEqual(
-      {
-        jsonrpc: '2.0',
-        id: 4,
-        result: [1, 2],
-      },
-      await call({
-        jsonrpc: '2.0',
-        method: 'get_all_account_ids',
-        params: [],
-        id: 4,
-      })
-    )
-
-    dc.close()
-  })
-})
-
 describe('Basic offline Tests', function () {
   it('opens a context', async function () {
     const { dc, context } = DeltaChat.newTemporary()
@@ -217,7 +128,7 @@ describe('Basic offline Tests', function () {
 
     await expect(
       context.configure({ addr: 'delta1@delta.localhost' })
-    ).to.eventually.be.rejectedWith('Missing (IMAP) password.')
+    ).to.eventually.be.rejectedWith('Please enter a password.')
     await expect(context.configure({ mailPw: 'delta1' })).to.eventually.be
       .rejected
 
@@ -690,8 +601,8 @@ describe('Offline Tests with unconfigured account', function () {
     strictEqual(chatList.getCount(), 1, 'only one archived')
   })
 
-  it('Remove quote from (draft) message', function () {
-    context.addDeviceMessage('test_quote', 'test')
+  it('Remove qoute from (draft) message', function () {
+    context.addDeviceMessage('test_qoute', 'test')
     const msgId = context.getChatMessages(10, 0, 0)[0]
     const msg = context.messageNew()
 

package.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "@deltachat/jsonrpc-client": "file:deltachat-jsonrpc/typescript",
     "debug": "^4.1.1",
     "napi-macros": "^2.0.0",
-    "node-gyp-build": "^4.1.0"
+    "node-gyp-build": "^4.1.0",
+    "split2": "^3.1.1"
   },
   "description": "node.js bindings for deltachat-core",
   "devDependencies": {
@@ -42,7 +42,7 @@
     "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 && node-gyp rebuild",
+    "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",
@@ -58,8 +58,8 @@
     "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 --bail"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.93.0"
+  "version": "1.81.0"
 }

python/README.rst

@@ -1,77 +1,84 @@
 =========================
-DeltaChat Python bindings
+deltachat python bindings
 =========================
 
-This package provides `Python bindings`_ to the `deltachat-core library`_
-which implements IMAP/SMTP/MIME/OpenPGP e-mail standards and offers
+This package provides bindings to the deltachat-core_ Rust -library
+which implements IMAP/SMTP/MIME/PGP e-mail standards and offers
 a low-level Chat/Contact/Message API to user interfaces and bots.
 
-.. _`deltachat-core library`: https://github.com/deltachat/deltachat-core-rust
-.. _`Python bindings`: https://py.delta.chat/
 
 Installing pre-built packages (Linux-only)
-==========================================
+========================================================
 
 If you have a Linux system you may try to install the ``deltachat`` binary "wheel" packages
 without any "build-from-source" steps.
-Otherwise you need to `compile the Delta Chat bindings yourself`__.
-
-__ sourceinstall_
+Otherwise you need to `compile the Delta Chat bindings yourself <#sourceinstall>`_.
 
 We recommend to first `install virtualenv <https://virtualenv.pypa.io/en/stable/installation.html>`_,
 then create a fresh Python virtual environment and activate it in your shell::
 
-        virtualenv env  # or: python -m venv
-        source env/bin/activate
+        virtualenv venv  # or: python -m venv
+        source venv/bin/activate
 
 Afterwards, invoking ``python`` or ``pip install`` only
-modifies files in your ``env`` directory and leaves
+modifies files in your ``venv`` directory and leaves
 your system installation alone.
 
-For Linux we build wheels for all releases and push them to a python package
-index. To install the latest release::
+For Linux, we automatically build wheels for all github PR branches
+and push them to a python package index. To install the latest
+github ``master`` branch::
 
-    pip install deltachat
+    pip install --pre -i https://m.devpi.net/dc/master deltachat
 
 To verify it worked::
 
     python -c "import deltachat"
 
+.. note::
+
+    If you can help to automate the building of wheels for Mac or Windows,
+    that'd be much appreciated! please then get
+    `in contact with us <https://delta.chat/en/contribute>`_.
+
+
 Running tests
 =============
 
-Recommended way to run tests is using `tox <https://tox.wiki>`_.
-After successful binding installation you can install tox
-and run the tests::
+After successful binding installation you can install a few more
+Python packages before running the tests::
 
-    pip install tox
-    tox -e py3
+    python -m pip install pytest pytest-xdist pytest-timeout pytest-rerunfailures requests
+    pytest -v tests
 
 This will run all "offline" tests and skip all functional
 end-to-end tests that require accounts on real e-mail servers.
 
 .. _livetests:
 
-Running "live" tests with temporary accounts
---------------------------------------------
+running "live" tests with temporary accounts
+---------------------------------------------
 
-If you want to run live functional tests you can set ``DCC_NEW_TMP_EMAIL`` to a URL that creates e-mail accounts.  Most developers use https://testrun.org URLs created and managed by `mailadm <https://mailadm.readthedocs.io/>`_.
+If you want to run live functional tests you can set ``DCC_NEW_TMP_EMAIL`` to a URL that creates e-mail accounts.  Most developers use https://testrun.org URLS created and managed by [mailadm](https://mailadm.readthedocs.io/en/latest/).
 
-Please feel free to contact us through a github issue or by e-mail and we'll send you a URL that you can then use for functional tests like this::
+Please feel free to contact us through a github issue or by e-mail and we'll send you a URL that you can then use for functional tests like this:
 
     export DCC_NEW_TMP_EMAIL=<URL you got from us>
 
 With this account-creation setting, pytest runs create ephemeral e-mail accounts on the http://testrun.org server.  These accounts exists only for one hour and then are removed completely.
-One hour is enough to invoke pytest and run all offline and online tests::
+One hour is enough to invoke pytest and run all offline and online tests:
 
-    tox -e py3
+    pytest
+
+    # or if you have installed pytest-xdist for parallel test execution
+    pytest -n6
 
 Each test run creates new accounts.
 
+
 .. _sourceinstall:
 
-Installing bindings from source
-===============================
+Installing bindings from source (Updated: July 2020)
+=========================================================
 
 Install Rust and Cargo first.
 The easiest is probably to use `rustup <https://rustup.rs/>`_.
@@ -90,42 +97,74 @@ E.g. on Debian-based systems `apt install python3 python3-pip
 python3-venv` should give you a usable python installation.
 
 Ensure you are in the deltachat-core-rust/python directory, create the
-virtual environment with dependencies using tox
-and activate it in your shell::
+virtual environment and activate it in your shell::
 
    cd python
-   tox --devenv env
-   source env/bin/activate
+   python3 -m venv venv  # or: virtualenv venv
+   source venv/bin/activate
 
 You should now be able to build the python bindings using the supplied script::
 
-   python3 install_python_bindings.py
+   python install_python_bindings.py
 
 The core compilation and bindings building might take a while,
 depending on the speed of your machine.
+The bindings will be installed in release mode but with debug symbols.
+The release mode is currently necessary because some tests generate RSA keys
+which is prohibitively slow in non-release mode.
+
+
+Code examples
+=============
+
+You may look at `examples <https://py.delta.chat/examples.html>`_.
+
+
+.. _`deltachat-core-rust github repository`: https://github.com/deltachat/deltachat-core-rust
+.. _`deltachat-core`: https://github.com/deltachat/deltachat-core-rust
+
 
 Building manylinux based wheels
-===============================
+====================================
 
 Building portable manylinux wheels which come with libdeltachat.so
-can be done with Docker_ or Podman_.
+can be done with docker-tooling.
 
-.. _Docker: https://www.docker.com/
-.. _Podman: https://podman.io/
+using docker pull / premade images
+------------------------------------
 
-If you want to build your own wheels, build container image first::
+We publish a build environment under the ``deltachat/coredeps`` tag so
+that you can pull it from the ``hub.docker.com`` site's "deltachat"
+organization::
 
-   $ cd deltachat-core-rust # cd to deltachat-core-rust working tree
-   $ docker build -t deltachat/coredeps scripts/coredeps
-
-This will use the ``scripts/coredeps/Dockerfile`` to build
-container image called ``deltachat/coredeps``.  You can afterwards
-find it with::
-
-   $ docker images
+    $ docker pull deltachat/coredeps
 
 This docker image can be used to run tests and build Python wheels for all interpreters::
 
     $ docker run -e DCC_NEW_TMP_EMAIL \
-       --rm -it -v $(pwd):/mnt -w /mnt \
+       --rm -it -v \$(pwd):/mnt -w /mnt \
        deltachat/coredeps scripts/run_all.sh
+
+
+Optionally build your own docker image
+--------------------------------------
+
+If you want to build your own custom docker image you can do this::
+
+   $ cd deltachat-core # cd to deltachat-core checkout directory
+   $ docker build -t deltachat/coredeps scripts/docker_coredeps
+
+This will use the ``scripts/docker_coredeps/Dockerfile`` to build
+up docker image called ``deltachat/coredeps``.  You can afterwards
+find it with::
+
+   $ docker images
+
+
+Troubleshooting
+---------------
+
+On more recent systems running the docker image may crash.  You can
+fix this by adding ``vsyscall=emulate`` to the Linux kernel boot
+arguments commandline.  E.g. on Debian you'd add this to
+``GRUB_CMDLINE_LINUX_DEFAULT`` in ``/etc/default/grub``.

python/doc/_templates/globaltoc.html

@@ -11,7 +11,8 @@
 <ul>
   <li><a href="https://github.com/deltachat/deltachat-core-rust">github repository</a></li>
   <li><a href="https://pypi.python.org/pypi/deltachat">pypi: deltachat</a></li>
-  <li><a href="https://web.libera.chat/#deltachat">#deltachat</a></li>
 </ul>
 
+<b>#deltachat [freenode]</b>
+
 </div>

python/examples/echo_and_quit.py

@@ -1,3 +1,4 @@
+
 # content of echo_and_quit.py
 
 from deltachat import account_hookimpl, run_cmdline

python/examples/group_tracking.py

@@ -1,3 +1,4 @@
+
 # content of group_tracking.py
 
 from deltachat import account_hookimpl, run_cmdline
@@ -32,21 +33,15 @@ class GroupTrackingPlugin:
 
     @account_hookimpl
     def ac_member_added(self, chat, contact, actor, message):
-        print(
-            "ac_member_added {} to chat {} from {}".format(
-                contact.addr, chat.id, actor or message.get_sender_contact().addr
-            )
-        )
+        print("ac_member_added {} to chat {} from {}".format(
+            contact.addr, chat.id, actor or message.get_sender_contact().addr))
         for member in chat.get_contacts():
             print("chat member: {}".format(member.addr))
 
     @account_hookimpl
     def ac_member_removed(self, chat, contact, actor, message):
-        print(
-            "ac_member_removed {} from chat {} by {}".format(
-                contact.addr, chat.id, actor or message.get_sender_contact().addr
-            )
-        )
+        print("ac_member_removed {} from chat {} by {}".format(
+            contact.addr, chat.id, actor or message.get_sender_contact().addr))
 
 
 def main(argv=None):

python/examples/test_examples.py

@@ -1,20 +1,20 @@
+
+import pytest
+import py
 import echo_and_quit
 import group_tracking
-import py
-import pytest
-
 from deltachat.events import FFIEventLogger
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope='session')
 def datadir():
     """The py.path.local object of the test-data/ directory."""
     for path in reversed(py.path.local(__file__).parts()):
-        datadir = path.join("test-data")
+        datadir = path.join('test-data')
         if datadir.isdir():
             return datadir
     else:
-        pytest.skip("test-data directory not found")
+        pytest.skip('test-data directory not found')
 
 
 def test_echo_quit_plugin(acfactory, lp):
@@ -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_online_accounts(1)
 
     lp.sec("sending a message to the bot")
     bot_contact = ac1.create_contact(botproc.addr)
@@ -44,11 +44,9 @@ def test_group_tracking_plugin(acfactory, lp):
 
     ac1, ac2 = acfactory.get_online_accounts(2)
 
-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
         *ac_configure_completed*
-    """
-    )
+    """)
     ac1.add_account_plugin(FFIEventLogger(ac1))
     ac2.add_account_plugin(FFIEventLogger(ac2))
 
@@ -58,11 +56,9 @@ def test_group_tracking_plugin(acfactory, lp):
     ch.add_contact(bot_contact)
     ch.send_text("hello")
 
-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
         *ac_chat_modified*bot test group*
-    """
-    )
+    """)
 
     lp.sec("adding third member {}".format(ac2.get_config("addr")))
     contact3 = ac1.create_contact(ac2.get_config("addr"))
@@ -72,20 +68,12 @@ def test_group_tracking_plugin(acfactory, lp):
     assert "hello" in reply.text
 
     lp.sec("now looking at what the bot received")
-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
         *ac_member_added {}*from*{}*
-    """.format(
-            contact3.addr, ac1.get_config("addr")
-        )
-    )
+    """.format(contact3.addr, ac1.get_config("addr")))
 
     lp.sec("contact successfully added, now removing")
     ch.remove_contact(contact3)
-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
         *ac_member_removed {}*from*{}*
-    """.format(
-            contact3.addr, ac1.get_config("addr")
-        )
-    )
+    """.format(contact3.addr, ac1.get_config("addr")))

python/fail_test.py

@@ -0,0 +1,7 @@
+from __future__ import print_function
+from deltachat import capi
+from deltachat.capi import ffi, lib
+
+if __name__ == "__main__":
+    ctx = capi.lib.dc_context_new(ffi.NULL, ffi.NULL)
+    lib.dc_stop_io(ctx)

python/install_python_bindings.py

@@ -16,15 +16,17 @@ if __name__ == "__main__":
         dn = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         os.environ["DCC_RS_DEV"] = dn
 
-    cmd = ["cargo", "build", "-p", "deltachat_ffi", "--features", "jsonrpc"]
+    cmd = ["cargo", "build", "-p", "deltachat_ffi"]
 
-    if target == "release":
+    if target == 'release':
         os.environ["CARGO_PROFILE_RELEASE_LTO"] = "on"
         cmd.append("--release")
 
     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 src/deltachat/*.dylib src/deltachat/*.dll" , shell=True)
 
     if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
-        subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", "."])
+        subprocess.check_call([
+            sys.executable, "-m", "pip", "install", "-e", "."
+        ])

python/pyproject.toml

@@ -1,48 +1,8 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", "cffi>=1.0.0", "pkgconfig"]
+requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2", "cffi>=1.0.0", "pkgconfig"]
 build-backend = "setuptools.build_meta"
 
-[project]
-name = "deltachat"
-description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
-readme = "README.rst"
-requires-python = ">=3.7"
-authors = [
-    { name = "holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors" },
-]
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-    "Programming Language :: Python :: 3",
-    "Topic :: Communications :: Email",
-    "Topic :: Software Development :: Libraries",
-]
-dependencies = [
-    "cffi>=1.0.0",
-    "imap-tools",
-    "pluggy",
-    "requests",
-]
-dynamic = [
-    "version"
-]
-
-[project.urls]
-"Home" = "https://github.com/deltachat/deltachat-core-rust/"
-"Bug Tracker" = "https://github.com/deltachat/deltachat-core-rust/issues"
-"Documentation" = "https://py.delta.chat/"
-
-[project.entry-points.pytest11]
-"deltachat.testplugin" = "deltachat.testplugin"
-
 [tool.setuptools_scm]
 root = ".."
 tag_regex = '^(?P<prefix>py-)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
 git_describe_command = "git describe --dirty --tags --long --match py-*.*"
-
-[tool.black]
-line-length = 120
-
-[tool.isort]
-profile = "black"

python/setup.cfg

@@ -0,0 +1,4 @@
+[devpi:upload]
+formats = sdist.tgz
+no-vcs = 1
+

python/setup.py

@@ -1,4 +1,39 @@
-from setuptools import setup
+import setuptools
+import os
+import re
+
+
+def main():
+    with open("README.rst") as f:
+        long_description = f.read()
+    setuptools.setup(
+        name='deltachat',
+        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',
+        ],
+        packages=setuptools.find_packages('src'),
+        package_dir={'': 'src'},
+        cffi_modules=['src/deltachat/_build.py:ffibuilder'],
+        entry_points = {
+            'pytest11': [
+                'deltachat.testplugin = deltachat.testplugin',
+            ],
+        },
+        classifiers=[
+            'Development Status :: 4 - Beta',
+            'Intended Audience :: Developers',
+            'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
+            'Programming Language :: Python :: 3',
+            'Topic :: Communications :: Email',
+            'Topic :: Software Development :: Libraries',
+        ],
+    )
+
 
 if __name__ == "__main__":
-    setup(cffi_modules=["src/deltachat/_build.py:ffibuilder"])
+    main()

python/src/deltachat/__init__.py

@@ -1,15 +1,15 @@
 import sys
 
-from pkg_resources import DistributionNotFound, get_distribution
-
-from . import capi, const, events, hookspec  # noqa
-from .account import Account, get_core_info  # noqa
+from . import capi, const, hookspec # noqa
 from .capi import ffi  # noqa
-from .chat import Chat  # noqa
-from .contact import Contact  # noqa
-from .hookspec import account_hookimpl, global_hookimpl  # noqa
+from .account import Account, get_core_info  # noqa
 from .message import Message  # noqa
+from .contact import Contact  # noqa
+from .chat import Chat        # noqa
+from .hookspec import account_hookimpl, global_hookimpl  # noqa
+from . import events
 
+from pkg_resources import get_distribution, DistributionNotFound
 try:
     __version__ = get_distribution(__name__).version
 except DistributionNotFound:
@@ -26,7 +26,7 @@ def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
 
 
 def register_global_plugin(plugin):
-    """Register a global plugin which implements one or more
+    """ Register a global plugin which implements one or more
     of the :class:`deltachat.hookspec.Global` hooks.
     """
     gm = hookspec.Global._get_plugin_manager()
@@ -43,10 +43,9 @@ register_global_plugin(events)
 
 
 def run_cmdline(argv=None, account_plugins=None):
-    """Run a simple default command line app, registering the specified
-    account plugins."""
+    """ Run a simple default command line app, registering the specified
+    account plugins. """
     import argparse
-
     if argv is None:
         argv = sys.argv
 
@@ -60,7 +59,29 @@ def run_cmdline(argv=None, account_plugins=None):
 
     ac = Account(args.db)
 
-    ac.run_account(addr=args.email, password=args.password, account_plugins=account_plugins, show_ffi=args.show_ffi)
+    if args.show_ffi:
+        ac.set_config("displayname", "bot")
+        log = events.FFIEventLogger(ac)
+        ac.add_account_plugin(log)
+
+    for plugin in account_plugins or []:
+        print("adding plugin", plugin)
+        ac.add_account_plugin(plugin)
+
+    if not ac.is_configured():
+        assert args.email and args.password, (
+            "you must specify --email and --password once to configure this database/account"
+        )
+        ac.set_config("addr", args.email)
+        ac.set_config("mail_pw", args.password)
+        ac.set_config("mvbox_move", "0")
+        ac.set_config("sentbox_watch", "0")
+        ac.set_config("bot", "1")
+        configtracker = ac.configure()
+        configtracker.wait_finish()
+
+    # start IO threads and configure if neccessary
+    ac.start_io()
 
     print("{}: waiting for message".format(ac.get_config("addr")))
 

python/src/deltachat/_build.py

@@ -20,33 +20,30 @@ def local_build_flags(projdir, target):
     :param target: The rust build target, `debug` or `release`.
     """
     flags = {}
-    if platform.system() == "Darwin":
-        flags["libraries"] = ["resolv", "dl"]
-        flags["extra_link_args"] = [
-            "-framework",
-            "CoreFoundation",
-            "-framework",
-            "CoreServices",
-            "-framework",
-            "Security",
+    if platform.system() == 'Darwin':
+        flags['libraries'] = ['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"] = []
+    elif platform.system() == 'Linux':
+        flags['libraries'] = ['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")]
+        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')]
     return flags
 
 
 def system_build_flags():
     """Construct build flags for building against an installed libdeltachat."""
-    return pkgconfig.parse("deltachat")
+    return pkgconfig.parse('deltachat')
 
 
 def extract_functions(flags):
@@ -64,13 +61,11 @@ def extract_functions(flags):
         src_name = os.path.join(tmpdir, "include.h")
         dst_name = os.path.join(tmpdir, "expanded.h")
         with open(src_name, "w") as src_fp:
-            src_fp.write("#include <deltachat.h>")
-        cc.preprocess(
-            source=src_name,
-            output_file=dst_name,
-            include_dirs=flags["include_dirs"],
-            macros=[("PY_CFFI", "1")],
-        )
+            src_fp.write('#include <deltachat.h>')
+        cc.preprocess(source=src_name,
+                      output_file=dst_name,
+                      include_dirs=flags['include_dirs'],
+                      macros=[('PY_CFFI', '1')])
         with open(dst_name, "r") as dst_fp:
             return dst_fp.read()
     finally:
@@ -92,9 +87,7 @@ def find_header(flags):
         obj_name = os.path.join(tmpdir, "where.o")
         dst_name = os.path.join(tmpdir, "where")
         with open(src_name, "w") as src_fp:
-            src_fp.write(
-                textwrap.dedent(
-                    """
+            src_fp.write(textwrap.dedent("""
                 #include <stdio.h>
                 #include <deltachat.h>
 
@@ -102,20 +95,18 @@ def find_header(flags):
                     printf("%s", _dc_header_file_location());
                     return 0;
                 }
-            """
-                )
-            )
+            """))
         cwd = os.getcwd()
         try:
             os.chdir(tmpdir)
-            cc.compile(
-                sources=["where.c"],
-                include_dirs=flags["include_dirs"],
-                macros=[("PY_CFFI_INC", "1")],
-            )
+            cc.compile(sources=["where.c"],
+                       include_dirs=flags['include_dirs'],
+                       macros=[("PY_CFFI_INC", "1")])
         finally:
             os.chdir(cwd)
-        cc.link_executable(objects=[obj_name], output_progname="where", output_dir=tmpdir)
+        cc.link_executable(objects=[obj_name],
+                           output_progname="where",
+                           output_dir=tmpdir)
         return subprocess.check_output(dst_name)
     finally:
         shutil.rmtree(tmpdir)
@@ -132,8 +123,7 @@ def extract_defines(flags):
     cdef() method.
     """
     header = find_header(flags)
-    defines_re = re.compile(
-        r"""
+    defines_re = re.compile(r"""
         \#define\s+   # The start of a define.
         (             # Begin capturing group which captures the define name.
             (?:       # A nested group which is not captured, this allows us
@@ -161,28 +151,26 @@ def extract_defines(flags):
         )             # Close the capturing group, this contains
                       # the entire name e.g. DC_MSG_TEXT.
         \s+\S+        # Ensure there is whitespace followed by a value.
-    """,
-        re.VERBOSE,
-    )
+    """, re.VERBOSE)
     defines = []
     with open(header) as fp:
         for line in fp:
             match = defines_re.match(line)
             if match:
                 defines.append(match.group(1))
-    return "\n".join("#define {} ...".format(d) for d in defines)
+    return '\n'.join('#define {} ...'.format(d) for d in defines)
 
 
 def ffibuilder():
-    projdir = os.environ.get("DCC_RS_DEV")
+    projdir = os.environ.get('DCC_RS_DEV')
     if projdir:
-        target = os.environ.get("DCC_RS_TARGET", "release")
+        target = os.environ.get('DCC_RS_TARGET', 'release')
         flags = local_build_flags(projdir, target)
     else:
         flags = system_build_flags()
     builder = cffi.FFI()
     builder.set_source(
-        "deltachat.capi",
+        'deltachat.capi',
         """
             #include <deltachat.h>
             int dc_event_has_string_data(int e)
@@ -192,13 +180,11 @@ def ffibuilder():
         """,
         **flags,
     )
-    builder.cdef(
-        """
+    builder.cdef("""
         typedef int... time_t;
         void free(void *ptr);
         extern int dc_event_has_string_data(int);
-    """
-    )
+    """)
     function_defs = extract_functions(flags)
     defines = extract_defines(flags)
     builder.cdef(function_defs)
@@ -206,9 +192,8 @@ def ffibuilder():
     return builder
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     import os.path
-
-    pkgdir = os.path.join(os.path.dirname(__file__), "..")
+    pkgdir = os.path.join(os.path.dirname(__file__), '..')
     builder = ffibuilder()
     builder.compile(tmpdir=pkgdir, verbose=True)

python/src/deltachat/account.py

@@ -1,46 +1,37 @@
 """ Account class implementation. """
 
 from __future__ import print_function
-
-import os
-from array import array
 from contextlib import contextmanager
 from email.utils import parseaddr
 from threading import Event
-from typing import Any, Dict, Generator, List, Optional, Union
-
-from . import const, hookspec
+import os
+from array import array
+from . import const
 from .capi import ffi, lib
+from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer, iter_array, DCLot
 from .chat import Chat
-from .contact import Contact
-from .cutil import (
-    DCLot,
-    as_dc_charpointer,
-    from_dc_charpointer,
-    from_optional_dc_charpointer,
-    iter_array,
-)
-from .events import EventThread, FFIEventLogger
 from .message import Message
-from .tracker import ConfigureTracker, ImexTracker
+from .contact import Contact
+from .tracker import ImexTracker, ConfigureTracker
+from . import hookspec
+from .events import EventThread
+from typing import Union, Any, Dict, Optional, List, Generator
 
 
 class MissingCredentials(ValueError):
-    """Account is missing `addr` and `mail_pw` config values."""
+    """ Account is missing `addr` and `mail_pw` config values. """
 
 
 def get_core_info():
-    """get some system 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,
-            )
-        )
+        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):
@@ -55,22 +46,18 @@ def get_dc_info_as_dict(dc_context):
 
 
 class Account(object):
-    """Each account is tied to a sqlite database file which is fully managed
+    """ Each account is tied to a sqlite database file which is fully managed
     by the underlying deltachat core library.  All public Account methods are
     meant to be memory-safe and return memory-safe objects.
     """
-
     MissingCredentials = MissingCredentials
 
-    def __init__(self, db_path, os_name=None, logging=True, closed=False) -> None:
-        """initialize account object.
+    def __init__(self, db_path, os_name=None, logging=True) -> None:
+        """ initialize account object.
 
         :param db_path: a path to the account database. The database
                         will be created if it doesn't exist.
-        :param os_name: [Deprecated]
-        :param logging: enable logging for this account
-        :param closed: set to True to avoid automatically opening the account
-                       after creation.
+        :param os_name: this will be put to the X-Mailer header in outgoing messages
         """
         # initialize per-account plugin system
         self._pm = hookspec.PerAccount._make_plugin_manager()
@@ -83,7 +70,7 @@ class Account(object):
             db_path = db_path.encode("utf8")
 
         self._dc_context = ffi.gc(
-            lib.dc_context_new_closed(db_path) if closed else lib.dc_context_new(ffi.NULL, db_path, ffi.NULL),
+            lib.dc_context_new(as_dc_charpointer(os_name), db_path, ffi.NULL),
             lib.dc_context_unref,
         )
         if self._dc_context == ffi.NULL:
@@ -95,23 +82,12 @@ class Account(object):
         hook = hookspec.Global._get_plugin_manager().hook
         hook.dc_account_init(account=self)
 
-    def open(self, passphrase: Optional[str] = None) -> bool:
-        """Open the account's database with the given passphrase.
-        This can only be used on a closed account. If the account is new, this
-        operation sets the database passphrase. For existing databases the passphrase
-        should be the one used to encrypt the database the first time.
-
-        :returns: True if the database is opened with this passphrase, False if the
-                  passphrase is incorrect or an error occurred.
-        """
-        return bool(lib.dc_context_open(self._dc_context, as_dc_charpointer(passphrase)))
-
     def disable_logging(self) -> None:
-        """disable logging."""
+        """ disable logging. """
         self._logging = False
 
     def enable_logging(self) -> None:
-        """re-enable logging."""
+        """ re-enable logging. """
         self._logging = True
 
     def __repr__(self):
@@ -126,10 +102,11 @@ class Account(object):
 
     def _check_config_key(self, name: str) -> None:
         if name not in self._configkeys:
-            raise KeyError("{!r} not a valid config key, existing keys: {!r}".format(name, self._configkeys))
+            raise KeyError("{!r} not a valid config key, existing keys: {!r}".format(
+                           name, self._configkeys))
 
     def get_info(self) -> Dict[str, str]:
-        """return dictionary of built config parameters."""
+        """ return dictionary of built config parameters. """
         return get_dc_info_as_dict(self._dc_context)
 
     def dump_account_info(self, logfile):
@@ -149,7 +126,7 @@ class Account(object):
         log("")
 
     def set_stock_translation(self, id: int, string: str) -> None:
-        """set stock translation string.
+        """ set stock translation string.
 
         :param id: id of stock string (const.DC_STR_*)
         :param value: string to set as new transalation
@@ -161,7 +138,7 @@ class Account(object):
             raise ValueError("could not set translation string")
 
     def set_config(self, name: str, value: Optional[str]) -> None:
-        """set configuration values.
+        """ set configuration values.
 
         :param name: config key name (unicode)
         :param value: value to set (unicode)
@@ -169,6 +146,8 @@ class Account(object):
         """
         self._check_config_key(name)
         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:
@@ -178,7 +157,7 @@ class Account(object):
         lib.dc_set_config(self._dc_context, namebytes, valuebytes)
 
     def get_config(self, name: str) -> str:
-        """return unicode string value.
+        """ return unicode string value.
 
         :param name: configuration key to lookup (eg "addr" or "mail_pw")
         :returns: unicode value
@@ -196,17 +175,15 @@ class Account(object):
 
         In other words, you don't need this.
         """
-        res = lib.dc_preconfigure_keypair(
-            self._dc_context,
-            as_dc_charpointer(addr),
-            as_dc_charpointer(public),
-            as_dc_charpointer(secret),
-        )
+        res = lib.dc_preconfigure_keypair(self._dc_context,
+                                          as_dc_charpointer(addr),
+                                          as_dc_charpointer(public),
+                                          as_dc_charpointer(secret))
         if res == 0:
             raise Exception("Failed to set key")
 
     def update_config(self, kwargs: Dict[str, Any]) -> None:
-        """update config values.
+        """ update config values.
 
         :param kwargs: name=value config settings for this account.
                        values need to be unicode.
@@ -216,18 +193,18 @@ class Account(object):
             self.set_config(key, value)
 
     def is_configured(self) -> bool:
-        """determine if the account is configured already; an initial connection
+        """ determine if the account is configured already; an initial connection
         to SMTP/IMAP has been verified.
 
         :returns: True if account is configured.
         """
-        return bool(lib.dc_is_configured(self._dc_context))
+        return True if lib.dc_is_configured(self._dc_context) else False
 
     def is_open(self) -> bool:
         """Determine if account is open
 
         :returns True if account is open."""
-        return bool(lib.dc_context_is_open(self._dc_context))
+        return True if lib.dc_context_is_open(self._dc_context) else False
 
     def set_avatar(self, img_path: Optional[str]) -> None:
         """Set self avatar.
@@ -242,17 +219,18 @@ class Account(object):
             self.set_config("selfavatar", img_path)
 
     def check_is_configured(self) -> None:
-        """Raise ValueError if this account is not configured."""
+        """ Raise ValueError if this account is not configured. """
         if not self.is_configured():
             raise ValueError("need to configure first")
 
     def get_latest_backupfile(self, backupdir) -> Optional[str]:
-        """return the latest backup file in a given directory."""
+        """ return the latest backup file in a given directory.
+        """
         res = lib.dc_imex_has_backup(self._dc_context, as_dc_charpointer(backupdir))
         return from_optional_dc_charpointer(res)
 
     def get_blobdir(self) -> str:
-        """return the directory for files.
+        """ return the directory for files.
 
         All sent files are copied to this directory if necessary.
         Place files there directly to avoid copying.
@@ -260,7 +238,7 @@ class Account(object):
         return from_dc_charpointer(lib.dc_get_blobdir(self._dc_context))
 
     def get_self_contact(self) -> Contact:
-        """return this account's identity as a :class:`deltachat.contact.Contact`.
+        """ return this account's identity as a :class:`deltachat.contact.Contact`.
 
         :returns: :class:`deltachat.contact.Contact`
         """
@@ -302,14 +280,14 @@ class Account(object):
         elif isinstance(obj, str):
             displayname, addr = parseaddr(obj)
         else:
-            raise TypeError("don't know how to create chat for %r" % (obj,))
+            raise TypeError("don't know how to create chat for %r" % (obj, ))
 
         if name is None and displayname:
             name = displayname
         return (name, addr)
 
     def delete_contact(self, contact: Contact) -> bool:
-        """delete a Contact.
+        """ delete a Contact.
 
         :param contact: contact object obtained
         :returns: True if deletion succeeded (contact was deleted)
@@ -320,7 +298,7 @@ class Account(object):
         return bool(lib.dc_delete_contact(self._dc_context, contact_id))
 
     def get_contact_by_addr(self, email: str) -> Optional[Contact]:
-        """get a contact for the email address or None if it's blocked or doesn't exist."""
+        """ get a contact for the email address or None if it's blocked or doesn't exist. """
         _, addr = parseaddr(email)
         addr = as_dc_charpointer(addr)
         contact_id = lib.dc_lookup_contact_id_by_addr(self._dc_context, addr)
@@ -329,18 +307,21 @@ class Account(object):
         return None
 
     def get_contact_by_id(self, contact_id: int) -> Contact:
-        """return Contact instance or raise an exception.
+        """ return Contact instance or raise an exception.
         :param contact_id: integer id of this contact.
         :returns: :class:`deltachat.contact.Contact` instance.
         """
         return Contact(self, contact_id)
 
     def get_blocked_contacts(self) -> List[Contact]:
-        """return a list of all blocked contacts.
+        """ return a list of all blocked contacts.
 
         :returns: list of :class:`deltachat.contact.Contact` objects.
         """
-        dc_array = ffi.gc(lib.dc_get_blocked_contacts(self._dc_context), lib.dc_array_unref)
+        dc_array = ffi.gc(
+            lib.dc_get_blocked_contacts(self._dc_context),
+            lib.dc_array_unref
+        )
         return list(iter_array(dc_array, lambda x: Contact(self, x)))
 
     def get_contacts(
@@ -363,16 +344,22 @@ class Account(object):
             flags |= const.DC_GCL_VERIFIED_ONLY
         if with_self:
             flags |= const.DC_GCL_ADD_SELF
-        dc_array = ffi.gc(lib.dc_get_contacts(self._dc_context, flags, query), lib.dc_array_unref)
+        dc_array = ffi.gc(
+            lib.dc_get_contacts(self._dc_context, flags, query),
+            lib.dc_array_unref
+        )
         return list(iter_array(dc_array, lambda x: Contact(self, x)))
 
     def get_fresh_messages(self) -> Generator[Message, None, None]:
-        """yield all fresh messages from all chats."""
-        dc_array = ffi.gc(lib.dc_get_fresh_msgs(self._dc_context), lib.dc_array_unref)
+        """ yield all fresh messages from all chats. """
+        dc_array = ffi.gc(
+            lib.dc_get_fresh_msgs(self._dc_context),
+            lib.dc_array_unref
+        )
         yield from iter_array(dc_array, lambda x: Message.from_db(self, x))
 
     def create_chat(self, obj) -> Chat:
-        """Create a 1:1 chat with Account, Contact or e-mail address."""
+        """ Create a 1:1 chat with Account, Contact or e-mail address. """
         return self.create_contact(obj).create_chat()
 
     def create_group_chat(
@@ -398,11 +385,14 @@ class Account(object):
         return chat
 
     def get_chats(self) -> List[Chat]:
-        """return list of chats.
+        """ return list of chats.
 
         :returns: a list of :class:`deltachat.chat.Chat` objects.
         """
-        dc_chatlist = ffi.gc(lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0), lib.dc_chatlist_unref)
+        dc_chatlist = ffi.gc(
+            lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0),
+            lib.dc_chatlist_unref
+        )
 
         assert dc_chatlist != ffi.NULL
         chatlist = []
@@ -415,14 +405,14 @@ class Account(object):
         return Contact(self, const.DC_CONTACT_ID_DEVICE).create_chat()
 
     def get_message_by_id(self, msg_id: int) -> Message:
-        """return Message instance.
+        """ return Message instance.
         :param msg_id: integer id of this message.
         :returns: :class:`deltachat.message.Message` instance.
         """
         return Message.from_db(self, msg_id)
 
     def get_chat_by_id(self, chat_id: int) -> Chat:
-        """return Chat instance.
+        """ return Chat instance.
         :param chat_id: integer id of this chat.
         :returns: :class:`deltachat.chat.Chat` instance.
         :raises: ValueError if chat does not exist.
@@ -434,7 +424,7 @@ class Account(object):
         return Chat(self, chat_id)
 
     def mark_seen_messages(self, messages: List[Union[int, Message]]) -> None:
-        """mark the given set of messages as seen.
+        """ mark the given set of messages as seen.
 
         :param messages: a list of message ids or Message instances.
         """
@@ -448,7 +438,7 @@ class Account(object):
         lib.dc_markseen_msgs(self._dc_context, msg_ids, len(messages))
 
     def forward_messages(self, messages: List[Message], chat: Chat) -> None:
-        """Forward list of messages to a chat.
+        """ Forward list of messages to a chat.
 
         :param messages: list of :class:`deltachat.message.Message` object.
         :param chat: :class:`deltachat.chat.Chat` object.
@@ -458,7 +448,7 @@ class Account(object):
         lib.dc_forward_msgs(self._dc_context, msg_ids, len(msg_ids), chat.id)
 
     def delete_messages(self, messages: List[Message]) -> None:
-        """delete messages (local and remote).
+        """ delete messages (local and remote).
 
         :param messages: list of :class:`deltachat.message.Message` object.
         :returns: None
@@ -467,34 +457,31 @@ class Account(object):
         lib.dc_delete_msgs(self._dc_context, msg_ids, len(msg_ids))
 
     def export_self_keys(self, path):
-        """export public and private keys to the specified directory.
+        """ export public and private keys to the specified directory.
 
         Note that the account does not have to be started.
         """
         return self._export(path, imex_cmd=const.DC_IMEX_EXPORT_SELF_KEYS)
 
-    def export_all(self, path: str, passphrase: Optional[str] = None) -> str:
-        """Export a backup of all database state (chats, contacts, keys, media, ...).
-
-        :param path: the directory where the backup will be stored.
-        :param passphrase: the backup will be encrypted with the passphrase, if it is
-                           None or empty string, the backup is not encrypted.
-        :returns: path to the created backup.
+    def export_all(self, path):
+        """return new file containing a backup of all database state
+        (chats, contacts, keys, media, ...). The file is created in the
+        the `path` directory.
 
         Note that the account has to be stopped; call stop_io() if necessary.
         """
-        export_files = self._export(path, const.DC_IMEX_EXPORT_BACKUP, passphrase)
+        export_files = self._export(path, const.DC_IMEX_EXPORT_BACKUP)
         if len(export_files) != 1:
             raise RuntimeError("found more than one new file")
         return export_files[0]
 
-    def _export(self, path: str, imex_cmd: int, passphrase: Optional[str] = None) -> list:
+    def _export(self, path, imex_cmd):
         with self.temp_plugin(ImexTracker()) as imex_tracker:
-            self.imex(path, imex_cmd, passphrase)
+            self.imex(path, imex_cmd)
             return imex_tracker.wait_finish()
 
     def import_self_keys(self, path):
-        """Import private keys found in the `path` directory.
+        """ Import private keys found in the `path` directory.
         The last imported key is made the default keys unless its name
         contains the string legacy. Public keys are not imported.
 
@@ -502,23 +489,21 @@ class Account(object):
         """
         self._import(path, imex_cmd=const.DC_IMEX_IMPORT_SELF_KEYS)
 
-    def import_all(self, path: str, passphrase: Optional[str] = None) -> None:
-        """Import Delta Chat state from the specified backup file.
-        The account must be in unconfigured state for import to attempted.
+    def import_all(self, path):
+        """import delta chat state from the specified backup `path` (a file).
 
-        :param path: path to the backup file.
-        :param passphrase: if not None or empty, the backup will be opened with the passphrase.
+        The account must be in unconfigured state for import to attempted.
         """
         assert not self.is_configured(), "cannot import into configured account"
-        self._import(path, imex_cmd=const.DC_IMEX_IMPORT_BACKUP, passphrase=passphrase)
+        self._import(path, imex_cmd=const.DC_IMEX_IMPORT_BACKUP)
 
-    def _import(self, path: str, imex_cmd: int, passphrase: Optional[str] = None) -> None:
+    def _import(self, path, imex_cmd):
         with self.temp_plugin(ImexTracker()) as imex_tracker:
-            self.imex(path, imex_cmd, passphrase)
+            self.imex(path, imex_cmd)
             imex_tracker.wait_finish()
 
-    def imex(self, path: str, imex_cmd: int, passphrase: Optional[str] = None) -> None:
-        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), as_dc_charpointer(passphrase))
+    def imex(self, path, imex_cmd):
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)
 
     def initiate_key_transfer(self) -> str:
         """return setup code after a Autocrypt setup message
@@ -532,7 +517,7 @@ class Account(object):
         return from_dc_charpointer(res)
 
     def get_setup_contact_qr(self) -> str:
-        """get/create Setup-Contact QR Code as ascii-string.
+        """ get/create Setup-Contact QR Code as ascii-string.
 
         this string needs to be transferred to another DC account
         in a second channel (typically used by mobiles with QRcode-show + scan UX)
@@ -542,15 +527,18 @@ class Account(object):
         return from_dc_charpointer(res)
 
     def check_qr(self, qr):
-        """check qr code and return :class:`ScannedQRCode` instance representing the result"""
-        res = ffi.gc(lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)), lib.dc_lot_unref)
+        """ check qr code and return :class:`ScannedQRCode` instance representing the result"""
+        res = ffi.gc(
+            lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)),
+            lib.dc_lot_unref
+        )
         lot = DCLot(res)
         if lot.state() == const.DC_QR_ERROR:
             raise ValueError("invalid or unknown QR code: {}".format(lot.text1()))
         return ScannedQRCode(lot)
 
     def qr_setup_contact(self, qr):
-        """setup contact and return a Chat after contact is established.
+        """ setup contact and return a Chat after contact is established.
 
         Note that this function may block for a long time as messages are exchanged
         with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
@@ -564,7 +552,7 @@ class Account(object):
         return Chat(self, chat_id)
 
     def qr_join_chat(self, qr):
-        """join a chat group through a QR code.
+        """ join a chat group through a QR code.
 
         Note that this function may block for a long time as messages are exchanged
         with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
@@ -578,7 +566,9 @@ class Account(object):
             raise ValueError("could not join group")
         return Chat(self, chat_id)
 
-    def set_location(self, latitude: float = 0.0, longitude: float = 0.0, accuracy: float = 0.0) -> None:
+    def set_location(
+        self, latitude: float = 0.0, longitude: float = 0.0, accuracy: float = 0.0
+    ) -> None:
         """set a new location. It effects all chats where we currently
         have enabled location streaming.
 
@@ -596,38 +586,8 @@ class Account(object):
     # meta API for start/stop and event based processing
     #
 
-    def run_account(self, addr=None, password=None, account_plugins=None, show_ffi=False):
-        """get the account running, configure it if necessary. add plugins if provided.
-
-        :param addr: the email address of the account
-        :param password: the password of the account
-        :param account_plugins: a list of plugins to add
-        :param show_ffi: show low level ffi events
-        """
-        if show_ffi:
-            self.set_config("displayname", "bot")
-            log = FFIEventLogger(self)
-            self.add_account_plugin(log)
-
-        for plugin in account_plugins or []:
-            print("adding plugin", plugin)
-            self.add_account_plugin(plugin)
-
-        if not self.is_configured():
-            assert addr and password, "you must specify email and password once to configure this database/account"
-            self.set_config("addr", addr)
-            self.set_config("mail_pw", password)
-            self.set_config("mvbox_move", "0")
-            self.set_config("sentbox_watch", "0")
-            self.set_config("bot", "1")
-            configtracker = self.configure()
-            configtracker.wait_finish()
-
-        # start IO threads and configure if neccessary
-        self.start_io()
-
     def add_account_plugin(self, plugin, name=None):
-        """add an account plugin which implements one or more of
+        """ 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):
@@ -637,18 +597,18 @@ class Account(object):
         return plugin
 
     def remove_account_plugin(self, plugin, name=None):
-        """remove an account plugin."""
+        """ remove an account plugin. """
         self._pm.unregister(plugin, name=name)
 
     @contextmanager
     def temp_plugin(self, plugin):
-        """run a with-block with the given plugin temporarily registered."""
+        """ run a with-block with the given plugin temporarily registered. """
         self._pm.register(plugin)
         yield plugin
         self._pm.unregister(plugin)
 
     def stop_ongoing(self):
-        """Stop ongoing securejoin, configuration or other core jobs."""
+        """ Stop ongoing securejoin, configuration or other core jobs. """
         lib.dc_stop_ongoing_process(self._dc_context)
 
     def get_connectivity(self):
@@ -661,7 +621,7 @@ class Account(object):
         return lib.dc_all_work_done(self._dc_context)
 
     def start_io(self):
-        """start this account's IO scheduling (Rust-core async scheduler)
+        """ start this account's IO scheduling (Rust-core async scheduler)
 
         If this account is not configured an Exception is raised.
         You need to call account.configure() and account.wait_configure_finish()
@@ -705,12 +665,11 @@ class Account(object):
         lib.dc_maybe_network(self._dc_context)
 
     def configure(self, reconfigure: bool = False) -> ConfigureTracker:
-        """Start configuration process and return a Configtracker instance
+        """ Start configuration process and return a Configtracker instance
         on which you can block with wait_finish() to get a True/False success
         value for the configuration process.
-
-        :param reconfigure: deprecated, doesn't need to be checked anymore.
         """
+        assert self.is_configured() == reconfigure
         if not self.get_config("addr") or not self.get_config("mail_pw"):
             raise MissingCredentials("addr or mail_pwd not set in config")
         configtracker = ConfigureTracker(self)
@@ -719,11 +678,11 @@ class Account(object):
         return configtracker
 
     def wait_shutdown(self) -> None:
-        """wait until shutdown of this account has completed."""
+        """ wait until shutdown of this account has completed. """
         self._shutdown_event.wait()
 
     def stop_io(self) -> None:
-        """stop core IO scheduler if it is running."""
+        """ stop core IO scheduler if it is running. """
         self.log("stop_ongoing")
         self.stop_ongoing()
 
@@ -731,7 +690,7 @@ class Account(object):
         lib.dc_stop_io(self._dc_context)
 
     def shutdown(self) -> None:
-        """shutdown and destroy account (stop callback thread, close and remove
+        """ shutdown and destroy account (stop callback thread, close and remove
         underlying dc_context)."""
         if self._dc_context is None:
             return

python/src/deltachat/chat.py

@@ -1,40 +1,32 @@
 """ Chat and Location related API. """
 
+import mimetypes
 import calendar
 import json
-import mimetypes
-import os
 from datetime import datetime, timezone
-from typing import Optional
-
+import os
+from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer, iter_array
+from .capi import lib, ffi
 from . import const
-from .capi import ffi, lib
-from .cutil import (
-    as_dc_charpointer,
-    from_dc_charpointer,
-    from_optional_dc_charpointer,
-    iter_array,
-)
 from .message import Message
+from typing import Optional
 
 
 class Chat(object):
-    """Chat object which manages members and through which you can send and retrieve messages.
+    """ Chat object which manages members and through which you can send and retrieve messages.
 
     You obtain instances of it through :class:`deltachat.account.Account`.
     """
 
     def __init__(self, account, id) -> None:
         from .account import Account
-
         assert isinstance(account, Account), repr(account)
         self.account = account
         self.id = id
 
     def __eq__(self, other) -> bool:
-        if other is None:
-            return False
-        return self.id == getattr(other, "id", None) and self.account._dc_context == other.account._dc_context
+        return self.id == getattr(other, "id", None) and \
+               self.account._dc_context == other.account._dc_context
 
     def __ne__(self, other) -> bool:
         return not (self == other)
@@ -44,7 +36,10 @@ class Chat(object):
 
     @property
     def _dc_chat(self):
-        return ffi.gc(lib.dc_get_chat(self.account._dc_context, self.id), lib.dc_chat_unref)
+        return ffi.gc(
+            lib.dc_get_chat(self.account._dc_context, self.id),
+            lib.dc_chat_unref
+        )
 
     def delete(self) -> None:
         """Delete this chat and all its messages.
@@ -67,66 +62,28 @@ class Chat(object):
     # ------  chat status/metadata API ------------------------------
 
     def is_group(self) -> bool:
-        """Return True if this chat is a group chat.
+        """ return true if this chat is a group chat.
 
-        :returns: True if chat is a group-chat, False otherwise
+        :returns: True if chat is a group-chat, false if it's a contact 1:1 chat.
         """
         return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_GROUP
 
-    def is_single(self) -> bool:
-        """Return True if this chat is a single/direct chat, False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_SINGLE
-
-    def is_mailinglist(self) -> bool:
-        """Return True if this chat is a mailing list, False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_MAILINGLIST
-
-    def is_broadcast(self) -> bool:
-        """Return True if this chat is a broadcast list, False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_BROADCAST
-
-    def is_multiuser(self) -> bool:
-        """Return True if this chat is a multi-user chat (group, mailing list or broadcast), False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) in (
-            const.DC_CHAT_TYPE_GROUP,
-            const.DC_CHAT_TYPE_MAILINGLIST,
-            const.DC_CHAT_TYPE_BROADCAST,
-        )
-
-    def is_self_talk(self) -> bool:
-        """Return True if this chat is the self-chat (a.k.a. "Saved Messages"), False otherwise"""
-        return bool(lib.dc_chat_is_self_talk(self._dc_chat))
-
-    def is_device_talk(self) -> bool:
-        """Returns True if this chat is the "Device Messages" chat, False otherwise"""
-        return bool(lib.dc_chat_is_device_talk(self._dc_chat))
-
     def is_muted(self) -> bool:
-        """return true if this chat is muted.
+        """ return true if this chat is muted.
 
         :returns: True if chat is muted, False otherwise.
         """
-        return bool(lib.dc_chat_is_muted(self._dc_chat))
+        return lib.dc_chat_is_muted(self._dc_chat)
 
-    def is_pinned(self) -> bool:
-        """Return True if this chat is pinned, False otherwise"""
-        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_PINNED
-
-    def is_archived(self) -> bool:
-        """Return True if this chat is archived, False otherwise.
-        :returns: True if archived, False otherwise
-        """
-        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_ARCHIVED
-
-    def is_contact_request(self) -> bool:
-        """return True if this chat is a contact request chat.
+    def is_contact_request(self):
+        """ return True if this chat is a contact request chat.
 
         :returns: True if chat is a contact request chat, False otherwise.
         """
-        return bool(lib.dc_chat_is_contact_request(self._dc_chat))
+        return lib.dc_chat_is_contact_request(self._dc_chat)
 
-    def is_promoted(self) -> bool:
-        """return True if this chat is promoted, i.e.
+    def is_promoted(self):
+        """ return True if this chat is promoted, i.e.
         the member contacts are aware of their membership,
         have been sent messages.
 
@@ -140,24 +97,24 @@ class Chat(object):
 
         :returns: True if the chat is writable, False otherwise
         """
-        return bool(lib.dc_chat_can_send(self._dc_chat))
+        return lib.dc_chat_can_send(self._dc_chat)
 
     def is_protected(self) -> bool:
-        """return True if this chat is a protected chat.
+        """ return True if this chat is a protected chat.
 
         :returns: True if chat is protected, False otherwise.
         """
-        return bool(lib.dc_chat_is_protected(self._dc_chat))
+        return lib.dc_chat_is_protected(self._dc_chat)
 
     def get_name(self) -> Optional[str]:
-        """return name of this chat.
+        """ return name of this chat.
 
         :returns: unicode name
         """
         return from_dc_charpointer(lib.dc_chat_get_name(self._dc_chat))
 
     def set_name(self, name: str) -> bool:
-        """set name of this chat.
+        """ set name of this chat.
 
         :param name: as a unicode string.
         :returns: True on success, False otherwise
@@ -165,20 +122,8 @@ class Chat(object):
         name = as_dc_charpointer(name)
         return bool(lib.dc_set_chat_name(self.account._dc_context, self.id, name))
 
-    def get_color(self):
-        """return the color of the chat.
-        :returns: color as 0x00rrggbb
-        """
-        return lib.dc_chat_get_color(self._dc_chat)
-
-    def get_summary(self):
-        """return dictionary with summary information."""
-        dc_res = lib.dc_chat_get_info_json(self.account._dc_context, self.id)
-        s = from_dc_charpointer(dc_res)
-        return json.loads(s)
-
     def mute(self, duration: Optional[int] = None) -> None:
-        """mutes the chat
+        """ mutes the chat
 
         :param duration: Number of seconds to mute the chat for. None to mute until unmuted again.
         :returns: None
@@ -192,7 +137,7 @@ class Chat(object):
             raise ValueError("Call to dc_set_chat_mute_duration failed")
 
     def unmute(self) -> None:
-        """unmutes the chat
+        """ unmutes the chat
 
         :returns: None
         """
@@ -200,26 +145,8 @@ class Chat(object):
         if not bool(ret):
             raise ValueError("Failed to unmute chat")
 
-    def pin(self) -> None:
-        """Pin the chat."""
-        lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_PINNED)
-
-    def unpin(self) -> None:
-        """Unpin the chat."""
-        if self.is_pinned():
-            lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_NORMAL)
-
-    def archive(self) -> None:
-        """Archive the chat."""
-        lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_ARCHIVED)
-
-    def unarchive(self) -> None:
-        """Unarchive the chat."""
-        if self.is_archived():
-            lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_NORMAL)
-
     def get_mute_duration(self) -> int:
-        """Returns the number of seconds until the mute of this chat is lifted.
+        """ Returns the number of seconds until the mute of this chat is lifted.
 
         :param duration:
         :returns: Returns the number of seconds the chat is still muted for. (0 for not muted, -1 forever muted)
@@ -227,14 +154,14 @@ class Chat(object):
         return lib.dc_chat_get_remaining_mute_duration(self._dc_chat)
 
     def get_ephemeral_timer(self) -> int:
-        """get ephemeral timer.
+        """ get ephemeral timer.
 
         :returns: ephemeral timer value in seconds
         """
         return lib.dc_get_chat_ephemeral_timer(self.account._dc_context, self.id)
 
     def set_ephemeral_timer(self, timer: int) -> bool:
-        """set ephemeral timer.
+        """ set ephemeral timer.
 
         :param: timer value in seconds
 
@@ -243,7 +170,7 @@ class Chat(object):
         return bool(lib.dc_set_chat_ephemeral_timer(self.account._dc_context, self.id, timer))
 
     def get_type(self) -> int:
-        """(deprecated) return type of this chat.
+        """ (deprecated) return type of this chat.
 
         :returns: one of const.DC_CHAT_TYPE_*
         """
@@ -257,7 +184,7 @@ class Chat(object):
         return from_dc_charpointer(res)
 
     def get_join_qr(self) -> Optional[str]:
-        """get/create Join-Group QR Code as ascii-string.
+        """ get/create Join-Group QR Code as ascii-string.
 
         this string needs to be transferred to another DC account
         in a second channel (typically used by mobiles with QRcode-show + scan UX)
@@ -293,7 +220,7 @@ class Chat(object):
         return msg
 
     def send_text(self, text):
-        """send a text message and return the resulting Message instance.
+        """ send a text message and return the resulting Message instance.
 
         :param msg: unicode text
         :raises ValueError: if message can not be send/chat does not exist.
@@ -306,7 +233,7 @@ class Chat(object):
         return Message.from_db(self.account, msg_id)
 
     def send_file(self, path, mime_type="application/octet-stream"):
-        """send a file and return the resulting Message instance.
+        """ send a file and return the resulting Message instance.
 
         :param path: path to the file.
         :param mime_type: the mime-type of this file, defaults to application/octet-stream.
@@ -321,7 +248,7 @@ class Chat(object):
         return Message.from_db(self.account, sent_id)
 
     def send_image(self, path):
-        """send an image message and return the resulting Message instance.
+        """ send an image message and return the resulting Message instance.
 
         :param path: path to an image file.
         :raises ValueError: if message can not be send/chat does not exist.
@@ -336,7 +263,7 @@ class Chat(object):
         return Message.from_db(self.account, sent_id)
 
     def prepare_message(self, msg):
-        """prepare a message for sending.
+        """ prepare a message for sending.
 
         :param msg: the message to be prepared.
         :returns: a :class:`deltachat.message.Message` instance.
@@ -351,7 +278,7 @@ class Chat(object):
         return msg
 
     def prepare_message_file(self, path, mime_type=None, view_type="file"):
-        """prepare a message for sending and return the resulting Message instance.
+        """ prepare a message for sending and return the resulting Message instance.
 
         To actually send the message, call :meth:`send_prepared`.
         The file must be inside the blob directory.
@@ -367,7 +294,7 @@ class Chat(object):
         return self.prepare_message(msg)
 
     def send_prepared(self, message):
-        """send a previously prepared message.
+        """ send a previously prepared message.
 
         :param message: a :class:`Message` instance previously returned by
                         :meth:`prepare_file`.
@@ -387,7 +314,7 @@ class Chat(object):
         msg._dc_msg = Message.from_db(self.account, sent_id)._dc_msg
 
     def set_draft(self, message):
-        """set message as draft.
+        """ set message as draft.
 
         :param message: a :class:`Message` instance
         :returns: None
@@ -398,7 +325,7 @@ class Chat(object):
             lib.dc_set_draft(self.account._dc_context, self.id, message._dc_msg)
 
     def get_draft(self):
-        """get draft message for this chat.
+        """ get draft message for this chat.
 
         :param message: a :class:`Message` instance
         :returns: Message object or None (if no draft available)
@@ -410,34 +337,40 @@ class Chat(object):
         return Message(self.account, dc_msg)
 
     def get_messages(self):
-        """return list of messages in this chat.
+        """ return list of messages in this chat.
 
         :returns: list of :class:`deltachat.message.Message` objects for this chat.
         """
         dc_array = ffi.gc(
             lib.dc_get_chat_msgs(self.account._dc_context, self.id, 0, 0),
-            lib.dc_array_unref,
+            lib.dc_array_unref
         )
         return list(iter_array(dc_array, lambda x: Message.from_db(self.account, x)))
 
     def count_fresh_messages(self):
-        """return number of fresh messages in this chat.
+        """ return number of fresh messages in this chat.
 
         :returns: number of fresh messages
         """
         return lib.dc_get_fresh_msg_cnt(self.account._dc_context, self.id)
 
     def mark_noticed(self):
-        """mark all messages in this chat as noticed.
+        """ mark all messages in this chat as noticed.
 
         Noticed messages are no longer fresh.
         """
         return lib.dc_marknoticed_chat(self.account._dc_context, self.id)
 
+    def get_summary(self):
+        """ return dictionary with summary information. """
+        dc_res = lib.dc_chat_get_info_json(self.account._dc_context, self.id)
+        s = from_dc_charpointer(dc_res)
+        return json.loads(s)
+
     # ------  group management API ------------------------------
 
     def add_contact(self, obj):
-        """add a contact to this chat.
+        """ add a contact to this chat.
 
         :params obj: Contact, Account or e-mail address.
         :raises ValueError: if contact could not be added
@@ -450,7 +383,7 @@ class Chat(object):
         return contact
 
     def remove_contact(self, obj):
-        """remove a contact from this chat.
+        """ remove a contact from this chat.
 
         :params obj: Contact, Account or e-mail address.
         :raises ValueError: if contact could not be removed
@@ -462,22 +395,23 @@ class Chat(object):
             raise ValueError("could not remove contact {!r} from chat".format(contact))
 
     def get_contacts(self):
-        """get all contacts for this chat.
+        """ get all contacts for this chat.
         :returns: list of :class:`deltachat.contact.Contact` objects for this chat
         """
         from .contact import Contact
-
         dc_array = ffi.gc(
             lib.dc_get_chat_contacts(self.account._dc_context, self.id),
-            lib.dc_array_unref,
+            lib.dc_array_unref
+        )
+        return list(iter_array(
+            dc_array, lambda id: Contact(self.account, id))
         )
-        return list(iter_array(dc_array, lambda id: Contact(self.account, id)))
 
     def num_contacts(self):
-        """return number of contacts in this chat."""
+        """ return number of contacts in this chat. """
         dc_array = ffi.gc(
             lib.dc_get_chat_contacts(self.account._dc_context, self.id),
-            lib.dc_array_unref,
+            lib.dc_array_unref
         )
         return lib.dc_array_get_cnt(dc_array)
 
@@ -524,6 +458,12 @@ class Chat(object):
             return None
         return from_dc_charpointer(dc_res)
 
+    def get_color(self):
+        """return the color of the chat.
+        :returns: color as 0x00rrggbb
+        """
+        return lib.dc_chat_get_color(self._dc_chat)
+
     # ------  location streaming API ------------------------------
 
     def is_sending_locations(self):
@@ -532,6 +472,12 @@ class Chat(object):
         """
         return lib.dc_is_sending_locations_to_chat(self.account._dc_context, self.id)
 
+    def is_archived(self):
+        """return True if this chat is archived.
+        :returns: True if archived.
+        """
+        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_ARCHIVED
+
     def enable_sending_locations(self, seconds):
         """enable sending locations for this chat.
 
@@ -567,7 +513,10 @@ class Chat(object):
                 latitude=lib.dc_array_get_latitude(dc_array, i),
                 longitude=lib.dc_array_get_longitude(dc_array, i),
                 accuracy=lib.dc_array_get_accuracy(dc_array, i),
-                timestamp=datetime.fromtimestamp(lib.dc_array_get_timestamp(dc_array, i), timezone.utc),
+                timestamp=datetime.fromtimestamp(
+                    lib.dc_array_get_timestamp(dc_array, i),
+                    timezone.utc
+                ),
                 marker=from_optional_dc_charpointer(lib.dc_array_get_marker(dc_array, i)),
             )
             for i in range(lib.dc_array_get_cnt(dc_array))

python/src/deltachat/contact.py

@@ -10,21 +10,17 @@ from .cutil import from_dc_charpointer, from_optional_dc_charpointer
 
 
 class Contact(object):
-    """Delta-Chat Contact.
+    """ Delta-Chat Contact.
 
     You obtain instances of it through :class:`deltachat.account.Account`.
     """
-
     def __init__(self, account, id):
         from .account import Account
-
         assert isinstance(account, Account), repr(account)
         self.account = account
         self.id = id
 
-    def __eq__(self, other) -> bool:
-        if other is None:
-            return False
+    def __eq__(self, other):
         return self.account._dc_context == other.account._dc_context and self.id == other.id
 
     def __ne__(self, other):
@@ -35,16 +31,19 @@ class Contact(object):
 
     @property
     def _dc_contact(self):
-        return ffi.gc(lib.dc_get_contact(self.account._dc_context, self.id), lib.dc_contact_unref)
+        return ffi.gc(
+            lib.dc_get_contact(self.account._dc_context, self.id),
+            lib.dc_contact_unref
+        )
 
     @props.with_doc
     def addr(self) -> str:
-        """normalized e-mail address for this account."""
+        """ normalized e-mail address for this account. """
         return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
 
     @props.with_doc
     def name(self) -> str:
-        """display name for this contact."""
+        """ display name for this contact. """
         return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
 
     # deprecated alias
@@ -53,26 +52,28 @@ class Contact(object):
     @props.with_doc
     def last_seen(self) -> date:
         """Last seen timestamp."""
-        return datetime.fromtimestamp(lib.dc_contact_get_last_seen(self._dc_contact), timezone.utc)
+        return datetime.fromtimestamp(
+            lib.dc_contact_get_last_seen(self._dc_contact), timezone.utc
+        )
 
     def is_blocked(self):
-        """Return True if the contact is blocked."""
+        """ Return True if the contact is blocked. """
         return lib.dc_contact_is_blocked(self._dc_contact)
 
     def set_blocked(self, block=True):
-        """[Deprecated, use block/unblock methods] Block or unblock a contact."""
+        """ [Deprecated, use block/unblock methods] Block or unblock a contact. """
         return lib.dc_block_contact(self.account._dc_context, self.id, block)
 
     def block(self):
-        """Block this contact. Message will not be seen/retrieved from this contact."""
+        """ Block this contact. Message will not be seen/retrieved from this contact. """
         return lib.dc_block_contact(self.account._dc_context, self.id, True)
 
     def unblock(self):
-        """Unblock this contact. Messages from this contact will be retrieved (again)."""
+        """ Unblock this contact. Messages from this contact will be retrieved (again)."""
         return lib.dc_block_contact(self.account._dc_context, self.id, False)
 
     def is_verified(self):
-        """Return True if the contact is verified."""
+        """ Return True if the contact is verified. """
         return lib.dc_contact_is_verified(self._dc_contact)
 
     def get_profile_image(self) -> Optional[str]:
@@ -92,7 +93,7 @@ class Contact(object):
         return from_dc_charpointer(lib.dc_contact_get_status(self._dc_contact))
 
     def create_chat(self):
-        """create or get an existing 1:1 chat object for the specified contact or contact id.
+        """ create or get an existing 1:1 chat object for the specified contact or contact id.
 
         :param contact: chat_id (int) or contact object.
         :returns: a :class:`deltachat.chat.Chat` object.

python/src/deltachat/cutil.py

@@ -1,9 +1,9 @@
+from .capi import lib
+from .capi import ffi
 from datetime import datetime, timezone
-from typing import Callable, Generator, Optional, TypeVar
+from typing import Optional, TypeVar, Generator, Callable
 
-from .capi import ffi, lib
-
-T = TypeVar("T")
+T = TypeVar('T')
 
 
 def as_dc_charpointer(obj):

python/src/deltachat/direct_imap.py

@@ -3,27 +3,18 @@ Internal Python-level IMAP handling used by the testplugin
 and for cleaning up inbox/mvbox for each test function run.
 """
 
-import imaplib
 import io
-import pathlib
 import ssl
+import pathlib
 from contextlib import contextmanager
+from imap_tools import MailBox, MailBoxTls, errors, AND, Header, MailMessageFlags, MailMessage
+import imaplib
+from deltachat import const, Account
 from typing import List
 
-from imap_tools import (
-    AND,
-    Header,
-    MailBox,
-    MailBoxTls,
-    MailMessage,
-    MailMessageFlags,
-    errors,
-)
 
-from deltachat import Account, const
-
-FLAGS = b"FLAGS"
-FETCH = b"FETCH"
+FLAGS = b'FLAGS'
+FETCH = b'FETCH'
 ALL = "1:*"
 
 
@@ -78,8 +69,8 @@ class DirectImap:
         return self.conn.folder.set(foldername)
 
     def select_config_folder(self, config_name: str):
-        """Return info about selected folder if it is
-        configured, otherwise None."""
+        """ Return info about selected folder if it is
+        configured, otherwise None. """
         if "_" not in config_name:
             config_name = "configured_{}_folder".format(config_name)
         foldername = self.account.get_config(config_name)
@@ -87,17 +78,17 @@ class DirectImap:
             return self.select_folder(foldername)
 
     def list_folders(self) -> List[str]:
-        """return list of all existing folder names"""
+        """ return list of all existing folder names"""
         assert not self._idling
         return [folder.name for folder in self.conn.folder.list()]
 
     def delete(self, uid_list: str, expunge=True):
-        """delete a range of messages (imap-syntax).
+        """ 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.client.uid('STORE', uid_list, '+FLAGS', r'(\Deleted)')
         if expunge:
             self.conn.expunge()
 
@@ -150,13 +141,7 @@ class DirectImap:
                 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"),
-                )
+                log("Message", msg.uid, msg.flags, "Message-Id:", msg.obj.get("Message-Id"))
 
         if empty_folders:
             log("--------- EMPTY FOLDERS:", empty_folders)
@@ -165,7 +150,7 @@ class DirectImap:
 
     @contextmanager
     def idle(self):
-        """return Idle ContextManager."""
+        """ return Idle ContextManager. """
         idle_manager = IdleManager(self)
         try:
             yield idle_manager
@@ -178,11 +163,11 @@ class DirectImap:
         """
         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)
+        msg = '\n'.join([s.lstrip() for s in msg.splitlines()])
+        self.conn.append(bytes(msg, encoding='ascii'), folder)
 
     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)))]
+        msgs = [msg.uid for msg in self.conn.fetch(AND(header=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]
@@ -198,7 +183,7 @@ class IdleManager:
         self.direct_imap.conn.idle.start()
 
     def check(self, timeout=None) -> List[bytes]:
-        """(blocking) wait for next idle message from server."""
+        """ (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))
@@ -207,19 +192,20 @@ class IdleManager:
     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:
+                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."""
+        """ 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])
+                    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."""
+        """ 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,19 +1,18 @@
-import io
-import os
-import re
-import sys
 import threading
-import time
+import sys
 import traceback
-from contextlib import contextmanager
-from queue import Empty, Queue
+import time
+import io
+import re
+import os
+from queue import Queue, Empty
 
 import deltachat
-
-from .capi import ffi, lib
-from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
+from contextlib import contextmanager
+from .capi import ffi, lib
 from .message import map_system_message
+from .cutil import from_optional_dc_charpointer
 
 
 class FFIEvent:
@@ -27,10 +26,9 @@ class FFIEvent:
 
 
 class FFIEventLogger:
-    """If you register an instance of this logger with an Account
+    """ If you register an instance of this logger with an Account
     you'll get all ffi-events printed.
     """
-
     # to prevent garbled logging
     _loglock = threading.RLock()
 
@@ -58,9 +56,9 @@ class FFIEventLogger:
         s = "{:2.2f} [{}] {}".format(elapsed, locname, message)
 
         if os.name == "posix":
-            WARN = "\033[93m"
-            ERROR = "\033[91m"
-            ENDC = "\033[0m"
+            WARN = '\033[93m'
+            ERROR = '\033[91m'
+            ENDC = '\033[0m'
             if message.startswith("DC_EVENT_WARNING"):
                 s = WARN + s + ENDC
             if message.startswith("DC_EVENT_ERROR"):
@@ -173,12 +171,12 @@ class FFIEventTracker:
         self.get_info_contains("INBOX: Idle entering")
 
     def wait_next_incoming_message(self):
-        """wait for and return next incoming message."""
+        """ wait for and return next incoming message. """
         ev = self.get_matching("DC_EVENT_INCOMING_MSG")
         return self.account.get_message_by_id(ev.data2)
 
     def wait_next_messages_changed(self):
-        """wait for and return next message-changed message or None
+        """ wait for and return next message-changed message or None
         if the event contains no msgid"""
         ev = self.get_matching("DC_EVENT_MSGS_CHANGED")
         if ev.data2 > 0:
@@ -193,11 +191,10 @@ class FFIEventTracker:
 
 
 class EventThread(threading.Thread):
-    """Event Thread for an account.
+    """ Event Thread for an account.
 
     With each Account init this callback thread is started.
     """
-
     def __init__(self, account) -> None:
         self.account = account
         super(EventThread, self).__init__(name="events")
@@ -222,7 +219,7 @@ class EventThread(threading.Thread):
         self.join(timeout=timeout)
 
     def run(self) -> None:
-        """get and run events until shutdown."""
+        """ get and run events until shutdown. """
         with self.log_execution("EVENT THREAD"):
             self._inner_run()
 
@@ -262,7 +259,8 @@ class EventThread(threading.Thread):
         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()))
+            self.account.log("{}\nException {}\nTraceback:\n{}"
+                             .format(info, ex, logfile.getvalue()))
 
     def _map_ffi_event(self, ffi_event: FFIEvent):
         name = ffi_event.name
@@ -271,8 +269,7 @@ class EventThread(threading.Thread):
             data1 = ffi_event.data1
             if data1 == 0 or data1 == 1000:
                 success = data1 == 1000
-                comment = ffi_event.data2
-                yield "ac_configure_completed", dict(success=success, comment=comment)
+                yield "ac_configure_completed", dict(success=success)
         elif name == "DC_EVENT_INCOMING_MSG":
             msg = account.get_message_by_id(ffi_event.data2)
             yield map_system_message(msg) or ("ac_incoming_message", dict(message=msg))
@@ -285,10 +282,7 @@ class EventThread(threading.Thread):
                         yield res
                     yield "ac_outgoing_message", dict(message=msg)
                 elif msg.is_in_fresh():
-                    yield map_system_message(msg) or (
-                        "ac_incoming_message",
-                        dict(message=msg),
-                    )
+                    yield map_system_message(msg) or ("ac_incoming_message", dict(message=msg))
         elif name == "DC_EVENT_MSG_DELIVERED":
             msg = account.get_message_by_id(ffi_event.data2)
             yield "ac_message_delivered", dict(message=msg)

python/src/deltachat/hookspec.py

@@ -2,6 +2,7 @@
 
 import pluggy
 
+
 account_spec_name = "deltachat-account"
 account_hookspec = pluggy.HookspecMarker(account_spec_name)
 account_hookimpl = pluggy.HookimplMarker(account_spec_name)
@@ -12,13 +13,12 @@ global_hookimpl = pluggy.HookimplMarker(global_spec_name)
 
 
 class PerAccount:
-    """per-Account-instance hook specifications.
+    """ per-Account-instance hook specifications.
 
     All hooks are executed in a dedicated Event thread.
     Hooks are generally not allowed to block/last long as this
     blocks overall event processing on the python side.
     """
-
     @classmethod
     def _make_plugin_manager(cls):
         pm = pluggy.PluginManager(account_spec_name)
@@ -27,7 +27,7 @@ class PerAccount:
 
     @account_hookspec
     def ac_process_ffi_event(self, ffi_event):
-        """process a CFFI low level events for a given account.
+        """ process a CFFI low level events for a given account.
 
         ffi_event has "name", "data1", "data2" values as specified
         with `DC_EVENT_* <https://c.delta.chat/group__DC__EVENT.html>`_.
@@ -35,37 +35,37 @@ class PerAccount:
 
     @account_hookspec
     def ac_log_line(self, message):
-        """log a message related to the account."""
+        """ log a message related to the account. """
 
     @account_hookspec
-    def ac_configure_completed(self, success, comment):
-        """Called after a configure process completed."""
+    def ac_configure_completed(self, success):
+        """ Called after a configure process completed. """
 
     @account_hookspec
     def ac_incoming_message(self, message):
-        """Called on any incoming message (both existing chats and contact requests)."""
+        """ Called on any incoming message (both existing chats and contact requests). """
 
     @account_hookspec
     def ac_outgoing_message(self, message):
-        """Called on each outgoing message (both system and "normal")."""
+        """ Called on each outgoing message (both system and "normal")."""
 
     @account_hookspec
     def ac_message_delivered(self, message):
-        """Called when an outgoing message has been delivered to SMTP.
+        """ Called when an outgoing message has been delivered to SMTP.
 
         :param message: Message that was just delivered.
         """
 
     @account_hookspec
     def ac_chat_modified(self, chat):
-        """Chat was created or modified regarding membership, avatar, title.
+        """ Chat was created or modified regarding membership, avatar, title.
 
         :param chat: Chat which was modified.
         """
 
     @account_hookspec
     def ac_member_added(self, chat, contact, actor, message):
-        """Called for each contact added to an accepted chat.
+        """ Called for each contact added to an accepted chat.
 
         :param chat: Chat where contact was added.
         :param contact: Contact that was added.
@@ -75,7 +75,7 @@ class PerAccount:
 
     @account_hookspec
     def ac_member_removed(self, chat, contact, actor, message):
-        """Called for each contact removed from a chat.
+        """ Called for each contact removed from a chat.
 
         :param chat: Chat where contact was removed.
         :param contact: Contact that was removed.
@@ -85,11 +85,10 @@ class PerAccount:
 
 
 class Global:
-    """global hook specifications using a per-process singleton
+    """ global hook specifications using a per-process singleton
     plugin manager instance.
 
     """
-
     _plugin_manager = None
 
     @classmethod
@@ -101,11 +100,11 @@ class Global:
 
     @global_hookspec
     def dc_account_init(self, account):
-        """called when `Account::__init__()` function starts executing."""
+        """ called when `Account::__init__()` function starts executing. """
 
     @global_hookspec
     def dc_account_extra_configure(self, account):
-        """Called when account configuration successfully finished.
+        """ Called when account configuration successfully finished.
 
         This hook can be used to perform extra work before
         ac_configure_completed is called.
@@ -113,4 +112,4 @@ class Global:
 
     @global_hookspec
     def dc_account_after_shutdown(self, account):
-        """Called after the account has been shutdown."""
+        """ Called after the account has been shutdown. """

python/src/deltachat/message.py

@@ -1,23 +1,21 @@
 """ The Message object. """
 
-import json
 import os
 import re
+from . import props
+from .cutil import from_dc_charpointer, from_optional_dc_charpointer, as_dc_charpointer
+from .capi import lib, ffi
+from . import const
 from datetime import datetime, timezone
-from typing import Optional, Union
-
-from . import const, props
-from .capi import ffi, lib
-from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer
+from typing import Optional
 
 
 class Message(object):
-    """Message object.
+    """ Message object.
 
     You obtain instances of it through :class:`deltachat.account.Account` or
     :class:`deltachat.chat.Chat`.
     """
-
     def __init__(self, account, dc_msg):
         self.account = account
         assert isinstance(self.account._dc_context, ffi.CData)
@@ -27,48 +25,42 @@ class Message(object):
         msg_id = self.id
         assert msg_id is not None and msg_id >= 0, repr(msg_id)
 
-    def __eq__(self, other) -> bool:
-        if other is None:
-            return False
+    def __eq__(self, other):
         return self.account == other.account and self.id == other.id
 
     def __repr__(self):
         c = self.get_sender_contact()
         typ = "outgoing" if self.is_outgoing() else "incoming"
         return "<Message {} sys={} {} id={} sender={}/{} chat={}/{}>".format(
-            typ,
-            self.is_system_message(),
-            repr(self.text[:10]),
-            self.id,
-            c.id,
-            c.addr,
-            self.chat.id,
-            self.chat.get_name(),
-        )
+            typ, self.is_system_message(), repr(self.text[:10]),
+            self.id, c.id, c.addr, self.chat.id, self.chat.get_name())
 
     @classmethod
     def from_db(cls, account, id):
         assert id > 0
-        return cls(account, ffi.gc(lib.dc_get_msg(account._dc_context, id), lib.dc_msg_unref))
+        return cls(account, ffi.gc(
+                lib.dc_get_msg(account._dc_context, id),
+                lib.dc_msg_unref
+        ))
 
     @classmethod
     def new_empty(cls, account, view_type):
-        """create a non-persistent message.
+        """ create a non-persistent message.
 
-        :param view_type: the message type code or one of the strings:
-           "text", "audio", "video", "file", "sticker", "videochat", "webxdc"
+        :param: view_type is the message type code or one of the strings:
+           "text", "audio", "video", "file", "sticker"
         """
         if isinstance(view_type, int):
             view_type_code = view_type
         else:
             view_type_code = get_viewtype_code_from_name(view_type)
-        return Message(
-            account,
-            ffi.gc(lib.dc_msg_new(account._dc_context, view_type_code), lib.dc_msg_unref),
-        )
+        return Message(account, ffi.gc(
+            lib.dc_msg_new(account._dc_context, view_type_code),
+            lib.dc_msg_unref
+        ))
 
     def create_chat(self):
-        """create or get an existing chat (group) object for this message.
+        """ create or get an existing chat (group) object for this message.
 
         If the message is a contact request
         the sender will become an accepted contact.
@@ -80,22 +72,23 @@ class Message(object):
 
     @props.with_doc
     def id(self):
-        """id of this message."""
+        """id of this message. """
         return lib.dc_msg_get_id(self._dc_msg)
 
     @props.with_doc
     def text(self) -> str:
-        """unicode text of this messages (might be empty if not a text message)."""
+        """unicode text of this messages (might be empty if not a text message). """
         return from_dc_charpointer(lib.dc_msg_get_text(self._dc_msg))
 
     def set_text(self, text):
-        """set text of this message."""
+        """set text of this message. """
         lib.dc_msg_set_text(self._dc_msg, as_dc_charpointer(text))
 
     @props.with_doc
     def html(self) -> str:
-        """html text of this messages (might be empty if not an html message)."""
-        return from_optional_dc_charpointer(lib.dc_get_msg_html(self.account._dc_context, self.id)) or ""
+        """html text of this messages (might be empty if not an html message). """
+        return from_optional_dc_charpointer(
+            lib.dc_get_msg_html(self.account._dc_context, self.id)) or ""
 
     def has_html(self):
         """return True if this message has an html part, False otherwise."""
@@ -110,11 +103,11 @@ class Message(object):
 
     @props.with_doc
     def filename(self):
-        """filename if there was an attachment, otherwise empty string."""
+        """filename if there was an attachment, otherwise empty string. """
         return from_dc_charpointer(lib.dc_msg_get_file(self._dc_msg))
 
     def set_file(self, path, mime_type=None):
-        """set file for this message from path and mime_type."""
+        """set file for this message from path and mime_type. """
         mtype = ffi.NULL if mime_type is None else as_dc_charpointer(mime_type)
         if not os.path.exists(path):
             raise ValueError("path does not exist: {!r}".format(path))
@@ -122,7 +115,7 @@ class Message(object):
 
     @props.with_doc
     def basename(self) -> str:
-        """basename of the attachment if it exists, otherwise empty string."""
+        """basename of the attachment if it exists, otherwise empty string. """
         # FIXME, it does not return basename
         return from_dc_charpointer(lib.dc_msg_get_filename(self._dc_msg))
 
@@ -131,74 +124,44 @@ class Message(object):
         """mime type of the file (if it exists)"""
         return from_dc_charpointer(lib.dc_msg_get_filemime(self._dc_msg))
 
-    def get_status_updates(self, serial: int = 0) -> list:
-        """Get the status updates of this webxdc message.
-
-        The status updates may be sent by yourself or by other members.
-        If this message doesn't have a webxdc instance, an empty list is returned.
-
-        :param serial: The last known serial. Pass 0 if there are no known serials to receive all updates.
-        """
-        return json.loads(
-            from_dc_charpointer(lib.dc_get_webxdc_status_updates(self.account._dc_context, self.id, serial))
-        )
-
-    def send_status_update(self, json_data: Union[str, dict], description: str) -> bool:
-        """Send an status update for the webxdc instance of this message.
-
-        If the webxdc instance is a draft, the update is not sent immediately.
-        Instead, the updates are collected and sent out in a batch when the instance is actually sent.
-
-        :param json_data: program-readable data, the actual payload.
-        :param description: The user-visible description of JSON data
-        :returns: True on success, False otherwise
-        """
-        if isinstance(json_data, dict):
-            json_data = json.dumps(json_data, default=str)
-        return bool(
-            lib.dc_send_webxdc_status_update(
-                self.account._dc_context, self.id, as_dc_charpointer(json_data), as_dc_charpointer(description)
-            )
-        )
-
     def is_system_message(self):
-        """return True if this message is a system/info message."""
+        """ return True if this message is a system/info message. """
         return bool(lib.dc_msg_is_info(self._dc_msg))
 
     def is_setup_message(self):
-        """return True if this message is a setup message."""
+        """ return True if this message is a setup message. """
         return lib.dc_msg_is_setupmessage(self._dc_msg)
 
     def get_setupcodebegin(self) -> str:
-        """return the first characters of a setup code in a setup message."""
+        """ return the first characters of a setup code in a setup message. """
         return from_dc_charpointer(lib.dc_msg_get_setupcodebegin(self._dc_msg))
 
     def is_encrypted(self):
-        """return True if this message was encrypted."""
+        """ return True if this message was encrypted. """
         return bool(lib.dc_msg_get_showpadlock(self._dc_msg))
 
     def is_bot(self):
-        """return True if this message is submitted automatically."""
+        """ return True if this message is submitted automatically. """
         return bool(lib.dc_msg_is_bot(self._dc_msg))
 
     def is_forwarded(self):
-        """return True if this message was forwarded."""
+        """ return True if this message was forwarded. """
         return bool(lib.dc_msg_is_forwarded(self._dc_msg))
 
     def get_message_info(self) -> str:
-        """Return informational text for a single message.
+        """ Return informational text for a single message.
 
         The text is multiline and may contain eg. the raw text of the message.
         """
         return from_dc_charpointer(lib.dc_get_msg_info(self.account._dc_context, self.id))
 
-    def get_summarytext(self, width: int) -> str:
-        """Get a message summary as a single line of text. Typically used for notifications."""
-        return from_dc_charpointer(lib.dc_msg_get_summarytext(self._dc_msg, width))
-
     def continue_key_transfer(self, setup_code):
-        """extract key and use it as primary key for this account."""
-        res = lib.dc_continue_key_transfer(self.account._dc_context, self.id, as_dc_charpointer(setup_code))
+        """ extract key and use it as primary key for this account. """
+        res = lib.dc_continue_key_transfer(
+                self.account._dc_context,
+                self.id,
+                as_dc_charpointer(setup_code)
+        )
         if res == 0:
             raise ValueError("could not decrypt")
 
@@ -267,7 +230,7 @@ class Message(object):
         lib.dc_msg_force_plaintext(self._dc_msg)
 
     def get_mime_headers(self):
-        """return mime-header object for an incoming message.
+        """ return mime-header object for an incoming message.
 
         This only returns a non-None object if ``save_mime_headers``
         config option was set and the message is incoming.
@@ -275,7 +238,6 @@ class Message(object):
         :returns: email-mime message object (with headers only, no body).
         """
         import email.parser
-
         mime_headers = lib.dc_get_mime_headers(self.account._dc_context, self.id)
         if mime_headers:
             s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
@@ -295,7 +257,6 @@ class Message(object):
         :returns: :class:`deltachat.chat.Chat` object
         """
         from .chat import Chat
-
         chat_id = lib.dc_msg_get_chat_id(self._dc_msg)
         return Chat(self.account, chat_id)
 
@@ -305,11 +266,13 @@ class Message(object):
 
         Usually used to impersonate someone else.
         """
-        return from_optional_dc_charpointer(lib.dc_msg_get_override_sender_name(self._dc_msg))
+        return from_optional_dc_charpointer(
+            lib.dc_msg_get_override_sender_name(self._dc_msg))
 
     def set_override_sender_name(self, name):
-        """set different sender name for a message."""
-        lib.dc_msg_set_override_sender_name(self._dc_msg, as_dc_charpointer(name))
+        """set different sender name for a message. """
+        lib.dc_msg_set_override_sender_name(
+            self._dc_msg, as_dc_charpointer(name))
 
     def get_sender_chat(self):
         """return the 1:1 chat with the sender of this message.
@@ -324,7 +287,6 @@ class Message(object):
         :returns: :class:`deltachat.chat.Contact` instance
         """
         from .contact import Contact
-
         contact_id = lib.dc_msg_get_from_id(self._dc_msg)
         return Contact(self.account, contact_id)
 
@@ -337,11 +299,14 @@ class Message(object):
             dc_msg = self._dc_msg
         else:
             # load message from db to get a fresh/current state
-            dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
+            dc_msg = ffi.gc(
+                lib.dc_get_msg(self.account._dc_context, self.id),
+                lib.dc_msg_unref
+            )
         return lib.dc_msg_get_state(dc_msg)
 
     def is_in_fresh(self):
-        """return True if Message is incoming fresh message (un-noticed).
+        """ return True if Message is incoming fresh message (un-noticed).
 
         Fresh messages are not noticed nor seen and are typically
         shown in notifications.
@@ -365,25 +330,25 @@ class Message(object):
         return self._msgstate == const.DC_STATE_IN_SEEN
 
     def is_outgoing(self):
-        """Return True if Message is outgoing."""
+        """Return True if Message is outgoing. """
         return self._msgstate in (
-            const.DC_STATE_OUT_PREPARING,
-            const.DC_STATE_OUT_PENDING,
-            const.DC_STATE_OUT_FAILED,
-            const.DC_STATE_OUT_MDN_RCVD,
-            const.DC_STATE_OUT_DELIVERED,
-        )
+            const.DC_STATE_OUT_PREPARING, const.DC_STATE_OUT_PENDING,
+            const.DC_STATE_OUT_FAILED, const.DC_STATE_OUT_MDN_RCVD,
+            const.DC_STATE_OUT_DELIVERED)
 
     def is_out_preparing(self):
-        """Return True if Message is outgoing, but its file is being prepared."""
+        """Return True if Message is outgoing, but its file is being prepared.
+        """
         return self._msgstate == const.DC_STATE_OUT_PREPARING
 
     def is_out_pending(self):
-        """Return True if Message is outgoing, but is pending (no single checkmark)."""
+        """Return True if Message is outgoing, but is pending (no single checkmark).
+        """
         return self._msgstate == const.DC_STATE_OUT_PENDING
 
     def is_out_failed(self):
-        """Return True if Message is unrecoverably failed."""
+        """Return True if Message is unrecoverably failed.
+        """
         return self._msgstate == const.DC_STATE_OUT_FAILED
 
     def is_out_delivered(self):
@@ -410,58 +375,48 @@ class Message(object):
         return lib.dc_msg_get_viewtype(self._dc_msg)
 
     def is_text(self):
-        """return True if it's a text message."""
+        """ return True if it's a text message. """
         return self._view_type == const.DC_MSG_TEXT
 
     def is_image(self):
-        """return True if it's an image message."""
+        """ return True if it's an image message. """
         return self._view_type == const.DC_MSG_IMAGE
 
     def is_gif(self):
-        """return True if it's a gif message."""
+        """ return True if it's a gif message. """
         return self._view_type == const.DC_MSG_GIF
 
     def is_sticker(self):
-        """return True if it's a sticker message."""
+        """ return True if it's a sticker message. """
         return self._view_type == const.DC_MSG_STICKER
 
     def is_audio(self):
-        """return True if it's an audio message."""
+        """ return True if it's an audio message. """
         return self._view_type == const.DC_MSG_AUDIO
 
     def is_video(self):
-        """return True if it's a video message."""
+        """ return True if it's a video message. """
         return self._view_type == const.DC_MSG_VIDEO
 
-    def is_videochat_invitation(self):
-        """return True if it's a videochat invitation message."""
-        return self._view_type == const.DC_MSG_VIDEOCHAT_INVITATION
-
-    def is_webxdc(self):
-        """return True if it's a Webxdc message."""
-        return self._view_type == const.DC_MSG_WEBXDC
-
     def is_file(self):
-        """return True if it's a file message."""
+        """ return True if it's a file message. """
         return self._view_type == const.DC_MSG_FILE
 
     def mark_seen(self):
-        """mark this message as seen."""
+        """ mark this message as seen. """
         self.account.mark_seen_messages([self.id])
 
 
 # some code for handling DC_MSG_* view types
 
 _view_type_mapping = {
-    "text": const.DC_MSG_TEXT,
-    "image": const.DC_MSG_IMAGE,
-    "gif": const.DC_MSG_GIF,
-    "audio": const.DC_MSG_AUDIO,
-    "video": const.DC_MSG_VIDEO,
-    "file": const.DC_MSG_FILE,
-    "sticker": const.DC_MSG_STICKER,
-    "videochat": const.DC_MSG_VIDEOCHAT_INVITATION,
-    "webxdc": const.DC_MSG_WEBXDC,
+    'text': const.DC_MSG_TEXT,
+    'image': const.DC_MSG_IMAGE,
+    'gif': const.DC_MSG_GIF,
+    'audio': const.DC_MSG_AUDIO,
+    'video': const.DC_MSG_VIDEO,
+    'file': const.DC_MSG_FILE,
+    'sticker': const.DC_MSG_STICKER,
 }
 
 
@@ -469,16 +424,14 @@ def get_viewtype_code_from_name(view_type_name):
     code = _view_type_mapping.get(view_type_name)
     if code is not None:
         return code
-    raise ValueError(
-        "message typecode not found for {!r}, " "available {!r}".format(view_type_name, list(_view_type_mapping.keys()))
-    )
+    raise ValueError("message typecode not found for {!r}, "
+                     "available {!r}".format(view_type_name, list(_view_type_mapping.keys())))
 
 
 #
 # some helper code for turning system messages into hook events
 #
 
-
 def map_system_message(msg):
     if msg.is_system_message():
         res = parse_system_add_remove(msg.text)
@@ -495,7 +448,7 @@ def map_system_message(msg):
 
 
 def extract_addr(text):
-    m = re.match(r".*\((.+@.+)\)", text)
+    m = re.match(r'.*\((.+@.+)\)', text)
     if m:
         text = m.group(1)
     text = text.rstrip(".")
@@ -503,9 +456,9 @@ def extract_addr(text):
 
 
 def parse_system_add_remove(text):
-    """return add/remove info from parsing the given system message text.
+    """ return add/remove info from parsing the given system message text.
 
-    returns a (action, affected, actor) triple"""
+    returns a (action, affected, actor) triple """
 
     # Member Me (x@y) removed by a@b.
     # Member x@y added by a@b
@@ -514,7 +467,7 @@ def parse_system_add_remove(text):
     # Group left by some one (tmp1@x.org).
     # Group left by tmp1@x.org.
     text = text.lower()
-    m = re.match(r"member (.+) (removed|added) by (.+)", text)
+    m = re.match(r'member (.+) (removed|added) by (.+)', text)
     if m:
         affected, action, actor = m.groups()
         return action, extract_addr(affected), extract_addr(actor)

python/src/deltachat/props.py

@@ -9,7 +9,6 @@ def with_doc(f):
 # https://github.com/devpi/devpi/blob/master/common/devpi_common/types.py
 def cached(f):
     """returns a cached property that is calculated by function f"""
-
     def get(self):
         try:
             return self._property_cache[f]

python/src/deltachat/provider.py

@@ -26,12 +26,14 @@ class Provider(object):
     @property
     def overview_page(self) -> str:
         """URL to the overview page of the provider on providers.delta.chat."""
-        return from_dc_charpointer(lib.dc_provider_get_overview_page(self._provider))
+        return from_dc_charpointer(
+            lib.dc_provider_get_overview_page(self._provider))
 
     @property
     def get_before_login_hints(self) -> str:
         """Should be shown to the user on login."""
-        return from_dc_charpointer(lib.dc_provider_get_before_login_hint(self._provider))
+        return from_dc_charpointer(
+            lib.dc_provider_get_before_login_hint(self._provider))
 
     @property
     def status(self) -> int: