improve naming

that dc-node has everything it needs to provide @deltachat/jsonrpc-client
without an extra ts compile step

.cargo/config.toml

@@ -1,11 +0,0 @@
-[env]
-# In unoptimised builds tokio tends to use a lot of stack space when
-# creating some complicated futures, tokio has an open issue for this:
-# https://github.com/tokio-rs/tokio/issues/2055.  Some of our tests
-# manage to not fit in the default 2MiB stack anymore due to this, so
-# while the issue is not resolved we want to work around this.
-# Because compiling optimised builds takes a very long time we prefer
-# to avoid that.  Setting this environment variable ensures that when
-# invoking `cargo test` threads are allowed to have a large enough
-# stack size without needing to use an optimised build.
-RUST_MIN_STACK = "8388608"

.github/mergeable.yml

@@ -16,7 +16,7 @@ mergeable:
                 required: ['CHANGELOG.md']
             - do: dependent
               changed:
-                file: 'deltachat-ffi/src/**'
+                file: 'deltachat-ffi/**'
                 required: ['CHANGELOG.md']
     fail:
       - do: checks

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   RUSTFLAGS: -Dwarnings
-   
+
 jobs:
 
   fmt:
@@ -40,17 +40,12 @@ jobs:
             toolchain: stable
             components: clippy
             override: true
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.20.1'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v1
       - 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
@@ -60,11 +55,6 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.20.1'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -87,28 +77,24 @@ jobs:
         include:
           # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.63.0
+            rust: 1.61.0
             python: 3.9
           - os: windows-latest
-            rust: 1.63.0
+            rust: 1.61.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.63.0
+          # 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.63.0
+            rust: 1.56.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        version: '3.20.1'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Install ${{ matrix.rust }}
       uses: actions-rs/toolchain@v1
       with:
@@ -130,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 }}
 
@@ -150,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 }}
@@ -160,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-client-npm-package.yml

@@ -1,83 +0,0 @@
-name: 'jsonrpc js client build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  pack-module:
-    name: 'Package @deltachat/jsonrpc-client and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-${{ 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: |
-          npm --version
-          node --version
-          echo $DELTACHAT_JSONRPC_TAR_GZ
-      - name: install dependencies without running scripts
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm install --ignore-scripts
-      - name: package
-        shell: bash
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run build:tsc
-          npm pack .
-          ls -lah
-          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: deltachat-jsonrpc-client.tgz
-          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-jsonrpc-client preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_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_JSONRPC_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
-        if: ${{ steps.tag.outputs.tag }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/jsonrpc.yml

@@ -1,51 +0,0 @@
-name: JSON-RPC API Test
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MIN_STACK: "8388608"
-
-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: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.20.1'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - 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/jsonrpc_api.yml

@@ -0,0 +1,66 @@
+name: JSON-RPC API Test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.56.0
+          override: true
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v1.3.0
+      - name: Build
+        run: cargo build --verbose --features webserver -p deltachat-jsonrpc
+      - name: Run tests
+        run: cargo test --verbose --features webserver -p deltachat-jsonrpc
+
+  ts_bindings:
+    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: 1.56.0
+          override: true
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v1.3.0
+      - name: npm i
+        run: |
+          cd deltachat-jsonrpc/typescript
+          npm i
+      - name: npm run generate-bindings
+        run: |
+          cd deltachat-jsonrpc/typescript
+          npm run generate-bindings
+      - name: npm run check ts
+        run: |
+          cd deltachat-jsonrpc/typescript
+          npx tsc --noEmit
+      - name: run integration tests
+        run: |
+          cd deltachat-jsonrpc/typescript
+          npm run build
+          cargo build --features webserver
+          npm run test:integration
+      - name: run prettier
+        run: |
+          cd deltachat-jsonrpc/typescript
+          npm run prettier:check

.github/workflows/node-package.yml

@@ -27,11 +27,7 @@ jobs:
           cargo -vV
           npm --version
           node --version
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.20.1'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Cache node modules
         uses: actions/cache@v2
         with:

.github/workflows/node-tests.yml

@@ -27,11 +27,7 @@ jobs:
           cargo -vV
           npm --version
           node --version
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.20.1'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Cache node modules
         uses: actions/cache@v2
         with:
@@ -56,7 +52,6 @@ jobs:
           npm install --verbose
 
       - name: Test
-        timeout-minutes: 10
         if: runner.os != 'Windows'
         run: |
           cd node
@@ -64,7 +59,6 @@ jobs:
         env:
           DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
       - name: Run tests on Windows, except lint
-        timeout-minutes: 10
         if: runner.os == 'Windows'
         run: |
           cd node

CHANGELOG.md

@@ -2,360 +2,6 @@
 
 ## Unreleased
 
-### Changes
-- Refactor: Remove the remaining AsRef<str> #3669
-- Small speedup #3780
-
-### API-Changes
-- Add Python API to send reactions #3762
-- jsonrpc: add message errors to MessageObject #3788
-
-### Fixes
-- Make sure malformed messsages will never block receiving further messages anymore #3771
-- strip leading/trailing whitespace from "Chat-Group-Name{,-Changed}:" headers content #3650
-- Assume all Thunderbird users prefer encryption #3774
-- refactor peerstate handling to ensure no duplicate peerstates #3776
-
-
-## 1.102.0
-
-### Changes
-
-- If an email has multiple From addresses, handle this as if there was
-  no From address, to prevent from forgery attacks. Also, improve
-  handling of emails with invalid From addresses in general #3667
-
-### API-Changes
-
-### Fixes
-- fix detection of "All mail", "Trash", "Junk" etc folders. #3760
-- fetch messages sequentially to fix reactions on partially downloaded messages #3688
-- Fix a bug where one malformed message blocked receiving any further messages #3769
-
-
-## 1.101.0
-
-### Changes
-- add `configured_inbox_folder` to account info #3748
-- `dc_delete_contact()` hides contacts if referenced #3751
-- add IMAP UIDs to message info #3755
-
-### Fixes
-- improve IMAP logging, in particular fix incorrect "IMAP IDLE protocol
-  timed out" message on network error during IDLE #3749
-- pop Recently Seen Loop event out of the queue when it is in the past
-  to avoid busy looping #3753
-- fix build failures by going back to standard `async_zip` #3747
-
-
-## 1.100.0
-
-### API-Changes
-- jsonrpc: add `miscSaveSticker` method
-
-### Changes
-- add JSON-RPC stdio server `deltachat-rpc-server` and use it for JSON-RPC tests #3695
-- update rPGP from 0.8 to 0.9 #3737
-- jsonrpc: typescript client: use npm released deltachat fork of the tiny emitter package #3741
-- jsonrpc: show sticker image in quote #3744
-
-
-
-## 1.99.0
-
-### API-Changes
-- breaking jsonrpc: changed function naming
-  - `autocryptInitiateKeyTransfer` -> `initiateAutocryptKeyTransfer`
-  - `autocryptContinueKeyTransfer` -> `continueAutocryptKeyTransfer`
-  - `chatlistGetFullChatById` -> `getFullChatById`
-  - `messageGetMessage` -> `getMessage`
-  - `messageGetMessages` -> `getMessages`
-  - `messageGetNotificationInfo` -> `getMessageNotificationInfo`
-  - `contactsGetContact` -> `getContact`
-  - `contactsCreateContact` -> `createContact`
-  - `contactsCreateChatByContactId` -> `createChatByContactId`
-  - `contactsBlock` -> `blockContact`
-  - `contactsUnblock` -> `unblockContact`
-  - `contactsGetBlocked` -> `getBlockedContacts`
-  - `contactsGetContactIds` -> `getContactIds`
-  - `contactsGetContacts` -> `getContacts`
-  - `contactsGetContactsByIds` -> `getContactsByIds`
-  - `chatGetMedia` -> `getChatMedia`
-  - `chatGetNeighboringMedia` -> `getNeighboringChatMedia`
-  - `webxdcSendStatusUpdate` -> `sendWebxdcStatusUpdate`
-  - `webxdcGetStatusUpdates` -> `getWebxdcStatusUpdates`
-  - `messageGetWebxdcInfo` -> `getWebxdcInfo`
-- jsonrpc: changed method signature
-  - `miscSendTextMessage(accountId, text, chatId)` -> `miscSendTextMessage(accountId, chatId, text)`
-- jsonrpc: add `SystemMessageType` to `Message`
-- cffi: add missing `DC_INFO_` constants
-- Add DC_EVENT_INCOMING_MSG_BUNCH event #3643
-- Python bindings: Make get_matching() only match the
-  whole event name, e.g. events.get_matching("DC_EVENT_INCOMING_MSG")
-  won't match DC_EVENT_INCOMING_MSG_BUNCH anymore #3643
-
-
-- Rust: Introduce a ContextBuilder #3698
-
-### Changes
-- allow sender timestamp to be in the future, but not too much
-- Disable the new "Authentication-Results/DKIM checking" security feature
-  until we have tested it a bit #3728
-- refactorings #3706
-
-### Fixes
-- `dc_search_msgs()` returns unaccepted requests #3694
-- emit "contacts changed" event when the contact is no longer "seen recently" #3703
-- do not allow peerstate reset if DKIM check failed #3731
-
-
-## 1.98.0
-
-### API-Changes
-- jsonrpc: typescript client: export constants under `C` enum, similar to how its exported from `deltachat-node` #3681
-- added reactions support #3644
-- jsonrpc: reactions: added reactions to `Message` type and the `sendReaction()` method #3686
-
-### Changes
-- simplify `UPSERT` queries #3676
-
-### Fixes
-
-
-## 1.97.0
-
-### API-Changes
-- jsonrpc: add function: #3641, #3645, #3653
-  - `getChatContacts()`
-  - `createGroupChat()`
-  - `createBroadcastList()`
-  - `setChatName()`
-  - `setChatProfileImage()`
-  - `downloadFullMessage()`
-  - `lookupContactIdByAddr()`
-  - `sendVideochatInvitation()`
-  - `searchMessages()`
-  - `messageIdsToSearchResults()`
-  - `setChatVisibility()`
-  - `getChatEphemeralTimer()`
-  - `setChatEphemeralTimer()`
-  - `getLocations()`
-  - `getAccountFileSize()`
-  - `estimateAutoDeletionCount()`
-  - `setStockStrings()`
-  - `exportSelfKeys()`
-  - `importSelfKeys()`
-  - `sendSticker()`
-  - `changeContactName()`
-  - `deleteContact()`
-  - `joinSecurejoin()`
-  - `stopIoForAllAccounts()`
-  - `startIoForAllAccounts()`
-  - `startIo()`
-  - `stopIo()`
-  - `exportBackup()`
-  - `importBackup()`
-  - `getMessageHtml()` #3671
-  - `miscGetStickerFolder` and `miscGetStickers` #3672
-- breaking: jsonrpc: remove function `messageListGetMessageIds()`, it is replaced by `getMessageIds()` and `getMessageListItems()` the latter returns a new `MessageListItem` type, which is the now prefered way of using the message list.
-- jsonrpc: add type: #3641, #3645
-  - `MessageSearchResult`
-  - `Location`
-- jsonrpc: add `viewType` to quoted message(`MessageQuote` type) in `Message` object type #3651
-
-
-### Changes
-- Look at Authentication-Results. Don't accept Autocrypt key changes
-  if they come with negative authentiation results while this contact
-  sent emails with positive authentication results in the past. #3583
-- jsonrpc in cffi also sends events now #3662
-- jsonrpc: new format for events and better typescript autocompletion
-- Join all "[migration] vXX" log messages into one
-
-### Fixes
-- share stock string translations across accounts created by the same account manager #3640
-- suppress welcome device messages after account import #3642
-- fix unix timestamp used for daymarker #3660
-
-## 1.96.0
-
-### Changes
-- jsonrpc js client:
-  - Change package name from `deltachat-jsonrpc-client` to `@deltachat/jsonrpc-client`
-  - remove relative file dependency to it from `deltachat-node` (because it did not work anyway and broke the nix build of desktop)
-  - ci: add github ci action to upload it to our download server automaticaly on realease
-
-## 1.95.0
-
-### API-Changes
-- jsonrpc: add `mailingListAddress` property to `FullChat` #3607
-- jsonrpc: add `MessageNotificationInfo` & `messageGetNotificationInfo()` #3614
-- jsonrpc: add `chat_get_neighboring_media` function #3610
-
-### Changes
-- added `dclogin:` scheme to allow configuration from a qr code
-  (data inside qrcode, contrary to `dcaccount:` which points to an API to create an account) #3541
-- truncate incoming messages by lines instead of just length #3480
-- emit separate `DC_EVENT_MSGS_CHANGED` for each expired message,
-  and `DC_EVENT_WEBXDC_INSTANCE_DELETED` when a message contains a webxdc #3605
-- enable `bcc_self` by default #3612
-
-
-## 1.94.0
-
-### 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
-- Fix `get_connectivity_html` and `get_encrinfo` futures not being Send. See rust-lang/rust#101650 for more information
-- jsonrpc: add functions: #3586, #3587, #3590
-  - `deleteChat()`
-  - `getChatEncryptionInfo()`
-  - `getChatSecurejoinQrCodeSvg()`
-  - `leaveGroup()`
-  - `removeContactFromChat()`
-  - `addContactToChat()`
-  - `deleteMessages()`
-  - `getMessageInfo()`
-  - `getBasicChatInfo()`
-  - `marknoticedChat()`
-  - `getFirstUnreadMessageOfChat()`
-  - `markseenMsgs()`
-  - `forwardMessages()`
-  - `removeDraft()`
-  - `getDraft()`
-  - `miscSendMsg()`
-  - `miscSetDraft()`
-  - `maybeNetwork()`
-  - `getConnectivity()`
-  - `getContactEncryptionInfo()`
-  - `getConnectivityHtml()`
-- 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
-- python: move `get_dc_event_name()` from `deltachat` to `deltachat.events` #3564
-- jsonrpc: add `webxdc_info`, `parent_id` and `download_state` property to `Message` #3588, #3590
-- jsonrpc: add `BasicChat` object as a leaner alternative to `FullChat` #3590
-- jsonrpc: add `last_seen` property to `Contact` #3590
-- breaking! jsonrpc: replace `Message.quoted_text` and `Message.quoted_message_id` with `Message.quote` #3590
-- add separate stock strings for actions done by contacts to make them easier to translate #3518
-- `dc_initiate_key_transfer()` is non-blocking now. #3553
-  UIs don't need to display a button to cancel sending Autocrypt Setup Message with
-  `dc_stop_ongoing_process()` anymore.
-
-### 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 #3592
-
-### 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
@@ -363,10 +9,9 @@
 - 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
+- set a default error if NDN does not provide an error
 - 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
@@ -379,7 +24,6 @@
 - 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

Cargo.toml

@@ -1,18 +1,14 @@
 [package]
 name = "deltachat"
-version = "1.102.0"
+version = "1.86.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.63"
+rust-version = "1.56"
 
 [profile.dev]
 debug = 0
 panic = 'abort'
-opt-level = 1
-
-[profile.test]
-opt-level = 0
 
 [profile.release]
 lto = true
@@ -23,23 +19,23 @@ 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.22"
-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 }
 backtrace = "0.3"
 base64 = "0.13"
 bitflags = "1.3"
 chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
 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.4", 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"
@@ -49,18 +45,18 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.16.0"
-percent-encoding = "2.2"
-pgp = { version = "0.9", default-features = false }
+once_cell = "1.12.0"
+percent-encoding = "2.0"
+pgp = { version = "0.7", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
 quick-xml = "0.23"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
-rand = "0.8"
-regex = "1.7"
+rand = "0.7"
+regex = "1.5"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustyline = { version = "10", optional = true }
+rustyline = { version = "9", optional = true }
 sanitize-filename = "0.4"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -69,42 +65,33 @@ 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"
-humansize = "2"
+fast-socks5 = "0.4"
+humansize = "1"
 qrcodegen = "1.7.0"
 tagger = "4.3.3"
-textwrap = "0.16.0"
-async-channel = "1.6.1"
-futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.11", features = ["fs"] }
-reqwest = { version = "0.11.13", features = ["json"] }
-async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
-iroh-share = { version = "0.1.3" }
-iroh-resolver = { version = "0.1.3", default-features = false }
-tempfile = "3"
-multibase = "0.9"
-port_check = "0.1.5"
+textwrap = "0.15.0"
+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",
-  "deltachat-rpc-server"
+  "deltachat-jsonrpc"
 ]
 
 [[example]]
@@ -146,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

@@ -120,26 +120,15 @@ $ cargo test -- --ignored
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
 - `nightly`: Enable nightly only performance and security related features.
 
-## Update Provider Data
-
-To add the updates from the
-[provider-db](https://github.com/deltachat/provider-db) to the core, run:
-
-```
-./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
-```
-
 ## Language bindings and frontend projects
 
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **Node.js** 
-  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
-  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
+- **Node.js** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
-- **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
+- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)
 
 The following "frontend" projects make use of the Rust-library
@@ -151,5 +140,3 @@ or its language bindings:
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
 - several **Bots**
-
-[^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.

benches/contacts.rs

@@ -1,7 +1,7 @@
+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::stock_str::StockStrings;
 use deltachat::Events;
 use tempfile::tempdir;
 
@@ -9,7 +9,7 @@ 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(), StockStrings::new())
+    let context = Context::new(dbfile.into(), id, Events::new())
         .await
         .unwrap();
 
@@ -27,16 +27,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,16 +1,16 @@
-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::stock_str::StockStrings;
 use deltachat::Events;
 
 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
     let id = 100;
-    let context = Context::new(dbfile, id, Events::new(), StockStrings::new())
+    let context = Context::new(dbfile.into(), id, Events::new())
         .await
         .unwrap();
 
@@ -23,10 +23,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();
-
-        let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
+        let chats: Vec<_> = async_std::task::block_on(async {
+            let context = Context::new((&path).into(), 100, Events::new())
                 .await
                 .unwrap();
             let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
@@ -35,7 +33,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         });
 
         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::stock_str::StockStrings;
 use deltachat::Events;
 
 async fn get_chat_list_benchmark(context: &Context) {
@@ -15,14 +13,11 @@ 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(), StockStrings::new())
-                .await
-                .unwrap()
+        let context = async_std::task::block_on(async {
+            Context::new(path.into(), 100, Events::new()).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,
-    stock_str::StockStrings,
     Events,
 };
 use tempfile::tempdir;
@@ -31,60 +32,7 @@ Hello {i}",
             i = i,
             i_dec = i - 1,
         );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-    }
-    context
-}
-
-/// Receive 100 emails that remove charlie@example.com and add
-/// him back
-async fn recv_groupmembership_emails(context: Context) -> Context {
-    for i in 0..50 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Added: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Removed: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
+        dc_receive_imf(&context, black_box(imf_raw.as_bytes()), false)
             .await
             .unwrap();
     }
@@ -95,17 +43,17 @@ async fn create_context() -> Context {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(dbfile.as_path(), id, Events::new(), StockStrings::new())
+    let context = Context::new(dbfile.into(), id, Events::new())
         .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.as_path(), None)
+        imex(&context, ImexMode::ImportBackup, &backup, None)
             .await
             .unwrap();
     }
@@ -126,30 +74,12 @@ 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.bench_function(
-        "Receive 100 Chat-Group-Member-{Added|Removed} messages",
-        |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_groupmembership_emails(black_box(ctx)).await;
-                }
-            });
-        },
-    );
     group.finish();
 }
 

benches/search_msgs.rs

@@ -1,12 +1,13 @@
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 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(), StockStrings::new())
+    let context = Context::new(dbfile.into(), id, Events::new())
         .await
         .unwrap();
 
@@ -19,10 +20,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.102.0"
+version = "1.86.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -21,13 +21,10 @@ 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.16.0"
-iroh-share = { version = "0.1.3" }
-multibase = "0.9"
 
 [features]
 default = ["vendored"]

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/src/dc_array.rs

@@ -1,6 +1,5 @@
 use crate::chat::ChatItem;
 use crate::constants::DC_MSG_ID_DAYMARKER;
-use crate::contact::ContactId;
 use crate::location::Location;
 use crate::message::MsgId;
 
@@ -8,7 +7,6 @@ use crate::message::MsgId;
 #[derive(Debug, Clone)]
 pub enum dc_array_t {
     MsgIds(Vec<MsgId>),
-    ContactIds(Vec<ContactId>),
     Chat(Vec<ChatItem>),
     Locations(Vec<Location>),
     Uint(Vec<u32>),
@@ -18,7 +16,6 @@ impl dc_array_t {
     pub(crate) fn get_id(&self, index: usize) -> u32 {
         match self {
             Self::MsgIds(array) => array[index].to_u32(),
-            Self::ContactIds(array) => array[index].to_u32(),
             Self::Chat(array) => match array[index] {
                 ChatItem::Message { msg_id } => msg_id.to_u32(),
                 ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
@@ -31,7 +28,6 @@ impl dc_array_t {
     pub(crate) fn get_timestamp(&self, index: usize) -> Option<i64> {
         match self {
             Self::MsgIds(_) => None,
-            Self::ContactIds(_) => None,
             Self::Chat(array) => array.get(index).and_then(|item| match item {
                 ChatItem::Message { .. } => None,
                 ChatItem::DayMarker { timestamp } => Some(*timestamp),
@@ -44,7 +40,6 @@ impl dc_array_t {
     pub(crate) fn get_marker(&self, index: usize) -> Option<&str> {
         match self {
             Self::MsgIds(_) => None,
-            Self::ContactIds(_) => None,
             Self::Chat(_) => None,
             Self::Locations(array) => array
                 .get(index)
@@ -65,7 +60,6 @@ impl dc_array_t {
     pub(crate) fn len(&self) -> usize {
         match self {
             Self::MsgIds(array) => array.len(),
-            Self::ContactIds(array) => array.len(),
             Self::Chat(array) => array.len(),
             Self::Locations(array) => array.len(),
             Self::Uint(array) => array.len(),
@@ -89,12 +83,6 @@ impl From<Vec<MsgId>> for dc_array_t {
     }
 }
 
-impl From<Vec<ContactId>> for dc_array_t {
-    fn from(array: Vec<ContactId>) -> Self {
-        dc_array_t::ContactIds(array)
-    }
-}
-
 impl From<Vec<ChatItem>> for dc_array_t {
     fn from(array: Vec<ChatItem>) -> Self {
         dc_array_t::Chat(array)

deltachat-ffi/src/lib.rs

@@ -1,4 +1,4 @@
-#![warn(unused, clippy::all)]
+#![deny(unused, clippy::all)]
 #![allow(
     non_camel_case_types,
     non_snake_case,
@@ -15,7 +15,6 @@ extern crate human_panic;
 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;
@@ -23,12 +22,11 @@ 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;
@@ -37,13 +35,10 @@ use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
-use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
-use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
-use tokio::task::JoinHandle;
 
 mod dc_array;
 mod lot;
@@ -51,7 +46,6 @@ mod lot;
 mod string;
 use self::string::*;
 use deltachat::chatlist::Chatlist;
-use deltachat::qr::Qr;
 
 // as C lacks a good and portable error handling,
 // in general, the C Interface is forgiving wrt to bad parameters.
@@ -68,25 +62,6 @@ use deltachat::qr::Qr;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;
 
-pub type dc_reactions_t = Reactions;
-
-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,
@@ -104,10 +79,9 @@ pub unsafe extern "C" fn dc_context_new(
         // 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),
+            as_path(dbfile).to_path_buf().into(),
             id,
             Events::new(),
-            StockStrings::new(),
         ))
     } else {
         eprintln!("blobdir can not be defined explicitly anymore");
@@ -133,10 +107,9 @@ 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),
+        as_path(dbfile).to_path_buf().into(),
         id,
         Events::new(),
-        StockStrings::new(),
     )) {
         Ok(context) => Box::into_raw(Box::new(context)),
         Err(err) => {
@@ -184,7 +157,7 @@ pub unsafe extern "C" fn dc_context_unref(context: *mut dc_context_t) {
         eprintln!("ignoring careless call to dc_context_unref()");
         return;
     }
-    drop(Box::from_raw(context));
+    Box::from_raw(context);
 }
 
 #[no_mangle]
@@ -411,7 +384,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")
         {
@@ -478,7 +451,7 @@ pub unsafe extern "C" fn dc_event_unref(a: *mut dc_event_t) {
         return;
     }
 
-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }
 
 #[no_mangle]
@@ -502,9 +475,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::Error(_) => 400,
         EventType::ErrorSelfNotInGroup(_) => 410,
         EventType::MsgsChanged { .. } => 2000,
-        EventType::ReactionsChanged { .. } => 2001,
         EventType::IncomingMsg { .. } => 2005,
-        EventType::IncomingMsgBunch { .. } => 2006,
         EventType::MsgsNoticed { .. } => 2008,
         EventType::MsgDelivered { .. } => 2010,
         EventType::MsgFailed { .. } => 2012,
@@ -521,7 +492,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::ConnectivityChanged => 2100,
         EventType::SelfavatarChanged => 2110,
         EventType::WebxdcStatusUpdate { .. } => 2120,
-        EventType::WebxdcInstanceDeleted { .. } => 2121,
     }
 }
 
@@ -546,10 +516,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::Error(_)
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
-        | EventType::IncomingMsgBunch { .. }
         | EventType::ErrorSelfNotInGroup(_) => 0,
         EventType::MsgsChanged { chat_id, .. }
-        | EventType::ReactionsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
         | EventType::MsgsNoticed(chat_id)
         | EventType::MsgDelivered { chat_id, .. }
@@ -570,7 +538,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,
     }
 }
 
@@ -602,12 +569,9 @@ 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::IncomingMsgBunch { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
-        | EventType::ReactionsChanged { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
         | EventType::MsgDelivered { msg_id, .. }
         | EventType::MsgFailed { msg_id, .. }
@@ -647,7 +611,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             data2.into_raw()
         }
         EventType::MsgsChanged { .. }
-        | EventType::ReactionsChanged { .. }
         | EventType::IncomingMsg { .. }
         | EventType::MsgsNoticed(_)
         | EventType::MsgDelivered { .. }
@@ -662,7 +625,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::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -675,11 +637,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             let data2 = file.to_c_string().unwrap_or_default();
             data2.into_raw()
         }
-        EventType::IncomingMsgBunch { msg_ids } => serde_json::to_string(msg_ids)
-            .unwrap_or_default()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
     }
 }
 
@@ -714,7 +671,7 @@ pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t
         return;
     }
 
-    drop(Box::from_raw(emitter));
+    Box::from_raw(emitter);
 }
 
 #[no_mangle]
@@ -725,13 +682,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]
@@ -771,7 +725,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 {
@@ -964,48 +918,6 @@ pub unsafe extern "C" fn dc_send_videochat_invitation(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_send_reaction(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    reaction: *const libc::c_char,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_send_reaction()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    block_on(async move {
-        send_reaction(ctx, MsgId::new(msg_id), &to_string_lossy(reaction))
-            .await
-            .map(|msg_id| msg_id.to_u32())
-            .unwrap_or_log_default(ctx, "Failed to send reaction")
-    })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_msg_reactions(
-    context: *mut dc_context_t,
-    msg_id: u32,
-) -> *mut dc_reactions_t {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_msg_reactions()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-
-    let reactions = if let Ok(reactions) = block_on(get_msg_reactions(ctx, MsgId::new(msg_id)))
-        .log_err(ctx, "failed dc_get_msg_reactions() call")
-    {
-        reactions
-    } else {
-        return ptr::null_mut();
-    };
-
-    Box::into_raw(Box::new(reactions))
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_webxdc_status_update(
     context: *mut dc_context_t,
@@ -1281,11 +1193,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));
@@ -1294,10 +1201,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(),
         ))
     })
 }
@@ -1660,7 +1573,7 @@ pub unsafe extern "C" fn dc_set_chat_profile_image(
     let ctx = &*context;
 
     block_on(async move {
-        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), &to_string_lossy(image))
+        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), to_string_lossy(image))
             .await
             .map(|_| 1)
             .unwrap_or_log_default(ctx, "Failed to set profile image")
@@ -2145,10 +2058,7 @@ pub unsafe extern "C" fn dc_delete_contact(
     block_on(async move {
         match Contact::delete(ctx, contact_id).await {
             Ok(_) => 1,
-            Err(err) => {
-                error!(ctx, "cannot delete contact: {}", err);
-                0
-            }
+            Err(_) => 0,
         }
     })
 }
@@ -2205,97 +2115,6 @@ pub unsafe extern "C" fn dc_imex(
     }
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_send_backup(
-    context: *mut dc_context_t,
-    folder: *const libc::c_char,
-    passphrase: *const libc::c_char,
-) -> *mut dc_backup_sender {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_send_backup()");
-        return ptr::null_mut();
-    }
-
-    let passphrase = to_opt_string_lossy(passphrase);
-    let ctx = &*context;
-
-    if let Some(folder) = to_opt_string_lossy(folder) {
-        block_on(async move {
-            imex::send_backup(ctx, folder.as_ref(), passphrase)
-                .await
-                .map(|transfer| Box::into_raw(Box::new(dc_backup_sender { transfer })))
-                .log_err(ctx, "send_backup failed")
-                .unwrap_or(ptr::null_mut())
-        })
-    } else {
-        eprintln!("dc_imex called without a valid directory");
-        ptr::null_mut()
-    }
-}
-
-pub struct dc_backup_sender {
-    transfer: iroh_share::SenderTransfer,
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_sender_qr(
-    ctx: *mut dc_context_t,
-    bs: *const dc_backup_sender,
-) -> *mut libc::c_char {
-    if ctx.is_null() || bs.is_null() {
-        eprintln!("ignoring careless call to dc_backup_sender_qr");
-        return ptr::null_mut();
-    }
-    let ctx = &*ctx;
-    let bs = &*bs;
-    let ticket = bs.transfer.ticket();
-
-    qr_code_generator::generate_backup_qr_code(ticket)
-        .map(|s| s.strdup())
-        .log_err(ctx, "generate_backup_qr_code failed")
-        .unwrap_or(ptr::null_mut())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_sender_done(ctx: *mut dc_context_t, bs: *mut dc_backup_sender) {
-    if ctx.is_null() || bs.is_null() {
-        eprintln!("ignoring careless call to dc_backup_sender_wait");
-        return;
-    }
-    let ctx = &*ctx;
-    let bs = Box::from_raw(bs);
-
-    block_on(async move {
-        if let Err(e) = bs.transfer.done().await {
-            error!(ctx, "sending backup failed: {:?}", e);
-        }
-    });
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_receive_backup(
-    ctx: *mut dc_context_t,
-    qr: *const libc::c_char,
-    passphrase: *const libc::c_char,
-) {
-    if ctx.is_null() {
-        eprintln!("ignoring careless call to dc_receive_backup");
-        return;
-    }
-    let ctx = &*ctx;
-    let ticket = match block_on(qr::check_qr(ctx, &to_string_lossy(qr))) {
-        Ok(Qr::Backup { ticket }) => ticket.as_bytes(),
-        _ => vec![],
-    };
-    let passphrase = to_opt_string_lossy(passphrase);
-
-    spawn(async move {
-        imex::receive_backup(ctx, ticket, passphrase)
-            .await
-            .log_err(ctx, "IMEX failed")
-    });
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_imex_has_backup(
     context: *mut dc_context_t,
@@ -2411,7 +2230,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()
 }
@@ -2449,7 +2268,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")
@@ -2575,7 +2394,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
@@ -2589,7 +2408,7 @@ pub unsafe extern "C" fn dc_array_unref(a: *mut dc_array::dc_array_t) {
         return;
     }
 
-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }
 
 #[no_mangle]
@@ -2770,7 +2589,7 @@ pub unsafe extern "C" fn dc_chatlist_unref(chatlist: *mut dc_chatlist_t) {
         eprintln!("ignoring careless call to dc_chatlist_unref()");
         return;
     }
-    drop(Box::from_raw(chatlist));
+    Box::from_raw(chatlist);
 }
 
 #[no_mangle]
@@ -2915,7 +2734,7 @@ pub unsafe extern "C" fn dc_chat_unref(chat: *mut dc_chat_t) {
         return;
     }
 
-    drop(Box::from_raw(chat));
+    Box::from_raw(chat);
 }
 
 #[no_mangle]
@@ -2948,20 +2767,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()
-        .unwrap_or_default()
-        .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() {
@@ -3189,7 +2994,7 @@ pub unsafe extern "C" fn dc_msg_unref(msg: *mut dc_msg_t) {
         return;
     }
 
-    drop(Box::from_raw(msg));
+    Box::from_raw(msg);
 }
 
 #[no_mangle]
@@ -3911,7 +3716,7 @@ pub unsafe extern "C" fn dc_contact_unref(contact: *mut dc_contact_t) {
         eprintln!("ignoring careless call to dc_contact_unref()");
         return;
     }
-    drop(Box::from_raw(contact));
+    Box::from_raw(contact);
 }
 
 #[no_mangle]
@@ -4030,16 +3835,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() {
@@ -4075,7 +3870,7 @@ pub unsafe extern "C" fn dc_lot_unref(lot: *mut dc_lot_t) {
         return;
     }
 
-    drop(Box::from_raw(lot));
+    Box::from_raw(lot);
 }
 
 #[no_mangle]
@@ -4144,45 +3939,6 @@ pub unsafe extern "C" fn dc_lot_get_timestamp(lot: *mut dc_lot_t) -> i64 {
     lot.get_timestamp()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_contacts(
-    reactions: *mut dc_reactions_t,
-) -> *mut dc_array::dc_array_t {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_contacts()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    let array: dc_array_t = reactions.contacts().into();
-
-    Box::into_raw(Box::new(array))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_by_contact_id(
-    reactions: *mut dc_reactions_t,
-    contact_id: u32,
-) -> *mut libc::c_char {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_by_contact_id()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    reactions.get(ContactId::new(contact_id)).as_str().strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_unref(reactions: *mut dc_reactions_t) {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_unref()");
-        return;
-    }
-
-    drop(Box::from_raw(reactions));
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_str_unref(s: *mut libc::c_char) {
     libc::free(s as *mut _)
@@ -4371,7 +4127,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))),
@@ -4406,8 +4162,7 @@ pub unsafe extern "C" fn dc_accounts_get_account(
     }
 
     let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_account(id)
+    block_on(async move { accounts.read().await.get_account(id).await })
         .map(|ctx| Box::into_raw(Box::new(ctx)))
         .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4422,8 +4177,7 @@ pub unsafe extern "C" fn dc_accounts_get_selected_account(
     }
 
     let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_selected_account()
+    block_on(async move { accounts.read().await.get_selected_account().await })
         .map(|ctx| Box::into_raw(Box::new(ctx)))
         .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4545,7 +4299,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,
@@ -4568,7 +4322,7 @@ pub unsafe extern "C" fn dc_accounts_get_all(accounts: *mut dc_accounts_t) -> *m
     }
 
     let accounts = &*accounts;
-    let list = block_on(accounts.read()).get_all();
+    let list = block_on(async move { accounts.read().await.get_all().await });
     let array: dc_array_t = list.into();
 
     Box::into_raw(Box::new(array))
@@ -4628,32 +4382,59 @@ 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 = 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();
     }
 
     let accounts = &*accounts;
-    let emitter = block_on(accounts.read()).get_event_emitter();
+    let emitter = block_on(async move { accounts.read().await.get_event_emitter().await });
 
     Box::into_raw(Box::new(emitter))
 }
 
+#[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)
+}
+
 #[cfg(feature = "jsonrpc")]
 mod jsonrpc {
     use super::*;
     use deltachat_jsonrpc::api::CommandApi;
-    use deltachat_jsonrpc::events::event_to_json_rpc_notification;
-    use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
+    use deltachat_jsonrpc::yerpc::{MessageHandle, RpcHandle};
 
     pub struct dc_jsonrpc_instance_t {
-        receiver: OutReceiver,
-        handle: RpcSession<CommandApi>,
-        event_thread: JoinHandle<Result<(), anyhow::Error>>,
+        receiver: async_std::channel::Receiver<deltachat_jsonrpc::yerpc::Message>,
+        handle: MessageHandle<CommandApi>,
     }
 
     #[no_mangle]
@@ -4666,39 +4447,12 @@ mod jsonrpc {
         }
 
         let cmd_api =
-            deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());
+            deltachat_jsonrpc::api::CommandApi::new_from_arc((*account_manager).inner.clone());
 
-        let (request_handle, receiver) = RpcClient::new();
-        let request_handle2 = request_handle.clone();
-        let handle = RpcSession::new(request_handle, cmd_api);
+        let (request_handle, receiver) = RpcHandle::new();
+        let handle = MessageHandle::new(request_handle, cmd_api);
 
-        let events = block_on({
-            async {
-                let am = (*account_manager).inner.clone();
-                let ev = am.read().await.get_event_emitter();
-                drop(am);
-                ev
-            }
-        });
-
-        let event_thread = spawn({
-            async move {
-                while let Some(event) = events.recv().await {
-                    let event = event_to_json_rpc_notification(event);
-                    request_handle2
-                        .send_notification("event", Some(event))
-                        .await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        let instance = dc_jsonrpc_instance_t {
-            receiver,
-            handle,
-            event_thread,
-        };
+        let instance = dc_jsonrpc_instance_t { receiver, handle };
 
         Box::into_raw(Box::new(instance))
     }
@@ -4709,8 +4463,8 @@ mod jsonrpc {
             eprintln!("ignoring careless call to dc_jsonrpc_unref()");
             return;
         }
-        (*jsonrpc_instance).event_thread.abort();
-        drop(Box::from_raw(jsonrpc_instance));
+
+        Box::from_raw(jsonrpc_instance);
     }
 
     #[no_mangle]
@@ -4726,8 +4480,8 @@ mod jsonrpc {
         let api = &*jsonrpc_instance;
         let handle = &api.handle;
         let request = to_string_lossy(request);
-        spawn(async move {
-            handle.handle_incoming(&request).await;
+        async_std::task::spawn(async move {
+            handle.handle_message(&request).await;
         });
     }
 
@@ -4740,7 +4494,7 @@ mod jsonrpc {
             return ptr::null_mut();
         }
         let api = &*jsonrpc_instance;
-        block_on(api.receiver.recv())
+        async_std::task::block_on(api.receiver.recv())
             .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
             .unwrap_or(ptr::null_mut())
     }

deltachat-ffi/src/lot.rs

@@ -50,16 +50,14 @@ impl Lot {
                 Qr::FprMismatch { .. } => None,
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                 Qr::Account { domain } => Some(domain),
-                Qr::Backup { .. } => None,
                 Qr::WebrtcInstance { domain, .. } => Some(domain),
-                Qr::Addr { draft, .. } => draft.as_deref(),
+                Qr::Addr { .. } => None,
                 Qr::Url { url } => Some(url),
                 Qr::Text { text } => Some(text),
                 Qr::WithdrawVerifyContact { .. } => None,
                 Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
                 Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
-                Qr::Login { address, .. } => Some(address),
             },
             Self::Error(err) => Some(err),
         }
@@ -81,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,
         }
     }
@@ -102,7 +94,6 @@ impl Lot {
                 Qr::FprMismatch { .. } => LotState::QrFprMismatch,
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
-                Qr::Backup { .. } => LotState::QrBackup,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
@@ -111,7 +102,6 @@ impl Lot {
                 Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
                 Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
                 Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
-                Qr::Login { .. } => LotState::QrLogin,
             },
             Self::Error(_err) => LotState::QrError,
         }
@@ -127,16 +117,14 @@ impl Lot {
                 Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
-                Qr::Backup { .. } => 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(),
                 Qr::WithdrawVerifyGroup { .. } => Default::default(),
                 Qr::ReviveVerifyContact { contact_id, .. } => contact_id.to_u32(),
                 Qr::ReviveVerifyGroup { .. } => Default::default(),
-                Qr::Login { .. } => Default::default(),
             },
             Self::Error(_) => Default::default(),
         }
@@ -176,9 +164,6 @@ pub enum LotState {
     /// text1=domain
     QrAccount = 250,
 
-    /// TODO
-    QrBackup = 251,
-
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 
@@ -204,9 +189,6 @@ pub enum LotState {
     /// text1=groupname
     QrReviveVerifyGroup = 512,
 
-    /// text1=email_address
-    QrLogin = 520,
-
     // Message States
     MsgInFresh = 10,
     MsgInNoticed = 13,

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

@@ -1,41 +1,39 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.102.0"
-description = "DeltaChat JSON-RPC API"
+version = "1.86.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
-default-run = "deltachat-jsonrpc-server"
+default-run = "webserver"
 license = "MPL-2.0"
 
 [[bin]]
-name = "deltachat-jsonrpc-server"
+name = "webserver"
 path = "src/webserver.rs"
 required-features = ["webserver"]
 
 [dependencies]
 anyhow = "1"
+async-std = { version = "1", features = ["attributes"] }
 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.25" }
-serde_json = "1.0.87"
-yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
-typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.21.2" }
-sanitize-filename = "0.4"
-walkdir = "2.3.2"
-
-# optional dependencies
-axum = { version = "0.5.17", optional = true, features = ["ws"] }
-env_logger = { version = "0.9.1", optional = true }
-
-[dev-dependencies]
-tokio = { version = "1.21.2", features = ["full", "rt-multi-thread"] }
+futures = { version = "0.3.19" }
+serde_json = "1.0.75"
+yerpc = { git = "https://github.com/Frando/yerpc", features = ["anyhow"] }
+typescript-type-def = { git = "https://github.com/Frando/rust-typescript-type-def", branch = "yerpc", features = ["json_value"] }
+# optional, depended on features
+env_logger = { version = "0.9.0", optional = true }
+tide = { version = "0.16.0", optional = true }
+tide-websockets = { version = "0.4.0", optional = true }
+yerpc-tide = { git = "https://github.com/Frando/yerpc", optional = true }
 
 
 [features]
 default = []
-webserver = ["env_logger", "axum", "tokio/full", "yerpc/support-axum"]
+webserver = ["env_logger", "tide", "tide-websockets", "yerpc-tide"]
+
+[profile.release]
+lto = true

deltachat-jsonrpc/README.MD

@@ -0,0 +1,75 @@
+# deltachat-jsonrpc
+
+## Build Requirements
+
+- Linux or Mac, scrips make use of features like `>` pipes and `&&` (maybe the newer versions of powershell support them, but I didn't try that.)
+- rust (installed via rustup)
+
+## Start the webserver
+
+The webserver is an example usage. Goal of it is to be usable both as example and as base for deltachat-kaiOS.
+
+```sh
+RUST_LOG=info cargo run --features webserver
+```
+
+## Generate Typescript Bindings
+
+```sh
+cd typescript
+npm i
+npm run build
+```
+
+## Run the development example
+
+Mac
+
+```sh
+alias firefox=/Applications/Firefox.app/Contents/MacOS/firefox
+npm run example:build && firefox --devtools $(pwd)/example/browser-example.html
+```
+
+Linux:
+
+```sh
+npm run example:run
+```
+
+## Compiling server for kaiOS or android:
+
+```sh
+cross build --features=webserver --target armv7-linux-androideabi --release
+```
+
+## Run the tests
+
+### Rust tests
+
+```
+cargo test --features=webserver
+```
+
+### Typescript
+
+```
+cd typescript
+npm run test
+```
+
+For the online tests to run you need a test account token for a mailadm instance,
+you can use docker to spin up a local instance: https://github.com/deltachat/docker-mailadm
+
+> set the env var `DCC_NEW_TMP_EMAIL` to your mailadm token: example:
+> `DCC_NEW_TMP_EMAIL=https://testrun.org/new_email?t=1h_195dksa6544`
+
+If your test fail with server shutdown at the start, then you might have a process from a last run still running probably and you need to kill that process manually to continue.
+
+#### Test Coverage
+
+You can test coverage with `npm run coverage`, but you need to have `DCC_NEW_TMP_EMAIL` set, otherwise the result will be useless because some functions can only be tested with the online tests.
+
+> If you are offline and want to see the coverage results anyway (even though they are NOT correct), you can bypass the error with `COVERAGE_OFFLINE=1 npm run coverage`
+
+Open `coverage/index.html` for a detailed report.
+`bindings.ts` is probably the most interesting file for coverage, because it describes the api functions.

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 +1,347 @@
-# TODO
+## Core system
 
-- [ ] different test type to simulate two devices: to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer
+- [X] Base structure of JSON API code 
+- [X] Implement the first methods for testing + the code that should later be generated by the proc macro
+- [X] Create the proc macro
+  - [X] json api
+  - [X] ts types
+    - [X] arguments (no args, one argument, multiple args)
+    - [X] return type
+    - [X] custom types as type aliases that ts file looks prettier
 
-## MVP - Websocket server&client
 
-For kaiOS and other experiments, like a deltachat "web" over network from an android phone.
+## Pre - MVP
 
+- [X] Web socket server
+- [WIP] Web socket client (ts)
+  - [X] backend connection state changed events
+  - [X] Reconnect on connection loss / connection state
+  - [ ] find a way to type the event emitter callback functions
+- [X] Events
+
+## MVP
+
+- [X] mocha integration test for ts api
+ - [X] basic tests
+ - [X] advanced / "online tests" (mailadm for burner accounts)
 - [ ] 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
+## Other Ideas
 
-- [ ] make sure there can only be one connection at a time to the ws
+- [ ] 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
+- [X] GH action for tests (rust and typescript)
+  - [X] rust test
+  - [X] rust fmt
+  - [X] rust clippy
+  - [X] tsc check
+  - [X] prettier
+  - [X] mocha
+- [X] scripts to check&fix prettier formatting
 
-## 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
+## Apis
+
+replicate desktop api feature set:
+
+(this feature set is based on desktop version `1.20`, needs to be updated in the future)
+
+```rs
+
+
+struct sendMessageParams {
+  text: Option<String>,
+  filename: Option<String>, // TODO we need to think about blobs some more
+  location: Option<(u32,u32)>,
+  quote_message_id: Option<u32>,
+}
+
+struct QrCodeResponse = {
+  state: u32 // also enum in reality, for simlicity u32 here
+  id: u32
+  text1: String
+}
+
+impl Api {
+
+// root ---------------------------------------------------------------
+
+// NEEDS_THE_BLOB_QUESTION_ANSWERED_EVENTUALLY
+async fn sc_set_profile_picture(&self, new_image: String) -> Result<()> {}
+
+// NEEDS_THE_BLOB_QUESTION_ANSWERED_EVENTUALLY
+// 'getProfilePicture' equals to `dc.getContact(C.DC_CONTACT_ID_SELF).getProfileImage()` or `dc.get_config("selfavatar")`
+
+async fn sc_join_secure_join(&self, qrCode: String) -> Result<u32> {}
+async fn sc_stop_ongoing_process(&self) -> Result<u32> {}
+async fn sc_check_qr_code(&self, qrCode: String) -> Result<QrCodeResponse> {}
+
+// login ----------------------------------------------------
+
+// INFO: login functions need to call stop&start io where applicable
+
+// login.newLogin:
+// do instead in frontend:
+//   1. call `add_account`
+//   2. call `select_account`
+//   3. set credentials via set config
+//   4. call `sc_configure`
+
+// login.getLogins - is already implemented: `get_all_accounts`
+
+// login.loadAccount - Basically `select_account`
+
+// login.logout -> TODO: unselect account, which isn't implemented in the core yet
+
+// login.forgetAccount -> `remove_account`
+
+// login.getLastLoggedInAccount -> `get_selected_account_id`
+
+// login.updateCredentials -> do instead: set config then call `sc_configure`
+
+// backup -------------------------------------------------------------
+
+// INFO: backup functions need to call stop&start io
+
+// NEEDS_THE_BLOB_QUESTION_ANSWERED_EVENTUALLY
+async fn sc_backup_export(&self, out_dir: String) -> Result<()> {}
+// NEEDS_THE_BLOB_QUESTION_ANSWERED_EVENTUALLY
+async fn sc_backup_import(&self, file: String) -> Result<()> {} // will not return the same as in desktop because this function imports backup to the current context unlike it was in desktop
+
+// chatList -----------------------------------------------------------
+
+// chatList.selectChat - will be removed from desktop
+// chatList.getSelectedChatId - will be removed from desktop
+// chatList.onChatModified - will be removed from desktop
+
+async fn sc_chatlist_get_general_fresh_message_counter(&self) -> Result<u32> // this method might be used for a favicon badge counter
+
+// contacts ------------------------------------------------------------
+
+async fn sc_contacts_change_nickname(&self, contact_id: u32, new_name: String) -> Result<()>
+
+
+// contacts.getChatIdByContactId - very similar to sc_contacts_create_chat_by_contact_id
+// contacts.getDMChatId -  very similar to sc_contacts_create_chat_by_contact_id
+
+async fn sc_contacts_get_encryption_info(&self, contact_id: u32) -> Result<String>
+
+async fn sc_contacts_lookup_contact_id_by_addr(&self, email: String) -> Result<u32>
+
+
+}
+
+```
+```ts
+
+class DeltaRemote {
+  // chat ---------------------------------------------------------------
+  call(
+    fnName: 'chat.getChatMedia',
+    chatId: number,
+    msgType1: number,
+    msgType2: number
+  ): Promise<MessageType[]>
+  call(fnName: 'chat.getEncryptionInfo', chatId: number): Promise<string>
+  call(fnName: 'chat.getQrCode', chatId?: number): Promise<string>
+  call(fnName: 'chat.leaveGroup', chatId: number): Promise<void>
+  call(fnName: 'chat.setName', chatId: number, name: string): Promise<boolean>
+  call(
+    fnName: 'chat.modifyGroup',
+    chatId: number,
+    name: string,
+    image: string,
+    remove: number[],
+    add: number[]
+  ): Promise<boolean>
+  call(
+    fnName: 'chat.addContactToChat',
+    chatId: number,
+    contactId: number
+  ): Promise<boolean>
+  call(
+    fnName: 'chat.setProfileImage',
+    chatId: number,
+    newImage: string
+  ): Promise<boolean>
+  call(
+    fnName: 'chat.setMuteDuration',
+    chatId: number,
+    duration: MuteDuration
+  ): Promise<boolean>
+  call(
+    fnName: 'chat.createGroupChat',
+    verified: boolean,
+    name: string
+  ): Promise<number>
+  call(fnName: 'chat.delete', chatId: number): Promise<void>
+  call(
+    fnName: 'chat.setVisibility',
+    chatId: number,
+    visibility:
+      | C.DC_CERTCK_AUTO
+      | C.DC_CERTCK_STRICT
+      | C.DC_CHAT_VISIBILITY_PINNED
+  ): Promise<void>
+  call(fnName: 'chat.getChatContacts', chatId: number): Promise<number[]>
+  call(fnName: 'chat.markNoticedChat', chatId: number): Promise<void>
+  call(fnName: 'chat.getChatEphemeralTimer', chatId: number): Promise<number>
+  call(
+    fnName: 'chat.setChatEphemeralTimer',
+    chatId: number,
+    ephemeralTimer: number
+  ): Promise<void>
+  call(fnName: 'chat.sendVideoChatInvitation', chatId: number): Promise<number>
+  call(
+    fnName: 'chat.decideOnContactRequest',
+    messageId: number,
+    decision:
+      | C.DC_DECISION_START_CHAT
+      | C.DC_DECISION_NOT_NOW
+      | C.DC_DECISION_BLOCK
+  ): Promise<number>
+  // locations ----------------------------------------------------------
+  call(
+    fnName: 'locations.setLocation',
+    latitude: number,
+    longitude: number,
+    accuracy: number
+  ): Promise<void>
+  call(
+    fnName: 'locations.getLocations',
+    chatId: number,
+    contactId: number,
+    timestampFrom: number,
+    timestampTo: number
+  ): Promise<JsonLocations>
+
+  // NOTHING HERE that is called directly from the frontend, yet
+  // messageList --------------------------------------------------------
+  call(
+    fnName: 'messageList.sendMessage',
+    chatId: number,
+    params: sendMessageParams
+  ): Promise<[number, MessageType | null]>
+  call(
+    fnName: 'messageList.sendSticker',
+    chatId: number,
+    stickerPath: string
+  ): Promise<void>
+  call(fnName: 'messageList.deleteMessage', id: number): Promise<void>
+  call(fnName: 'messageList.getMessageInfo', msgId: number): Promise<string>
+  call(
+    fnName: 'messageList.getDraft',
+    chatId: number
+  ): Promise<MessageType | null>
+  call(
+    fnName: 'messageList.setDraft',
+    chatId: number,
+    {
+      text,
+      file,
+      quotedMessageId,
+    }: { text?: string; file?: string; quotedMessageId?: number }
+  ): Promise<void>
+  call(
+    fnName: 'messageList.messageIdToJson',
+    id: number
+  ): Promise<{ msg: null } | MessageType>
+  call(
+    fnName: 'messageList.forwardMessage',
+    msgId: number,
+    chatId: number
+  ): Promise<void>
+  call(
+    fnName: 'messageList.searchMessages',
+    query: string,
+    chatId?: number
+  ): Promise<number[]>
+  call(
+    fnName: 'messageList.msgIds2SearchResultItems',
+    msgIds: number[]
+  ): Promise<{ [id: number]: MessageSearchResult }>
+  call(
+    fnName: 'messageList.saveMessageHTML2Disk',
+    messageId: number
+  ): Promise<string>
+  // settings -----------------------------------------------------------
+  call(fnName: 'settings.keysImport', directory: string): Promise<void>
+  call(fnName: 'settings.keysExport', directory: string): Promise<void>
+  call(
+    fnName: 'settings.serverFlags',
+    {
+      mail_security,
+      send_security,
+    }: {
+      mail_security?: string
+      send_security?: string
+    }
+  ): Promise<number | ''>
+  call(
+    fnName: 'settings.setDesktopSetting',
+    key: keyof DesktopSettings,
+    value: string | number | boolean
+  ): Promise<boolean>
+  call(fnName: 'settings.getDesktopSettings'): Promise<DesktopSettings>
+  call(
+    fnName: 'settings.saveBackgroundImage',
+    file: string,
+    isDefaultPicture: boolean
+  ): Promise<string>
+  call(
+    fnName: 'settings.estimateAutodeleteCount',
+    fromServer: boolean,
+    seconds: number
+  ): Promise<number>
+  // stickers -----------------------------------------------------------
+  call(
+    fnName: 'stickers.getStickers'
+  ): Promise<{
+    [key: string]: string[]
+  }> // todo move to extras? because its not directly elated to core
+  // context ------------------------------------------------------------
+  call(fnName: 'context.maybeNetwork'): Promise<void>
+  // burner accounts ------------------------------------------------------------
+  call(
+    fnName: 'burnerAccounts.create',
+    url: string
+  ): Promise<{ email: string; password: string }> // think about how to improve that api - probably use core api instead
+  // extras -------------------------------------------------------------
+  call(fnName: 'extras.getLocaleData', locale: string): Promise<LocaleData>
+  call(fnName: 'extras.setLocale', locale: string): Promise<void>
+  call(
+    fnName: 'extras.getActiveTheme'
+  ): Promise<{
+    theme: Theme
+    data: string
+  } | null>
+  call(fnName: 'extras.setThemeFilePath', address: string): void
+  call(fnName: 'extras.getAvailableThemes'): Promise<Theme[]>
+  call(fnName: 'extras.setTheme', address: string): Promise<boolean>
+  // catchall: ----------------------------------------------------------
+  call(fnName: string): Promise<any>
+  call(fnName: string, ...args: any[]): Promise<any> {
+    return _callDcMethodAsync(fnName, ...args)
+  }
+}
+
+export const DeltaBackend = new DeltaRemote()
+```
+
+
+after that, or while doing it adjust api to be more complete
+
+
+
+
+TODO different test to simulate two devices:
+
+to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer

deltachat-jsonrpc/src/api/events.rs

@@ -4,384 +4,137 @@ use serde_json::{json, Value};
 use typescript_type_def::TypeDef;
 
 pub fn event_to_json_rpc_notification(event: Event) -> Value {
-    let id: JSONRPCEventType = event.typ.into();
+    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)),
+    };
+
     json!({
-        "event": id,
+        "id": event_type_to_string(event.typ),
         "contextId": event.id,
+        "field1": field1,
+        "field2": field2
     })
 }
 
 #[derive(Serialize, TypeDef)]
-#[serde(tag = "type", rename = "Event")]
-pub enum JSONRPCEventType {
-    /// The library-user may write an informational string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Info {
-        msg: String,
-    },
-
-    /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected {
-        msg: String,
-    },
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected {
-        msg: String,
-    },
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent {
-        msg: String,
-    },
-
-    /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted {
-        msg: String,
-    },
-
-    /// Emitted when an IMAP message has been moved
-    ImapMessageMoved {
-        msg: String,
-    },
-
-    /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile {
-        file: String,
-    },
-
-    /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile {
-        file: String,
-    },
-
-    /// The library-user should write a warning string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Warning {
-        msg: String,
-    },
-
-    /// The library-user should report an error to the end-user.
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. configure())
-    /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the *last* error
-    /// in a messasge box then.
-    Error {
-        msg: String,
-    },
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// setChatName(), setChatProfileImage(),
-    /// addContactToChat(), removeContactFromChat(),
-    /// and messages sending functions.
-    ErrorSelfNotInGroup {
-        msg: String,
-    },
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    ///
-    /// `chatId` is set if only a single chat is affected by the changes, otherwise 0.
-    /// `msgId` is set if only a single message is affected by the changes, otherwise 0.
-    #[serde(rename_all = "camelCase")]
-    MsgsChanged {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Reactions for the message changed.
-    #[serde(rename_all = "camelCase")]
-    ReactionsChanged {
-        chat_id: u32,
-        msg_id: u32,
-        contact_id: u32,
-    },
-
-    /// There is a fresh message. Typically, the user will show an notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsg {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Downloading a bunch of messages just finished. This is an experimental
-    /// event to allow the UI to only show one notification per message bunch,
-    /// instead of cluttering the user with many notifications.
-    ///
-    /// msg_ids contains the message ids.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch {
-        msg_ids: Vec<u32>,
-    },
-
-    /// Messages were seen or noticed.
-    /// chat id is always set.
-    #[serde(rename_all = "camelCase")]
-    MsgsNoticed {
-        chat_id: u32,
-    },
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgDelivered {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgFailed {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgRead {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See setChatName(), setChatProfileImage(), addContactToChat()
-    /// and removeContactFromChat().
-    ///
-    /// This event does not include ephemeral timer modification, which
-    /// is a separate event.
-    #[serde(rename_all = "camelCase")]
-    ChatModified {
-        chat_id: u32,
-    },
-
-    /// Chat ephemeral timer changed.
-    #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified {
-        chat_id: u32,
-        timer: u32,
-    },
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    ///
-    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
-    #[serde(rename_all = "camelCase")]
-    ContactsChanged {
-        contact_id: Option<u32>,
-    },
-
-    /// Location of one or more contact has changed.
-    ///
-    /// @param data1 (u32) contact_id of the contact for which the location has changed.
-    ///     If the locations of several contacts have been changed,
-    ///     this parameter is set to `None`.
-    #[serde(rename_all = "camelCase")]
-    LocationChanged {
-        contact_id: Option<u32>,
-    },
-
-    /// Inform about the configuration progress started by configure().
-    ConfigureProgress {
-        /// Progress.
-        ///
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-
-        /// Progress comment or error, something to display to the user.
-        comment: Option<String>,
-    },
-
-    /// Inform about the import/export progress started by imex().
-    ///
-    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexProgress {
-        progress: usize,
-    },
-
-    /// A file has been exported. A file has been written by imex().
-    /// This event may be sent multiple times by a single call to imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexFileWritten {
-        path: String,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by getChatSecurejoinQrCodeSvg().
-    ///
-    /// @param data1 (int) ID of the contact that wants to join.
-    /// @param data2 (int) Progress as:
-    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
-    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
-    ///     1000=Protocol finished for this contact.
-    #[serde(rename_all = "camelCase")]
-    SecurejoinInviterProgress {
-        contact_id: u32,
-        progress: usize,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while secureJoin(), which
-    /// may take some time, is executed.
-    /// @param data1 (int) ID of the inviting contact.
-    /// @param data2 (int) Progress as:
-    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-    ///     (Bob has verified alice and waits until Alice does the same for him)
-    #[serde(rename_all = "camelCase")]
-    SecurejoinJoinerProgress {
-        contact_id: u32,
-        progress: usize,
-    },
-
-    /// The connectivity to the server changed.
-    /// This means that you should refresh the connectivity view
-    /// and possibly the connectivtiy HTML; see getConnectivity() and
-    /// getConnectivityHtml() for details.
+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,
-
-    #[serde(rename_all = "camelCase")]
-    WebxdcStatusUpdate {
-        msg_id: u32,
-        status_update_serial: u32,
-    },
-
-    /// Inform that a message containing a webxdc instance has been deleted
-    #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted {
-        msg_id: u32,
-    },
+    WebxdcStatusUpdate,
 }
 
-impl From<EventType> for JSONRPCEventType {
-    fn from(event: EventType) -> Self {
-        use JSONRPCEventType::*;
-        match event {
-            EventType::Info(msg) => Info { msg },
-            EventType::SmtpConnected(msg) => SmtpConnected { msg },
-            EventType::ImapConnected(msg) => ImapConnected { msg },
-            EventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
-            EventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
-            EventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
-            EventType::NewBlobFile(file) => NewBlobFile { file },
-            EventType::DeletedBlobFile(file) => DeletedBlobFile { file },
-            EventType::Warning(msg) => Warning { msg },
-            EventType::Error(msg) => Error { msg },
-            EventType::ErrorSelfNotInGroup(msg) => ErrorSelfNotInGroup { msg },
-            EventType::MsgsChanged { chat_id, msg_id } => MsgsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::ReactionsChanged {
-                chat_id,
-                msg_id,
-                contact_id,
-            } => ReactionsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-            },
-            EventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::IncomingMsgBunch { msg_ids } => IncomingMsgBunch {
-                msg_ids: msg_ids.into_iter().map(|id| id.to_u32()).collect(),
-            },
-            EventType::MsgsNoticed(chat_id) => MsgsNoticed {
-                chat_id: chat_id.to_u32(),
-            },
-            EventType::MsgDelivered { chat_id, msg_id } => MsgDelivered {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::MsgFailed { chat_id, msg_id } => MsgFailed {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::MsgRead { chat_id, msg_id } => MsgRead {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::ChatModified(chat_id) => ChatModified {
-                chat_id: chat_id.to_u32(),
-            },
-            EventType::ChatEphemeralTimerModified { chat_id, timer } => {
-                ChatEphemeralTimerModified {
-                    chat_id: chat_id.to_u32(),
-                    timer: timer.to_u32(),
-                }
-            }
-            EventType::ContactsChanged(contact) => ContactsChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            EventType::LocationChanged(contact) => LocationChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            EventType::ConfigureProgress { progress, comment } => {
-                ConfigureProgress { progress, comment }
-            }
-            EventType::ImexProgress(progress) => ImexProgress { progress },
-            EventType::ImexFileWritten(path) => ImexFileWritten {
-                path: path.to_str().unwrap_or_default().to_owned(),
-            },
-            EventType::SecurejoinInviterProgress {
-                contact_id,
-                progress,
-            } => SecurejoinInviterProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            EventType::SecurejoinJoinerProgress {
-                contact_id,
-                progress,
-            } => SecurejoinJoinerProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            EventType::ConnectivityChanged => ConnectivityChanged,
-            EventType::SelfavatarChanged => SelfavatarChanged,
-            EventType::WebxdcStatusUpdate {
-                msg_id,
-                status_update_serial,
-            } => WebxdcStatusUpdate {
-                msg_id: msg_id.to_u32(),
-                status_update_serial: status_update_serial.to_u32(),
-            },
-            EventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
-                msg_id: msg_id.to_u32(),
-            },
-        }
+fn event_type_to_string(event: EventType) -> EventTypeName {
+    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,
     }
 }
 
@@ -394,8 +147,7 @@ fn generate_events_ts_types_definition() {
             root_namespace: None,
             ..typescript_type_def::DefinitionFileOptions::default()
         };
-        typescript_type_def::write_definition_file::<_, JSONRPCEventType>(&mut buf, options)
-            .unwrap();
+        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/types/account.rs

@@ -9,7 +9,7 @@ use super::color_int_to_hex_string;
 #[derive(Serialize, TypeDef)]
 #[serde(tag = "type")]
 pub enum Account {
-    #[serde(rename_all = "camelCase")]
+    //#[serde(rename_all = "camelCase")]
     Configured {
         id: u32,
         display_name: Option<String>,
@@ -18,8 +18,9 @@ pub enum Account {
         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 },
+    Unconfigured {
+        id: u32,
+    },
 }
 
 impl Account {

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

@@ -1,20 +1,16 @@
-use std::time::{Duration, SystemTime};
-
-use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
+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::{Deserialize, Serialize};
+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,
@@ -36,22 +32,20 @@ pub struct FullChat {
     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,
-    mailing_list_address: Option<String>,
 }
 
 impl FullChat {
-    pub async fn try_from_dc_chat_id(context: &Context, chat_id: u32) -> Result<Self> {
+    pub async fn 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());
+        let mut contacts = Vec::new();
 
         for contact_id in &contact_ids {
             contacts.push(
-                ContactObject::try_from_dc_contact(
+                ContactObject::from_dc_contact(
                     context,
                     Contact::load_from_db(context, *contact_id).await?,
                 )
@@ -70,25 +64,12 @@ impl FullChat {
 
         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
-        };
-
-        let mailing_list_address = chat.get_mailinglist_addr().map(|s| s.to_string());
-
         Ok(FullChat {
             id: chat_id,
             name: chat.name.clone(),
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
-            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
+            archived: chat.get_visibility() == deltachat::chat::ChatVisibility::Archived,
             chat_type: chat
                 .get_type()
                 .to_u32()
@@ -105,109 +86,6 @@ impl FullChat {
             is_muted: chat.is_muted(),
             ephemeral_timer,
             can_send,
-            was_seen_recently,
-            mailing_list_address,
         })
     }
 }
-
-/// cheaper version of fullchat, omits:
-/// - contacts
-/// - contact_ids
-/// - fresh_message_counter
-/// - ephemeral_timer
-/// - self_in_group
-/// - was_seen_recently
-/// - can_send
-///
-/// used when you only need the basic metadata of a chat like type, name, profile picture
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct BasicChat {
-    id: u32,
-    name: String,
-    is_protected: bool,
-    profile_image: Option<String>, //BLOBS ?
-    archived: bool,
-    chat_type: u32,
-    is_unpromoted: bool,
-    is_self_talk: bool,
-    color: String,
-    is_contact_request: bool,
-    is_device_chat: bool,
-    is_muted: bool,
-}
-
-impl BasicChat {
-    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 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?);
-
-        Ok(BasicChat {
-            id: chat_id,
-            name: chat.name.clone(),
-            is_protected: chat.is_protected(),
-            profile_image, //BLOBS ?
-            archived: chat.get_visibility() == 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(),
-            color,
-            is_contact_request: chat.is_contact_request(),
-            is_device_chat: chat.is_device_talk(),
-            is_muted: chat.is_muted(),
-        })
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-pub enum MuteDuration {
-    NotMuted,
-    Forever,
-    Until(i64),
-}
-
-impl MuteDuration {
-    pub fn try_into_core_type(self) -> Result<chat::MuteDuration> {
-        match self {
-            MuteDuration::NotMuted => Ok(chat::MuteDuration::NotMuted),
-            MuteDuration::Forever => Ok(chat::MuteDuration::Forever),
-            MuteDuration::Until(n) => {
-                if n <= 0 {
-                    bail!("failed to read mute duration")
-                }
-
-                Ok(SystemTime::now()
-                    .checked_add(Duration::from_secs(n as u64))
-                    .map_or(chat::MuteDuration::Forever, chat::MuteDuration::Until))
-            }
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-#[serde(rename = "ChatVisibility")]
-pub enum JSONRPCChatVisibility {
-    Normal,
-    Archived,
-    Pinned,
-}
-
-impl JSONRPCChatVisibility {
-    pub fn into_core_type(self) -> ChatVisibility {
-        match self {
-            JSONRPCChatVisibility::Normal => ChatVisibility::Normal,
-            JSONRPCChatVisibility::Archived => ChatVisibility::Archived,
-            JSONRPCChatVisibility::Pinned => ChatVisibility::Pinned,
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use deltachat::constants::*;
-use deltachat::contact::{Contact, ContactId};
+use deltachat::contact::ContactId;
 use deltachat::{
     chat::{get_chat_contacts, ChatVisibility},
     chatlist::Chatlist,
@@ -42,11 +42,6 @@ pub enum ChatListItemFetchResult {
         is_pinned: bool,
         is_muted: bool,
         is_contact_request: bool,
-        /// true when chat is a broadcastlist
-        is_broadcast: bool,
-        /// contact id if this is a dm chat (for view profile entry in context menu)
-        dm_chat_contact: Option<u32>,
-        was_seen_recently: bool,
     },
     ArchiveLink,
     #[serde(rename_all = "camelCase")]
@@ -91,25 +86,9 @@ pub(crate) async fn get_chat_list_item_by_id(
         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 self_in_group = get_chat_contacts(ctx, chat_id)
+        .await?
+        .contains(&ContactId::SELF);
 
     let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
     let color = color_int_to_hex_string(chat.get_color(ctx).await?);
@@ -134,8 +113,5 @@ pub(crate) async fn get_chat_list_item_by_id(
         is_pinned: visibility == ChatVisibility::Pinned,
         is_muted: chat.is_muted(),
         is_contact_request: chat.is_contact_request(),
-        is_broadcast: chat.get_type() == Chattype::Broadcast,
-        dm_chat_contact,
-        was_seen_recently,
     })
 }

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

@@ -7,7 +7,7 @@ use typescript_type_def::TypeDef;
 use super::color_int_to_hex_string;
 
 #[derive(Serialize, TypeDef)]
-#[serde(rename = "Contact", rename_all = "camelCase")]
+#[serde(rename = "Contact")]
 pub struct ContactObject {
     address: String,
     color: String,
@@ -20,13 +20,10 @@ pub struct ContactObject {
     name_and_addr: String,
     is_blocked: bool,
     is_verified: bool,
-    /// the contact's last seen timestamp
-    last_seen: i64,
-    was_seen_recently: bool,
 }
 
 impl ContactObject {
-    pub async fn try_from_dc_contact(
+    pub async fn from_dc_contact(
         context: &Context,
         contact: deltachat::contact::Contact,
     ) -> Result<Self> {
@@ -48,8 +45,6 @@ impl ContactObject {
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
             is_verified,
-            last_seen: contact.last_seen(),
-            was_seen_recently: contact.was_seen_recently(),
         })
     }
 }

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

@@ -1,47 +0,0 @@
-use deltachat::location::Location;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Location", rename_all = "camelCase")]
-pub struct JsonrpcLocation {
-    pub location_id: u32,
-    pub is_independent: bool,
-    pub latitude: f64,
-    pub longitude: f64,
-    pub accuracy: f64,
-    pub timestamp: i64,
-    pub contact_id: u32,
-    pub msg_id: u32,
-    pub chat_id: u32,
-    pub marker: Option<String>,
-}
-
-impl From<Location> for JsonrpcLocation {
-    fn from(location: Location) -> Self {
-        let Location {
-            location_id,
-            independent,
-            latitude,
-            longitude,
-            accuracy,
-            timestamp,
-            contact_id,
-            msg_id,
-            chat_id,
-            marker,
-        } = location;
-        Self {
-            location_id,
-            is_independent: independent != 0,
-            latitude,
-            longitude,
-            accuracy,
-            timestamp,
-            contact_id: contact_id.to_u32(),
-            msg_id,
-            chat_id: chat_id.to_u32(),
-            marker,
-        }
-    }
-}

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

@@ -1,42 +1,28 @@
 use anyhow::{anyhow, Result};
-use deltachat::chat::Chat;
-use deltachat::chat::ChatItem;
-use deltachat::constants::Chattype;
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::download;
 use deltachat::message::Message;
 use deltachat::message::MsgId;
-use deltachat::message::Viewtype;
-use deltachat::reaction::get_msg_reactions;
 use num_traits::cast::ToPrimitive;
-use serde::Deserialize;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-use super::color_int_to_hex_string;
 use super::contact::ContactObject;
-use super::reactions::JSONRPCReactions;
-use super::webxdc::WebxdcMessageInfo;
 
 #[derive(Serialize, TypeDef)]
-#[serde(rename = "Message", rename_all = "camelCase")]
+#[serde(rename = "Message")]
 pub struct MessageObject {
     id: u32,
     chat_id: u32,
     from_id: u32,
-    quote: Option<MessageQuote>,
-    parent_id: Option<u32>,
-
+    quoted_text: Option<String>,
+    quoted_message_id: Option<u32>,
     text: Option<String>,
     has_location: bool,
     has_html: bool,
-    view_type: MessageViewtype,
+    view_type: u32,
     state: u32,
 
-    /// An error text, if there is one.
-    error: Option<String>,
-
     timestamp: i64,
     sort_timestamp: i64,
     received_timestamp: i64,
@@ -48,8 +34,6 @@ pub struct MessageObject {
     is_setupmessage: bool,
     is_info: bool,
     is_forwarded: bool,
-    /// when is_info is true this describes what type of system message it is
-    system_message_type: SystemMessageType,
 
     duration: i32,
     dimensions_height: i32,
@@ -67,110 +51,40 @@ pub struct MessageObject {
     file_mime: Option<String>,
     file_bytes: u64,
     file_name: Option<String>,
-
-    webxdc_info: Option<WebxdcMessageInfo>,
-
-    download_state: DownloadState,
-
-    reactions: Option<JSONRPCReactions>,
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(tag = "kind")]
-enum MessageQuote {
-    JustText {
-        text: String,
-    },
-    #[serde(rename_all = "camelCase")]
-    WithMessage {
-        text: String,
-        message_id: u32,
-        author_display_name: String,
-        author_display_color: String,
-        override_sender_name: Option<String>,
-        image: Option<String>,
-        is_forwarded: bool,
-        view_type: MessageViewtype,
-    },
 }
 
 impl MessageObject {
     pub async fn from_message_id(context: &Context, message_id: u32) -> Result<Self> {
         let msg_id = MsgId::new(message_id);
-        Self::from_msg_id(context, msg_id).await
-    }
-
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
         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 sender = ContactObject::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
-        };
-
-        let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
-
-        let download_state = message.download_state().into();
-
-        let quote = if let Some(quoted_text) = message.quoted_text() {
-            match message.quoted_message(context).await? {
-                Some(quote) => {
-                    let quote_author = Contact::load_from_db(context, quote.get_from_id()).await?;
-                    Some(MessageQuote::WithMessage {
-                        text: quoted_text,
-                        message_id: quote.get_id().to_u32(),
-                        author_display_name: quote_author.get_display_name().to_owned(),
-                        author_display_color: color_int_to_hex_string(quote_author.get_color()),
-                        override_sender_name: quote.get_override_sender_name(),
-                        image: if quote.get_viewtype() == Viewtype::Image
-                            || quote.get_viewtype() == Viewtype::Gif
-                            || quote.get_viewtype() == Viewtype::Sticker
-                        {
-                            match quote.get_file(context) {
-                                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-                                None => None,
-                            }
-                        } else {
-                            None
-                        },
-                        is_forwarded: quote.is_forwarded(),
-                        view_type: quote.get_viewtype().into(),
-                    })
-                }
-                None => Some(MessageQuote::JustText { text: quoted_text }),
-            }
-        } else {
-            None
-        };
-
-        let reactions = get_msg_reactions(context, msg_id).await?;
-        let reactions = if reactions.is_empty() {
-            None
-        } else {
-            Some(reactions.into())
-        };
-
         Ok(MessageObject {
-            id: msg_id.to_u32(),
+            id: message_id,
             chat_id: message.get_chat_id().to_u32(),
             from_id: message.get_from_id().to_u32(),
-            quote,
-            parent_id,
+            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(),
+            view_type: message
+                .get_viewtype()
+                .to_u32()
+                .ok_or_else(|| anyhow!("viewtype conversion to number failed"))?,
             state: message
                 .get_state()
                 .to_u32()
                 .ok_or_else(|| anyhow!("state conversion to number failed"))?,
-            error: message.error(),
 
             timestamp: message.get_timestamp(),
             sort_timestamp: message.get_sort_timestamp(),
@@ -182,7 +96,6 @@ impl MessageObject {
             is_setupmessage: message.is_setupmessage(),
             is_info: message.is_info(),
             is_forwarded: message.is_forwarded(),
-            system_message_type: message.get_info_type().into(),
 
             duration: message.get_duration(),
             dimensions_height: message.get_height(),
@@ -209,284 +122,6 @@ impl MessageObject {
             file_mime: message.get_filemime(),
             file_bytes,
             file_name: message.get_filename(),
-            webxdc_info,
-
-            download_state,
-
-            reactions,
         })
     }
 }
-
-#[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,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-pub enum DownloadState {
-    Done,
-    Available,
-    Failure,
-    InProgress,
-}
-
-impl From<download::DownloadState> for DownloadState {
-    fn from(state: download::DownloadState) -> Self {
-        match state {
-            download::DownloadState::Done => DownloadState::Done,
-            download::DownloadState::Available => DownloadState::Available,
-            download::DownloadState::Failure => DownloadState::Failure,
-            download::DownloadState::InProgress => DownloadState::InProgress,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-pub enum SystemMessageType {
-    Unknown,
-    GroupNameChanged,
-    GroupImageChanged,
-    MemberAddedToGroup,
-    MemberRemovedFromGroup,
-    AutocryptSetupMessage,
-    SecurejoinMessage,
-    LocationStreamingEnabled,
-    LocationOnly,
-
-    /// Chat ephemeral message timer is changed.
-    EphemeralTimerChanged,
-
-    // Chat protection state changed
-    ChatProtectionEnabled,
-    ChatProtectionDisabled,
-
-    /// Self-sent-message that contains only json used for multi-device-sync;
-    /// if possible, we attach that to other messages as for locations.
-    MultiDeviceSync,
-
-    // Sync message that contains a json payload
-    // sent to the other webxdc instances
-    // These messages are not shown in the chat.
-    WebxdcStatusUpdate,
-
-    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
-    WebxdcInfoMessage,
-}
-
-impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
-    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
-        use deltachat::mimeparser::SystemMessage;
-        match system_message_type {
-            SystemMessage::Unknown => SystemMessageType::Unknown,
-            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
-            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
-            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
-            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
-            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
-            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
-            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
-            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
-            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
-            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
-            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
-            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
-            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
-            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageNotificationInfo {
-    id: u32,
-    chat_id: u32,
-    account_id: u32,
-
-    image: Option<String>,
-    image_mime_type: Option<String>,
-
-    chat_name: String,
-    chat_profile_image: Option<String>,
-
-    /// also known as summary_text1
-    summary_prefix: Option<String>,
-    /// also known as summary_text2
-    summary_text: String,
-}
-
-impl MessageNotificationInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-
-        let image = if matches!(
-            message.get_viewtype(),
-            Viewtype::Image | Viewtype::Gif | Viewtype::Sticker
-        ) {
-            message
-                .get_file(context)
-                .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-                .unwrap_or_default()
-        } else {
-            None
-        };
-
-        let chat_profile_image = chat
-            .get_profile_image(context)
-            .await?
-            .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-            .unwrap_or_default();
-
-        let summary = message.get_summary(context, Some(&chat)).await?;
-
-        Ok(MessageNotificationInfo {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            account_id: context.get_id(),
-            image,
-            image_mime_type: message.get_filemime(),
-            chat_name: chat.name,
-            chat_profile_image,
-            summary_prefix: summary.prefix.map(|s| s.to_string()),
-            summary_text: summary.text,
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageSearchResult {
-    id: u32,
-    author_profile_image: Option<String>,
-    author_name: String,
-    author_color: String,
-    chat_name: Option<String>,
-    message: String,
-    timestamp: i64,
-}
-
-impl MessageSearchResult {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-        let sender = Contact::load_from_db(context, message.get_from_id()).await?;
-
-        let profile_image = match sender.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        Ok(Self {
-            id: msg_id.to_u32(),
-            author_profile_image: profile_image,
-            author_name: sender.get_display_name().to_owned(),
-            author_color: color_int_to_hex_string(sender.get_color()),
-            chat_name: if chat.get_type() == Chattype::Single {
-                Some(chat.get_name().to_owned())
-            } else {
-                None
-            },
-            message: message.get_text().unwrap_or_default(),
-            timestamp: message.get_timestamp(),
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase", rename = "MessageListItem", tag = "kind")]
-pub enum JSONRPCMessageListItem {
-    Message {
-        msg_id: u32,
-    },
-
-    /// Day marker, separating messages that correspond to different
-    /// days according to local time.
-    DayMarker {
-        /// Marker timestamp, for day markers, in unix milliseconds
-        timestamp: i64,
-    },
-}
-
-impl From<ChatItem> for JSONRPCMessageListItem {
-    fn from(item: ChatItem) -> Self {
-        match item {
-            ChatItem::Message { msg_id } => JSONRPCMessageListItem::Message {
-                msg_id: msg_id.to_u32(),
-            },
-            ChatItem::DayMarker { timestamp } => JSONRPCMessageListItem::DayMarker { timestamp },
-        }
-    }
-}

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

@@ -2,233 +2,9 @@ pub mod account;
 pub mod chat;
 pub mod chat_list;
 pub mod contact;
-pub mod location;
 pub mod message;
 pub mod provider_info;
-pub mod qr;
-pub mod reactions;
-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,
-    },
-    Login {
-        address: 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,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-            Qr::Backup { ticket } => QrObject::Backup {
-                ticket: ticket.as_bytes(),
-            },
-        }
-    }
-}

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

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

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

@@ -1,213 +0,0 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[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,
-    },
-    Login {
-        address: 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,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-        }
-    }
-}

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

@@ -1,47 +0,0 @@
-use std::collections::BTreeMap;
-
-use deltachat::reaction::Reactions;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-/// Structure representing all reactions to a particular message.
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Reactions", rename_all = "camelCase")]
-pub struct JSONRPCReactions {
-    /// Map from a contact to it's reaction to message.
-    reactions_by_contact: BTreeMap<u32, Vec<String>>,
-    /// Unique reactions and their count
-    reactions: BTreeMap<String, u32>,
-}
-
-impl From<Reactions> for JSONRPCReactions {
-    fn from(reactions: Reactions) -> Self {
-        let mut reactions_by_contact: BTreeMap<u32, Vec<String>> = BTreeMap::new();
-        let mut unique_reactions: BTreeMap<String, u32> = BTreeMap::new();
-
-        for contact_id in reactions.contacts() {
-            let reaction = reactions.get(contact_id);
-            if reaction.is_empty() {
-                continue;
-            }
-            let emojis: Vec<String> = reaction
-                .emojis()
-                .into_iter()
-                .map(|emoji| emoji.to_owned())
-                .collect();
-            reactions_by_contact.insert(contact_id.to_u32(), emojis.clone());
-            for emoji in emojis {
-                if let Some(x) = unique_reactions.get_mut(&emoji) {
-                    *x += 1;
-                } else {
-                    unique_reactions.insert(emoji, 1);
-                }
-            }
-        }
-
-        JSONRPCReactions {
-            reactions_by_contact,
-            reactions: unique_reactions,
-        }
-    }
-}

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,29 +1,36 @@
 pub mod api;
 pub use api::events;
+
 pub use yerpc;
 
 #[cfg(test)]
 mod tests {
     use super::api::{Accounts, CommandApi};
     use async_channel::unbounded;
+    use async_std::task;
     use futures::StreamExt;
     use tempfile::TempDir;
-    use yerpc::{RpcClient, RpcSession};
+    use yerpc::{MessageHandle, RpcHandle};
 
-    #[tokio::test(flavor = "multi_thread")]
+    #[async_std::test]
     async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
+        // println!("{}", "");
         let tmp_dir = TempDir::new().unwrap().path().into();
+        println!("tmp_dir: {:?}", tmp_dir);
+
         let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
+        let cmd_api = CommandApi::new(accounts);
 
         let (sender, mut receiver) = unbounded::<String>();
 
-        let (client, mut rx) = RpcClient::new();
-        let session = RpcSession::new(client, api);
-        tokio::spawn({
+        let (request_handle, mut rx) = RpcHandle::new();
+        let session = cmd_api;
+        let handle = MessageHandle::new(request_handle, session);
+        task::spawn({
             async move {
                 while let Some(message) = rx.next().await {
                     let message = serde_json::to_string(&message)?;
+                    // Abort serialization on error.
                     sender.send(message).await?;
                 }
                 let res: Result<(), anyhow::Error> = Ok(());
@@ -34,7 +41,7 @@ mod tests {
         {
             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;
+            handle.handle_message(request).await;
             let result = receiver.next().await;
             println!("{:?}", result);
             assert_eq!(result, Some(response.to_owned()));
@@ -42,7 +49,7 @@ mod tests {
         {
             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;
+            handle.handle_message(request).await;
             let result = receiver.next().await;
             println!("{:?}", result);
             assert_eq!(result, Some(response.to_owned()));
@@ -50,43 +57,4 @@ mod tests {
 
         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 +1,44 @@
-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};
+use async_std::path::PathBuf;
+use async_std::task;
+use tide::Request;
+use yerpc::RpcHandle;
+use yerpc_tide::yerpc_handler;
 
 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_std::main]
 async fn main() -> Result<(), std::io::Error> {
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+    env_logger::init();
+    log::info!("Starting");
 
-    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 accounts = Accounts::new(PathBuf::from("./accounts")).await.unwrap();
     let state = CommandApi::new(accounts);
 
-    let app = Router::new()
-        .route("/ws", get(handler))
-        .layer(Extension(state.clone()));
+    let mut app = tide::with_state(state.clone());
+    app.at("/ws").get(yerpc_handler(request_handler));
 
-    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();
+    state.accounts.read().await.start_io().await;
+    app.listen("127.0.0.1:20808").await?;
 
     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();
-        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
+async fn request_handler(
+    request: Request<CommandApi>,
+    rpc: RpcHandle,
+) -> anyhow::Result<CommandApi> {
+    let state = request.state().clone();
+    task::spawn(event_loop(state.clone(), rpc));
+    Ok(state)
+}
+
+async fn event_loop(state: CommandApi, rpc: RpcHandle) -> anyhow::Result<()> {
+    let events = state.accounts.read().await.get_event_emitter().await;
+    while let Some(event) = events.recv().await {
+        // log::debug!("event {:?}", event);
+        let event = event_to_json_rpc_notification(event);
+        rpc.notify("event", Some(event)).await?;
+    }
+    Ok(())
 }

deltachat-jsonrpc/typescript/.gitignore

@@ -4,5 +4,3 @@ 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/example.ts

@@ -1,13 +1,13 @@
-import { DcEvent, DeltaChat } from "../deltachat.js";
-
-var SELECTED_ACCOUNT = 0;
+import { RawClient, RPC } from "./src/lib";
+import { WebsocketTransport, Request } from "yerpc";
 
+type DeltaEvent = { id: string; contextId: number; field1: any; field2: any };
+var selectedAccount = 0;
 window.addEventListener("DOMContentLoaded", (_event) => {
   (window as any).selectDeltaAccount = (id: string) => {
-    SELECTED_ACCOUNT = Number(id);
+    selectedAccount = Number(id);
     window.dispatchEvent(new Event("account-changed"));
   };
-  console.log("launch run script...");
   run().catch((err) => console.error("run failed", err));
 });
 
@@ -16,37 +16,34 @@ async function run() {
   const $side = document.getElementById("side")!;
   const $head = document.getElementById("header")!;
 
-  const client = new DeltaChat("ws://localhost:20808/ws");
+  const transport = new WebsocketTransport("ws://localhost:20808/ws");
+  const client = new RawClient(transport);
 
-  (window as any).client = client.rpc;
+  (window as any).client = client;
 
-  client.on("ALL", (accountId, event) => {
-    onIncomingEvent(accountId, event);
+  transport.on("request", (request: Request) => {
+    const method = request.method;
+    if (method === "event") {
+      const params = request.params! as DeltaEvent;
+      onIncomingEvent(params, params.id);
+    }
   });
 
   window.addEventListener("account-changed", async (_event: Event) => {
+    await client.selectAccount(selectedAccount);
     listChatsForSelectedAccount();
   });
 
   await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
 
   async function loadAccountsInHeader() {
-    console.log("load accounts");
-    const accounts = await client.rpc.getAllAccounts();
-    console.log("accounts loaded", accounts);
+    const accounts = await client.getAllAccounts();
     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)
+          ${account.addr!}
           </a>&nbsp;`
         );
       }
@@ -55,30 +52,31 @@ async function run() {
 
   async function listChatsForSelectedAccount() {
     clear($main);
-    const selectedAccount = SELECTED_ACCOUNT;
-    const info = await client.rpc.getAccountInfo(selectedAccount);
+    const selectedAccount = await client.getSelectedAccountId();
+    if (!selectedAccount) return write($main, "No account selected");
+    const info = await client.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(
+    const chats = await client.getChatlistEntries(
       selectedAccount,
       0,
       null,
       null
     );
     for (const [chatId, _messageId] of chats) {
-      const chat = await client.rpc.getFullChatById(
+      const chat = await client.chatlistGetFullChatById(
         selectedAccount,
         chatId
       );
       write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.getMessageIds(
+      const messageIds = await client.messageListGetMessageIds(
         selectedAccount,
         chatId,
         0
       );
-      const messages = await client.rpc.getMessages(
+      const messages = await client.messageGetMessages(
         selectedAccount,
         messageIds
       );
@@ -88,15 +86,14 @@ async function run() {
     }
   }
 
-  function onIncomingEvent(accountId: number, event: DcEvent) {
+  function onIncomingEvent(event: DeltaEvent, name: string) {
     write(
       $side,
       `
         <p class="message">
-          [<strong>${event.type}</strong> on account ${accountId}]<br>
-          <em>f1:</em> ${JSON.stringify(
-            Object.assign({}, event, { type: undefined })
-          )}
+          [<strong>${name}</strong> on account ${event.contextId}]<br>
+          <em>f1:</em> ${JSON.stringify(event.field1)}<br>
+          <em>f2:</em> ${JSON.stringify(event.field2)}
         </p>`
     );
   }

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/generated/client.ts

@@ -66,26 +66,6 @@ export class RawClient {
     return (this._transport.request('get_all_accounts', [] as RPC.Params)) as Promise<(T.Account)[]>;
   }
 
-
-  public startIoForAllAccounts(): Promise<null> {
-    return (this._transport.request('start_io_for_all_accounts', [] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public stopIoForAllAccounts(): Promise<null> {
-    return (this._transport.request('stop_io_for_all_accounts', [] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public startIo(id: T.U32): Promise<null> {
-    return (this._transport.request('start_io', [id] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public stopIo(id: T.U32): Promise<null> {
-    return (this._transport.request('stop_io', [id] as RPC.Params)) as Promise<null>;
-  }
-
   /**
    * Get top-level info for an account.
    */
@@ -93,13 +73,6 @@ export class RawClient {
     return (this._transport.request('get_account_info', [accountId] as RPC.Params)) as Promise<T.Account>;
   }
 
-  /**
-   * Get the combined filesize of an account in bytes
-   */
-  public getAccountFileSize(accountId: T.U32): Promise<T.U64> {
-    return (this._transport.request('get_account_file_size', [accountId] as RPC.Params)) as Promise<T.U64>;
-  }
-
   /**
    * Returns provider for the given domain.
    *
@@ -136,22 +109,6 @@ export class RawClient {
     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)>;
@@ -162,11 +119,6 @@ export class RawClient {
     return (this._transport.request('batch_get_config', [accountId, keys] as RPC.Params)) as Promise<Record<string,(string|null)>>;
   }
 
-
-  public setStockStrings(strings: Record<T.U32,string>): Promise<null> {
-    return (this._transport.request('set_stock_strings', [strings] as RPC.Params)) as Promise<null>;
-  }
-
   /**
    * Configures this account with the currently set parameters.
    * Setup the credential config before calling this.
@@ -183,62 +135,13 @@ export class RawClient {
   }
 
 
-  public exportSelfKeys(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('export_self_keys', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
+  public autocryptInitiateKeyTransfer(accountId: T.U32): Promise<string> {
+    return (this._transport.request('autocrypt_initiate_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
   }
 
 
-  public importSelfKeys(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('import_self_keys', [accountId, path, passphrase] 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>;
-  }
-
-  /**
-   * Estimate the number of messages that will be deleted
-   * by the set_config()-options `delete_device_after` or `delete_server_after`.
-   * This is typically used to show the estimated impact to the user
-   * before actually enabling deletion of old messages.
-   */
-  public estimateAutoDeletionCount(accountId: T.U32, fromServer: boolean, seconds: T.I64): Promise<T.Usize> {
-    return (this._transport.request('estimate_auto_deletion_count', [accountId, fromServer, seconds] as RPC.Params)) as Promise<T.Usize>;
-  }
-
-
-  public initiateAutocryptKeyTransfer(accountId: T.U32): Promise<string> {
-    return (this._transport.request('initiate_autocrypt_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-
-  public continueAutocryptKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
-    return (this._transport.request('continue_autocrypt_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
+  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>;
   }
 
 
@@ -252,16 +155,8 @@ export class RawClient {
   }
 
 
-  public getFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
-    return (this._transport.request('get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
-  }
-
-  /**
-   * get basic info about a chat,
-   * use chatlist_get_full_chat_by_id() instead if you need more information
-   */
-  public getBasicChatInfo(accountId: T.U32, chatId: T.U32): Promise<T.BasicChat> {
-    return (this._transport.request('get_basic_chat_info', [accountId, chatId] as RPC.Params)) as Promise<T.BasicChat>;
+  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>;
   }
 
 
@@ -274,410 +169,26 @@ export class RawClient {
     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 leave_group()
-   */
-  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 `secure_join()`
-   *
-   * 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.
-   *
-   * return format: `[code, svg]`
-   */
-  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]>;
-  }
-
-  /**
-   * Continue a Setup-Contact or Verified-Group-Invite protocol
-   * started on another device with `get_chat_securejoin_qr_code_svg()`.
-   * This function is typically called when `check_qr()` returns
-   * type=AskVerifyContact or type=AskVerifyGroup.
-   *
-   * The function returns immediately and the handshake runs in background,
-   * sending and receiving several messages.
-   * During the handshake, info messages are added to the chat,
-   * showing progress, success or errors.
-   *
-   * Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-   *
-   * See https://countermitm.readthedocs.io/en/latest/new.html
-   * for details about both protocols.
-   *
-   * **qr**: The text of the scanned QR code. Typically, the same string as given
-   *     to `check_qr()`.
-   *
-   * **returns**: The chat ID of the joined chat, the UI may redirect to the this chat.
-   *         A returned chat ID does not guarantee that the chat is protected or the belonging contact is verified.
-   *
-   */
-  public secureJoin(accountId: T.U32, qr: string): Promise<T.U32> {
-    return (this._transport.request('secure_join', [accountId, qr] 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 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>;
-  }
-
-  /**
-   * Get the contact IDs belonging to a chat.
-   *
-   * - for normal chats, the function always returns exactly one contact,
-   *   DC_CONTACT_ID_SELF is returned only for SELF-chats.
-   *
-   * - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
-   *   explicitly as it may happen that oneself gets removed from a still existing
-   *   group
-   *
-   * - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
-   *
-   * - for mailing lists, the behavior is not documented currently, we will decide on that later.
-   *   for now, the UI should not show the list for mailing lists.
-   *   (we do not know all members and there is not always a global mailing list address,
-   *   so we could return only SELF or the known members; this is not decided yet)
-   */
-  public getChatContacts(accountId: T.U32, chatId: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('get_chat_contacts', [accountId, chatId] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Create a new group chat.
-   *
-   * After creation,
-   * the group has one member with the ID DC_CONTACT_ID_SELF
-   * and is in _unpromoted_ state.
-   * This means, you can add or remove members, change the name,
-   * the group image and so on without messages being sent to all group members.
-   *
-   * This changes as soon as the first message is sent to the group members
-   * and the group becomes _promoted_.
-   * After that, all changes are synced with all group members
-   * by sending status message.
-   *
-   * To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of `BasicChat` or `FullChat`.
-   * This may be useful if you want to show some help for just created groups.
-   *
-   * @param protect If set to 1 the function creates group with protection initially enabled.
-   *     Only verified members are allowed in these groups
-   *     and end-to-end-encryption is always enabled.
-   */
-  public createGroupChat(accountId: T.U32, name: string, protect: boolean): Promise<T.U32> {
-    return (this._transport.request('create_group_chat', [accountId, name, protect] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Create a new broadcast list.
-   *
-   * Broadcast lists are similar to groups on the sending device,
-   * however, recipients get the messages in normal one-to-one chats
-   * and will not be aware of other members.
-   *
-   * Replies to broadcasts go only to the sender
-   * and not to all broadcast recipients.
-   * Moreover, replies will not appear in the broadcast list
-   * but in the one-to-one chat with the person answering.
-   *
-   * The name and the image of the broadcast list is set automatically
-   * and is visible to the sender only.
-   * Not asking for these data allows more focused creation
-   * and we bypass the question who will get which data.
-   * Also, many users will have at most one broadcast list
-   * so, a generic name and image is sufficient at the first place.
-   *
-   * Later on, however, the name can be changed using dc_set_chat_name().
-   * The image cannot be changed to have a unique, recognizable icon in the chat lists.
-   * All in all, this is also what other messengers are doing here.
-   */
-  public createBroadcastList(accountId: T.U32): Promise<T.U32> {
-    return (this._transport.request('create_broadcast_list', [accountId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Set group name.
-   *
-   * 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 setChatName(accountId: T.U32, chatId: T.U32, newName: string): Promise<null> {
-    return (this._transport.request('set_chat_name', [accountId, chatId, newName] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Set group profile image.
-   *
-   * 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.
-   *
-   * To find out the profile image of a chat, use dc_chat_get_profile_image()
-   *
-   * @param image_path Full path of the image to use as the group image. The image will immediately be copied to the
-   *     `blobdir`; the original image will not be needed anymore.
-   *      If you pass null here, the group image is deleted (for promoted groups, all members are informed about
-   *      this change anyway).
-   */
-  public setChatProfileImage(accountId: T.U32, chatId: T.U32, imagePath: (string|null)): Promise<null> {
-    return (this._transport.request('set_chat_profile_image', [accountId, chatId, imagePath] as RPC.Params)) as Promise<null>;
+  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 setChatVisibility(accountId: T.U32, chatId: T.U32, visibility: T.ChatVisibility): Promise<null> {
-    return (this._transport.request('set_chat_visibility', [accountId, chatId, visibility] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public setChatEphemeralTimer(accountId: T.U32, chatId: T.U32, timer: T.U32): Promise<null> {
-    return (this._transport.request('set_chat_ephemeral_timer', [accountId, chatId, timer] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getChatEphemeralTimer(accountId: T.U32, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('get_chat_ephemeral_timer', [accountId, chatId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  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>;
-  }
-
-  /**
-   *  Mark all messages in a chat as _noticed_.
-   *  _Noticed_ messages are no longer _fresh_ and do not count as being unseen
-   *  but are still waiting for being marked as "seen" using markseen_msgs()
-   *  (IMAP/MDNs is not done for noticed messages).
-   *
-   *  Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
-   *  See also markseen_msgs().
-   */
-  public marknoticedChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('marknoticed_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getFirstUnreadMessageOfChat(accountId: T.U32, chatId: T.U32): Promise<(T.U32|null)> {
-    return (this._transport.request('get_first_unread_message_of_chat', [accountId, chatId] as RPC.Params)) as Promise<(T.U32|null)>;
-  }
-
-  /**
-   * Set mute duration of a chat.
-   *
-   * The UI can then call is_chat_muted() when receiving a new message
-   * to decide whether it should trigger an notification.
-   *
-   * Muted chats should not sound or vibrate
-   * and should not show a visual notification in the system area.
-   * Moreover, muted chats should be excluded from global badge counter
-   * (get_fresh_msgs() skips muted chats therefore)
-   * and the in-app, per-chat badge counter should use a less obtrusive color.
-   *
-   * Sends out #DC_EVENT_CHAT_MODIFIED.
-   */
-  public setChatMuteDuration(accountId: T.U32, chatId: T.U32, duration: T.MuteDuration): Promise<null> {
-    return (this._transport.request('set_chat_mute_duration', [accountId, chatId, duration] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Check whether the chat is currently muted (can be changed by set_chat_mute_duration()).
-   *
-   * This is available as a standalone function outside of fullchat, because it might be only needed for notification
-   */
-  public isChatMuted(accountId: T.U32, chatId: T.U32): Promise<boolean> {
-    return (this._transport.request('is_chat_muted', [accountId, chatId] as RPC.Params)) as Promise<boolean>;
-  }
-
-  /**
-   * Mark messages as presented to the user.
-   * Typically, UIs call this function on scrolling through the message list,
-   * when the messages are presented at least for a little moment.
-   * The concrete action depends on the type of the chat and on the users settings
-   * (dc_msgs_presented() may be a better name therefore, but well. :)
-   *
-   * - For normal chats, the IMAP state is updated, MDN is sent
-   *   (if set_config()-options `mdns_enabled` is set)
-   *   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
-   *
-   * - For contact requests, no IMAP or MDNs is done
-   *   and the internal state is not changed therefore.
-   *   See also marknoticed_chat().
-   *
-   * Moreover, timer is started for incoming ephemeral messages.
-   * This also happens for contact requests chats.
-   *
-   * One #DC_EVENT_MSGS_NOTICED event is emitted per modified chat.
-   */
-  public markseenMsgs(accountId: T.U32, msgIds: (T.U32)[]): Promise<null> {
-    return (this._transport.request('markseen_msgs', [accountId, msgIds] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public getMessageListItems(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.MessageListItem)[]> {
-    return (this._transport.request('get_message_list_items', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.MessageListItem)[]>;
-  }
-
-
-  public getMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
-    return (this._transport.request('get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
-  }
-
-
-  public getMessageHtml(accountId: T.U32, messageId: T.U32): Promise<(string|null)> {
-    return (this._transport.request('get_message_html', [accountId, messageId] as RPC.Params)) as Promise<(string|null)>;
-  }
-
-
-  public getMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
-    return (this._transport.request('get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
-  }
-
-  /**
-   * Fetch info desktop needs for creating a notification for a message
-   */
-  public getMessageNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
-    return (this._transport.request('get_message_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
-  }
-
-  /**
-   * 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>;
-  }
-
-  /**
-   * Asks the core to start downloading a message fully.
-   * This function is typically called when the user hits the "Download" button
-   * that is shown by the UI in case `download_state` is `'Available'` or `'Failure'`
-   *
-   * On success, the @ref DC_MSG "view type of the message" may change
-   * or the message may be replaced completely by one or more messages with other message IDs.
-   * That may happen e.g. in cases where the message was encrypted
-   * and the type could not be determined without fully downloading.
-   * Downloaded content can be accessed as usual after download.
-   *
-   * To reflect these changes a @ref DC_EVENT_MSGS_CHANGED event will be emitted.
-   */
-  public downloadFullMessage(accountId: T.U32, messageId: T.U32): Promise<null> {
-    return (this._transport.request('download_full_message', [accountId, messageId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Search messages containing the given query string.
-   * Searching can be done globally (chat_id=0) or in a specified chat only (chat_id set).
-   *
-   * Global chat results are typically displayed using dc_msg_get_summary(), chat
-   * search results may just hilite the corresponding messages and present a
-   * prev/next button.
-   *
-   * For global search, result is limited to 1000 messages,
-   * this allows incremental search done fast.
-   * So, when getting exactly 1000 results, the result may be truncated;
-   * the UIs may display sth. as "1000+ messages found" in this case.
-   * Chat search (if a chat_id is set) is not limited.
-   */
-  public searchMessages(accountId: T.U32, query: string, chatId: (T.U32|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('search_messages', [accountId, query, chatId] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public messageIdsToSearchResults(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.MessageSearchResult>> {
-    return (this._transport.request('message_ids_to_search_results', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.MessageSearchResult>>;
+  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>>;
   }
 
   /**
    * Get a single contact options by ID.
    */
-  public getContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
-    return (this._transport.request('get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
+  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>;
   }
 
   /**
@@ -685,263 +196,55 @@ export class RawClient {
    *
    * Returns contact id of the created or existing contact
    */
-  public createContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
-    return (this._transport.request('create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
+  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 createChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
-    return (this._transport.request('create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
+  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 blockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('block_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  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 unblockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('unblock_contact', [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 getBlockedContacts(accountId: T.U32): Promise<(T.Contact)[]> {
-    return (this._transport.request('get_blocked_contacts', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
+  public contactsGetBlocked(accountId: T.U32): Promise<(T.Contact)[]> {
+    return (this._transport.request('contacts_get_blocked', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
   }
 
 
-  public getContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
+  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 getContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
-    return (this._transport.request('get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
+  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 getContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
-    return (this._transport.request('get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
-  }
-
-
-  public deleteContact(accountId: T.U32, contactId: T.U32): Promise<boolean> {
-    return (this._transport.request('delete_contact', [accountId, contactId] as RPC.Params)) as Promise<boolean>;
-  }
-
-
-  public changeContactName(accountId: T.U32, contactId: T.U32, name: string): Promise<null> {
-    return (this._transport.request('change_contact_name', [accountId, contactId, name] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get encryption info for a contact.
-   * Get a multi-line encryption info, containing your fingerprint and the
-   * fingerprint of the contact, used e.g. to compare the fingerprints for a simple out-of-band verification.
-   */
-  public getContactEncryptionInfo(accountId: T.U32, contactId: T.U32): Promise<string> {
-    return (this._transport.request('get_contact_encryption_info', [accountId, contactId] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * Check if an e-mail address belongs to a known and unblocked contact.
-   * To get a list of all known and unblocked contacts, use contacts_get_contacts().
-   *
-   * To validate an e-mail address independently of the contact database
-   * use check_email_validity().
-   */
-  public lookupContactIdByAddr(accountId: T.U32, addr: string): Promise<(T.U32|null)> {
-    return (this._transport.request('lookup_contact_id_by_addr', [accountId, addr] as RPC.Params)) as Promise<(T.U32|null)>;
-  }
-
-  /**
-   * 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 getChatMedia(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('get_chat_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Search next/previous message based on a given message and a list of types.
-   * Typically used to implement the "next" and "previous" buttons
-   * in a gallery or in a media player.
-   *
-   * one combined call for getting chat::get_next_media for both directions
-   * the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
-   */
-  public getNeighboringChatMedia(accountId: T.U32, msgId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<[(T.U32|null),(T.U32|null)]> {
-    return (this._transport.request('get_neighboring_chat_media', [accountId, msgId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<[(T.U32|null),(T.U32|null)]>;
-  }
-
-
-  public exportBackup(accountId: T.U32, destination: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('export_backup', [accountId, destination, passphrase] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public importBackup(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('import_backup', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Indicate that the network likely has come back.
-   * or just that the network conditions might have changed
-   */
-  public maybeNetwork(): Promise<null> {
-    return (this._transport.request('maybe_network', [] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get the current connectivity, i.e. whether the device is connected to the IMAP server.
-   * One of:
-   * - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
-   * - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
-   * - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
-   * - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
-   *
-   * We don't use exact values but ranges here so that we can split up
-   * states into multiple states in the future.
-   *
-   * Meant as a rough overview that can be shown
-   * e.g. in the title of the main screen.
-   *
-   * If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-   */
-  public getConnectivity(accountId: T.U32): Promise<T.U32> {
-    return (this._transport.request('get_connectivity', [accountId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Get an overview of the current connectivity, and possibly more statistics.
-   * Meant to give the user more insight about the current status than
-   * the basic connectivity info returned by get_connectivity(); show this
-   * e.g., if the user taps on said basic connectivity info.
-   *
-   * If this page changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-   *
-   * This comes as an HTML from the core so that we can easily improve it
-   * and the improvement instantly reaches all UIs.
-   */
-  public getConnectivityHtml(accountId: T.U32): Promise<string> {
-    return (this._transport.request('get_connectivity_html', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-
-  public getLocations(accountId: T.U32, chatId: (T.U32|null), contactId: (T.U32|null), timestampBegin: T.I64, timestampEnd: T.I64): Promise<(T.Location)[]> {
-    return (this._transport.request('get_locations', [accountId, chatId, contactId, timestampBegin, timestampEnd] as RPC.Params)) as Promise<(T.Location)[]>;
-  }
-
-
-  public sendWebxdcStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
-    return (this._transport.request('send_webxdc_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getWebxdcStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
-    return (this._transport.request('get_webxdc_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * Get info from a webxdc message
-   */
-  public getWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
-    return (this._transport.request('get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
-  }
-
-  /**
-   * 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.
-   */
-  public forwardMessages(accountId: T.U32, messageIds: (T.U32)[], chatId: T.U32): Promise<null> {
-    return (this._transport.request('forward_messages', [accountId, messageIds, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public sendSticker(accountId: T.U32, chatId: T.U32, stickerPath: string): Promise<T.U32> {
-    return (this._transport.request('send_sticker', [accountId, chatId, stickerPath] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Send a reaction to message.
-   *
-   * Reaction is a string of emojis separated by spaces. Reaction to a
-   * single message can be sent multiple times. The last reaction
-   * received overrides all previously received reactions. It is
-   * possible to remove all reactions by sending an empty string.
-   */
-  public sendReaction(accountId: T.U32, messageId: T.U32, reaction: (string)[]): Promise<T.U32> {
-    return (this._transport.request('send_reaction', [accountId, messageId, reaction] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public removeDraft(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('remove_draft', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   *  Get draft for a chat, if any.
-   */
-  public getDraft(accountId: T.U32, chatId: T.U32): Promise<(T.Message|null)> {
-    return (this._transport.request('get_draft', [accountId, chatId] as RPC.Params)) as Promise<(T.Message|null)>;
-  }
-
-
-  public sendVideochatInvitation(accountId: T.U32, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('send_videochat_invitation', [accountId, chatId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public miscGetStickerFolder(accountId: T.U32): Promise<string> {
-    return (this._transport.request('misc_get_sticker_folder', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * save a sticker to a collection/folder in the account's sticker folder
-   */
-  public miscSaveSticker(accountId: T.U32, msgId: T.U32, collection: string): Promise<null> {
-    return (this._transport.request('misc_save_sticker', [accountId, msgId, collection] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * for desktop, get stickers from stickers folder,
-   * grouped by the collection/folder they are in.
-   */
-  public miscGetStickers(accountId: T.U32): Promise<Record<string,(string)[]>> {
-    return (this._transport.request('misc_get_stickers', [accountId] as RPC.Params)) as Promise<Record<string,(string)[]>>;
+  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 the messageid of the sent message
    */
-  public miscSendTextMessage(accountId: T.U32, chatId: T.U32, text: string): Promise<T.U32> {
-    return (this._transport.request('misc_send_text_message', [accountId, chatId, text] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public miscSendMsg(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), location: ([T.F64,T.F64]|null), quotedMessageId: (T.U32|null)): Promise<[T.U32,T.Message]> {
-    return (this._transport.request('misc_send_msg', [accountId, chatId, text, file, location, quotedMessageId] as RPC.Params)) as Promise<[T.U32,T.Message]>;
-  }
-
-
-  public miscSetDraft(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), quotedMessageId: (T.U32|null)): Promise<null> {
-    return (this._transport.request('misc_set_draft', [accountId, chatId, text, file, quotedMessageId] as RPC.Params)) as Promise<null>;
+  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/constants.ts

@@ -1,199 +0,0 @@
-// Generated!
-
-export enum C {
-  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
-  DC_CERTCK_AUTO = 0,
-  DC_CERTCK_STRICT = 1,
-  DC_CHAT_ID_ALLDONE_HINT = 7,
-  DC_CHAT_ID_ARCHIVED_LINK = 6,
-  DC_CHAT_ID_LAST_SPECIAL = 9,
-  DC_CHAT_ID_TRASH = 3,
-  DC_CHAT_TYPE_BROADCAST = 160,
-  DC_CHAT_TYPE_GROUP = 120,
-  DC_CHAT_TYPE_MAILINGLIST = 140,
-  DC_CHAT_TYPE_SINGLE = 100,
-  DC_CHAT_TYPE_UNDEFINED = 0,
-  DC_CONNECTIVITY_CONNECTED = 4000,
-  DC_CONNECTIVITY_CONNECTING = 2000,
-  DC_CONNECTIVITY_NOT_CONNECTED = 1000,
-  DC_CONNECTIVITY_WORKING = 3000,
-  DC_CONTACT_ID_DEVICE = 5,
-  DC_CONTACT_ID_INFO = 2,
-  DC_CONTACT_ID_LAST_SPECIAL = 9,
-  DC_CONTACT_ID_SELF = 1,
-  DC_GCL_ADD_ALLDONE_HINT = 4,
-  DC_GCL_ADD_SELF = 2,
-  DC_GCL_ARCHIVED_ONLY = 1,
-  DC_GCL_FOR_FORWARDING = 8,
-  DC_GCL_NO_SPECIALS = 2,
-  DC_GCL_VERIFIED_ONLY = 1,
-  DC_GCM_ADDDAYMARKER = 1,
-  DC_GCM_INFO_ONLY = 2,
-  DC_KEY_GEN_DEFAULT = 0,
-  DC_KEY_GEN_ED25519 = 2,
-  DC_KEY_GEN_RSA2048 = 1,
-  DC_LP_AUTH_NORMAL = 4,
-  DC_LP_AUTH_OAUTH2 = 2,
-  DC_MEDIA_QUALITY_BALANCED = 0,
-  DC_MEDIA_QUALITY_WORSE = 1,
-  DC_MSG_ID_DAYMARKER = 9,
-  DC_MSG_ID_LAST_SPECIAL = 9,
-  DC_MSG_ID_MARKER1 = 1,
-  DC_PROVIDER_STATUS_BROKEN = 3,
-  DC_PROVIDER_STATUS_OK = 1,
-  DC_PROVIDER_STATUS_PREPARATION = 2,
-  DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1,
-  DC_SHOW_EMAILS_ALL = 2,
-  DC_SHOW_EMAILS_OFF = 0,
-  DC_SOCKET_AUTO = 0,
-  DC_SOCKET_PLAIN = 3,
-  DC_SOCKET_SSL = 1,
-  DC_SOCKET_STARTTLS = 2,
-  DC_STATE_IN_FRESH = 10,
-  DC_STATE_IN_NOTICED = 13,
-  DC_STATE_IN_SEEN = 16,
-  DC_STATE_OUT_DELIVERED = 26,
-  DC_STATE_OUT_DRAFT = 19,
-  DC_STATE_OUT_FAILED = 24,
-  DC_STATE_OUT_MDN_RCVD = 28,
-  DC_STATE_OUT_PENDING = 20,
-  DC_STATE_OUT_PREPARING = 18,
-  DC_STATE_UNDEFINED = 0,
-  DC_STR_AC_SETUP_MSG_BODY = 43,
-  DC_STR_AC_SETUP_MSG_SUBJECT = 42,
-  DC_STR_ADD_MEMBER_BY_OTHER = 129,
-  DC_STR_ADD_MEMBER_BY_YOU = 128,
-  DC_STR_AEAP_ADDR_CHANGED = 122,
-  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
-  DC_STR_ARCHIVEDCHATS = 40,
-  DC_STR_AUDIO = 11,
-  DC_STR_BAD_TIME_MSG_BODY = 85,
-  DC_STR_BROADCAST_LIST = 115,
-  DC_STR_CANNOT_LOGIN = 60,
-  DC_STR_CANTDECRYPT_MSG_BODY = 29,
-  DC_STR_CONFIGURATION_FAILED = 84,
-  DC_STR_CONNECTED = 107,
-  DC_STR_CONNTECTING = 108,
-  DC_STR_CONTACT_NOT_VERIFIED = 36,
-  DC_STR_CONTACT_SETUP_CHANGED = 37,
-  DC_STR_CONTACT_VERIFIED = 35,
-  DC_STR_DEVICE_MESSAGES = 68,
-  DC_STR_DEVICE_MESSAGES_HINT = 70,
-  DC_STR_DOWNLOAD_AVAILABILITY = 100,
-  DC_STR_DRAFT = 3,
-  DC_STR_E2E_AVAILABLE = 25,
-  DC_STR_E2E_PREFERRED = 34,
-  DC_STR_ENCRYPTEDMSG = 24,
-  DC_STR_ENCR_NONE = 28,
-  DC_STR_ENCR_TRANSP = 27,
-  DC_STR_EPHEMERAL_DAY = 79,
-  DC_STR_EPHEMERAL_DAYS = 95,
-  DC_STR_EPHEMERAL_DISABLED = 75,
-  DC_STR_EPHEMERAL_FOUR_WEEKS = 81,
-  DC_STR_EPHEMERAL_HOUR = 78,
-  DC_STR_EPHEMERAL_HOURS = 94,
-  DC_STR_EPHEMERAL_MINUTE = 77,
-  DC_STR_EPHEMERAL_MINUTES = 93,
-  DC_STR_EPHEMERAL_SECONDS = 76,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER = 147,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU = 146,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER = 145,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU = 144,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER = 143,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU = 142,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER = 149,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU = 148,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER = 155,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU = 154,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER = 139,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU = 138,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER = 153,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU = 152,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER = 151,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU = 150,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER = 141,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU = 140,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER = 157,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU = 156,
-  DC_STR_EPHEMERAL_WEEK = 80,
-  DC_STR_EPHEMERAL_WEEKS = 96,
-  DC_STR_ERROR = 112,
-  DC_STR_ERROR_NO_NETWORK = 87,
-  DC_STR_FAILED_SENDING_TO = 74,
-  DC_STR_FILE = 12,
-  DC_STR_FINGERPRINTS = 30,
-  DC_STR_FORWARDED = 97,
-  DC_STR_GIF = 23,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER = 127,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU = 126,
-  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER = 135,
-  DC_STR_GROUP_IMAGE_DELETED_BY_YOU = 134,
-  DC_STR_GROUP_LEFT_BY_OTHER = 133,
-  DC_STR_GROUP_LEFT_BY_YOU = 132,
-  DC_STR_GROUP_NAME_CHANGED_BY_OTHER = 125,
-  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
-  DC_STR_IMAGE = 9,
-  DC_STR_INCOMING_MESSAGES = 103,
-  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
-  DC_STR_LOCATION = 66,
-  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
-  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
-  DC_STR_MESSAGES = 114,
-  DC_STR_MSGACTIONBYME = 63,
-  DC_STR_MSGACTIONBYUSER = 62,
-  DC_STR_MSGADDMEMBER = 17,
-  DC_STR_MSGDELMEMBER = 18,
-  DC_STR_MSGGROUPLEFT = 19,
-  DC_STR_MSGGRPIMGCHANGED = 16,
-  DC_STR_MSGGRPIMGDELETED = 33,
-  DC_STR_MSGGRPNAME = 15,
-  DC_STR_MSGLOCATIONDISABLED = 65,
-  DC_STR_MSGLOCATIONENABLED = 64,
-  DC_STR_NOMESSAGES = 1,
-  DC_STR_NOT_CONNECTED = 121,
-  DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
-  DC_STR_ONE_MOMENT = 106,
-  DC_STR_OUTGOING_MESSAGES = 104,
-  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
-  DC_STR_PART_OF_TOTAL_USED = 116,
-  DC_STR_PROTECTION_DISABLED = 89,
-  DC_STR_PROTECTION_DISABLED_BY_OTHER = 161,
-  DC_STR_PROTECTION_DISABLED_BY_YOU = 160,
-  DC_STR_PROTECTION_ENABLED = 88,
-  DC_STR_PROTECTION_ENABLED_BY_OTHER = 159,
-  DC_STR_PROTECTION_ENABLED_BY_YOU = 158,
-  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
-  DC_STR_READRCPT = 31,
-  DC_STR_READRCPT_MAILBODY = 32,
-  DC_STR_REMOVE_MEMBER_BY_OTHER = 131,
-  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
-  DC_STR_REPLY_NOUN = 90,
-  DC_STR_SAVED_MESSAGES = 69,
-  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
-  DC_STR_SECURE_JOIN_REPLIES = 118,
-  DC_STR_SECURE_JOIN_STARTED = 117,
-  DC_STR_SELF = 2,
-  DC_STR_SELF_DELETED_MSG_BODY = 91,
-  DC_STR_SENDING = 110,
-  DC_STR_SERVER_TURNED_OFF = 92,
-  DC_STR_SETUP_CONTACT_QR_DESC = 119,
-  DC_STR_STICKER = 67,
-  DC_STR_STORAGE_ON_DOMAIN = 105,
-  DC_STR_SUBJECT_FOR_NEW_CONTACT = 73,
-  DC_STR_SYNC_MSG_BODY = 102,
-  DC_STR_SYNC_MSG_SUBJECT = 101,
-  DC_STR_UNKNOWN_SENDER_FOR_CHAT = 72,
-  DC_STR_UPDATE_REMINDER_MSG_BODY = 86,
-  DC_STR_UPDATING = 109,
-  DC_STR_VIDEO = 10,
-  DC_STR_VIDEOCHAT_INVITATION = 82,
-  DC_STR_VIDEOCHAT_INVITE_MSG_BODY = 83,
-  DC_STR_VOICEMESSAGE = 7,
-  DC_STR_WELCOME_MESSAGE = 71,
-  DC_TEXT1_DRAFT = 1,
-  DC_TEXT1_SELF = 3,
-  DC_TEXT1_USERNAME = 2,
-  DC_VIDEOCHATTYPE_BASICWEBRTC = 1,
-  DC_VIDEOCHATTYPE_JITSI = 2,
-  DC_VIDEOCHATTYPE_UNKNOWN = 0,
-}

deltachat-jsonrpc/typescript/generated/events.ts

@@ -1,214 +1,3 @@
 // AUTO-GENERATED by typescript-type-def
 
-export type U32=number;
-export type Usize=number;
-export type Event=(({
-/**
- * The library-user may write an informational string to the log.
- * 
- * This event should *not* be reported to the end-user using a popup or something like
- * that.
- */
-"type":"Info";}&{"msg":string;})|({
-/**
- * Emitted when SMTP connection is established and login was successful.
- */
-"type":"SmtpConnected";}&{"msg":string;})|({
-/**
- * Emitted when IMAP connection is established and login was successful.
- */
-"type":"ImapConnected";}&{"msg":string;})|({
-/**
- * Emitted when a message was successfully sent to the SMTP server.
- */
-"type":"SmtpMessageSent";}&{"msg":string;})|({
-/**
- * Emitted when an IMAP message has been marked as deleted
- */
-"type":"ImapMessageDeleted";}&{"msg":string;})|({
-/**
- * Emitted when an IMAP message has been moved
- */
-"type":"ImapMessageMoved";}&{"msg":string;})|({
-/**
- * Emitted when an new file in the $BLOBDIR was created
- */
-"type":"NewBlobFile";}&{"file":string;})|({
-/**
- * Emitted when an file in the $BLOBDIR was deleted
- */
-"type":"DeletedBlobFile";}&{"file":string;})|({
-/**
- * The library-user should write a warning string to the log.
- * 
- * This event should *not* be reported to the end-user using a popup or something like
- * that.
- */
-"type":"Warning";}&{"msg":string;})|({
-/**
- * The library-user should report an error to the end-user.
- * 
- * As most things are asynchronous, things may go wrong at any time and the user
- * should not be disturbed by a dialog or so.  Instead, use a bubble or so.
- * 
- * However, for ongoing processes (eg. configure())
- * or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
- * it might be better to delay showing these events until the function has really
- * failed (returned false). It should be sufficient to report only the *last* error
- * in a messasge box then.
- */
-"type":"Error";}&{"msg":string;})|({
-/**
- * An action cannot be performed because the user is not in the group.
- * Reported eg. after a call to
- * setChatName(), setChatProfileImage(),
- * addContactToChat(), removeContactFromChat(),
- * and messages sending functions.
- */
-"type":"ErrorSelfNotInGroup";}&{"msg":string;})|({
-/**
- * Messages or chats changed.  One or more messages or chats changed for various
- * reasons in the database:
- * - Messages sent, received or removed
- * - Chats created, deleted or archived
- * - A draft has been set
- * 
- * `chatId` is set if only a single chat is affected by the changes, otherwise 0.
- * `msgId` is set if only a single message is affected by the changes, otherwise 0.
- */
-"type":"MsgsChanged";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * Reactions for the message changed.
- */
-"type":"ReactionsChanged";}&{"chatId":U32;"msgId":U32;"contactId":U32;})|({
-/**
- * There is a fresh message. Typically, the user will show an notification
- * when receiving this message.
- * 
- * There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
- */
-"type":"IncomingMsg";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * Downloading a bunch of messages just finished. This is an experimental
- * event to allow the UI to only show one notification per message bunch,
- * instead of cluttering the user with many notifications.
- * 
- * msg_ids contains the message ids.
- */
-"type":"IncomingMsgBunch";}&{"msgIds":(U32)[];})|({
-/**
- * Messages were seen or noticed.
- * chat id is always set.
- */
-"type":"MsgsNoticed";}&{"chatId":U32;})|({
-/**
- * A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
- * DC_STATE_OUT_DELIVERED, see `Message.state`.
- */
-"type":"MsgDelivered";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
- * DC_STATE_OUT_FAILED, see `Message.state`.
- */
-"type":"MsgFailed";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
- * DC_STATE_OUT_MDN_RCVD, see `Message.state`.
- */
-"type":"MsgRead";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * Chat changed.  The name or the image of a chat group was changed or members were added or removed.
- * Or the verify state of a chat has changed.
- * See setChatName(), setChatProfileImage(), addContactToChat()
- * and removeContactFromChat().
- * 
- * This event does not include ephemeral timer modification, which
- * is a separate event.
- */
-"type":"ChatModified";}&{"chatId":U32;})|({
-/**
- * Chat ephemeral timer changed.
- */
-"type":"ChatEphemeralTimerModified";}&{"chatId":U32;"timer":U32;})|({
-/**
- * Contact(s) created, renamed, blocked or deleted.
- * 
- * @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
- */
-"type":"ContactsChanged";}&{"contactId":(U32|null);})|({
-/**
- * Location of one or more contact has changed.
- * 
- * @param data1 (u32) contact_id of the contact for which the location has changed.
- *     If the locations of several contacts have been changed,
- *     this parameter is set to `None`.
- */
-"type":"LocationChanged";}&{"contactId":(U32|null);})|({
-/**
- * Inform about the configuration progress started by configure().
- */
-"type":"ConfigureProgress";}&{
-/**
- * Progress.
- * 
- * 0=error, 1-999=progress in permille, 1000=success and done
- */
-"progress":Usize;
-/**
- * Progress comment or error, something to display to the user.
- */
-"comment":(string|null);})|({
-/**
- * Inform about the import/export progress started by imex().
- * 
- * @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
- * @param data2 0
- */
-"type":"ImexProgress";}&{"progress":Usize;})|({
-/**
- * A file has been exported. A file has been written by imex().
- * This event may be sent multiple times by a single call to imex().
- * 
- * A typical purpose for a handler of this event may be to make the file public to some system
- * services.
- * 
- * @param data2 0
- */
-"type":"ImexFileWritten";}&{"path":string;})|({
-/**
- * Progress information of a secure-join handshake from the view of the inviter
- * (Alice, the person who shows the QR code).
- * 
- * These events are typically sent after a joiner has scanned the QR code
- * generated by getChatSecurejoinQrCodeSvg().
- * 
- * @param data1 (int) ID of the contact that wants to join.
- * @param data2 (int) Progress as:
- *     300=vg-/vc-request received, typically shown as "bob@addr joins".
- *     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
- *     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
- *     1000=Protocol finished for this contact.
- */
-"type":"SecurejoinInviterProgress";}&{"contactId":U32;"progress":Usize;})|({
-/**
- * Progress information of a secure-join handshake from the view of the joiner
- * (Bob, the person who scans the QR code).
- * The events are typically sent while secureJoin(), which
- * may take some time, is executed.
- * @param data1 (int) ID of the inviting contact.
- * @param data2 (int) Progress as:
- *     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
- *     (Bob has verified alice and waits until Alice does the same for him)
- */
-"type":"SecurejoinJoinerProgress";}&{"contactId":U32;"progress":Usize;})|{
-/**
- * The connectivity to the server changed.
- * This means that you should refresh the connectivity view
- * and possibly the connectivtiy HTML; see getConnectivity() and
- * getConnectivityHtml() for details.
- */
-"type":"ConnectivityChanged";}|{"type":"SelfavatarChanged";}|({"type":"WebxdcStatusUpdate";}&{"msgId":U32;"statusUpdateSerial":U32;})|({
-/**
- * Inform that a message containing a webxdc instance has been deleted
- */
-"type":"WebxdcInstanceDeleted";}&{"msgId":U32;}));
+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");

deltachat-jsonrpc/typescript/generated/types.ts

@@ -1,199 +1,15 @@
 // 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 U64=number;
-export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
-export type U8=number;
-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;})|({"type":"login";}&{"address":string;})|({"type":"backup";}&{"ticket":(U8)[];}));
-export type Usize=number;
-export type I64=number;
+export type Account=(({"type":"Configured";}&{"id":U32;"display_name":(string|null);"addr":(string|null);"profile_image":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
+export type ProviderInfo={"before_login_hint":string;"overview_page":string;"status":U32;};
 export type ChatListEntry=[U32,U32];
-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;
-/**
- * the contact's last seen timestamp
- */
-"lastSeen":I64;"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;"mailingListAddress":(string|null);};
-
-/**
- * cheaper version of fullchat, omits:
- * - contacts
- * - contact_ids
- * - fresh_message_counter
- * - ephemeral_timer
- * - self_in_group
- * - was_seen_recently
- * - can_send
- * 
- * used when you only need the basic metadata of a chat like type, name, profile picture
- */
-export type BasicChat=
-/**
- * cheaper version of fullchat, omits:
- * - contacts
- * - contact_ids
- * - fresh_message_counter
- * - ephemeral_timer
- * - self_in_group
- * - was_seen_recently
- * - can_send
- * 
- * used when you only need the basic metadata of a chat like type, name, profile picture
- */
-{"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"color":string;"isContactRequest":boolean;"isDeviceChat":boolean;"isMuted":boolean;};
-export type ChatVisibility=("Normal"|"Archived"|"Pinned");
-export type MuteDuration=("NotMuted"|"Forever"|{"Until":I64;});
-export type MessageListItem=(({"kind":"message";}&{"msg_id":U32;})|({
-/**
- * Day marker, separating messages that correspond to different
- * days according to local time.
- */
-"kind":"dayMarker";}&{
-/**
- * Marker timestamp, for day markers, in unix milliseconds
- */
-"timestamp":I64;}));
-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 MessageQuote=(({"kind":"JustText";}&{"text":string;})|({"kind":"WithMessage";}&{"text":string;"messageId":U32;"authorDisplayName":string;"authorDisplayColor":string;"overrideSenderName":(string|null);"image":(string|null);"isForwarded":boolean;"viewType":Viewtype;}));
-export type SystemMessageType=("Unknown"|"GroupNameChanged"|"GroupImageChanged"|"MemberAddedToGroup"|"MemberRemovedFromGroup"|"AutocryptSetupMessage"|"SecurejoinMessage"|"LocationStreamingEnabled"|"LocationOnly"|
-/**
- * Chat ephemeral message timer is changed.
- */
-"EphemeralTimerChanged"|"ChatProtectionEnabled"|"ChatProtectionDisabled"|
-/**
- * Self-sent-message that contains only json used for multi-device-sync;
- * if possible, we attach that to other messages as for locations.
- */
-"MultiDeviceSync"|"WebxdcStatusUpdate"|
-/**
- * Webxdc info added with `info` set in `send_webxdc_status_update()`.
- */
-"WebxdcInfoMessage");
+export type I64=number;
+export type Usize=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;})|{"type":"ArchiveLink";}|({"type":"Error";}&{"id":U32;"error":string;}));
+export type Contact={"address":string;"color":string;"auth_name":string;"status":string;"display_name":string;"id":U32;"name":string;"profile_image":(string|null);"name_and_addr":string;"is_blocked":boolean;"is_verified":boolean;};
+export type FullChat={"id":U32;"name":string;"is_protected":boolean;"profile_image":(string|null);"archived":boolean;"chat_type":U32;"is_unpromoted":boolean;"is_self_talk":boolean;"contacts":(Contact)[];"contact_ids":(U32)[];"color":string;"fresh_message_counter":Usize;"is_contact_request":boolean;"is_device_chat":boolean;"self_in_group":boolean;"is_muted":boolean;"ephemeral_timer":U32;"can_send":boolean;};
 export type I32=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 DownloadState=("Done"|"Available"|"Failure"|"InProgress");
-
-/**
- * Structure representing all reactions to a particular message.
- */
-export type Reactions=
-/**
- * Structure representing all reactions to a particular message.
- */
-{
-/**
- * Map from a contact to it's reaction to message.
- */
-"reactionsByContact":Record<U32,(string)[]>;
-/**
- * Unique reactions and their count
- */
-"reactions":Record<string,U32>;};
-export type Message={"id":U32;"chatId":U32;"fromId":U32;"quote":(MessageQuote|null);"parentId":(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;
-/**
- * when is_info is true this describes what type of system message it is
- */
-"systemMessageType":SystemMessageType;"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);"downloadState":DownloadState;"reactions":(Reactions|null);};
-export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"image":(string|null);"imageMimeType":(string|null);"chatName":string;"chatProfileImage":(string|null);
-/**
- * also known as summary_text1
- */
-"summaryPrefix":(string|null);
-/**
- * also known as summary_text2
- */
-"summaryText":string;};
-export type MessageSearchResult={"id":U32;"authorProfileImage":(string|null);"authorName":string;"authorColor":string;"chatName":(string|null);"message":string;"timestamp":I64;};
-export type F64=number;
-export type Location={"locationId":U32;"isIndependent":boolean;"latitude":F64;"longitude":F64;"accuracy":F64;"timestamp":I64;"contactId":U32;"msgId":U32;"chatId":U32;"marker":(string|null);};
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,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)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,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,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,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,boolean,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,(string)[],U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,U32,string,null,U32,Record<string,(string)[]>,U32,U32,string,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];
+export type U64=number;
+export type Message={"id":U32;"chat_id":U32;"from_id":U32;"quoted_text":(string|null);"quoted_message_id":(U32|null);"text":(string|null);"has_location":boolean;"has_html":boolean;"view_type":U32;"state":U32;"timestamp":I64;"sort_timestamp":I64;"received_timestamp":I64;"has_deviating_timestamp":boolean;"subject":string;"show_padlock":boolean;"is_setupmessage":boolean;"is_info":boolean;"is_forwarded":boolean;"duration":I32;"dimensions_height":I32;"dimensions_width":I32;"videochat_type":(U32|null);"videochat_url":(string|null);"override_sender_name":(string|null);"sender":Contact;"setup_code_begin":(string|null);"file":(string|null);"file_mime":(string|null);"file_bytes":U64;"file_name":(string|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,(string|null),U32,(string)[],Record<string,(string|null)>,U32,null,U32,null,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,U32,(U32)[],U32,U32,Message,U32,(U32)[],Record<U32,Message>,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,string,U32,U32];

deltachat-jsonrpc/typescript/index.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>DeltaChat JSON-RPC example</title>
     <style>
       body {
         font-family: monospace;
@@ -42,7 +41,6 @@
     <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>

deltachat-jsonrpc/typescript/node-demo.js

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

deltachat-jsonrpc/typescript/package.json

@@ -1,11 +1,30 @@
 {
+  "name": "@deltachat/jsonrpc-client",
+  "version": "0.1.0",
+  "main": "dist/deltachat.js",
+  "types": "dist/deltachat.d.ts",
+  "type": "module",
   "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
+  "license": "MPL-2.0",
+  "scripts": {
+    "prettier:check": "prettier --check **.ts",
+    "prettier:fix": "prettier --write **.ts",
+    "build": "npm run generate-bindings && tsc",
+    "bundle": "npm run build && esbuild --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
+    "generate-bindings": "cargo test",
+    "example:build": "tsc && esbuild --bundle dist/example.js --outfile=dist/example.bundle.js",
+    "example:dev": "esbuild example.ts --bundle --outdir=dist --servedir=.",
+    "coverage": "tsc -b test && COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include \"dist/*\" -r text -r html -r json mocha test_dist && node report_api_coverage.mjs",
+    "test": "rm -rf dist && npm run build && npm run coverage && npm run prettier:check"
+  },
   "dependencies": {
-    "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.3.3"
+    "tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
+    "yerpc": "^0.2.3"
   },
   "devDependencies": {
+    "prettier": "^2.6.2",
+    "chai-as-promised": "^7.1.1",
     "@types/chai": "^4.2.21",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^9.0.0",
@@ -13,40 +32,10 @@
     "@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 extract-constants 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 .",
-    "extract-constants": "node ./scripts/generate-constants.js",
-    "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 --package deltachat-rpc-server --bin deltachat-rpc-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.102.0"
-}
+  }
+}

deltachat-jsonrpc/typescript/report_api_coverage.mjs

@@ -1,14 +1,14 @@
 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 generated_file = "typescript/generated/client.ts";
 const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
 const jsonCoverage =
-  json[Object.keys(json).find((k) => k.includes(generatedFile))];
+  json[Object.keys(json).find((k) => k.includes(generated_file))];
 const fnMap = Object.keys(jsonCoverage.fnMap).map(
   (key) => jsonCoverage.fnMap[key]
 );
 const htmlCoverage = readFileSync(
-  "./coverage/" + generatedFile + ".html",
+  "./coverage/" + generated_file + ".html",
   "utf8"
 );
 const uncoveredLines = htmlCoverage
@@ -22,7 +22,7 @@ console.log(
     uncoveredFunctions
       .map((uF) => fnMap.find(({ name }) => name === uF))
       .map(
-        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`
+        ({ name, line }) => `.${name.padEnd(40)}  (${generated_file}:${line})`
       )
       .join("\n")
 );

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

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-import { readFileSync, writeFileSync } from "fs";
-import { resolve } from "path";
-import { fileURLToPath } from "url";
-import { dirname } from "path";
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const data = [];
-const header = resolve(__dirname, "../../../deltachat-ffi/deltachat.h");
-
-console.log("Generating constants...");
-
-const header_data = readFileSync(header, "UTF-8");
-const regex = /^#define\s+(\w+)\s+(\w+)/gm;
-let match;
-while (null != (match = regex.exec(header_data))) {
-  const key = match[1];
-  const value = parseInt(match[2]);
-  if (!isNaN(value)) {
-    data.push({ key, value });
-  }
-}
-
-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;
-  })
-  .filter(({ key }) => {
-    // filter out what we don't need it
-    return !(
-      key.startsWith("DC_EVENT_") ||
-      key.startsWith("DC_IMEX_") ||
-      key.startsWith("DC_CHAT_VISIBILITY") ||
-      key.startsWith("DC_DOWNLOAD") ||
-      key.startsWith("DC_INFO_") ||
-      (key.startsWith("DC_MSG") && !key.startsWith("DC_MSG_ID")) ||
-      key.startsWith("DC_QR_")
-    );
-  })
-  .map((row) => {
-    return `  ${row.key}: ${row.value}`;
-  })
-  .join(",\n");
-
-writeFileSync(
-  resolve(__dirname, "../generated/constants.ts"),
-  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`
-);

deltachat-jsonrpc/typescript/src/client.ts

@@ -1,59 +1,39 @@
 import * as T from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { Event } from "../generated/events.js";
+import { EventTypeName } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "@deltachat/tiny-emitter";
+import { TinyEmitter } from "tiny-emitter";
 
-type DCWireEvent<T extends Event> = {
-  event: T;
+export type DeltachatEvent = {
+  id: EventTypeName;
   contextId: number;
+  field1: any;
+  field2: any;
 };
-// export type Events = Record<
-//   Event["type"] | "ALL",
-//   (event: DeltaChatEvent<Event>) => void
-// >;
+export type Events = Record<
+  EventTypeName | "ALL",
+  (event: DeltachatEvent) => void
+>;
 
-type Events = { ALL: (accountId: number, event: Event) => void } & {
-  [Property in Event["type"]]: (
-    accountId: number,
-    event: Extract<Event, { type: Property }>
-  ) => void;
-};
-
-type ContextEvents = { ALL: (event: Event) => void } & {
-  [Property in Event["type"]]: (
-    event: Extract<Event, { type: Property }>
-  ) => void;
-};
-
-export type DcEvent = Event;
-export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>;
-
-export class BaseDeltaChat<
-  Transport extends BaseTransport<any>
+export class BaseDeltachat<
+  Transport extends BaseTransport
 > extends TinyEmitter<Events> {
   rpc: RawClient;
   account?: T.Account;
-  private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
-  constructor(public transport: Transport) {
+  constructor(protected 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 DCWireEvent<Event>;
-	//@ts-ignore
-        this.emit(event.event.type, event.contextId, event.event as any);
-        this.emit("ALL", event.contextId, event.event as any);
+        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.event.type,
-            //@ts-ignore
-            event.event as any
-          );
-          this.contextEmitters[event.contextId].emit("ALL", event.event);
+          this.contextEmitters[event.contextId].emit(event.id, event);
+          this.contextEmitters[event.contextId].emit("ALL", event);
         }
       }
     });
@@ -63,6 +43,8 @@ export class BaseDeltaChat<
     return await this.rpc.getAllAccounts();
   }
 
+  private contextEmitters: TinyEmitter<Events>[] = [];
+
   getContextEvents(account_id: number) {
     if (this.contextEmitters[account_id]) {
       return this.contextEmitters[account_id];
@@ -80,48 +62,16 @@ export type Opts = {
 export const DEFAULT_OPTS: Opts = {
   url: "ws://localhost:20808/ws",
 };
-export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
+export class Deltachat extends BaseDeltachat<WebsocketTransport> {
   opts: Opts;
   close() {
-    this.transport.close();
+    this.transport._socket.close();
   }
-  constructor(opts?: Opts | string) {
+  constructor(opts: Opts | string | undefined) {
     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);
+    super(new WebsocketTransport(opts.url));
     this.opts = opts;
   }
 }
-
-export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
-  close() {}
-  constructor(input: any, output: any) {
-    const transport = new StdioTransport(input, output);
-    super(transport);
-  }
-}
-
-export class StdioTransport extends BaseTransport {
-  constructor(public input: any, public output: any) {
-    super();
-
-    var buffer = "";
-    this.output.on("data", (data: any) => {
-      buffer += data.toString();
-      while (buffer.includes("\n")) {
-        const n = buffer.indexOf("\n");
-        const line = buffer.substring(0, n);
-        const message = JSON.parse(line);
-        this._onmessage(message);
-        buffer = buffer.substring(n + 1);
-      }
-    });
-  }
-
-  _send(message: RPC.Message): void {
-    const serialized = JSON.stringify(message);
-    this.input.write(serialized + "\n");
-  }
-}

deltachat-jsonrpc/typescript/src/lib.ts

@@ -4,4 +4,3 @@ export * from "../generated/events.js";
 export { RawClient } from "../generated/client.js";
 export * from "./client.js";
 export * as yerpc from "yerpc";
-export { C } from "../generated/constants.js";

deltachat-jsonrpc/typescript/test/README.md

@@ -0,0 +1 @@
+# tests need to be ported to new API

deltachat-jsonrpc/typescript/test/basic.ts

@@ -2,53 +2,59 @@ import { strictEqual } from "assert";
 import chai, { assert, expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
-import { StdioDeltaChat as DeltaChat } from "../deltachat.js";
+import { Deltachat } from "../dist/deltachat.js";
 
 import {
-  RpcServerHandle,
-  startServer,
+  CMD_API_Server_Handle,
+  CMD_API_SERVER_PORT,
+  startCMD_API_Server,
 } from "./test_base.js";
 
 describe("basic tests", () => {
-  let serverHandle: RpcServerHandle;
-  let dc: DeltaChat;
+  let server_handle: CMD_API_Server_Handle;
+  let dc: Deltachat;
 
   before(async () => {
-    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout)
-    // dc.on("ALL", (event) => {
+    server_handle = await startCMD_API_Server(CMD_API_SERVER_PORT);
+    // make sure server is up by the time we continue
+    await new Promise((res) => setTimeout(res, 100));
+
+    dc = new Deltachat({
+      url: "ws://localhost:" + CMD_API_SERVER_PORT + "/ws",
+    });
+    dc.on("ALL", (event) => {
       //console.log("event", event);
-    // });
+    });
   });
 
   after(async () => {
     dc && dc.close();
-    await serverHandle.close();
+    await server_handle.close();
   });
 
-  it("check email address validity", async () => {
-    const validAddresses = [
+  it("check email", async () => {
+    const positive_test_cases = [
       "email@example.com",
       "36aa165ae3406424e0c61af17700f397cad3fe8ab83d682d0bddf3338a5dd52e@yggmail@yggmail",
     ];
-    const invalidAddresses = ["email@", "example.com", "emai221"];
+    const negative_test_cases = ["email@", "example.com", "emai221"];
 
     expect(
       await Promise.all(
-        validAddresses.map((email) => dc.rpc.checkEmailValidity(email))
+        positive_test_cases.map((email) => dc.rpc.checkEmailValidity(email))
       )
     ).to.not.contain(false);
 
     expect(
       await Promise.all(
-        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email))
+        negative_test_cases.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([
+    const system_info = await dc.rpc.getSystemInfo();
+    expect(system_info).to.contain.keys([
       "arch",
       "num_cpus",
       "deltachat_core_version",
@@ -58,7 +64,7 @@ describe("basic tests", () => {
 
   describe("account managment", () => {
     it("should create account", async () => {
-      const res = await dc.rpc.addAccount();
+      await dc.rpc.addAccount();
       assert((await dc.rpc.getAllAccountIds()).length === 1);
     });
 
@@ -77,55 +83,55 @@ describe("basic tests", () => {
   });
 
   describe("contact managment", function () {
-    let accountId: number;
+    let acc: number;
     before(async () => {
-      accountId = await dc.rpc.addAccount();
+      acc = await dc.rpc.addAccount();
     });
-    it("should block and unblock contact", async function () {
-      const contactId = await dc.rpc.createContact(
-        accountId,
+    it("block and unblock contact", async function () {
+      const contactId = await dc.rpc.contactsCreateContact(
+        acc,
         "example@delta.chat",
         null
       );
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
+      expect((await dc.rpc.contactsGetContact(acc, contactId)).is_blocked).to.be
         .false;
-      await dc.rpc.blockContact(accountId, contactId);
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
+      await dc.rpc.contactsBlock(acc, contactId);
+      expect((await dc.rpc.contactsGetContact(acc, contactId)).is_blocked).to.be
         .true;
-      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(1);
-      await dc.rpc.unblockContact(accountId, contactId);
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
+      expect(await dc.rpc.contactsGetBlocked(acc)).to.have.length(1);
+      await dc.rpc.contactsUnblock(acc, contactId);
+      expect((await dc.rpc.contactsGetContact(acc, contactId)).is_blocked).to.be
         .false;
-      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(0);
+      expect(await dc.rpc.contactsGetBlocked(acc)).to.have.length(0);
     });
   });
 
   describe("configuration", function () {
-    let accountId: number;
+    let acc: number;
     before(async () => {
-      accountId = await dc.rpc.addAccount();
+      acc = 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");
+      await dc.rpc.setConfig(acc, "addr", "valid@email");
+      assert((await dc.rpc.getConfig(acc, "addr")) == "valid@email");
     });
     it("set invalid key should throw", async function () {
-      await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to.be
+      await expect(dc.rpc.setConfig(acc, "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
+      await expect(dc.rpc.getConfig(acc, "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");
+      await dc.rpc.setConfig(acc, "ui.chat_bg", "color:red");
+      assert((await dc.rpc.getConfig(acc, "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));
+      await dc.rpc.batchSetConfig(acc, config);
+      const retrieved = await dc.rpc.batchGetConfig(acc, Object.keys(config));
       expect(retrieved).to.deep.equal(config);
     });
     it("set and retrive ui.* (batch)", async function () {
@@ -133,8 +139,8 @@ describe("basic tests", () => {
         "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));
+      await dc.rpc.batchSetConfig(acc, config);
+      const retrieved = await dc.rpc.batchGetConfig(acc, Object.keys(config));
       expect(retrieved).to.deep.equal(config);
     });
     it("set and retrive mixed(ui and core) (batch)", async function () {
@@ -144,8 +150,8 @@ describe("basic tests", () => {
         addr: "valid2@email",
         mail_pw: "123456",
       };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
+      await dc.rpc.batchSetConfig(acc, config);
+      const retrieved = await dc.rpc.batchGetConfig(acc, Object.keys(config));
       expect(retrieved).to.deep.equal(config);
     });
   });

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,18 +1,21 @@
 import { assert, expect } from "chai";
-import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
-import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
-
-const EVENT_TIMEOUT = 20000;
+import { Deltachat, DeltachatEvent, EventTypeName } from "../dist/deltachat.js";
+import {
+  CMD_API_Server_Handle,
+  CMD_API_SERVER_PORT,
+  createTempUser,
+  startCMD_API_Server,
+} from "./test_base.js";
 
 describe("online tests", function () {
-  let serverHandle: RpcServerHandle;
-  let dc: DeltaChat;
-  let account1: { email: string; password: string };
+  let server_handle: CMD_API_Server_Handle;
+  let dc: Deltachat;
+  let account: { email: string; password: string };
   let account2: { email: string; password: string };
-  let accountId1: number, accountId2: number;
+  let acc1: number, acc2: number;
 
   before(async function () {
-    this.timeout(12000);
+    this.timeout(12000)
     if (!process.env.DCC_NEW_TMP_EMAIL) {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
@@ -26,15 +29,17 @@ describe("online tests", function () {
       );
       this.skip();
     }
-    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
-
-    dc.on("ALL", (contextId, { type }) => {
-      if (type !== "Info") console.log(contextId, type);
+    server_handle = await startCMD_API_Server(CMD_API_SERVER_PORT);
+    dc = new Deltachat({
+      url: "ws://localhost:" + CMD_API_SERVER_PORT + "/ws",
     });
 
-    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
-    if (!account1 || !account1.email || !account1.password) {
+    dc.on("ALL", ({ id, contextId }) => {
+      if (id !== "Info") console.log(contextId, id);
+    });
+
+    account = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
+    if (!account || !account.email || !account.password) {
       console.log(
         "We didn't got back an account from the api, skip intergration tests"
       );
@@ -52,116 +57,117 @@ describe("online tests", function () {
 
   after(async () => {
     dc && dc.close();
-    serverHandle && (await serverHandle.close());
+    server_handle && (await server_handle.close());
   });
 
-  let accountsConfigured = false;
+  let are_configured = false;
 
   it("configure test accounts", async function () {
-    this.timeout(40000);
+    this.timeout(20000);
 
-    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);
+    acc1 = await dc.rpc.addAccount();
+    await dc.rpc.setConfig(acc1, "addr", account.email);
+    await dc.rpc.setConfig(acc1, "mail_pw", account.password);
+    let configure_promise = dc.rpc.configure(acc1);
 
-    accountId2 = await dc.rpc.addAccount();
-    await dc.rpc.batchSetConfig(accountId2, {
+    acc2 = await dc.rpc.addAccount();
+    await dc.rpc.batchSetConfig(acc2, {
       addr: account2.email,
       mail_pw: account2.password,
     });
-    await dc.rpc.configure(accountId2);
-    accountsConfigured = true;
+
+    await Promise.all([configure_promise, dc.rpc.configure(acc2)]);
+    are_configured = true;
   });
 
   it("send and recieve text message", async function () {
-    if (!accountsConfigured) {
+    if (!are_configured) {
       this.skip();
     }
     this.timeout(15000);
 
-    const contactId = await dc.rpc.createContact(
-      accountId1,
+    const contactId = await dc.rpc.contactsCreateContact(
+      acc1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(acc1, contactId);
     const eventPromise = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId2),
-      waitForEvent(dc, "IncomingMsg", accountId2),
+      waitForEvent(dc, "MsgsChanged", acc2),
+      waitForEvent(dc, "IncomingMsg", acc2),
     ]);
 
-    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
-    const { chatId: chatIdOnAccountB } = await eventPromise;
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
-      accountId2,
+    dc.rpc.miscSendTextMessage(acc1, "Hello", chatId);
+    const { field1: chatIdOnAccountB } = await eventPromise;
+    await dc.rpc.acceptChat(acc2, chatIdOnAccountB);
+    const messageList = await dc.rpc.messageListGetMessageIds(
+      acc2,
       chatIdOnAccountB,
       0
     );
 
     expect(messageList).have.length(1);
-    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
+    const message = await dc.rpc.messageGetMessage(acc2, messageList[0]);
     expect(message.text).equal("Hello");
   });
 
   it("send and recieve text message roundtrip, encrypted on answer onwards", async function () {
-    if (!accountsConfigured) {
+    if (!are_configured) {
       this.skip();
     }
     this.timeout(10000);
 
     // send message from A to B
-    const contactId = await dc.rpc.createContact(
-      accountId1,
+    const contactId = await dc.rpc.contactsCreateContact(
+      acc1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(acc1, contactId);
     const eventPromise = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId2),
-      waitForEvent(dc, "IncomingMsg", accountId2),
+      waitForEvent(dc, "MsgsChanged", acc2),
+      waitForEvent(dc, "IncomingMsg", acc2),
     ]);
-    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
+    dc.rpc.miscSendTextMessage(acc1, "Hello2", chatId);
     // wait for message from A
     console.log("wait for message from A");
 
     const event = await eventPromise;
-    const { chatId: chatIdOnAccountB } = event;
+    const { field1: chatIdOnAccountB } = event;
 
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
-      accountId2,
+    await dc.rpc.acceptChat(acc2, chatIdOnAccountB);
+    const messageList = await dc.rpc.messageListGetMessageIds(
+      acc2,
       chatIdOnAccountB,
       0
     );
-    const message = await dc.rpc.getMessage(
-      accountId2,
+    const message = await dc.rpc.messageGetMessage(
+      acc2,
       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),
+      waitForEvent(dc, "MsgsChanged", acc1),
+      waitForEvent(dc, "IncomingMsg", acc1),
     ]);
-    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
+    dc.rpc.miscSendTextMessage(acc2, "super secret message", chatId);
     // Check if answer arives at A and if it is encrypted
     await eventPromise2;
 
     const messageId = (
-      await dc.rpc.getMessageIds(accountId1, chatId, 0)
+      await dc.rpc.messageListGetMessageIds(acc1, chatId, 0)
     ).reverse()[0];
-    const message2 = await dc.rpc.getMessage(accountId1, messageId);
+    const message2 = await dc.rpc.messageGetMessage(acc1, messageId);
     expect(message2.text).equal("super secret message");
-    expect(message2.showPadlock).equal(true);
+    expect(message2.show_padlock).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(
+    expect(info?.overview_page).to.equal(
       "https://providers.delta.chat/example-com"
     );
     expect(info?.status).to.equal(3);
@@ -175,24 +181,23 @@ describe("online tests", function () {
   });
 });
 
-async function waitForEvent<T extends DcEvent["type"]>(
-  dc: DeltaChat,
-  eventType: T,
-  accountId: number,
-  timeout: number = EVENT_TIMEOUT
-): Promise<Extract<DcEvent, { type: T }>> {
-  return new Promise((resolve, reject) => {
-    const rejectTimeout = setTimeout(
-      () => reject(new Error("Timeout reached before event came in")),
-      timeout
-    );
-    const callback = (contextId: number, event: DcEvent) => {
-      if (contextId == accountId) {
-        dc.off(eventType, callback);
-        clearTimeout(rejectTimeout);
-        resolve(event as any);
+type event_data = {
+  contextId: number;
+  id: EventTypeName;
+  [key: string]: any;
+};
+async function waitForEvent(
+  dc: Deltachat,
+  event: EventTypeName,
+  accountId: number
+): Promise<event_data> {
+  return new Promise((res, rej) => {
+    const callback = (ev: DeltachatEvent) => {
+      if (ev.contextId == accountId) {
+        dc.off(event, callback);
+        res(ev);
       }
     };
-    dc.on(eventType, callback);
+    dc.on(event, callback);
   });
 }

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -1,88 +1,28 @@
 import { tmpdir } from "os";
-import { join, resolve } from "path";
+import { join } from "path";
 import { mkdtemp, rm } from "fs/promises";
+import { existsSync } from "fs";
 import { spawn, exec } from "child_process";
+import { unwrapPromise } from "./ts_helpers.js";
 import fetch from "node-fetch";
-import { Readable, Writable } from "node:stream";
+/* port is not configurable yet */
 
-export type RpcServerHandle = {
-  stdin: Writable;
-  stdout: Readable;
-  close: () => Promise<void>;
-};
-
-export async function startServer(): Promise<RpcServerHandle> {
-  const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
-
-  const pathToServerBinary = resolve(
-    join(await getTargetDir(), "debug/deltachat-rpc-server")
-  );
-
-  const server = spawn(pathToServerBinary, {
-    cwd: tmpDir,
-    env: {
-      RUST_LOG: process.env.RUST_LOG || "info",
-      RUST_MIN_STACK: "8388608",
-    },
-  });
-
-  server.on("error", (err) => {
-    throw new Error(
-      "Failed to start server executable " +
-        pathToServerBinary +
-        ", make sure you built it first."
-    );
-  });
-  let shouldClose = false;
-
-  server.on("exit", () => {
-    if (shouldClose) {
-      return;
-    }
-    throw new Error("Server quit");
-  });
-
-  server.stderr.pipe(process.stderr);
-
-  return {
-    stdin: server.stdin,
-    stdout: server.stdout,
-    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) => {
+  return new Promise((res, rej) => {
     exec(
       "cargo metadata --no-deps --format-version 1",
-      (error, stdout, _stderr) => {
+      (error, stdout, stderr) => {
         if (error) {
           console.log("error", error);
-          reject(error);
+          rej(error);
         } else {
           try {
             const json = JSON.parse(stdout);
-            resolve(json.target_directory);
+            res(json.target_directory);
           } catch (error) {
             console.log("json error", error);
-            reject(error);
+            rej(error);
           }
         }
       }
@@ -90,3 +30,66 @@ function getTargetDir(): Promise<string> {
   });
 }
 
+export const CMD_API_SERVER_PORT = 20808;
+export async function startCMD_API_Server(port: typeof CMD_API_SERVER_PORT) {
+  const tmp_dir = await mkdtemp(join(tmpdir(), "test_prefix"));
+
+  const path_of_server = join(await getTargetDir(), "debug/webserver");
+  console.log(path_of_server);
+
+  if (!existsSync(path_of_server)) {
+    throw new Error(
+      "server executable does not exist, you need to build it first" +
+        "\nserver executable not found at " +
+        path_of_server
+    );
+  }
+
+  const server = spawn(path_of_server, {
+    cwd: tmp_dir,
+    env: {
+      RUST_LOG: "info",
+    },
+  });
+  let should_close = false;
+
+  server.on("exit", () => {
+    if (should_close) {
+      return;
+    }
+    throw new Error("Server quit");
+  });
+
+  server.stderr.pipe(process.stderr);
+
+  //server.stdout.pipe(process.stdout)
+
+  return {
+    close: async () => {
+      should_close = true;
+      if (!server.kill(9)) {
+        console.log("server termination failed");
+      }
+      await rm(tmp_dir, { recursive: true });
+    },
+  };
+}
+
+export type CMD_API_Server_Handle = unwrapPromise<
+  ReturnType<typeof startCMD_API_Server>
+>;
+
+export async function createTempUser(url: string) {
+  async function postData(url = "") {
+    // Default options are marked with *
+    const response = await fetch(url, {
+      method: "POST", // *GET, POST, PUT, DELETE, etc.
+      headers: {
+        "cache-control": "no-cache",
+      },
+    });
+    return response.json(); // parses JSON response into native JavaScript objects
+  }
+
+  return await postData(url);
+}

deltachat-jsonrpc/typescript/test/ts_helpers.ts

@@ -0,0 +1 @@
+export type unwrapPromise<T> = T extends Promise<infer U> ? U : never;

deltachat-jsonrpc/typescript/test/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "../test_dist",
+    "target": "ES2020",
+    "module": "es2020",
+    "moduleResolution": "node",
+    "declaration": false,
+    "esModuleInterop": true,
+    "noImplicitAny": true,
+    "isolatedModules": true,
+    "strictNullChecks": true,
+    "strict": true,
+    "sourceMap": true
+  },
+  "compileOnSave": true
+}

deltachat-jsonrpc/typescript/tsconfig.json

@@ -8,13 +8,13 @@
     "outDir": "dist",
     "lib": ["ES2017", "dom"],
     "target": "ES2017",
-    "module": "es2020",
+    "module": "es2015",
     "declaration": true,
     "esModuleInterop": true,
     "moduleResolution": "node",
     "noImplicitAny": true,
     "isolatedModules": true
   },
-  "include": ["*.ts", "example/*.ts", "test/*.ts"],
+  "include": ["*.ts"],
   "compileOnSave": false
 }

deltachat-rpc-server/Cargo.toml

@@ -1,26 +0,0 @@
-[package]
-name = "deltachat-rpc-server"
-version = "1.102.0"
-description = "DeltaChat JSON-RPC server"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
-edition = "2021"
-readme = "README.md"
-license = "MPL-2.0"
-
-keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
-categories = ["cryptography", "std", "email"]
-
-[[bin]]
-name = "deltachat-rpc-server"
-
-[dependencies]
-deltachat-jsonrpc = { path = "../deltachat-jsonrpc" }
-
-anyhow = "1"
-env_logger = { version = "0.9.1" }
-futures-lite = "1.12.0"
-log = "0.4"
-serde_json = "1.0.85"
-serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.21.2", features = ["io-std"] }
-yerpc = { version = "0.3.1", features = ["anyhow_expose"] }

deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs

@@ -1,68 +0,0 @@
-///! Delta Chat core RPC server.
-///!
-///! It speaks JSON Lines over stdio.
-use std::path::PathBuf;
-
-use anyhow::Result;
-use deltachat_jsonrpc::api::events::event_to_json_rpc_notification;
-use deltachat_jsonrpc::api::{Accounts, CommandApi};
-use futures_lite::stream::StreamExt;
-use tokio::io::{self, AsyncBufReadExt, BufReader};
-use tokio::task::JoinHandle;
-use yerpc::{RpcClient, RpcSession};
-
-#[tokio::main(flavor = "multi_thread")]
-async fn main() -> Result<()> {
-    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());
-    log::info!("Starting with accounts directory `{}`.", path);
-    let accounts = Accounts::new(PathBuf::from(&path)).await?;
-    let events = accounts.get_event_emitter();
-
-    log::info!("Creating JSON-RPC API.");
-    let state = CommandApi::new(accounts);
-
-    let (client, mut out_receiver) = RpcClient::new();
-    let session = RpcSession::new(client.clone(), state);
-
-    // Events task converts core events to JSON-RPC notifications.
-    let events_task: JoinHandle<Result<()>> = tokio::spawn(async move {
-        while let Some(event) = events.recv().await {
-            let event = event_to_json_rpc_notification(event);
-            client.send_notification("event", Some(event)).await?;
-        }
-        Ok(())
-    });
-
-    // Send task prints JSON responses to stdout.
-    let send_task: JoinHandle<anyhow::Result<()>> = tokio::spawn(async move {
-        while let Some(message) = out_receiver.next().await {
-            let message = serde_json::to_string(&message)?;
-            log::trace!("RPC send {}", message);
-            println!("{}", message);
-        }
-        Ok(())
-    });
-
-    // Receiver task reads JSON requests from stdin.
-    let recv_task: JoinHandle<anyhow::Result<()>> = tokio::spawn(async move {
-        let stdin = io::stdin();
-        let mut lines = BufReader::new(stdin).lines();
-        while let Some(message) = lines.next_line().await? {
-            log::trace!("RPC recv {}", message);
-            session.handle_incoming(&message).await;
-        }
-        log::info!("EOF reached on stdin");
-        Ok(())
-    });
-
-    // Wait for the end of stdin.
-    recv_task.await??;
-
-    // Shutdown the server.
-    send_task.abort();
-    events_task.abort();
-
-    Ok(())
-}

draft/aeap-mvp.md

@@ -11,49 +11,26 @@ Changes to the UIs
 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.
+- DONE: 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.
+- DONE: If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
 
   - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
 
   - The key stays the same.
 
-- [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.)
+- No changes for 1:1 chats, there simply is a new one. (This works since, contrary to group messages, messages sent to a 1:1 chat are not assigned to the group chat but always to the 1:1 chat with the sender. So it's not a problem that the new messages might be put into the old chat if they are a reply to a message there.)
 
-- [ ] When sending a message: If any of the secondary self addrs is in the chat's member list, remove it locally (because we just transitioned away from it). We add a log message for this (alternatively, a system message in the chat would be more visible).
+- When 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)
+- 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
@@ -120,8 +97,3 @@ 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/webxdc-dev-reference.md

@@ -4,7 +4,7 @@ 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://docs.webxdc.org/) shows more detailed information
+The [Webxdc guidebook](https://deltachat.github.io/webxdc_docs/) shows more detailed information
 when developing Webxdc apps.
 
 

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,12 +20,10 @@ use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::reaction::send_reaction;
-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.
@@ -98,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(())
 }
@@ -130,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") {
@@ -189,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#{}): {} {}{}{}{}{}{}{} [{}]",
@@ -217,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()
         },
@@ -335,8 +329,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  continue-key-transfer <msg-id> <setup-code>\n\
                  has-backup\n\
                  export-backup\n\
-                 send-backup [<passphrase>]\n\
-                 receive-backup <ticket> [<passphrase>]\n\
                  import-backup <backup-file>\n\
                  export-keys\n\
                  import-keys\n\
@@ -410,7 +402,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  resend <msg-id>\n\
                  markseen <msg-id>\n\
                  delmsg <msg-id>\n\
-                 react <msg-id> [<reaction>]\n\
                  ===========================Contact commands==\n\
                  listcontacts [<query>]\n\
                  listverified [<query>]\n\
@@ -477,30 +468,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 Some(arg2.to_string()),
             )
             .await?;
-            println!("Exported to {}.", dir.display());
-        }
-        "send-backup" => {
-            let tdir = tempfile::TempDir::new()?;
-            let dir = tdir.path();
-            println!("Storing backup in: {} ", dir.display());
-            let transfer = send_backup(&context, dir, Some(arg1.to_string())).await?;
-            let ticket = transfer.ticket();
-            let ticket_bytes = ticket.as_bytes();
-
-            println!(
-                "Ticket: {}",
-                multibase::encode(multibase::Base::Base64, &ticket_bytes)
-            );
-            let qr_code = deltachat::qr_code_generator::generate_backup_qr_code(ticket)?;
-            let file = dir.join("qr.svg");
-            tokio::fs::write(file, qr_code.as_bytes()).await?;
-
-            transfer.done().await?;
-        }
-        "receive-backup" => {
-            ensure!(!arg1.is_empty(), "Argument <ticket> is missing.");
-            let (_, ticket) = multibase::decode(&arg1)?;
-            receive_backup(&context, ticket, Some(arg2.to_string())).await?;
+            println!("Exported to {}.", dir.to_string_lossy());
         }
         "import-backup" => {
             ensure!(!arg1.is_empty(), "Argument <backup-file> missing.");
@@ -524,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(),
@@ -564,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) => {
@@ -579,11 +547,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             sql::housekeeping(&context).await.ok_or_log(&context);
         }
         "listchats" | "listarchived" | "chats" => {
-            let listflags = if arg0 == "listarchived" {
-                DC_GCL_ARCHIVED_ONLY
-            } else {
-                0
-            };
+            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
             let time_start = std::time::SystemTime::now();
             let chatlist = Chatlist::try_load(
                 &context,
@@ -633,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
@@ -846,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,
@@ -928,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);
@@ -1014,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,
@@ -1113,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" => {
@@ -1152,12 +1118,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ids[0] = MsgId::new(arg1.parse()?);
             message::delete_msgs(&context, &ids).await?;
         }
-        "react" => {
-            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let msg_id = MsgId::new(arg1.parse()?);
-            let reaction = arg2;
-            send_reaction(&context, msg_id, reaction).await?;
-        }
         "listcontacts" | "contacts" | "listverified" => {
             let contacts = Contact::get_all(
                 &context,
@@ -1273,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,21 +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::stock_str::StockStrings;
 use deltachat::{EventType, Events};
 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};
@@ -31,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) {
@@ -72,19 +71,6 @@ fn receive_event(event: EventType) {
                 ))
             );
         }
-        EventType::ReactionsChanged {
-            chat_id,
-            msg_id,
-            contact_id,
-        } => {
-            info!(
-                "{}",
-                yellow.paint(format!(
-                    "Received REACTIONS_CHANGED(chat_id={}, msg_id={}, contact_id={})",
-                    chat_id, msg_id, contact_id
-                ))
-            );
-        }
         EventType::ContactsChanged(_) => {
             info!("{}", yellow.paint("Received CONTACTS_CHANGED()"));
         }
@@ -155,15 +141,13 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 14] = [
+const IMEX_COMMANDS: [&str; 12] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
     "has-backup",
     "export-backup",
     "import-backup",
-    "send-backup",
-    "receive-backup",
     "export-keys",
     "import-keys",
     "export-setup",
@@ -223,7 +207,7 @@ const CHAT_COMMANDS: [&str; 36] = [
     "accept",
     "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 9] = [
+const MESSAGE_COMMANDS: [&str; 8] = [
     "listmsgs",
     "msginfo",
     "listfresh",
@@ -232,7 +216,6 @@ const MESSAGE_COMMANDS: [&str; 9] = [
     "markseen",
     "delmsg",
     "download",
-    "react",
 ];
 const CONTACT_COMMANDS: [&str; 9] = [
     "listcontacts",
@@ -315,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(), StockStrings::new()).await?;
+    let context = Context::new(Path::new(&args[1]).to_path_buf(), 0, Events::new()).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);
         }
@@ -330,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);
@@ -356,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;
                 }
             }
@@ -390,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(())
 }
@@ -424,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 {
@@ -441,14 +417,14 @@ 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")
                 }
                 println!("{}", qr);
                 let output = Command::new("qrencode")
-                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                     .output()
                     .expect("failed to execute process");
                 io::stdout().write_all(&output.stdout).unwrap();
@@ -461,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) => {
@@ -472,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),
@@ -482,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,6 @@ use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
-use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};
 
 fn cb(event: EventType) {
@@ -30,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(), StockStrings::new())
+    let ctx = Context::new(dbfile.into(), 0, Events::new())
         .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);
         }
@@ -81,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();
@@ -97,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

@@ -117,7 +117,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 +234,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/constants.js

@@ -42,7 +42,6 @@ module.exports = {
   DC_EVENT_IMEX_FILE_WRITTEN: 2052,
   DC_EVENT_IMEX_PROGRESS: 2051,
   DC_EVENT_INCOMING_MSG: 2005,
-  DC_EVENT_INCOMING_MSG_BUNCH: 2006,
   DC_EVENT_INFO: 100,
   DC_EVENT_LOCATION_CHANGED: 2035,
   DC_EVENT_MSGS_CHANGED: 2000,
@@ -51,14 +50,12 @@ module.exports = {
   DC_EVENT_MSG_FAILED: 2012,
   DC_EVENT_MSG_READ: 2015,
   DC_EVENT_NEW_BLOB_FILE: 150,
-  DC_EVENT_REACTIONS_CHANGED: 2001,
   DC_EVENT_SECUREJOIN_INVITER_PROGRESS: 2060,
   DC_EVENT_SECUREJOIN_JOINER_PROGRESS: 2061,
   DC_EVENT_SELFAVATAR_CHANGED: 2110,
   DC_EVENT_SMTP_CONNECTED: 101,
   DC_EVENT_SMTP_MESSAGE_SENT: 103,
   DC_EVENT_WARNING: 300,
-  DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
   DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
   DC_GCL_ADD_ALLDONE_HINT: 4,
   DC_GCL_ADD_SELF: 2,
@@ -72,19 +69,8 @@ module.exports = {
   DC_IMEX_EXPORT_SELF_KEYS: 1,
   DC_IMEX_IMPORT_BACKUP: 12,
   DC_IMEX_IMPORT_SELF_KEYS: 2,
-  DC_INFO_AUTOCRYPT_SETUP_MESSAGE: 6,
-  DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
-  DC_INFO_GROUP_IMAGE_CHANGED: 3,
-  DC_INFO_GROUP_NAME_CHANGED: 2,
-  DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
-  DC_INFO_LOCATION_ONLY: 9,
-  DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
-  DC_INFO_MEMBER_REMOVED_FROM_GROUP: 5,
   DC_INFO_PROTECTION_DISABLED: 12,
   DC_INFO_PROTECTION_ENABLED: 11,
-  DC_INFO_SECURE_JOIN_MESSAGE: 7,
-  DC_INFO_UNKNOWN: 0,
-  DC_INFO_WEBXDC_INFO_MESSAGE: 32,
   DC_KEY_GEN_DEFAULT: 0,
   DC_KEY_GEN_ED25519: 2,
   DC_KEY_GEN_RSA2048: 1,
@@ -116,7 +102,6 @@ module.exports = {
   DC_QR_FPR_MISMATCH: 220,
   DC_QR_FPR_OK: 210,
   DC_QR_FPR_WITHOUT_ADDR: 230,
-  DC_QR_LOGIN: 520,
   DC_QR_REVIVE_VERIFYCONTACT: 510,
   DC_QR_REVIVE_VERIFYGROUP: 512,
   DC_QR_TEXT: 330,
@@ -143,10 +128,6 @@ module.exports = {
   DC_STATE_UNDEFINED: 0,
   DC_STR_AC_SETUP_MSG_BODY: 43,
   DC_STR_AC_SETUP_MSG_SUBJECT: 42,
-  DC_STR_ADD_MEMBER_BY_OTHER: 129,
-  DC_STR_ADD_MEMBER_BY_YOU: 128,
-  DC_STR_AEAP_ADDR_CHANGED: 122,
-  DC_STR_AEAP_EXPLANATION_AND_LINK: 123,
   DC_STR_ARCHIVEDCHATS: 40,
   DC_STR_AUDIO: 11,
   DC_STR_BAD_TIME_MSG_BODY: 85,
@@ -177,26 +158,6 @@ module.exports = {
   DC_STR_EPHEMERAL_MINUTE: 77,
   DC_STR_EPHEMERAL_MINUTES: 93,
   DC_STR_EPHEMERAL_SECONDS: 76,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER: 147,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU: 146,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER: 145,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU: 144,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER: 143,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU: 142,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER: 149,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU: 148,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER: 155,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU: 154,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER: 139,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU: 138,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER: 153,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU: 152,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER: 151,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU: 150,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER: 141,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU: 140,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER: 157,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU: 156,
   DC_STR_EPHEMERAL_WEEK: 80,
   DC_STR_EPHEMERAL_WEEKS: 96,
   DC_STR_ERROR: 112,
@@ -206,20 +167,10 @@ module.exports = {
   DC_STR_FINGERPRINTS: 30,
   DC_STR_FORWARDED: 97,
   DC_STR_GIF: 23,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER: 127,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU: 126,
-  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER: 135,
-  DC_STR_GROUP_IMAGE_DELETED_BY_YOU: 134,
-  DC_STR_GROUP_LEFT_BY_OTHER: 133,
-  DC_STR_GROUP_LEFT_BY_YOU: 132,
-  DC_STR_GROUP_NAME_CHANGED_BY_OTHER: 125,
-  DC_STR_GROUP_NAME_CHANGED_BY_YOU: 124,
   DC_STR_IMAGE: 9,
   DC_STR_INCOMING_MESSAGES: 103,
   DC_STR_LAST_MSG_SENT_SUCCESSFULLY: 111,
   DC_STR_LOCATION: 66,
-  DC_STR_LOCATION_ENABLED_BY_OTHER: 137,
-  DC_STR_LOCATION_ENABLED_BY_YOU: 136,
   DC_STR_MESSAGES: 114,
   DC_STR_MSGACTIONBYME: 63,
   DC_STR_MSGACTIONBYUSER: 62,
@@ -239,16 +190,10 @@ module.exports = {
   DC_STR_PARTIAL_DOWNLOAD_MSG_BODY: 99,
   DC_STR_PART_OF_TOTAL_USED: 116,
   DC_STR_PROTECTION_DISABLED: 89,
-  DC_STR_PROTECTION_DISABLED_BY_OTHER: 161,
-  DC_STR_PROTECTION_DISABLED_BY_YOU: 160,
   DC_STR_PROTECTION_ENABLED: 88,
-  DC_STR_PROTECTION_ENABLED_BY_OTHER: 159,
-  DC_STR_PROTECTION_ENABLED_BY_YOU: 158,
   DC_STR_QUOTA_EXCEEDING_MSG_BODY: 98,
   DC_STR_READRCPT: 31,
   DC_STR_READRCPT_MAILBODY: 32,
-  DC_STR_REMOVE_MEMBER_BY_OTHER: 131,
-  DC_STR_REMOVE_MEMBER_BY_YOU: 130,
   DC_STR_REPLY_NOUN: 90,
   DC_STR_SAVED_MESSAGES: 69,
   DC_STR_SECURE_JOIN_GROUP_QR_DESC: 120,

node/events.js

@@ -14,9 +14,7 @@ module.exports = {
   400: 'DC_EVENT_ERROR',
   410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
   2000: 'DC_EVENT_MSGS_CHANGED',
-  2001: 'DC_EVENT_REACTIONS_CHANGED',
   2005: 'DC_EVENT_INCOMING_MSG',
-  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
   2010: 'DC_EVENT_MSG_DELIVERED',
   2012: 'DC_EVENT_MSG_FAILED',
@@ -32,6 +30,5 @@ module.exports = {
   2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
   2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
   2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED'
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE'
 }

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/constants.ts

@@ -42,7 +42,6 @@ export enum C {
   DC_EVENT_IMEX_FILE_WRITTEN = 2052,
   DC_EVENT_IMEX_PROGRESS = 2051,
   DC_EVENT_INCOMING_MSG = 2005,
-  DC_EVENT_INCOMING_MSG_BUNCH = 2006,
   DC_EVENT_INFO = 100,
   DC_EVENT_LOCATION_CHANGED = 2035,
   DC_EVENT_MSGS_CHANGED = 2000,
@@ -51,14 +50,12 @@ export enum C {
   DC_EVENT_MSG_FAILED = 2012,
   DC_EVENT_MSG_READ = 2015,
   DC_EVENT_NEW_BLOB_FILE = 150,
-  DC_EVENT_REACTIONS_CHANGED = 2001,
   DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060,
   DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061,
   DC_EVENT_SELFAVATAR_CHANGED = 2110,
   DC_EVENT_SMTP_CONNECTED = 101,
   DC_EVENT_SMTP_MESSAGE_SENT = 103,
   DC_EVENT_WARNING = 300,
-  DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
   DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
   DC_GCL_ADD_ALLDONE_HINT = 4,
   DC_GCL_ADD_SELF = 2,
@@ -72,19 +69,8 @@ export enum C {
   DC_IMEX_EXPORT_SELF_KEYS = 1,
   DC_IMEX_IMPORT_BACKUP = 12,
   DC_IMEX_IMPORT_SELF_KEYS = 2,
-  DC_INFO_AUTOCRYPT_SETUP_MESSAGE = 6,
-  DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
-  DC_INFO_GROUP_IMAGE_CHANGED = 3,
-  DC_INFO_GROUP_NAME_CHANGED = 2,
-  DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
-  DC_INFO_LOCATION_ONLY = 9,
-  DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
-  DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5,
   DC_INFO_PROTECTION_DISABLED = 12,
   DC_INFO_PROTECTION_ENABLED = 11,
-  DC_INFO_SECURE_JOIN_MESSAGE = 7,
-  DC_INFO_UNKNOWN = 0,
-  DC_INFO_WEBXDC_INFO_MESSAGE = 32,
   DC_KEY_GEN_DEFAULT = 0,
   DC_KEY_GEN_ED25519 = 2,
   DC_KEY_GEN_RSA2048 = 1,
@@ -116,7 +102,6 @@ export enum C {
   DC_QR_FPR_MISMATCH = 220,
   DC_QR_FPR_OK = 210,
   DC_QR_FPR_WITHOUT_ADDR = 230,
-  DC_QR_LOGIN = 520,
   DC_QR_REVIVE_VERIFYCONTACT = 510,
   DC_QR_REVIVE_VERIFYGROUP = 512,
   DC_QR_TEXT = 330,
@@ -143,10 +128,6 @@ export enum C {
   DC_STATE_UNDEFINED = 0,
   DC_STR_AC_SETUP_MSG_BODY = 43,
   DC_STR_AC_SETUP_MSG_SUBJECT = 42,
-  DC_STR_ADD_MEMBER_BY_OTHER = 129,
-  DC_STR_ADD_MEMBER_BY_YOU = 128,
-  DC_STR_AEAP_ADDR_CHANGED = 122,
-  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
   DC_STR_ARCHIVEDCHATS = 40,
   DC_STR_AUDIO = 11,
   DC_STR_BAD_TIME_MSG_BODY = 85,
@@ -177,26 +158,6 @@ export enum C {
   DC_STR_EPHEMERAL_MINUTE = 77,
   DC_STR_EPHEMERAL_MINUTES = 93,
   DC_STR_EPHEMERAL_SECONDS = 76,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER = 147,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU = 146,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER = 145,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU = 144,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER = 143,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU = 142,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER = 149,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU = 148,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER = 155,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU = 154,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER = 139,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU = 138,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER = 153,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU = 152,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER = 151,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU = 150,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER = 141,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU = 140,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER = 157,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU = 156,
   DC_STR_EPHEMERAL_WEEK = 80,
   DC_STR_EPHEMERAL_WEEKS = 96,
   DC_STR_ERROR = 112,
@@ -206,20 +167,10 @@ export enum C {
   DC_STR_FINGERPRINTS = 30,
   DC_STR_FORWARDED = 97,
   DC_STR_GIF = 23,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER = 127,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU = 126,
-  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER = 135,
-  DC_STR_GROUP_IMAGE_DELETED_BY_YOU = 134,
-  DC_STR_GROUP_LEFT_BY_OTHER = 133,
-  DC_STR_GROUP_LEFT_BY_YOU = 132,
-  DC_STR_GROUP_NAME_CHANGED_BY_OTHER = 125,
-  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
   DC_STR_IMAGE = 9,
   DC_STR_INCOMING_MESSAGES = 103,
   DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
   DC_STR_LOCATION = 66,
-  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
-  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
   DC_STR_MESSAGES = 114,
   DC_STR_MSGACTIONBYME = 63,
   DC_STR_MSGACTIONBYUSER = 62,
@@ -239,16 +190,10 @@ export enum C {
   DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
   DC_STR_PART_OF_TOTAL_USED = 116,
   DC_STR_PROTECTION_DISABLED = 89,
-  DC_STR_PROTECTION_DISABLED_BY_OTHER = 161,
-  DC_STR_PROTECTION_DISABLED_BY_YOU = 160,
   DC_STR_PROTECTION_ENABLED = 88,
-  DC_STR_PROTECTION_ENABLED_BY_OTHER = 159,
-  DC_STR_PROTECTION_ENABLED_BY_YOU = 158,
   DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
   DC_STR_READRCPT = 31,
   DC_STR_READRCPT_MAILBODY = 32,
-  DC_STR_REMOVE_MEMBER_BY_OTHER = 131,
-  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
   DC_STR_REPLY_NOUN = 90,
   DC_STR_SAVED_MESSAGES = 69,
   DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
@@ -295,9 +240,7 @@ export const EventId2EventName: { [key: number]: string } = {
   400: 'DC_EVENT_ERROR',
   410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
   2000: 'DC_EVENT_MSGS_CHANGED',
-  2001: 'DC_EVENT_REACTIONS_CHANGED',
   2005: 'DC_EVENT_INCOMING_MSG',
-  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
   2010: 'DC_EVENT_MSG_DELIVERED',
   2012: 'DC_EVENT_MSG_FAILED',
@@ -314,5 +257,4 @@ export const EventId2EventName: { [key: number]: string } = {
   2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
   2110: 'DC_EVENT_SELFAVATAR_CHANGED',
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
 }

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

@@ -115,7 +115,7 @@ export class AccountManager extends EventEmitter {
     debug('Started event handler')
   }
 
-  startJsonRpcHandler(callback: ((response: string) => void) | null) {
+  startJSONRPCHandler(callback: ((response: string) => void) | null) {
     if (this.dcn_accounts === null) {
       throw new Error('dcn_account is null')
     }
@@ -127,14 +127,14 @@ export class AccountManager extends EventEmitter {
     }
 
     binding.dcn_accounts_start_jsonrpc(this.dcn_accounts, callback.bind(this))
-    debug('Started JSON-RPC handler')
+    debug('Started jsonrpc handler')
     this.jsonRpcStarted = true
   }
 
-  jsonRpcRequest(message: string) {
+  jsonRPCRequest(message: string) {
     if (!this.jsonRpcStarted) {
       throw new Error(
-        'jsonrpc is not active, start it with startJsonRpcHandler first'
+        'jsonrpc is not active, start it with startJSONRPCHandler first'
       )
     }
     binding.dcn_json_rpc_request(this.dcn_accounts, message)

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/postLinksToDetails.js

@@ -12,12 +12,11 @@ const GITHUB_API_URL =
 
 const file_url = process.env['URL']
 const GITHUB_TOKEN = process.env['GITHUB_TOKEN']
-const context = process.env['MSG_CONTEXT']
 
 const STATUS_DATA = {
   state: 'success',
   description: '⏩ Click on "Details" to download →',
-  context: context || 'Download the node-bindings.tar.gz',
+  context: 'Download the node-bindings.tar.gz',
   target_url: base_url + file_url,
 }
 

node/src/module.c

@@ -101,6 +101,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.
  */
@@ -1628,18 +1636,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 +1926,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();
@@ -2949,7 +2938,6 @@ NAPI_METHOD(dcn_accounts_unref) {
   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);
@@ -3112,14 +3100,14 @@ static void accounts_event_handler_thread_func(void* 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;
@@ -3145,7 +3133,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 +3187,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) {
@@ -3291,6 +3279,8 @@ static void accounts_jsonrpc_thread_func(void* arg)
       break;
     }
   }
+  dc_jsonrpc_unref(dcn_accounts->jsonrpc_instance);
+  dcn_accounts->jsonrpc_instance = NULL;
   TRACE("accounts_jsonrpc_thread_func ended");
   napi_release_threadsafe_function(dcn_accounts->threadsafe_jsonrpc_handler, napi_tsfn_release);
 }
@@ -3313,7 +3303,7 @@ static void call_accounts_js_jsonrpc_handler(napi_env env, napi_value js_callbac
   if (status != napi_ok) {
     napi_throw_error(env, NULL, "Unable to create argv for js jsonrpc_handler arguments");
   } 
-  dc_str_unref(response);
+  free(response);
 
   TRACE("calling back into js");
   napi_value result;
@@ -3347,11 +3337,11 @@ NAPI_METHOD(dcn_accounts_start_jsonrpc) {
     callback,
     0,
     async_resource_name,
-    1000, // max_queue_size
+    1,
     1,
     NULL,
     NULL,
-    NULL,
+    dcn_accounts,
     call_accounts_js_jsonrpc_handler,
     &dcn_accounts->threadsafe_jsonrpc_handler));
   TRACE("done");
@@ -3375,7 +3365,6 @@ NAPI_METHOD(dcn_json_rpc_request) {
   NAPI_ARGV_UTF8_MALLOC(request, 1);
   dc_jsonrpc_request(dcn_accounts->jsonrpc_instance, request);
   free(request);
-  NAPI_RETURN_UNDEFINED();
 }
 
 
@@ -3514,7 +3503,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);

node/test/test.js

@@ -89,14 +89,10 @@ describe('JSON RPC', function () {
     const { dc } = DeltaChat.newTemporary()
     let promise_resolve
     const promise = new Promise((res, _rej) => {
-      promise_resolve = (response) => {
-        // ignore events
-        const answer = JSON.parse(response)
-        if (answer['method'] !== 'event') res(answer)
-      }
+      promise_resolve = res
     })
-    dc.startJsonRpcHandler(promise_resolve)
-    dc.jsonRpcRequest(
+    dc.startJSONRPCHandler(promise_resolve)
+    dc.jsonRPCRequest(
       JSON.stringify({
         jsonrpc: '2.0',
         method: 'get_all_account_ids',
@@ -110,7 +106,7 @@ describe('JSON RPC', function () {
         id: 2,
         result: [1],
       },
-      await promise
+      JSON.parse(await promise)
     )
     dc.close()
   })
@@ -119,13 +115,13 @@ describe('JSON RPC', function () {
     const { dc } = DeltaChat.newTemporary()
 
     const promises = {}
-    dc.startJsonRpcHandler((msg) => {
+    dc.startJSONRPCHandler((msg) => {
       const response = JSON.parse(msg)
       promises[response.id](response)
       delete promises[response.id]
     })
     const call = (request) => {
-      dc.jsonRpcRequest(JSON.stringify(request))
+      dc.jsonRPCRequest(JSON.stringify(request))
       return new Promise((res, _rej) => {
         promises[request.id] = res
       })
@@ -616,7 +612,7 @@ describe('Offline Tests with unconfigured account', function () {
     const id = context.createContact('someuser', 'someuser@site.com')
     const contact = context.getContact(id)
     strictEqual(contact.getId(), id, 'contact id matches')
-    context.deleteContact(id)
+    strictEqual(context.deleteContact(id), true, 'delete call succesful')
     strictEqual(context.getContact(id), null, 'contact is gone')
   })
 

package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@deltachat/jsonrpc-client": "file:deltachat-jsonrpc/typescript",
     "debug": "^4.1.1",
     "napi-macros": "^2.0.0",
     "node-gyp-build": "^4.1.0"
@@ -57,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 --exit"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.102.0"
-}
+  "version": "1.86.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/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,7 +16,7 @@ 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":
         os.environ["CARGO_PROFILE_RELEASE_LTO"] = "on"

python/pyproject.toml

@@ -1,41 +1,7 @@
 [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>.*)?$'

python/setup.cfg

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

python/setup.py

@@ -1,4 +1,40 @@
-from setuptools import setup
+import os
+import re
+
+import setuptools
+
+
+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

@@ -2,7 +2,7 @@ import sys
 
 from pkg_resources import DistributionNotFound, get_distribution
 
-from . import capi, events, hookspec  # noqa
+from . import capi, const, events, hookspec  # noqa
 from .account import Account, get_core_info  # noqa
 from .capi import ffi  # noqa
 from .chat import Chat  # noqa
@@ -17,6 +17,14 @@ except DistributionNotFound:
     __version__ = "0.0.0.dev0-unknown"
 
 
+def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
+    if not _DC_EVENTNAME_MAP:
+        for name in dir(const):
+            if name.startswith("DC_EVENT_"):
+                _DC_EVENTNAME_MAP[getattr(const, name)] = name
+    return _DC_EVENTNAME_MAP[integer]
+
+
 def register_global_plugin(plugin):
     """Register a global plugin which implements one or more
     of the :class:`deltachat.hookspec.Global` hooks.
@@ -52,7 +60,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

@@ -156,7 +156,6 @@ def extract_defines(flags):
                 | DC_KEY_GEN
                 | DC_IMEX
                 | DC_CONNECTIVITY
-                | DC_DOWNLOAD
             )         # End of prefix matching
             _[\w_]+   # Match the suffix, e.g. _RSA2048 in DC_KEY_GEN_RSA2048
         )             # Close the capturing group, this contains

python/src/deltachat/account.py

@@ -20,7 +20,7 @@ from .cutil import (
     from_optional_dc_charpointer,
     iter_array,
 )
-from .events import EventThread, FFIEventLogger
+from .events import EventThread
 from .message import Message
 from .tracker import ConfigureTracker, ImexTracker
 
@@ -169,6 +169,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:
@@ -596,36 +598,6 @@ 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
         the :class:`deltachat.hookspec.PerAccount` hooks.
@@ -708,9 +680,8 @@ class Account(object):
         """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)

python/src/deltachat/events.py

@@ -8,21 +8,14 @@ import traceback
 from contextlib import contextmanager
 from queue import Empty, Queue
 
-from . import const
+import deltachat
+
 from .capi import ffi, lib
 from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
 from .message import map_system_message
 
 
-def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
-    if not _DC_EVENTNAME_MAP:
-        for name in dir(const):
-            if name.startswith("DC_EVENT_"):
-                _DC_EVENTNAME_MAP[getattr(const, name)] = name
-    return _DC_EVENTNAME_MAP[integer]
-
-
 class FFIEvent:
     def __init__(self, name: str, data1, data2):
         self.name = name
@@ -105,7 +98,7 @@ class FFIEventTracker:
             yield self.get(timeout=timeout, check_error=check_error)
 
     def get_matching(self, event_name_regex, check_error=True, timeout=None):
-        rex = re.compile("^(?:{})$".format(event_name_regex))
+        rex = re.compile("(?:{}).*".format(event_name_regex))
         for ev in self.iter_events(timeout=timeout, check_error=check_error):
             if rex.match(ev.name):
                 return ev
@@ -192,12 +185,6 @@ class FFIEventTracker:
             return self.account.get_message_by_id(ev.data2)
         return None
 
-    def wait_next_reactions_changed(self):
-        """wait for and return next reactions-changed message"""
-        ev = self.get_matching("DC_EVENT_REACTIONS_CHANGED")
-        assert ev.data1 > 0
-        return self.account.get_message_by_id(ev.data2)
-
     def wait_msg_delivered(self, msg):
         ev = self.get_matching("DC_EVENT_MSG_DELIVERED")
         assert ev.data1 == msg.chat.id
@@ -252,7 +239,7 @@ class EventThread(threading.Thread):
             data1 = lib.dc_event_get_data1_int(event)
             # the following code relates to the deltachat/_build.py's helper
             # function which provides us signature info of an event call
-            evt_name = get_dc_event_name(evt)
+            evt_name = deltachat.get_dc_event_name(evt)
             if lib.dc_event_has_string_data(evt):
                 data2 = from_optional_dc_charpointer(lib.dc_event_get_data2_str(event))
             else:
@@ -302,10 +289,6 @@ class EventThread(threading.Thread):
                         "ac_incoming_message",
                         dict(message=msg),
                     )
-        elif name == "DC_EVENT_REACTIONS_CHANGED":
-            assert ffi_event.data1 > 0
-            msg = account.get_message_by_id(ffi_event.data2)
-            yield "ac_reactions_changed", 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

@@ -49,10 +49,6 @@ class PerAccount:
     def ac_outgoing_message(self, message):
         """Called on each outgoing message (both system and "normal")."""
 
-    @account_hookspec
-    def ac_reactions_changed(self, message):
-        """Called when message reactions changed."""
-
     @account_hookspec
     def ac_message_delivered(self, message):
         """Called when an outgoing message has been delivered to SMTP.

python/src/deltachat/message.py

@@ -9,7 +9,6 @@ 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 .reactions import Reactions
 
 
 class Message(object):
@@ -162,17 +161,6 @@ class Message(object):
             )
         )
 
-    def send_reaction(self, reaction: str):
-        """Send a reaction to message and return the resulting Message instance."""
-        msg_id = lib.dc_send_reaction(self.account._dc_context, self.id, as_dc_charpointer(reaction))
-        if msg_id == 0:
-            raise ValueError("reaction could not be send")
-        return Message.from_db(self.account, msg_id)
-
-    def get_reactions(self) -> Reactions:
-        """Get :class:`deltachat.reactions.Reactions` to the message."""
-        return Reactions.from_msg(self)
-
     def is_system_message(self):
         """return True if this message is a system/info message."""
         return bool(lib.dc_msg_is_info(self._dc_msg))
@@ -461,17 +449,6 @@ class Message(object):
         """mark this message as seen."""
         self.account.mark_seen_messages([self.id])
 
-    #
-    # Message download state
-    #
-    @property
-    def download_state(self):
-        assert self.id > 0
-
-        # 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)
-        return lib.dc_msg_get_download_state(dc_msg)
-
 
 # some code for handling DC_MSG_* view types
 
@@ -530,8 +507,6 @@ def parse_system_add_remove(text):
 
     returns a (action, affected, actor) triple"""
 
-    # You removed member a@b.
-    # You added member a@b.
     # Member Me (x@y) removed by a@b.
     # Member x@y added by a@b
     # Member With space (tmp1@x.org) removed by tmp2@x.org.
@@ -543,10 +518,6 @@ def parse_system_add_remove(text):
     if m:
         affected, action, actor = m.groups()
         return action, extract_addr(affected), extract_addr(actor)
-    m = re.match(r"you (removed|added) member (.+)", text)
-    if m:
-        action, affected = m.groups()
-        return action, extract_addr(affected), "me"
     if text.startswith("group left by "):
         addr = extract_addr(text[13:])
         if addr:

python/src/deltachat/reactions.py

@@ -1,43 +0,0 @@
-""" The Reactions object. """
-
-from .capi import ffi, lib
-from .cutil import from_dc_charpointer, iter_array
-
-
-class Reactions(object):
-    """Reactions object.
-
-    You obtain instances of it through :class:`deltachat.message.Message`.
-    """
-
-    def __init__(self, account, dc_reactions):
-        assert isinstance(account._dc_context, ffi.CData)
-        assert isinstance(dc_reactions, ffi.CData)
-        assert dc_reactions != ffi.NULL
-        self.account = account
-        self._dc_reactions = dc_reactions
-
-    def __repr__(self):
-        return "<Reactions dc_reactions={}>".format(self._dc_reactions)
-
-    @classmethod
-    def from_msg(cls, msg):
-        assert msg.id > 0
-        return cls(
-            msg.account,
-            ffi.gc(lib.dc_get_msg_reactions(msg.account._dc_context, msg.id), lib.dc_reactions_unref),
-        )
-
-    def get_contacts(self) -> list:
-        """Get list of contacts reacted to the message.
-
-        :returns: list of :class:`deltachat.contact.Contact` objects for this reaction.
-        """
-        from .contact import Contact
-
-        dc_array = ffi.gc(lib.dc_reactions_get_contacts(self._dc_reactions), lib.dc_array_unref)
-        return list(iter_array(dc_array, lambda x: Contact(self.account, x)))
-
-    def get_by_contact(self, contact) -> str:
-        """Get a string containing space-separated reactions of a single :class:`deltachat.contact.Contact`."""
-        return from_dc_charpointer(lib.dc_reactions_get_by_contact_id(self._dc_reactions, contact.id))

python/src/deltachat/testplugin.py

@@ -497,8 +497,6 @@ class ACFactory:
             configdict = dict(
                 addr=cloned_from.get_config("addr"),
                 mail_pw=cloned_from.get_config("mail_pw"),
-                imap_certificate_checks=cloned_from.get_config("imap_certificate_checks"),
-                smtp_certificate_checks=cloned_from.get_config("smtp_certificate_checks"),
             )
         configdict.update(kwargs)
         ac = self._get_cached_account(addr=configdict["addr"]) if cache else None

python/tests/package_wheels.py

@@ -0,0 +1,13 @@
+import os
+import subprocess
+import sys
+
+if __name__ == "__main__":
+    assert len(sys.argv) == 2
+    wheelhousedir = sys.argv[1]
+    # pip wheel will build in an isolated tmp dir that does not have git
+    # history so setuptools_scm can not automatically determine a
+    # version there. So pass in the version through an env var.
+    version = subprocess.check_output(["python", "setup.py", "--version"]).strip().split(b"\n")[-1]
+    os.environ["SETUPTOOLS_SCM_PRETEND_VERSION"] = version.decode("ascii")
+    subprocess.check_call(("pip wheel . -w %s" % wheelhousedir).split())