prep beta21

.circleci/config.yml

@@ -0,0 +1,227 @@
+version: 2.1
+executors:
+  default:
+    docker:
+      - image: filecoin/rust:latest
+    working_directory: /mnt/crate
+  doxygen:
+    docker:
+      - image: hrektts/doxygen
+
+restore-workspace: &restore-workspace
+  attach_workspace:
+    at: /mnt
+
+restore-cache: &restore-cache
+  restore_cache:
+    keys:
+      - cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - repo-source-{{ .Branch }}-{{ .Revision }}
+
+commands:
+  test_target:
+    parameters:
+      target:
+        type: string
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Test (<< parameters.target >>)
+          command: TARGET=<< parameters.target >> ci_scripts/run-rust-test.sh
+          no_output_timeout: 15m
+
+jobs:
+  cargo_fetch:
+    executor: default
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - run: rustup install $(cat rust-toolchain)
+      - run: rustup default $(cat rust-toolchain)
+      - run: rustup component add --toolchain $(cat rust-toolchain) rustfmt
+      - run: rustup component add --toolchain $(cat rust-toolchain) clippy-preview
+      - run: cargo fetch
+      - run: rustc +stable --version
+      - run: rustc +$(cat rust-toolchain) --version
+      # make sure this git repo doesn't grow too big
+      - run: git gc
+      - persist_to_workspace:
+          root: /mnt
+          paths:
+            - crate
+      - save_cache:
+          key: cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          paths:
+            - "~/.cargo"
+            - "~/.rustup"
+
+  rustfmt:
+    executor: default
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Run cargo fmt
+          command: cargo fmt --all -- --check
+
+  test_macos:
+    macos:
+      xcode: "10.0.0"
+    working_directory: ~/crate
+    steps:
+      - run:
+          name: Configure environment variables
+          command: |
+            echo 'export PATH="${HOME}/.cargo/bin:${HOME}/.bin:${PATH}"' >> $BASH_ENV
+            echo 'export CIRCLE_ARTIFACTS="/tmp"' >> $BASH_ENV
+      - checkout
+      - run:
+          name: Install Rust
+          command: |
+            curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - run: rustup install $(cat rust-toolchain)
+      - run: rustup default $(cat rust-toolchain)
+      - run: cargo fetch
+      - run:
+          name: Test
+          command: TARGET=x86_64-apple-darwin ci_scripts/run-rust-test.sh
+
+  test_x86_64-unknown-linux-gnu:
+    executor: default
+    steps:
+      - test_target:
+          target: "x86_64-unknown-linux-gnu"
+
+  test_i686-unknown-linux-gnu:
+    executor: default
+    steps:
+      - test_target:
+          target: "i686-unknown-linux-gnu"
+
+  test_aarch64-linux-android:
+    executor: default
+    steps:
+      - test_target:
+          target: "aarch64-linux-android"
+
+
+  build_doxygen:
+    executor: doxygen
+    steps:
+      - checkout
+      - run: bash ci_scripts/run-doxygen.sh
+      - run: mkdir -p workspace/c-docs
+      - run: cp -av deltachat-ffi/{html,xml} workspace/c-docs/
+      - persist_to_workspace:
+          root: workspace
+          paths:
+            - c-docs
+
+  # build_test_docs_wheel:
+  #   docker:
+  #     - image: deltachat/coredeps
+  #       environment:
+  #           TESTS: 1
+  #           DOCS: 1
+  #   working_directory: /mnt/crate
+  #   steps:
+  #     - *restore-workspace
+  #     - *restore-cache
+  #     - run:
+  #         name: build docs, run tests and build wheels
+  #         command: ci_scripts/run-python.sh
+  #     - run:
+  #          name: copying docs and wheels to workspace
+  #          command: |
+  #            mkdir -p workspace/python
+  #            # cp -av docs workspace/c-docs
+  #            cp -av python/.docker-tox/wheelhouse workspace/
+  #            cp -av python/doc/_build/ workspace/py-docs
+  #     - persist_to_workspace:
+  #         root: workspace
+  #         paths:
+  #           # - c-docs
+  #           - py-docs
+  #           - wheelhouse
+
+  remote_tests_rust:
+    machine: true
+    steps:
+      - checkout
+      - run: ci_scripts/remote_tests_rust.sh
+    
+  remote_tests_python:
+    machine: true
+    steps:
+      - checkout
+      #- attach_workspace:
+      #    at: workspace
+      - run: ci_scripts/remote_tests_python.sh
+    # workspace/py-docs workspace/wheelhouse workspace/c-docs
+
+  upload_docs_wheels:
+    machine: true
+    steps:
+      - checkout
+      - attach_workspace:
+          at: workspace
+      - run: pyenv global 3.5.2
+      - run: ls -laR workspace
+      - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs
+
+  clippy:
+    executor: default
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Run cargo clippy
+          command: cargo clippy 
+
+
+workflows:
+  version: 2.1
+
+  test:
+    jobs:
+      # - cargo_fetch
+
+      - remote_tests_rust
+
+      - remote_tests_python
+
+      # - upload_docs_wheels:
+      #     requires:
+      #       - build_test_docs_wheel
+      #       - build_doxygen
+      # - rustfmt:
+      #     requires:
+      #       - cargo_fetch
+      # - clippy:
+      #     requires:
+      #      - cargo_fetch
+
+      - build_doxygen
+
+      # Linux Desktop 64bit
+      # - test_x86_64-unknown-linux-gnu:
+      #     requires:
+      #       - cargo_fetch
+
+      # Linux Desktop 32bit
+      # - test_i686-unknown-linux-gnu:
+      #     requires:
+      #       - cargo_fetch
+
+      # Android 64bit
+      # - test_aarch64-linux-android:
+      #     requires:
+      #       - cargo_fetch
+
+      # Desktop Apple
+      # - test_macos:
+      #     requires:
+      #       - cargo_fetch

.gitattributes

@@ -12,6 +12,3 @@ test-data/* text=false
 *.gif  binary
 *.ico  binary
 
-*.py diff=python
-*.rs diff=rust
-*.md diff=markdown

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "cargo"
-    open-pull-requests-limit: 50

.github/mergeable.yml

@@ -1,26 +0,0 @@
-version: 2
-mergeable:
-  - when: pull_request.*
-    name: "Changelog check"
-    validate:
-      - do: or
-        validate:
-        - do: description
-          must_include:
-            regex: '#skip-changelog'
-        - do: and
-          validate:
-            - do: dependent
-              changed:
-                file: 'src/**'
-                required: ['CHANGELOG.md']
-            - do: dependent
-              changed:
-                file: 'deltachat-ffi/**'
-                required: ['CHANGELOG.md']
-    fail:
-      - do: checks
-        status: 'action_required' 
-        payload:
-          title: Changelog might need an update
-          summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."

.github/workflows/ci.yml

@@ -1,158 +0,0 @@
-name: Rust CI
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - staging
-      - trying
-
-env:
-  RUSTFLAGS: -Dwarnings
-   
-jobs:
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v1
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  run_clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-            toolchain: stable
-            components: clippy
-            override: true
-      - 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
-
-  docs:
-    name: Rust doc comments
-    runs-on: ubuntu-latest
-    env:
-      RUSTDOCFLAGS: -Dwarnings
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-      - name: Install rust stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          components: rust-docs
-          override: true
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v1
-      - name: Rustdoc
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --document-private-items --no-deps
-
-  build_and_test:
-    name: Build and test
-    strategy:
-      matrix:
-        include:
-          # Currently used Rust version, same as in `rust-toolchain` file.
-          - os: ubuntu-latest
-            rust: 1.61.0
-            python: 3.9
-          - os: windows-latest
-            rust: 1.61.0
-            python: false # Python bindings compilation on Windows is not supported.
-
-          # Minimum Supported Rust Version = 1.56.1
-          #
-          # Minimum Supported Python Version = 3.7
-          # This is the minimum version for which manylinux Python wheels are
-          # built.
-          - os: ubuntu-latest
-            rust: 1.56.1
-            python: 3.7
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install ${{ matrix.rust }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust }}
-        override: true
-
-    - name: Cache rust cargo artifacts
-      uses: swatinem/rust-cache@v1
-
-    - name: check
-      uses: actions-rs/cargo@v1
-      with:
-        command: check
-        args: --all --bins --examples --tests --features repl --benches
-
-    - name: tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all
-
-    - name: install python
-      if: ${{ matrix.python }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python }}
-
-    - name: install tox
-      if: ${{ matrix.python }}
-      run: pip install tox
-
-    - name: build C library
-      if: ${{ matrix.python }}
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: -p deltachat_ffi --features jsonrpc
-
-    - name: run python 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 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/code-quality.yml

@@ -0,0 +1,47 @@
+on: push
+name: Code Quality
+jobs:
+
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2019-11-06
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2019-11-06
+          override: true
+      - run: rustup component add rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  run_clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly-2019-11-06
+            components: clippy
+            override: true
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features

.github/workflows/dependabot.yml

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

.github/workflows/jsonrpc.yml

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

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

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

.github/workflows/node-docs.yml

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

.github/workflows/node-package.yml

@@ -1,165 +0,0 @@
-name: 'node.js build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  prebuild:
-    name: 'prebuild'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          cd node
-          npm install --verbose
-
-      - name: Build Prebuild
-        run: |
-          cd node
-          npm run prebuildify
-          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
-
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ matrix.os }}
-          path: node/${{ matrix.os }}.tar.gz
-
-  pack-module:
-    needs: prebuild
-    name: 'Package deltachat-node and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-          echo $DELTACHAT_NODE_TAR_GZ
-      - name: Download ubuntu prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: ubuntu-18.04
-      - name: Download macos prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: macos-latest
-      - name: Download windows prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: windows-latest
-      - shell: bash
-        run: |
-          mkdir node/prebuilds
-          tar -xvzf ubuntu-18.04/ubuntu-18.04.tar.gz -C node/prebuilds
-          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
-          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
-          tree node/prebuilds
-          rm -rf ubuntu-18.04 macos-latest windows-latest
-      - name: install dependencies without running scripts
-        run: |
-          npm install --ignore-scripts
-      - name: build constants
-        run: |
-          npm run build:core:constants
-      - name: build typescript part
-        run: |
-          npm run build:bindings:ts
-      - name: package
-        shell: bash
-        run: |
-          mv node/README.md README.md
-          npm pack .
-          ls -lah
-          mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: deltachat-node.tgz
-          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-node preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
-        continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-node build to download.delta.chat/node/
-        if: ${{ steps.tag.outputs.tag }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/node-tests.yml

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

.github/workflows/repl.yml

@@ -1,32 +0,0 @@
-# Manually triggered action to build a Windows repl.exe which users can
-# download to debug complex bugs.
-
-name: Build Windows REPL .exe
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_repl:
-    name: Build REPL example
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: 1.50.0
-        override: true
-
-    - name: build
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: --example repl --features repl,vendored
-
-    - name: Upload binary
-      uses: actions/upload-artifact@v2
-      with:
-        name: repl.exe
-        path: 'target/debug/examples/repl.exe'

.github/workflows/upload-docs.yml

@@ -1,28 +0,0 @@
-name: Build & Deploy Documentation on rs.delta.chat
-
-on:
-  push:
-    branches:
-      - master
-      - docs-gh-action
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/toolchain@v1
-    - name: Build the documentation with cargo
-      run: |
-        cargo doc --package deltachat --no-deps
-    - name: Upload to rs.delta.chat
-      uses: up9cloud/action-rsync@v1.3
-      env:
-        USER: ${{ secrets.USERNAME }}
-        KEY: ${{ secrets.KEY }}
-        HOST: "delta.chat"
-        SOURCE: "target/doc"
-        TARGET: "/var/www/html/rs/"
-

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

@@ -1,28 +0,0 @@
-name: Build & Deploy Documentation on cffi.delta.chat
-
-on:
-  push:
-    branches:
-      - master
-      - docs-gh-action
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/toolchain@v1
-    - name: Build the documentation with cargo
-      run: |
-        cargo doc --package deltachat_ffi --no-deps
-    - name: Upload to cffi.delta.chat
-      uses: up9cloud/action-rsync@v1.3
-      env:
-        USER: ${{ secrets.USERNAME }}
-        KEY: ${{ secrets.KEY }}
-        HOST: "delta.chat"
-        SOURCE: "target/doc"
-        TARGET: "/var/www/html/cffi/"
-

.gitignore

@@ -1,6 +1,5 @@
 /target
 **/*.rs.bk
-/build
 
 # ignore vi temporaries
 *~
@@ -26,17 +25,3 @@ deltachat-ffi/html
 deltachat-ffi/xml
 
 .rsynclist
-
-coverage/
-.DS_Store
-.vscode/launch.json
-python/accounts.txt
-python/all-testaccounts.txt
-tmp/
-
-# from deltachat-node
-node_modules/
-node/build/
-node/dist/
-node/prebuilds/
-node/.nyc_output/

.npmignore

@@ -1,56 +0,0 @@
-.circleci/
-.gitmodules
-node/.nyc_output/
-.travis.yml
-appveyor.yml
-node/build/
-node/README.md
-rustfmt.toml
-spec.md
-test-data/
-build2/
-node_modules
-.git
-.idea/
-.pytest_cache
-CMakeLists.txt
-README.md
-contrib/
-node/ci_scripts/
-coverage/
-node/.circleci
-node/appveyor.yml
-ci/
-ci_scripts/
-python/
-target
-proptest-regressions
-deltachat-ffi/Doxyfile
-scripts
-webxdc.md
-standards.md
-draft/
-node/examples/
-# deltachat-core-rust/assets # don't exclude assets, otherwise it won't build
-node/images/
-node/test/
-node/windows.md
-node/*.tar.gz
-node/old_docs.md
-.vscode/
-.github/
-node/.prettierrc.yml
-
-deltachat-jsonrpc/TODO.md
-deltachat-jsonrpc/README.MD
-deltachat-jsonrpc/.gitignore
-deltachat-jsonrpc/typescript/.gitignore
-deltachat-jsonrpc/typescript/.prettierignore
-deltachat-jsonrpc/typescript/accounts/
-deltachat-jsonrpc/typescript/index.html
-deltachat-jsonrpc/typescript/node-demo.js
-deltachat-jsonrpc/typescript/report_api_coverage.mjs
-deltachat-jsonrpc/typescript/test
-deltachat-jsonrpc/typescript/example.ts
-
-.DS_Store

.npmrc

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

CMakeLists.txt

@@ -1,50 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-project(deltachat LANGUAGES C)
-include(GNUInstallDirs)
-
-find_program(CARGO cargo)
-
-if(APPLE)
-       set(DYNAMIC_EXT "dylib")
-elseif(UNIX)
-       set(DYNAMIC_EXT "so")
-else()
-       set(DYNAMIC_EXT "dll")
-endif()
-
-add_custom_command(
-	OUTPUT
-	"target/release/libdeltachat.a"
-	"target/release/libdeltachat.${DYNAMIC_EXT}"
-	"target/release/pkgconfig/deltachat.pc"
-        COMMAND
-        PREFIX=${CMAKE_INSTALL_PREFIX}
-        LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
-        INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-        ${CARGO} build --release --no-default-features --features jsonrpc
-
-	# Build in `deltachat-ffi` directory instead of using
-	# `--package deltachat_ffi` to avoid feature resolver version
-	# "1" bug which makes `--no-default-features` affect only
-	# `deltachat`, but not `deltachat-ffi` package.
-	#
-	# We can't enable version "2" resolver [1] because it is not
-	# stable yet on rust 1.50.0.
-	#
-	# [1] https://doc.rust-lang.org/nightly/cargo/reference/features.html#resolver-version-2-command-line-flags
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
-)
-
-add_custom_target(
-	lib_deltachat
-	ALL
-	DEPENDS
-	"target/release/libdeltachat.a"
-	"target/release/libdeltachat.${DYNAMIC_EXT}"
-	"target/release/pkgconfig/deltachat.pc"
-)
-
-install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

Cargo.toml

@@ -1,146 +1,88 @@
 [package]
 name = "deltachat"
-version = "1.87.0"
+version = "1.0.0-beta.21"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
-edition = "2021"
+edition = "2018"
-license = "MPL-2.0"
+license = "MPL"
-rust-version = "1.56"
-
-[profile.dev]
-debug = 0
-panic = 'abort'
-opt-level = 1
-
-[profile.release]
-lto = true
-panic = 'abort'
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
 
-ansi_term = { version = "0.12.1", optional = true }
+libc = "0.2.51"
-anyhow = "1"
+pgp = { version = "0.4.0", default-features = false }
-async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
-async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
-trust-dns-resolver = "0.21"
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
-tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-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 = "0.2"
-escaper = "0.1"
-futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+sha2 = "0.8.0"
-kamadak-exif = "0.5"
+rand = "0.7.0"
-lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
+smallvec = "1.0.0"
-libc = "0.2"
+reqwest = { version = "0.9.15" }
-log = {version = "0.4.16", optional = true }
+num-derive = "0.3.0"
-mailparse = "0.13"
+num-traits = "0.2.6"
-native-tls = "0.2"
+async-smtp = { git = "https://github.com/async-email/async-smtp" }
-num_cpus = "1.13"
+email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-num-derive = "0.3"
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "native_tls" }
-num-traits = "0.2"
+
-once_cell = "1.12.0"
+# XXX newer commits of async-imap lead to import-export tests hanging
+async-imap = { git = "https://github.com/async-email/async-imap", branch = "dcc-stable" }
+
+async-native-tls = "0.1.1"
+async-std = { version = "1.0", features = ["unstable"] }
+base64 = "0.11"
+charset = "0.1"
 percent-encoding = "2.0"
-pgp = { version = "0.8", 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.5"
-rusqlite = { version = "0.27", features = ["sqlcipher"] }
-rust-hsluv = "0.1"
-rustyline = { version = "9", optional = true }
-sanitize-filename = "0.4"
-serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-sha-1 = "0.10"
+serde_json = "1.0"
-sha2 = "0.10"
+chrono = "0.4.6"
-smallvec = "1"
+failure = "0.1.5"
-strum = "0.24"
+failure_derive = "0.1.5"
-strum_macros = "0.24"
+indexmap = "1.3.0"
-thiserror = "1"
+# TODO: make optional
-toml = "0.5"
+rustyline = "4.1.0"
-url = "2"
+lazy_static = "1.4.0"
-uuid = { version = "1", features = ["serde", "v4"] }
+regex = "1.1.6"
-fast-socks5 = "0.8"
+rusqlite = { version = "0.20", features = ["bundled"] }
-humansize = "1"
+r2d2_sqlite = "0.12.0"
-qrcodegen = "1.7.0"
+r2d2 = "0.8.5"
-tagger = "4.3.3"
+strum = "0.16.0"
-textwrap = "0.15.0"
+strum_macros = "0.16.0"
-async-channel = "1.6.1"
+thread-local-object = "0.1.0"
-futures-lite = "1.12.0"
+backtrace = "0.3.33"
-tokio-stream = { version = "0.1.9", features = ["fs"] }
+byteorder = "1.3.1"
-reqwest = { version = "0.11.11", features = ["json"] }
+itertools = "0.8.0"
-async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }
+image-meta = "0.1.0"
+quick-xml = "0.17.1"
+escaper = "0.1.0"
+bitflags = "1.1.0"
+debug_stub_derive = "0.3.0"
+sanitize-filename = "0.2.1"
+stop-token = { version = "0.1.1", features = ["unstable"] }
+mailparse = "0.10.1"
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
+native-tls = "0.2.3"
+image = "0.22.3"
 
 [dev-dependencies]
-ansi_term = "0.12.0"
+tempfile = "3.0"
-criterion = { version = "0.3.4", features = ["async_tokio"] }
+pretty_assertions = "0.6.1"
-futures-lite = "1.12"
+pretty_env_logger = "0.3.0"
-log = "0.4"
+proptest = "0.9.4"
-pretty_env_logger = "0.4"
-proptest = { version = "1", default-features = false, features = ["std"] }
-tempfile = "3"
-tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 
 [workspace]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc"
 ]
 
 [[example]]
 name = "simple"
 path = "examples/simple.rs"
-required-features = ["repl"]
 
 [[example]]
 name = "repl"
 path = "examples/repl/main.rs"
-required-features = ["repl"]
 
 
-[[bench]]
-name = "create_account"
-harness = false
-
-[[bench]]
-name = "contacts"
-harness = false
-
-[[bench]]
-name = "search_msgs"
-harness = false
-
-[[bench]]
-name = "receive_emails"
-harness = false
-
-[[bench]]
-name = "get_chat_msgs"
-harness = false
-
-[[bench]]
-name = "get_chatlist"
-harness = false
-
 [features]
-default = ["vendored"]
+default = ["nightly", "ringbuf"]
-internals = []
+vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
-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"
-]
 nightly = ["pgp/nightly"]
+ringbuf = ["pgp/ringbuf"]

LICENSE

@@ -2,6 +2,9 @@ The files in this directory and under its subdirectories
 are (c) 2019 by Bjoern Petersen and contributors and released under the
 Mozilla Public License Version 2.0, see below for a copy.
 
+NOTE that the files in the "libs" directory are copyrighted by third parties
+and come with their own respective licenses.
+
 Mozilla Public License Version 2.0
 ==================================
 

README.md

@@ -2,26 +2,23 @@
 
 > Deltachat-core written in Rust 
 
-[![Rust CI](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml)
+[![CircleCI build status][circle-shield]][circle] [![Appveyor build status][appveyor-shield]][appveyor]
 
 ## Installing Rust and Cargo
 
 To download and install the official compiler for the Rust programming language, and the Cargo package manager, run the command in your user environment:
 
 ```
-$ curl https://sh.rustup.rs -sSf | sh
+curl https://sh.rustup.rs -sSf | sh
 ```
 
-> On Windows, you may need to also install **Perl** to be able to compile deltachat-core.
-
 ## Using the CLI client
 
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ RUST_LOG=repl=info cargo run --example repl --features repl -- ~/deltachat-db
+cargo run --example repl -- /path/to/db
 ```
-where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
 Configure your account (if not already configured):
 
@@ -81,16 +78,6 @@ For more commands type:
 > help
 ```
 
-## Installing libdeltachat system wide
-
-```
-$ git clone https://github.com/deltachat/deltachat-core-rust.git
-$ cd deltachat-core-rust
-$ cmake -B build . -DCMAKE_INSTALL_PREFIX=/usr
-$ cmake --build build
-$ sudo cmake --install build
-```
-
 ## Development
 
 ```sh
@@ -102,10 +89,12 @@ $ cargo build -p deltachat_ffi --release
 
 ## Debugging environment variables 
 
+- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
+  printed
+
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
 
-- `RUST_LOG=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
+
-SMTP tracing in addition to info messages.
 
 ### Expensive tests
 
@@ -119,24 +108,9 @@ $ cargo test -- --ignored
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
 - `nightly`: Enable nightly only performance and security related features.
+- `ringbuf`: Enable the use of [`slice_deque`](https://github.com/gnzlbg/slice_deque) in pgp.
 
-## Language bindings and frontend projects
+[circle-shield]: https://img.shields.io/circleci/project/github/deltachat/deltachat-core-rust/master.svg?style=flat-square
-
+[circle]: https://circleci.com/gh/deltachat/deltachat-core-rust/
-Language bindings are available for:
+[appveyor-shield]: https://ci.appveyor.com/api/projects/status/lqpegel3ld4ipxj8/branch/master?style=flat-square
-
+[appveyor]: https://ci.appveyor.com/project/dignifiedquire/deltachat-core-rust/branch/master
-- **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **Node.js** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
-- **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
-- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
-- **Java** and **Swift** (contained in the Android/iOS repos)
-
-The following "frontend" projects make use of the Rust-library
-or its language bindings:
-
-- [Android](https://github.com/deltachat/deltachat-android)
-- [iOS](https://github.com/deltachat/deltachat-ios)
-- [Desktop](https://github.com/deltachat/deltachat-desktop)
-- [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
-- [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
-- several **Bots**

appveyor.yml

@@ -0,0 +1,19 @@
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+
+install:
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init -yv --default-toolchain nightly-2019-07-10
+  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
+build: false
+
+test_script:
+  - cargo test --release --all
+
+cache:
+  - target
+  - C:\Users\appveyor\.cargo\registry

assets/icon-broadcast.svg

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 128 128"
-   viewBox="0 0 60 60"
-   version="1.1"
-   id="svg878"
-   sodipodi:docname="icon-broadcast.svg"
-   width="60"
-   height="60"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
-   inkscape:export-filename="/Users/bpetersen/projects/deltachat-core-rust/assets/icon-broadcast.png"
-   inkscape:export-xdpi="409.60001"
-   inkscape:export-ydpi="409.60001">
-  <metadata
-     id="metadata884">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs882" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1329"
-     inkscape:window-height="847"
-     id="namedview880"
-     showgrid="false"
-     inkscape:zoom="5.21875"
-     inkscape:cx="36.598802"
-     inkscape:cy="32.191617"
-     inkscape:window-x="111"
-     inkscape:window-y="205"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg878"
-     inkscape:document-rotation="0" />
-  <radialGradient
-     id="c"
-     cx="65.25"
-     cy="89"
-     r="26.440001"
-     gradientTransform="matrix(0.77611266,0.11996647,-0.18999676,1.2286617,-11.305867,-60.065999)"
-     gradientUnits="userSpaceOnUse">
-    <stop
-       stop-color="#FFC107"
-       offset="0"
-       id="stop833" />
-    <stop
-       stop-color="#FFBD06"
-       offset=".3502"
-       id="stop835" />
-    <stop
-       stop-color="#FFB104"
-       offset=".6938"
-       id="stop837" />
-    <stop
-       stop-color="#FFA000"
-       offset="1"
-       id="stop839" />
-  </radialGradient>
-  <radialGradient
-     id="b"
-     cx="52.5"
-     cy="19.75"
-     r="92.975998"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="rotate(45.323856,68.997115,75.979538)">
-    <stop
-       stop-color="#EF5350"
-       offset="0"
-       id="stop848" />
-    <stop
-       stop-color="#EB4F4C"
-       offset=".246"
-       id="stop850" />
-    <stop
-       stop-color="#E04341"
-       offset=".4878"
-       id="stop852" />
-    <stop
-       stop-color="#CD302F"
-       offset=".7272"
-       id="stop854" />
-    <stop
-       stop-color="#C62828"
-       offset=".8004"
-       id="stop856" />
-    <stop
-       stop-color="#C62828"
-       offset="1"
-       id="stop858" />
-  </radialGradient>
-  <radialGradient
-     id="a"
-     cx="16.979"
-     cy="92"
-     r="24.165001"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="rotate(45.323856,68.997115,75.979538)"
-     xlink:href="#b">
-    <stop
-       stop-color="#E0E0E0"
-       offset="0"
-       id="stop863" />
-    <stop
-       stop-color="#CFCFCF"
-       offset=".3112"
-       id="stop865" />
-    <stop
-       stop-color="#A4A4A4"
-       offset=".9228"
-       id="stop867" />
-    <stop
-       stop-color="#9E9E9E"
-       offset="1"
-       id="stop869" />
-  </radialGradient>
-  <rect
-     y="0"
-     x="0"
-     height="60"
-     width="60"
-     id="rect1420"
-     style="fill:#7cc0bc;fill-opacity:1;stroke:none;stroke-width:1.29077" />
-  <path
-     id="path872"
-     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.336872;stroke-opacity:1"
-     d="m 8.6780027,35.573064 0.032831,-11.910176 c 0.00138,-0.476406 0.4881282,-0.794259 0.9235226,-0.604877 l 4.1144877,2.345752 -0.02386,8.656315 -4.1268029,2.122946 C 9.1617452,36.370003 8.6766889,36.049472 8.6780027,35.573064 Z m 5.0469633,-1.508222 0.02386,-8.656314 31.145424,-9.537653 c 0.841472,-0.219211 1.65915,0.41667 1.656755,1.283728 l -0.06929,25.139995 c -0.0024,0.867062 -0.825942,1.500799 -1.663803,1.274581 z m 3.8042,6.892234 C 16.681121,40.104348 16.315444,38.819414 16.69043,37.591308 l 2.252234,-7.347193 c 0.2644,-0.861571 0.845185,-1.567441 1.641953,-1.989251 0.796769,-0.421808 1.706956,-0.509819 2.568531,-0.245419 l 7.263888,2.225804 c 1.775518,0.543235 2.780299,2.432591 2.232297,4.208094 L 30.3971,41.790532 c -0.545627,1.777887 -2.432591,2.780297 -4.208095,2.232298 l -7.263891,-2.225804 c -0.545033,-0.165864 -1.01825,-0.460162 -1.395948,-0.83995 z m 12.377693,-7.976728 c -0.07601,-0.07642 -0.17114,-0.133864 -0.280621,-0.167516 l -7.263891,-2.225803 c -0.233244,-0.07209 -0.421626,0.0013 -0.512275,0.04861 -0.09064,0.0474 -0.25772,0.166033 -0.327435,0.396899 l -2.252234,7.347191 c -0.108166,0.354628 0.09088,0.731541 0.447888,0.842099 l 7.263891,2.225802 c 0.354626,0.108174 0.731539,-0.09088 0.842099,-0.447888 l 2.249845,-7.344814 c 0.07453,-0.245145 0.0014,-0.504991 -0.167267,-0.67458 z" />
-</svg>

assets/icon-webxdc.svg

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="80mm"
-   height="297mm"
-   viewBox="0 0 80 297"
-   version="1.1"
-   id="svg71"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
-   sodipodi:docname="icon-webxdc.svg"
-   inkscape:export-filename="C:\Users\user\OneDrive - BFW-Leipzig\Documents\LogoDC\finalohnerand.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <metadata
-     id="metadata856">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     id="namedview73"
-     pagecolor="#767676"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="true"
-     inkscape:document-units="mm"
-     showgrid="false"
-     showborder="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-90.271136"
-     inkscape:cy="-1233.1209"
-     inkscape:window-width="1864"
-     inkscape:window-height="1027"
-     inkscape:window-x="56"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-global="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:document-rotation="0"
-     units="px">
-    <sodipodi:guide
-       position="-154.76097,641.11689"
-       orientation="0,-1"
-       id="guide21118" />
-    <sodipodi:guide
-       position="-60.286487,633.36619"
-       orientation="0,-1"
-       id="guide21120" />
-  </sodipodi:namedview>
-  <defs
-     id="defs68">
-    <linearGradient
-       id="linearGradient4375">
-      <stop
-         style="stop-color:#364e59;stop-opacity:1;"
-         offset="0"
-         id="stop4377" />
-      <stop
-         style="stop-color:#364e59;stop-opacity:0;"
-         offset="1"
-         id="stop4379" />
-    </linearGradient>
-  </defs>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#1a1a1a;stroke:#000000;stroke-width:0.167903"
-       id="rect880"
-       width="79.8321"
-       height="79.8321"
-       x="-64.03286"
-       y="-375.9097"
-       ry="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3799-2"
-       d="m -24.089585,-372.59579 c -19.986026,0.24336 -36.196903,16.666 -36.196903,36.67011 0,20.00409 16.210877,36.03233 36.196903,35.78912 19.0024236,-0.076 14.5340713,-10.6146 35.538854,-0.85693 -11.50627538,-17.97454 0.390097,-20.36737 0.658079,-35.81316 0,-20.00411 -16.2108788,-36.03235 -36.196911,-35.78914 z"
-       style="fill:#364e59;fill-opacity:1;stroke:none;stroke-width:1.93355"
-       sodipodi:nodetypes="sscccs" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -54.193871,-325.26419 Z"
-       id="path3846" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -49.397951,-326.67773 Z"
-       id="path3848" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -49.397951,-326.67773 v 0 0"
-       id="path3850" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m -51.35133,-325.0334 -7.964067,5.98895 z"
-       id="path3965" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path11037"
-       d="m -24.089585,-372.19891 c -19.986026,0.24156 -36.196903,16.54352 -36.196903,36.40062 0,7.86524 2.543315,15.1113 6.857155,20.97971 6.577146,8.94734 11.123515,9.77363 11.123515,9.77363 1.343237,1.78324 10.270932,4.3223 10.270932,4.3223 l 16.791727,-70.86654 -0.468369,-0.33457 c 0.458597,0.26445 0.428277,-0.27515 -8.378035,-0.27515 z"
-       style="fill:#7cc5cc;fill-opacity:1;stroke:none;stroke-width:1.92643"
-       sodipodi:nodetypes="sssccccss" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -49.944239,-310.69957 Z"
-       id="path13674" />
-    <g
-       id="g15178"
-       transform="matrix(0.79975737,0,0,0.79975737,53.088959,-63.716396)">
-      <rect
-         style="fill:#364e59;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect15072"
-         width="29.897917"
-         height="6.8791666"
-         x="-334.4964"
-         y="-154.51025"
-         transform="rotate(45)" />
-      <rect
-         style="fill:#364e59;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect15072-5"
-         width="29.897917"
-         height="6.8791666"
-         x="147.63107"
-         y="-334.4964"
-         transform="rotate(-45)"
-         inkscape:transform-center-x="-0.74835017"
-         inkscape:transform-center-y="0.37417525" />
-    </g>
-    <g
-       id="g22468"
-       transform="translate(3.3033974)">
-      <g
-         id="g15178-0"
-         transform="matrix(-0.79975737,0,0,0.79975737,-103.11028,-63.716404)"
-         style="fill:#7cc5cc;fill-opacity:1">
-        <rect
-           style="fill:#7cc5cc;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect15072-2"
-           width="29.897917"
-           height="6.8791666"
-           x="-334.4964"
-           y="-154.51025"
-           transform="rotate(45)" />
-        <rect
-           style="fill:#7cc5cc;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect15072-5-5"
-           width="29.897917"
-           height="6.8791666"
-           x="147.63107"
-           y="-334.4964"
-           transform="rotate(-45)"
-           inkscape:transform-center-x="-0.74835017"
-           inkscape:transform-center-y="0.37417525" />
-      </g>
-    </g>
-  </g>
-</svg>

assets/qrcode_logo_footer.svg

@@ -1,10 +0,0 @@
-<text
-     xml:space="preserve"
-     style="font-weight:bold;font-size:24.4118px;line-height:1.25;font-family:sans-serif;fill:#aaaaaa;fill-opacity:1;stroke:none;stroke-width:0.915439"
-     x="42.325161"
-     y="23.32255"
-     id="text72398">get.delta.chat</text>
-  <path
-     id="path84310"
-     style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.915439"
-     d="M 17.13769,0.00129321 C 7.6753075,0.11650893 0,7.8915283 0,17.362467 c 0,9.47094 7.6753075,17.059745 17.13769,16.944599 8.99669,-0.03598 6.880074,-5.025654 16.824785,-0.405885 -5.447648,-8.510047 0.184241,-9.642482 0.311117,-16.955289 0,-9.4709395 -7.673512,-17.0597453 -17.135895,-16.94459879 z M 17.0769,4.9986797 c 1.84214,0 3.447355,0.253959 4.815003,0.7616693 1.381603,0.5076411 2.072253,1.207862 2.072253,2.0990711 0,0.4286855 -0.167495,0.7836052 -0.50242,1.0656242 -0.334921,0.2819844 -0.724544,0.4237724 -1.171121,0.4237724 -0.641952,0 -1.396532,-0.3909376 -2.261778,-1.169353 C 19.14963,7.3898036 18.402555,6.83791 17.788507,6.5220182 17.188416,6.1950547 16.484552,6.0321266 15.675129,6.0321266 c -1.032717,0 -1.883352,0.1854523 -2.553215,0.5578447 -0.655913,0.372254 -0.98517,0.8460916 -0.98517,1.4214436 0,0.5414792 0.272815,1.0495355 0.817093,1.5233385 0.544275,0.4738026 1.946291,1.3367446 4.207097,2.5889976 2.414319,1.342419 4.117377,2.390985 5.108232,3.146807 1.004795,0.755857 1.821505,1.675853 2.449514,2.758846 0.628002,1.082993 0.942253,2.227607 0.942253,3.434674 0,2.120834 -0.929555,3.993314 -2.785656,5.617786 -1.84214,1.613228 -3.99694,2.41915 -6.467082,2.41915 -2.246845,0 -4.145607,-0.647976 -5.694677,-1.945312 -1.5490699,-1.297336 -2.3225722,-3.028063 -2.3225722,-5.194049 0,-2.087031 0.8506345,-3.83094 2.5532182,-5.229825 1.716541,-1.398884 3.824203,-2.245599 6.322256,-2.538897 -0.697774,-0.631749 -1.668763,-1.387225 -2.910816,-2.267155 -1.367648,-0.970199 -2.287914,-1.73045 -2.762402,-2.283243 -0.474491,-0.5640381 -0.711618,-1.1795944 -0.711618,-1.8451814 0,-0.9927581 0.572093,-1.7710351 1.716451,-2.3351077 1.144362,-0.5753173 2.636724,-0.8635642 4.478865,-0.8635642 z m 1.110327,10.3738083 c -4.005262,0.5302 -6.007576,2.75279 -6.007576,6.667322 0,2.01932 0.49495,3.587291 1.485805,4.704157 1.004806,1.116832 2.169696,1.675299 3.495479,1.675299 1.381602,0 2.520072,-0.535632 3.413229,-1.60738 0.893168,-1.082959 1.339187,-2.545264 1.339187,-4.384079 0,-2.662348 -1.242022,-5.013441 -3.726124,-7.055319 z" />

benches/contacts.rs

@@ -1,41 +0,0 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::contact::Contact;
-use deltachat::context::Context;
-use deltachat::Events;
-use tempfile::tempdir;
-
-async fn address_book_benchmark(n: u32, read_count: u32) {
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    let id = 100;
-    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
-
-    let book = (0..n)
-        .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))
-        .collect::<Vec<String>>()
-        .join("");
-
-    Contact::add_address_book(&context, &book).await.unwrap();
-
-    let query: Option<&str> = None;
-    for _ in 0..read_count {
-        Contact::get_all(&context, 0, query).await.unwrap();
-    }
-}
-
-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 })
-    });
-
-    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 })
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

benches/create_account.rs

@@ -1,26 +0,0 @@
-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 mut accounts = Accounts::new(p.clone()).await.unwrap();
-
-    for expected_id in 2..n {
-        let id = accounts.add_account().await.unwrap();
-        assert_eq!(id, expected_id);
-    }
-}
-
-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)))
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

benches/get_chat_msgs.rs

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

benches/get_chatlist.rs

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

benches/receive_emails.rs

@@ -1,87 +0,0 @@
-use std::path::PathBuf;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::{
-    config::Config,
-    context::Context,
-    imex::{imex, ImexMode},
-    receive_imf::receive_imf,
-    Events,
-};
-use tempfile::tempdir;
-
-async fn recv_all_emails(context: Context) -> Context {
-    for i in 0..100 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Mr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-In-Reply-To: Mr.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();
-    }
-    context
-}
-
-async fn create_context() -> Context {
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    let id = 100;
-    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
-
-    let backup: PathBuf = std::env::current_dir()
-        .unwrap()
-        .join("delta-chat-backup.tar");
-
-    if backup.exists() {
-        println!("Importing backup");
-        imex(&context, ImexMode::ImportBackup, &backup, None)
-            .await
-            .unwrap();
-    }
-
-    let addr = "alice@example.com";
-    context.set_config(Config::Addr, Some(addr)).await.unwrap();
-    context
-        .set_config(Config::ConfiguredAddr, Some(addr))
-        .await
-        .unwrap();
-    context
-        .set_config(Config::Configured, Some("1"))
-        .await
-        .unwrap();
-    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;
-            }
-        });
-    });
-    group.finish();
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

benches/search_msgs.rs

@@ -1,32 +0,0 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::context::Context;
-use deltachat::Events;
-use std::path::Path;
-
-async fn search_benchmark(dbfile: impl AsRef<Path>) {
-    let id = 100;
-    let context = Context::new(dbfile.as_ref(), id, Events::new())
-        .await
-        .unwrap();
-
-    for _ in 0..10u32 {
-        context.search_msgs(None, "hello").await.unwrap();
-    }
-}
-
-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)))
-        });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
-    }
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

ci_scripts/README.md

@@ -1,12 +1,11 @@
 # Continuous Integration Scripts for Delta Chat
 
-Continuous Integration, run through [GitHub
+Continuous Integration, run through CircleCI and an own build machine.
-Actions](https://docs.github.com/actions)
-and an own build machine.
 
 ## Description of scripts 
 
-- `../.github/workflows` contains jobs run by GitHub Actions.
+- `../.circleci/config.yml` describing the build jobs that are run
+  by Circle-CI
 
 - `remote_tests_python.sh` rsyncs to a build machine and runs
   `run-python-test.sh` remotely on the build machine. 
@@ -25,10 +24,10 @@ and an own build machine.
 
 There is experimental support for triggering a remote Python or Rust test run 
 from your local checkout/branch. You will need to be authorized to login to 
-the build machine (ask your friendly sysadmin on #deltachat Libera Chat) to type::
+the build machine (ask your friendly sysadmin on #deltachat freenode) to type::
 
-    scripts/manual_remote_tests.sh rust
+    ci_scripts/manual_remote_tests.sh rust
-    scripts/manual_remote_tests.sh python
+    ci_scripts/manual_remote_tests.sh python
 
 This will **rsync** your current checkout to the remote build machine 
 (no need to commit before) and then run either rust or python tests. 
@@ -42,10 +41,6 @@ python tests and build wheels (binary packages for Python)
 You can build the docker images yourself locally
 to avoid the relatively large download:: 
  
-    cd scripts  # where all CI things are 
+    cd ci_scripts  # where all CI things are 
     docker build -t deltachat/coredeps docker-coredeps
     docker build -t deltachat/doxygen docker-doxygen 
-
-Additionally, you can install qemu and build arm64 docker image:
-    apt-get install qemu binfmt-support qemu-user-static
-    docker build -t deltachat/coredeps-arm64 docker-coredeps-arm64

ci_scripts/ci_upload.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+if [ -z "$DEVPI_LOGIN" ] ; then 
+    echo "required: password for 'dc' user on https://m.devpi/net/dc index"
+    exit 0
+fi
+
+set -xe
+
+PYDOCDIR=${1:?directory with python docs}
+WHEELHOUSEDIR=${2:?directory with pre-built wheels}
+DOXYDOCDIR=${3:?directory where doxygen docs to be found}
+
+export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
+
+
+# DISABLED: python docs to py.delta.chat
+#ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
+#rsync -avz \
+#  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
+#  "$PYDOCDIR/html/" \
+#  delta@py.delta.chat:build/${BRANCH}
+
+# C docs to c.delta.chat
+ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@c.delta.chat mkdir -p build-c/${BRANCH}
+rsync -avz \
+  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
+  "$DOXYDOCDIR/html/" \
+  delta@c.delta.chat:build-c/${BRANCH}
+
+exit 0
+
+# OUTDATED -- for re-use from python release-scripts 
+
+echo -----------------------
+echo upload wheels 
+echo -----------------------
+
+# Bundle external shared libraries into the wheels
+pushd $WHEELHOUSEDIR
+
+pip3 install devpi-client
+devpi use https://m.devpi.net
+devpi login dc --password $DEVPI_LOGIN
+
+N_BRANCH=${BRANCH//[\/]}
+
+devpi use dc/$N_BRANCH || {
+    devpi index -c $N_BRANCH 
+    devpi use dc/$N_BRANCH
+}
+devpi index $N_BRANCH bases=/root/pypi
+devpi upload deltachat*.whl
+
+popd

ci_scripts/docker-coredeps/Dockerfile

@@ -0,0 +1,24 @@
+FROM quay.io/pypa/manylinux1_x86_64
+
+# Configure ld.so/ldconfig and pkg-config
+RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \
+    echo /usr/local/lib >> /etc/ld.so.conf.d/local.conf
+ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig
+
+# Install a recent Perl, needed to install OpenSSL
+ADD deps/build_perl.sh /builder/build_perl.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1
+
+# Install OpenSSL
+ADD deps/build_openssl.sh /builder/build_openssl.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_openssl.sh && cd .. && rm -r tmp1
+
+ENV PIP_DISABLE_PIP_VERSION_CHECK 1
+
+# Install python tools (auditwheels,tox, ...)
+ADD deps/build_python.sh /builder/build_python.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1
+
+# Install Rust nightly
+ADD deps/build_rust.sh /builder/build_rust.sh
+RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1

ci_scripts/docker-coredeps/deps/build_openssl.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e -x
+
+OPENSSL_VERSION=1.1.1a
+OPENSSL_SHA256=fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41
+
+curl -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
+echo "${OPENSSL_SHA256}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c -
+tar xzf openssl-${OPENSSL_VERSION}.tar.gz
+cd openssl-${OPENSSL_VERSION} 
+./config shared no-ssl2 no-ssl3 -fPIC --prefix=/usr/local
+
+sed -i "s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=200/" Makefile && \
+sed -i "s/^SHLIB_MINOR=.*/SHLIB_MINOR=0.0/" Makefile && \
+sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=200.0.0/" Makefile
+
+make depend
+make 
+make install_sw install_ssldirs
+ldconfig -v | grep ssl 

ci_scripts/docker-coredeps/deps/build_perl.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+PERL_VERSION=5.30.0
+# PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
+curl -O https://www.cpan.org/src/5.0/perl-${PERL_VERSION}.tar.gz
+# echo "${PERL_SHA256}  perl-${PERL_VERSION}.tar.gz" | sha256sum -c -
+tar -xzf perl-${PERL_VERSION}.tar.gz
+cd perl-${PERL_VERSION}
+
+./Configure -de
+make
+make install

ci_scripts/docker-coredeps/deps/build_python.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -x -e
+
+# we use the python3.5 environment as the base environment 
+/opt/python/cp35-cp35m/bin/pip install tox devpi-client auditwheel 
+
+pushd /usr/bin
+
+ln -s /opt/_internal/cpython-3.5.*/bin/tox
+ln -s /opt/_internal/cpython-3.5.*/bin/devpi
+ln -s /opt/_internal/cpython-3.5.*/bin/auditwheel
+
+popd

ci_scripts/docker-coredeps/deps/build_rust.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e -x
+
+# Install Rust
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-09-12 -y
+export PATH=/root/.cargo/bin:$PATH
+rustc --version

ci_scripts/docker-coredeps/deps/run_all.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Build the Delta Chat C/Rust library
+#
+set -e -x
+
+# perform clean build of core and install 
+export TOXWORKDIR=.docker-tox
+
+# build core library
+
+cargo build --release -p deltachat_ffi
+
+# configure access to a base python and 
+# to several python interpreters needed by tox below
+export PATH=$PATH:/opt/python/cp35-cp35m/bin
+export PYTHONDONTWRITEBYTECODE=1
+pushd /bin
+ln -s /opt/python/cp27-cp27m/bin/python2.7
+ln -s /opt/python/cp36-cp36m/bin/python3.6
+ln -s /opt/python/cp37-cp37m/bin/python3.7
+popd
+
+#
+# run python tests
+#
+
+if [ -n "$TESTS" ]; then 
+
+    echo ----------------
+    echo run python tests
+    echo ----------------
+
+    pushd python 
+    # first run all tests ...
+    rm -rf tests/__pycache__
+    rm -rf src/deltachat/__pycache__
+    export PYTHONDONTWRITEBYTECODE=1
+    tox --workdir "$TOXWORKDIR" -e py27,py35,py36,py37
+    popd
+fi
+
+
+if [ -n "$DOCS" ]; then 
+    echo -----------------------
+    echo generating python docs
+    echo -----------------------
+    (cd python && tox --workdir "$TOXWORKDIR" -e doc) 
+fi

ci_scripts/manual_remote_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -xe
+export CIRCLE_JOB=remote_tests_${1:?need to specify 'rust' or 'python'} 
+export CIRCLE_BUILD_NUM=$USER
+export CIRCLE_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
+export CIRCLE_PROJECT_REPONAME=$(basename `git rev-parse --show-toplevel`)
+
+time bash ci_scripts/$CIRCLE_JOB.sh 

ci_scripts/old/gh-actions-rust.yml

@@ -0,0 +1,77 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+env:
+  RUSTFLAGS: -Dwarnings
+
+jobs:
+  build_and_test:
+    name: Build and test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [nightly]
+
+    steps:
+    - uses: actions/checkout@master
+
+    - name: Install ${{ matrix.rust }}
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        override: true
+
+    - name: check
+      uses: actions-rs/cargo@v1
+      if: matrix.rust == 'nightly'
+      with:
+        command:  check
+        args: --all --bins --examples --tests
+
+    - name: tests
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
+
+    - name: tests ignored
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all --release -- --ignored
+
+  check_fmt:
+    name: Checking fmt and docs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+
+    - uses: actions-rs/toolchain@v1
+      with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+
+    - name: fmt
+      run: cargo fmt --all -- --check
+
+#  clippy_check:
+#    name: Clippy check
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions-rs/toolchain@v1
+#      with:
+#          profile: minimal
+#          toolchain: nightly
+#          override: true
+#          components: clippy
+#
+#    - name: clippy
+#      run: cargo clippy --all

ci_scripts/old/run-python.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Build the Delta Chat C/Rust library typically run in a docker
+# container that contains all library deps but should also work
+# outside if you have the dependencies installed on your system.
+
+set -e -x
+
+# Perform clean build of core and install.
+export TOXWORKDIR=.docker-tox
+
+# install core lib
+
+export PATH=/root/.cargo/bin:$PATH
+cargo build --release -p deltachat_ffi
+# cargo test --all --all-features
+
+# Statically link against libdeltachat.a.
+export DCC_RS_DEV=$(pwd)
+
+# Configure access to a base python and to several python interpreters
+# needed by tox below.
+export PATH=$PATH:/opt/python/cp35-cp35m/bin
+export PYTHONDONTWRITEBYTECODE=1
+pushd /bin
+ln -s /opt/python/cp27-cp27m/bin/python2.7
+ln -s /opt/python/cp36-cp36m/bin/python3.6
+ln -s /opt/python/cp37-cp37m/bin/python3.7
+popd
+
+if [ -n "$TESTS" ]; then
+
+    pushd python
+    # prepare a clean tox run
+    rm -rf tests/__pycache__
+    rm -rf src/deltachat/__pycache__
+    export PYTHONDONTWRITEBYTECODE=1
+
+    # run tox. The circle-ci project env-var-setting DCC_PY_LIVECONFIG 
+    # allows running of "liveconfig" tests but for speed reasons
+    # we run them only for the highest python version we support
+    
+    # we split out qr-tests run to minimize likelyness of flaky tests
+    # (some qr tests are pretty heavy in terms of send/received
+    # messages and rust's imap code likely has concurrency problems) 
+    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr"
+    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
+    unset DCC_PY_LIVECONFIG
+    tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
+    tox --workdir "$TOXWORKDIR" -e auditwheels
+    popd
+fi
+
+
+# if [ -n "$DOCS" ]; then
+#     echo -----------------------
+#     echo generating python docs
+#     echo -----------------------
+#     (cd python && tox --workdir "$TOXWORKDIR" -e doc)
+# fi

ci_scripts/remote_tests_python.sh

@@ -1,9 +1,12 @@
 #!/bin/bash 
 
-BUILD_ID=${1:?specify build ID}
+export BRANCH=${CIRCLE_BRANCH:?branch to build}
+export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
+export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
 
-SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+# we construct the BUILDDIR such that we can easily share the
-BUILDDIR=ci_builds/$BUILD_ID
+# CARGO_TARGET_DIR between runs ("..")
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
 
 echo "--- Copying files to $SSHTARGET:$BUILDDIR"
 
@@ -17,18 +20,16 @@ rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
 
 set +x
 
-echo "--- Running Python tests remotely"
+echo "--- Running $CIRCLE_JOB remotely"
 
 ssh $SSHTARGET <<_HERE
     set +x -e
-
-    # make sure all processes exit when ssh dies
-    shopt -s huponexit
-
-    export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
+    # let's share the target dir with our last run on this branch/job-type
+    # cargo will make sure to block/unblock us properly 
+    export CARGO_TARGET_DIR=\`pwd\`/../target
     export TARGET=release
-    export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
+    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
 
     #we rely on tox/virtualenv being available in the host
     #rm -rf virtualenv venv
@@ -41,5 +42,5 @@ ssh $SSHTARGET <<_HERE
     source \$HOME/venv/bin/activate
     which python
 
-    bash scripts/run-python-test.sh 
+    bash ci_scripts/run-python-test.sh 
 _HERE

ci_scripts/remote_tests_rust.sh

@@ -0,0 +1,32 @@
+#!/bin/bash 
+
+export BRANCH=${CIRCLE_BRANCH:?branch to build}
+export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name}
+export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+
+# we construct the BUILDDIR such that we can easily share the
+# CARGO_TARGET_DIR between runs ("..")
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
+
+set -e
+
+echo "--- Copying files to $SSHTARGET:$BUILDDIR"
+
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist 
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
+
+echo "--- Running $CIRCLE_JOB remotely"
+
+ssh $SSHTARGET <<_HERE
+    set +x -e
+    cd $BUILDDIR
+    # let's share the target dir with our last run on this branch/job-type
+    # cargo will make sure to block/unblock us properly 
+    export CARGO_TARGET_DIR=\`pwd\`/../target
+    export TARGET=x86_64-unknown-linux-gnu
+    export RUSTC_WRAPPER=sccache
+
+    bash ci_scripts/run-rust-test.sh
+_HERE
+

ci_scripts/run-doxygen.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cd deltachat-ffi 
+doxygen 
+

ci_scripts/run-python-test.sh

@@ -4,10 +4,9 @@
 # and tox/pytest. 
 
 set -e -x
-shopt -s huponexit
 
 # for core-building and python install step
-export DCC_RS_TARGET=debug
+export DCC_RS_TARGET=release
 export DCC_RS_DEV=`pwd`
 
 cd python
@@ -22,4 +21,4 @@ export PYTHONDONTWRITEBYTECODE=1
 # run python tests (tox invokes pytest to run tests in python/tests)
 #TOX_PARALLEL_NO_SPINNER=1 tox -e lint,doc
 tox -e lint
-tox -e doc,py3
+tox -e doc,py37

ci_scripts/run-rust-test.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -ex
-shopt -s huponexit
 
 #export RUST_TEST_THREADS=1
 export RUST_BACKTRACE=1

contrib/proxy.py

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

deltachat-ffi/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "deltachat_ffi"
-version = "1.87.0"
+version = "1.0.0-beta.21"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 readme = "README.md"
-license = "MPL-2.0"
+license = "MIT OR Apache-2.0"
 
 keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]
@@ -16,20 +16,15 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { path = "../", default-features = false }
-deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
+deltachat-provider-database = "0.2.1"
 libc = "0.2"
-human-panic = "1"
+human-panic = "1.0.1"
-num-traits = "0.2"
+num-traits = "0.2.6"
+failure = "0.1.6"
 serde_json = "1.0"
-tokio = { version = "1", features = ["rt-multi-thread"] }
-anyhow = "1"
-thiserror = "1"
-rand = "0.7"
-once_cell = "1.12.0"
 
 [features]
-default = ["vendored"]
+default = ["vendored", "nightly", "ringbuf"]
 vendored = ["deltachat/vendored"]
 nightly = ["deltachat/nightly"]
-jsonrpc = ["deltachat-jsonrpc"]
+ringbuf = ["deltachat/ringbuf"]
-

deltachat-ffi/Doxyfile

@@ -236,6 +236,12 @@ TAB_SIZE               = 4
 
 ALIASES                =
 
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -583,7 +589,7 @@ SORT_MEMBERS_CTORS_1ST = NO
 # appear in their defined order.
 # The default value is: NO.
 
-SORT_GROUP_NAMES       = YES
+SORT_GROUP_NAMES       = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
 # fully-qualified names, including namespaces. If set to NO, the class list will

deltachat-ffi/Doxyfile.css

@@ -4,16 +4,4 @@ div.fragment {
 	background-color: #e0e0e0;
 	border: 0;
 	padding: 1em;
-	border-radius: 6px;
 }
-
-code {
-	background-color: #e0e0e0;
-	padding-left: .5em;
-	padding-right: .5em;
-	border-radius: 6px;
-}
-
-li {
-	margin-bottom: .5em;
-}

deltachat-ffi/DoxygenLayout.xml

@@ -1,38 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.20 -->
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
-    <tab type="classes" visible="yes" title="">
-      <tab type="classlist" visible="no" title="" intro=""/>
-      <tab type="classindex" visible="no" title=""/>
-      <tab type="hierarchy" visible="no" title="" intro=""/>
-      <tab type="classmembers" visible="no" title="" intro=""/>
-    </tab>
-    <tab type="modules" visible="yes" title="Constants" intro="Here is a list of constants:"/>
-    <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespacelist" visible="yes" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="interfaces" visible="yes" title="">
-      <tab type="interfacelist" visible="yes" title="" intro=""/>
-      <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
-      <tab type="interfacehierarchy" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="structs" visible="yes" title="">
-      <tab type="structlist" visible="yes" title="" intro=""/>
-      <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
-    </tab>
-    <tab type="exceptions" visible="yes" title="">
-      <tab type="exceptionlist" visible="yes" title="" intro=""/>
-      <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
-      <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="files" visible="yes" title="">
-      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="examples" visible="yes" title="" intro=""/>
-  </navindex>
-</doxygenlayout>

deltachat-ffi/README.md

@@ -1,9 +1,5 @@
 # Delta Chat C Interface
 
-## Installation
-
-see `Installing libdeltachat system wide` in [../README.md](../README.md)
-
 ## Documentation
 
 To generate the C Interface documentation,

deltachat-ffi/build.rs

@@ -1,3 +1,4 @@
+use std::io::Write;
 use std::path::PathBuf;
 use std::{env, fs};
 
@@ -18,18 +19,15 @@ fn main() {
         include_str!("deltachat.pc.in"),
         name = "deltachat",
         description = env::var("CARGO_PKG_DESCRIPTION").unwrap(),
-        url = env::var("CARGO_PKG_HOMEPAGE").unwrap_or_else(|_| "".to_string()),
+        url = env::var("CARGO_PKG_HOMEPAGE").unwrap_or("".to_string()),
         version = env::var("CARGO_PKG_VERSION").unwrap(),
         libs_priv = libs_priv,
-        prefix = env::var("PREFIX").unwrap_or_else(|_| "/usr/local".to_string()),
+        prefix = env::var("PREFIX").unwrap_or("/usr/local".to_string()),
-        libdir = env::var("LIBDIR").unwrap_or_else(|_| "/usr/local/lib".to_string()),
-        includedir = env::var("INCLUDEDIR").unwrap_or_else(|_| "/usr/local/include".to_string()),
     );
 
     fs::create_dir_all(target_path.join("pkgconfig")).unwrap();
-    fs::write(
+    fs::File::create(target_path.join("pkgconfig").join("deltachat.pc"))
-        target_path.join("pkgconfig").join("deltachat.pc"),
+        .unwrap()
-        pkg_config.as_bytes(),
+        .write_all(&pkg_config.as_bytes())
-    )
+        .unwrap();
-    .unwrap();
 }

deltachat-ffi/deltachat.pc.in

@@ -1,6 +1,6 @@
 prefix={prefix}
-libdir={libdir}
+libdir=${{prefix}}/lib
-includedir={includedir}
+includedir=${{prefix}}/include
 
 Name: {name}
 Description: {description}

deltachat-ffi/src/dc_array.rs

@@ -1,54 +1,47 @@
-use crate::chat::ChatItem;
-use crate::constants::DC_MSG_ID_DAYMARKER;
 use crate::location::Location;
-use crate::message::MsgId;
 
 /* * the structure behind dc_array_t */
 #[derive(Debug, Clone)]
+#[allow(non_camel_case_types)]
 pub enum dc_array_t {
-    MsgIds(Vec<MsgId>),
-    Chat(Vec<ChatItem>),
     Locations(Vec<Location>),
     Uint(Vec<u32>),
 }
 
 impl dc_array_t {
-    pub(crate) fn get_id(&self, index: usize) -> u32 {
+    pub fn new(capacity: usize) -> Self {
+        dc_array_t::Uint(Vec::with_capacity(capacity))
+    }
+
+    /// Constructs a new, empty `dc_array_t` holding locations with specified `capacity`.
+    pub fn new_locations(capacity: usize) -> Self {
+        dc_array_t::Locations(Vec::with_capacity(capacity))
+    }
+
+    pub fn add_id(&mut self, item: u32) {
+        if let Self::Uint(array) = self {
+            array.push(item);
+        } else {
+            panic!("Attempt to add id to array of other type");
+        }
+    }
+
+    pub fn add_location(&mut self, location: Location) {
+        if let Self::Locations(array) = self {
+            array.push(location)
+        } else {
+            panic!("Attempt to add a location to array of other type");
+        }
+    }
+
+    pub fn get_id(&self, index: usize) -> u32 {
         match self {
-            Self::MsgIds(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,
-            },
             Self::Locations(array) => array[index].location_id,
-            Self::Uint(array) => array[index],
+            Self::Uint(array) => array[index] as u32,
         }
     }
 
-    pub(crate) fn get_timestamp(&self, index: usize) -> Option<i64> {
+    pub fn get_location(&self, index: usize) -> &Location {
-        match self {
-            Self::MsgIds(_) => None,
-            Self::Chat(array) => array.get(index).and_then(|item| match item {
-                ChatItem::Message { .. } => None,
-                ChatItem::DayMarker { timestamp } => Some(*timestamp),
-            }),
-            Self::Locations(array) => array.get(index).map(|location| location.timestamp),
-            Self::Uint(_) => None,
-        }
-    }
-
-    pub(crate) fn get_marker(&self, index: usize) -> Option<&str> {
-        match self {
-            Self::MsgIds(_) => None,
-            Self::Chat(_) => None,
-            Self::Locations(array) => array
-                .get(index)
-                .and_then(|location| location.marker.as_deref()),
-            Self::Uint(_) => None,
-        }
-    }
-
-    pub(crate) fn get_location(&self, index: usize) -> &Location {
         if let Self::Locations(array) = self {
             &array[index]
         } else {
@@ -56,18 +49,55 @@ impl dc_array_t {
         }
     }
 
-    /// Returns the number of elements in the array.
+    pub fn is_empty(&self) -> bool {
-    pub(crate) fn len(&self) -> usize {
+        match self {
+            Self::Locations(array) => array.is_empty(),
+            Self::Uint(array) => array.is_empty(),
+        }
+    }
+
+    /// Returns the number of elements in the array.
+    pub fn len(&self) -> usize {
         match self {
-            Self::MsgIds(array) => array.len(),
-            Self::Chat(array) => array.len(),
             Self::Locations(array) => array.len(),
             Self::Uint(array) => array.len(),
         }
     }
 
-    pub(crate) fn search_id(&self, needle: u32) -> Option<usize> {
+    pub fn clear(&mut self) {
-        (0..self.len()).find(|i| self.get_id(*i) == needle)
+        match self {
+            Self::Locations(array) => array.clear(),
+            Self::Uint(array) => array.clear(),
+        }
+    }
+
+    pub fn search_id(&self, needle: u32) -> Option<usize> {
+        if let Self::Uint(array) = self {
+            for (i, &u) in array.iter().enumerate() {
+                if u == needle {
+                    return Some(i);
+                }
+            }
+            None
+        } else {
+            panic!("Attempt to search for id in array of other type");
+        }
+    }
+
+    pub fn sort_ids(&mut self) {
+        if let dc_array_t::Uint(v) = self {
+            v.sort();
+        } else {
+            panic!("Attempt to sort array of something other than uints");
+        }
+    }
+
+    pub fn as_ptr(&self) -> *const u32 {
+        if let dc_array_t::Uint(v) = self {
+            v.as_ptr()
+        } else {
+            panic!("Attempt to convert array of something other than uints to raw");
+        }
     }
 }
 
@@ -77,18 +107,6 @@ impl From<Vec<u32>> for dc_array_t {
     }
 }
 
-impl From<Vec<MsgId>> for dc_array_t {
-    fn from(array: Vec<MsgId>) -> Self {
-        dc_array_t::MsgIds(array)
-    }
-}
-
-impl From<Vec<ChatItem>> for dc_array_t {
-    fn from(array: Vec<ChatItem>) -> Self {
-        dc_array_t::Chat(array)
-    }
-}
-
 impl From<Vec<Location>> for dc_array_t {
     fn from(array: Vec<Location>) -> Self {
         dc_array_t::Locations(array)
@@ -101,11 +119,12 @@ mod tests {
 
     #[test]
     fn test_dc_array() {
-        let arr: dc_array_t = Vec::<u32>::new().into();
+        let mut arr = dc_array_t::new(7);
-        assert!(arr.len() == 0);
+        assert!(arr.is_empty());
 
-        let ids: Vec<u32> = (2..1002).collect();
+        for i in 0..1000 {
-        let arr: dc_array_t = ids.into();
+            arr.add_id(i + 2);
+        }
 
         assert_eq!(arr.len(), 1000);
 
@@ -113,15 +132,31 @@ mod tests {
             assert_eq!(arr.get_id(i), (i + 2) as u32);
         }
 
-        assert_eq!(arr.search_id(10), Some(8));
+        arr.clear();
-        assert_eq!(arr.search_id(1), None);
+
+        assert!(arr.is_empty());
+
+        arr.add_id(13);
+        arr.add_id(7);
+        arr.add_id(666);
+        arr.add_id(0);
+        arr.add_id(5000);
+
+        arr.sort_ids();
+
+        assert_eq!(arr.get_id(0), 0);
+        assert_eq!(arr.get_id(1), 7);
+        assert_eq!(arr.get_id(2), 13);
+        assert_eq!(arr.get_id(3), 666);
     }
 
     #[test]
     #[should_panic]
     fn test_dc_array_out_of_bounds() {
-        let ids: Vec<u32> = (2..1002).collect();
+        let mut arr = dc_array_t::new(7);
-        let arr: dc_array_t = ids.into();
+        for i in 0..1000 {
+            arr.add_id(i + 2);
+        }
         arr.get_id(1000);
     }
 }

deltachat-ffi/src/lot.rs

@@ -1,245 +0,0 @@
-//! # Legacy generic return values for C API.
-
-use crate::message::MessageState;
-use crate::qr::Qr;
-use crate::summary::{Summary, SummaryPrefix};
-use anyhow::Error;
-use std::borrow::Cow;
-
-/// An object containing a set of values.
-/// The meaning of the values is defined by the function returning the object.
-/// Lot objects are created
-/// eg. by chatlist.get_summary() or dc_msg_get_summary().
-///
-/// *Lot* is used in the meaning *heap* here.
-#[derive(Debug)]
-pub enum Lot {
-    Summary(Summary),
-    Qr(Qr),
-    Error(String),
-}
-
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Meaning {
-    None = 0,
-    Text1Draft = 1,
-    Text1Username = 2,
-    Text1Self = 3,
-}
-
-impl Default for Meaning {
-    fn default() -> Self {
-        Meaning::None
-    }
-}
-
-impl Lot {
-    pub fn get_text1(&self) -> Option<&str> {
-        match self {
-            Self::Summary(summary) => match &summary.prefix {
-                None => None,
-                Some(SummaryPrefix::Draft(text)) => Some(text),
-                Some(SummaryPrefix::Username(username)) => Some(username),
-                Some(SummaryPrefix::Me(text)) => Some(text),
-            },
-            Self::Qr(qr) => match qr {
-                Qr::AskVerifyContact { .. } => None,
-                Qr::AskVerifyGroup { grpname, .. } => Some(grpname),
-                Qr::FprOk { .. } => None,
-                Qr::FprMismatch { .. } => None,
-                Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
-                Qr::Account { domain } => Some(domain),
-                Qr::WebrtcInstance { domain, .. } => Some(domain),
-                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),
-            },
-            Self::Error(err) => Some(err),
-        }
-    }
-
-    pub fn get_text2(&self) -> Option<Cow<str>> {
-        match self {
-            Self::Summary(summary) => Some(summary.truncated_text(160)),
-            Self::Qr(_) => None,
-            Self::Error(_) => None,
-        }
-    }
-
-    pub fn get_text1_meaning(&self) -> Meaning {
-        match self {
-            Self::Summary(summary) => match &summary.prefix {
-                None => Meaning::None,
-                Some(SummaryPrefix::Draft(_text)) => Meaning::Text1Draft,
-                Some(SummaryPrefix::Username(_username)) => Meaning::Text1Username,
-                Some(SummaryPrefix::Me(_text)) => Meaning::Text1Self,
-            },
-            Self::Qr(_qr) => Meaning::None,
-            Self::Error(_err) => Meaning::None,
-        }
-    }
-
-    pub fn get_state(&self) -> LotState {
-        match self {
-            Self::Summary(summary) => summary.state.into(),
-            Self::Qr(qr) => match qr {
-                Qr::AskVerifyContact { .. } => LotState::QrAskVerifyContact,
-                Qr::AskVerifyGroup { .. } => LotState::QrAskVerifyGroup,
-                Qr::FprOk { .. } => LotState::QrFprOk,
-                Qr::FprMismatch { .. } => LotState::QrFprMismatch,
-                Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
-                Qr::Account { .. } => LotState::QrAccount,
-                Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
-                Qr::Addr { .. } => LotState::QrAddr,
-                Qr::Url { .. } => LotState::QrUrl,
-                Qr::Text { .. } => LotState::QrText,
-                Qr::WithdrawVerifyContact { .. } => LotState::QrWithdrawVerifyContact,
-                Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
-                Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
-                Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
-            },
-            Self::Error(_err) => LotState::QrError,
-        }
-    }
-
-    pub fn get_id(&self) -> u32 {
-        match self {
-            Self::Summary(_) => Default::default(),
-            Self::Qr(qr) => match qr {
-                Qr::AskVerifyContact { contact_id, .. } => contact_id.to_u32(),
-                Qr::AskVerifyGroup { .. } => Default::default(),
-                Qr::FprOk { contact_id } => contact_id.to_u32(),
-                Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
-                Qr::FprWithoutAddr { .. } => Default::default(),
-                Qr::Account { .. } => Default::default(),
-                Qr::WebrtcInstance { .. } => Default::default(),
-                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(),
-            },
-            Self::Error(_) => Default::default(),
-        }
-    }
-
-    pub fn get_timestamp(&self) -> i64 {
-        match self {
-            Self::Summary(summary) => summary.timestamp,
-            Self::Qr(_) => Default::default(),
-            Self::Error(_) => Default::default(),
-        }
-    }
-}
-
-#[repr(u32)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum LotState {
-    // Default
-    Undefined = 0,
-
-    // Qr States
-    /// id=contact
-    QrAskVerifyContact = 200,
-
-    /// text1=groupname
-    QrAskVerifyGroup = 202,
-
-    /// id=contact
-    QrFprOk = 210,
-
-    /// id=contact
-    QrFprMismatch = 220,
-
-    /// text1=formatted fingerprint
-    QrFprWithoutAddr = 230,
-
-    /// text1=domain
-    QrAccount = 250,
-
-    /// text1=domain, text2=instance pattern
-    QrWebrtcInstance = 260,
-
-    /// id=contact
-    QrAddr = 320,
-
-    /// text1=text
-    QrText = 330,
-
-    /// text1=URL
-    QrUrl = 332,
-
-    /// text1=error string
-    QrError = 400,
-
-    QrWithdrawVerifyContact = 500,
-
-    /// text1=groupname
-    QrWithdrawVerifyGroup = 502,
-
-    QrReviveVerifyContact = 510,
-
-    /// text1=groupname
-    QrReviveVerifyGroup = 512,
-
-    // Message States
-    MsgInFresh = 10,
-    MsgInNoticed = 13,
-    MsgInSeen = 16,
-    MsgOutPreparing = 18,
-    MsgOutDraft = 19,
-    MsgOutPending = 20,
-    MsgOutFailed = 24,
-    MsgOutDelivered = 26,
-    MsgOutMdnRcvd = 28,
-}
-
-impl Default for LotState {
-    fn default() -> Self {
-        LotState::Undefined
-    }
-}
-
-impl From<MessageState> for LotState {
-    fn from(s: MessageState) -> Self {
-        use MessageState::*;
-        match s {
-            Undefined => LotState::Undefined,
-            InFresh => LotState::MsgInFresh,
-            InNoticed => LotState::MsgInNoticed,
-            InSeen => LotState::MsgInSeen,
-            OutPreparing => LotState::MsgOutPreparing,
-            OutDraft => LotState::MsgOutDraft,
-            OutPending => LotState::MsgOutPending,
-            OutFailed => LotState::MsgOutFailed,
-            OutDelivered => LotState::MsgOutDelivered,
-            OutMdnRcvd => LotState::MsgOutMdnRcvd,
-        }
-    }
-}
-
-impl From<Summary> for Lot {
-    fn from(summary: Summary) -> Self {
-        Lot::Summary(summary)
-    }
-}
-
-impl From<Qr> for Lot {
-    fn from(qr: Qr) -> Self {
-        Lot::Qr(qr)
-    }
-}
-
-// Make it easy to convert errors into the final `Lot`.
-impl From<Error> for Lot {
-    fn from(error: Error) -> Self {
-        Lot::Error(error.to_string())
-    }
-}

deltachat-ffi/src/providers.rs

@@ -0,0 +1,93 @@
+extern crate deltachat_provider_database;
+
+use std::ptr;
+
+use crate::string::{to_string_lossy, StrExt};
+use deltachat_provider_database::StatusState;
+
+#[no_mangle]
+pub type dc_provider_t = deltachat_provider_database::Provider;
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_new_from_domain(
+    domain: *const libc::c_char,
+) -> *const dc_provider_t {
+    match deltachat_provider_database::get_provider_info(&to_string_lossy(domain)) {
+        Some(provider) => provider,
+        None => ptr::null(),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_new_from_email(
+    email: *const libc::c_char,
+) -> *const dc_provider_t {
+    let email = to_string_lossy(email);
+    let domain = deltachat_provider_database::get_domain_from_email(&email);
+    match deltachat_provider_database::get_provider_info(domain) {
+        Some(provider) => provider,
+        None => ptr::null(),
+    }
+}
+
+macro_rules! null_guard {
+    ($context:tt) => {
+        if $context.is_null() {
+            return ptr::null_mut() as *mut libc::c_char;
+        }
+    };
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_overview_page(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    format!(
+        "{}/{}",
+        deltachat_provider_database::PROVIDER_OVERVIEW_URL,
+        (*provider).overview_page
+    )
+    .strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_name(provider: *const dc_provider_t) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).name.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_markdown(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).markdown.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_status_date(
+    provider: *const dc_provider_t,
+) -> *mut libc::c_char {
+    null_guard!(provider);
+    (*provider).status.date.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_get_status(provider: *const dc_provider_t) -> u32 {
+    if provider.is_null() {
+        return 0;
+    }
+    match (*provider).status.state {
+        StatusState::OK => 1,
+        StatusState::PREPARATION => 2,
+        StatusState::BROKEN => 3,
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_provider_unref(_provider: *const dc_provider_t) {
+    ()
+}
+
+// TODO expose general provider overview url?

deltachat-ffi/src/string.rs

@@ -1,5 +1,5 @@
+use failure::Fail;
 use std::ffi::{CStr, CString};
-use std::ptr;
 
 /// Duplicates a string
 ///
@@ -8,7 +8,7 @@ use std::ptr;
 /// # Examples
 ///
 /// ```rust,norun
-/// use crate::string::{dc_strdup, to_string_lossy};
+/// use deltachat::dc_tools::{dc_strdup, to_string_lossy};
 /// unsafe {
 ///     let str_a = b"foobar\x00" as *const u8 as *const libc::c_char;
 ///     let str_a_copy = dc_strdup(str_a);
@@ -16,24 +16,27 @@ use std::ptr;
 ///     assert_ne!(str_a, str_a_copy);
 /// }
 /// ```
-unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
+pub unsafe fn dc_strdup(s: *const libc::c_char) -> *mut libc::c_char {
-    let ret: *mut libc::c_char = if !s.is_null() {
+    let ret: *mut libc::c_char;
-        libc::strdup(s)
+    if !s.is_null() {
+        ret = libc::strdup(s);
+        assert!(!ret.is_null());
     } else {
-        libc::calloc(1, 1) as *mut libc::c_char
+        ret = libc::calloc(1, 1) as *mut libc::c_char;
-    };
+        assert!(!ret.is_null());
-    assert!(!ret.is_null());
+    }
+
     ret
 }
 
 /// Error type for the [OsStrExt] trait
-#[derive(Debug, PartialEq, thiserror::Error)]
+#[derive(Debug, Fail, PartialEq)]
-pub(crate) enum CStringError {
+pub enum CStringError {
     /// The string contains an interior null byte
-    #[error("String contains an interior null byte")]
+    #[fail(display = "String contains an interior null byte")]
     InteriorNullByte,
     /// The string is not valid Unicode
-    #[error("String is not valid unicode")]
+    #[fail(display = "String is not valid unicode")]
     NotUnicode,
 }
 
@@ -55,14 +58,14 @@ 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 {
 ///     let mut c_ptr: *mut libc::c_char = dc_strdup(path_c.as_ptr());
 /// }
 /// ```
-pub(crate) trait OsStrExt {
+pub trait OsStrExt {
     /// Convert a  [std::ffi::OsStr] to an [std::ffi::CString]
     ///
     /// This is useful to convert e.g. a [std::path::Path] to
@@ -102,9 +105,8 @@ impl<T: AsRef<std::ffi::OsStr>> OsStrExt for T {
     #[cfg(not(target_os = "windows"))]
     fn to_c_string(&self) -> Result<CString, CStringError> {
         use std::os::unix::ffi::OsStrExt;
-        CString::new(self.as_ref().as_bytes()).map_err(|err| {
+        CString::new(self.as_ref().as_bytes()).map_err(|err| match err {
-            let std::ffi::NulError { .. } = err;
+            std::ffi::NulError { .. } => CStringError::InteriorNullByte,
-            CStringError::InteriorNullByte
         })
     }
 
@@ -120,37 +122,35 @@ fn os_str_to_c_string_unicode(
     os_str: &dyn AsRef<std::ffi::OsStr>,
 ) -> Result<CString, CStringError> {
     match os_str.as_ref().to_str() {
-        Some(val) => CString::new(val.as_bytes()).map_err(|err| {
+        Some(val) => CString::new(val.as_bytes()).map_err(|err| match err {
-            let std::ffi::NulError { .. } = err;
+            std::ffi::NulError { .. } => CStringError::InteriorNullByte,
-            CStringError::InteriorNullByte
         }),
         None => Err(CStringError::NotUnicode),
     }
 }
 
 /// Convenience methods/associated functions for working with [CString]
-trait CStringExt {
+///
-    /// Create a new [CString], best effort
+/// This is helps transitioning from unsafe code.
+pub trait CStringExt {
+    /// Create a new [CString], yolo style
     ///
-    /// Like the [to_string_lossy] this doesn't give up in the face of
+    /// This unwrap the result, panicking when there are embedded NULL
-    /// bad input (embedded null bytes in this case) instead it does
+    /// bytes.
-    /// the best it can by stripping the embedded null bytes.
+    fn yolo<T: Into<Vec<u8>>>(t: T) -> CString {
-    fn new_lossy<T: Into<Vec<u8>>>(t: T) -> CString {
+        CString::new(t).expect("String contains null byte, can not be CString")
-        let mut s = t.into();
-        s.retain(|&c| c != 0);
-        CString::new(s).unwrap_or_default()
     }
 }
 
 impl CStringExt for CString {}
 
-/// Convenience methods to turn strings into C strings.
+/// Convenience methods to make transitioning from raw C strings easier.
 ///
 /// To interact with (legacy) C APIs we often need to convert from
 /// Rust strings to raw C strings.  This can be clumsy to do correctly
 /// and the compiler sometimes allows it in an unsafe way.  These
 /// methods make it more succinct and help you get it right.
-pub(crate) trait Strdup {
+pub trait StrExt {
     /// Allocate a new raw C `*char` version of this string.
     ///
     /// This allocates a new raw C string which must be freed using
@@ -167,64 +167,14 @@ pub(crate) trait Strdup {
     unsafe fn strdup(&self) -> *mut libc::c_char;
 }
 
-impl Strdup for str {
+impl<T: AsRef<str>> StrExt for T {
     unsafe fn strdup(&self) -> *mut libc::c_char {
-        let tmp = CString::new_lossy(self);
+        let tmp = CString::yolo(self.as_ref());
         dc_strdup(tmp.as_ptr())
     }
 }
 
-impl Strdup for String {
+pub fn to_string_lossy(s: *const libc::c_char) -> String {
-    unsafe fn strdup(&self) -> *mut libc::c_char {
-        let s: &str = self;
-        s.strdup()
-    }
-}
-
-impl Strdup for std::path::Path {
-    unsafe fn strdup(&self) -> *mut libc::c_char {
-        let tmp = self.to_c_string().unwrap_or_else(|_| CString::default());
-        dc_strdup(tmp.as_ptr())
-    }
-}
-
-impl Strdup for [u8] {
-    unsafe fn strdup(&self) -> *mut libc::c_char {
-        let tmp = CString::new_lossy(self);
-        dc_strdup(tmp.as_ptr())
-    }
-}
-
-/// Convenience methods to turn optional strings into C strings.
-///
-/// This is the same as the [Strdup] trait but a different trait name
-/// to work around the type system not allowing to implement [Strdup]
-/// for `Option<impl Strdup>` When we already have an [Strdup] impl
-/// for `AsRef<&str>`.
-///
-/// When the [Option] is [Option::Some] this behaves just like
-/// [Strdup::strdup], when it is [Option::None] a null pointer is
-/// returned.
-pub(crate) trait OptStrdup {
-    /// Allocate a new raw C `*char` version of this string, or NULL.
-    ///
-    /// See [Strdup::strdup] for details.
-    unsafe fn strdup(&self) -> *mut libc::c_char;
-}
-
-impl<T: AsRef<str>> OptStrdup for Option<T> {
-    unsafe fn strdup(&self) -> *mut libc::c_char {
-        match self {
-            Some(s) => {
-                let tmp = CString::new_lossy(s.as_ref());
-                dc_strdup(tmp.as_ptr())
-            }
-            None => ptr::null_mut(),
-        }
-    }
-}
-
-pub(crate) fn to_string_lossy(s: *const libc::c_char) -> String {
     if s.is_null() {
         return "".into();
     }
@@ -234,7 +184,7 @@ pub(crate) fn to_string_lossy(s: *const libc::c_char) -> String {
     cstr.to_string_lossy().to_string()
 }
 
-pub(crate) fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
+pub fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
     if s.is_null() {
         return None;
     }
@@ -250,12 +200,12 @@ pub(crate) fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
 /// [OsStrExt::to_c_string] requires valid Unicode on Windows, this
 /// requires that the pointer contains valid UTF-8 on Windows.
 ///
-/// Because this returns a reference the [Path] slice can not outlive
+/// Because this returns a reference the [Path] silce can not outlive
 /// the original pointer.
 ///
 /// [Path]: std::path::Path
 #[cfg(not(target_os = "windows"))]
-pub(crate) fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+pub fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
     assert!(!s.is_null(), "cannot be used on null pointers");
     use std::os::unix::ffi::OsStrExt;
     unsafe {
@@ -267,7 +217,7 @@ pub(crate) fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
 
 // as_path() implementation for windows, documented above.
 #[cfg(target_os = "windows")]
-pub(crate) fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
+pub fn as_path<'a>(s: *const libc::c_char) -> &'a std::path::Path {
     as_path_unicode(s)
 }
 
@@ -374,14 +324,8 @@ mod tests {
     }
 
     #[test]
-    fn test_cstring_new_lossy() {
+    fn test_cstring_yolo() {
-        assert!(CString::new("hel\x00lo").is_err());
+        assert_eq!(CString::new("hello").unwrap(), CString::yolo("hello"));
-        assert!(CString::new(String::from("hel\x00o")).is_err());
-        let r = CString::new("hello").unwrap();
-        assert_eq!(CString::new_lossy("hello"), r);
-        assert_eq!(CString::new_lossy("hel\x00lo"), r);
-        assert_eq!(CString::new_lossy(String::from("hello")), r);
-        assert_eq!(CString::new_lossy(String::from("hel\x00lo")), r);
     }
 
     #[test]
@@ -403,19 +347,4 @@ mod tests {
             assert_eq!(cmp, 0);
         }
     }
-
-    #[test]
-    fn test_strdup_opt_string() {
-        unsafe {
-            let s = Some("hello");
-            let c = s.strdup();
-            let cmp = strcmp(c, b"hello\x00" as *const u8 as *const libc::c_char);
-            free(c as *mut libc::c_void);
-            assert_eq!(cmp, 0);
-
-            let s: Option<&str> = None;
-            let c = s.strdup();
-            assert_eq!(c, ptr::null_mut());
-        }
-    }
 }

deltachat-jsonrpc/.gitignore

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

deltachat-jsonrpc/Cargo.toml

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

deltachat-jsonrpc/README.md

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

deltachat-jsonrpc/TODO.md

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

deltachat-jsonrpc/src/api/events.rs

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

deltachat-jsonrpc/src/api/mod.rs

@@ -1,683 +0,0 @@
-use anyhow::{anyhow, bail, Context, Result};
-use deltachat::{
-    chat::{get_chat_media, get_chat_msgs, ChatId},
-    chatlist::Chatlist,
-    config::Config,
-    contact::{may_be_valid_addr, Contact, ContactId},
-    context::get_info,
-    message::{Message, MsgId, Viewtype},
-    provider::get_provider_info,
-    qr,
-    webxdc::StatusUpdateSerial,
-};
-use std::collections::BTreeMap;
-use std::sync::Arc;
-use std::{collections::HashMap, str::FromStr};
-use tokio::sync::RwLock;
-use yerpc::rpc;
-
-pub use deltachat::accounts::Accounts;
-
-pub mod events;
-pub mod types;
-
-use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-
-use types::account::Account;
-use types::chat::FullChat;
-use types::chat_list::ChatListEntry;
-use types::contact::ContactObject;
-use types::message::MessageObject;
-use types::provider_info::ProviderInfo;
-use types::webxdc::WebxdcMessageInfo;
-
-use self::types::message::MessageViewtype;
-
-#[derive(Clone, Debug)]
-pub struct DeltaChatApiV0 {
-    pub(crate) accounts: Arc<RwLock<Accounts>>,
-}
-
-impl DeltaChatApiV0 {
-    pub fn new(accounts: Accounts) -> Self {
-        DeltaChatApiV0 {
-            accounts: Arc::new(RwLock::new(accounts)),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
-        DeltaChatApiV0 { accounts }
-    }
-
-    async fn get_context(&self, id: u32) -> Result<deltachat::context::Context> {
-        let sc = self
-            .accounts
-            .read()
-            .await
-            .get_account(id)
-            .await
-            .ok_or_else(|| anyhow!("account with id {} not found", id))?;
-        Ok(sc)
-    }
-}
-
-#[rpc(all_positional, ts_outdir = "typescript/generated")]
-impl DeltaChatApiV0 {
-    // ---------------------------------------------
-    //  Misc top level functions
-    // ---------------------------------------------
-
-    /// Check if an email address is valid.
-    async fn check_email_validity(&self, email: String) -> bool {
-        may_be_valid_addr(&email)
-    }
-
-    /// Get general system info.
-    async fn get_system_info(&self) -> BTreeMap<&'static str, String> {
-        get_info()
-    }
-
-    // ---------------------------------------------
-    // Account Management
-    // ---------------------------------------------
-
-    async fn add_account(&self) -> Result<u32> {
-        self.accounts.write().await.add_account().await
-    }
-
-    async fn remove_account(&self, account_id: u32) -> Result<()> {
-        self.accounts.write().await.remove_account(account_id).await
-    }
-
-    async fn get_all_account_ids(&self) -> Vec<u32> {
-        self.accounts.read().await.get_all().await
-    }
-
-    /// Select account id for internally selected state.
-    /// TODO: Likely this is deprecated as all methods take an account id now.
-    async fn select_account(&self, id: u32) -> Result<()> {
-        self.accounts.write().await.select_account(id).await
-    }
-
-    /// Get the selected account id of the internal state..
-    /// TODO: Likely this is deprecated as all methods take an account id now.
-    async fn get_selected_account_id(&self) -> Option<u32> {
-        self.accounts.read().await.get_selected_account_id().await
-    }
-
-    /// Get a list of all configured accounts.
-    async fn get_all_accounts(&self) -> Result<Vec<Account>> {
-        let mut accounts = Vec::new();
-        for id in self.accounts.read().await.get_all().await {
-            let context_option = self.accounts.read().await.get_account(id).await;
-            if let Some(ctx) = context_option {
-                accounts.push(Account::from_context(&ctx, id).await?)
-            } else {
-                println!("account with id {} doesn't exist anymore", id);
-            }
-        }
-        Ok(accounts)
-    }
-
-    // ---------------------------------------------
-    // Methods that work on individual accounts
-    // ---------------------------------------------
-
-    /// Get top-level info for an account.
-    async fn get_account_info(&self, account_id: u32) -> Result<Account> {
-        let context_option = self.accounts.read().await.get_account(account_id).await;
-        if let Some(ctx) = context_option {
-            Ok(Account::from_context(&ctx, account_id).await?)
-        } else {
-            Err(anyhow!(
-                "account with id {} doesn't exist anymore",
-                account_id
-            ))
-        }
-    }
-
-    /// Returns provider for the given domain.
-    ///
-    /// This function looks up domain in offline database.
-    ///
-    /// For compatibility, email address can be passed to this function
-    /// instead of the domain.
-    async fn get_provider_info(
-        &self,
-        account_id: u32,
-        email: String,
-    ) -> Result<Option<ProviderInfo>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let socks5_enabled = ctx
-            .get_config_bool(deltachat::config::Config::Socks5Enabled)
-            .await?;
-
-        let provider_info =
-            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), socks5_enabled).await;
-        Ok(ProviderInfo::from_dc_type(provider_info))
-    }
-
-    /// Checks if the context is already configured.
-    async fn is_configured(&self, account_id: u32) -> Result<bool> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.is_configured().await
-    }
-
-    /// Get system info for an account.
-    async fn get_info(&self, account_id: u32) -> Result<BTreeMap<&'static str, String>> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.get_info().await
-    }
-
-    async fn set_config(&self, account_id: u32, key: String, value: Option<String>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        set_config(&ctx, &key, value.as_deref()).await
-    }
-
-    async fn batch_set_config(
-        &self,
-        account_id: u32,
-        config: HashMap<String, Option<String>>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        for (key, value) in config.into_iter() {
-            set_config(&ctx, &key, value.as_deref())
-                .await
-                .with_context(|| format!("Can't set {} to {:?}", key, value))?;
-        }
-        Ok(())
-    }
-
-    /// Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
-    /// Before this function is called, dc_check_qr() should confirm the type of the
-    /// QR code is DC_QR_ACCOUNT or DC_QR_WEBRTC_INSTANCE.
-    ///
-    /// Internally, the function will call dc_set_config() with the appropriate keys,
-    /// e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT
-    /// or `webrtc_instance` for DC_QR_WEBRTC_INSTANCE.
-    async fn set_config_from_qr(&self, account_id: u32, qr_content: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        qr::set_config_from_qr(&ctx, &qr_content).await
-    }
-
-    async fn get_config(&self, account_id: u32, key: String) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        get_config(&ctx, &key).await
-    }
-
-    async fn batch_get_config(
-        &self,
-        account_id: u32,
-        keys: Vec<String>,
-    ) -> Result<HashMap<String, Option<String>>> {
-        let ctx = self.get_context(account_id).await?;
-        let mut result: HashMap<String, Option<String>> = HashMap::new();
-        for key in keys {
-            result.insert(key.clone(), get_config(&ctx, &key).await?);
-        }
-        Ok(result)
-    }
-
-    /// Configures this account with the currently set parameters.
-    /// Setup the credential config before calling this.
-    async fn configure(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.stop_io().await;
-        let result = ctx.configure().await;
-        if result.is_err() {
-            if let Ok(true) = ctx.is_configured().await {
-                ctx.start_io().await;
-            }
-            return result;
-        }
-        ctx.start_io().await;
-        Ok(())
-    }
-
-    /// Signal an ongoing process to stop.
-    async fn stop_ongoing_process(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.stop_ongoing().await;
-        Ok(())
-    }
-
-    /// Returns the message IDs of all _fresh_ messages of any chat.
-    /// Typically used for implementing notification summaries
-    /// or badge counters e.g. on the app icon.
-    /// The list is already sorted and starts with the most recent fresh message.
-    ///
-    /// Messages belonging to muted chats or to the contact requests are not returned;
-    /// these messages should not be notified
-    /// and also badge counters should not include these messages.
-    ///
-    /// To get the number of fresh messages for a single chat, muted or not,
-    /// use `get_fresh_msg_cnt()`.
-    async fn get_fresh_msgs(&self, account_id: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx
-            .get_fresh_msgs()
-            .await?
-            .iter()
-            .map(|msg_id| msg_id.to_u32())
-            .collect())
-    }
-
-    /// Get the number of _fresh_ messages in a chat.
-    /// Typically used to implement a badge with a number in the chatlist.
-    ///
-    /// If the specified chat is muted,
-    /// the UI should show the badge counter "less obtrusive",
-    /// e.g. using "gray" instead of "red" color.
-    async fn get_fresh_msg_cnt(&self, account_id: u32, chat_id: u32) -> Result<usize> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).get_fresh_msg_cnt(&ctx).await
-    }
-
-    // ---------------------------------------------
-    //  autocrypt
-    // ---------------------------------------------
-
-    async fn autocrypt_initiate_key_transfer(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        deltachat::imex::initiate_key_transfer(&ctx).await
-    }
-
-    async fn autocrypt_continue_key_transfer(
-        &self,
-        account_id: u32,
-        message_id: u32,
-        setup_code: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        deltachat::imex::continue_key_transfer(&ctx, MsgId::new(message_id), &setup_code).await
-    }
-
-    // ---------------------------------------------
-    //   chat list
-    // ---------------------------------------------
-
-    async fn get_chatlist_entries(
-        &self,
-        account_id: u32,
-        list_flags: Option<u32>,
-        query_string: Option<String>,
-        query_contact_id: Option<u32>,
-    ) -> Result<Vec<ChatListEntry>> {
-        let ctx = self.get_context(account_id).await?;
-        let list = Chatlist::try_load(
-            &ctx,
-            list_flags.unwrap_or(0) as usize,
-            query_string.as_deref(),
-            query_contact_id.map(ContactId::new),
-        )
-        .await?;
-        let mut l: Vec<ChatListEntry> = Vec::with_capacity(list.len());
-        for i in 0..list.len() {
-            l.push(ChatListEntry(
-                list.get_chat_id(i)?.to_u32(),
-                list.get_msg_id(i)?.unwrap_or_default().to_u32(),
-            ));
-        }
-        Ok(l)
-    }
-
-    async fn get_chatlist_items_by_entries(
-        &self,
-        account_id: u32,
-        entries: Vec<ChatListEntry>,
-    ) -> Result<HashMap<u32, ChatListItemFetchResult>> {
-        // todo custom json deserializer for ChatListEntry?
-        let ctx = self.get_context(account_id).await?;
-        let mut result: HashMap<u32, ChatListItemFetchResult> =
-            HashMap::with_capacity(entries.len());
-        for entry in entries.iter() {
-            result.insert(
-                entry.0,
-                match get_chat_list_item_by_id(&ctx, entry).await {
-                    Ok(res) => res,
-                    Err(err) => ChatListItemFetchResult::Error {
-                        id: entry.0,
-                        error: format!("{:?}", err),
-                    },
-                },
-            );
-        }
-        Ok(result)
-    }
-
-    // ---------------------------------------------
-    //  chat
-    // ---------------------------------------------
-
-    async fn chatlist_get_full_chat_by_id(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-    ) -> Result<FullChat> {
-        let ctx = self.get_context(account_id).await?;
-        FullChat::try_from_dc_chat_id(&ctx, chat_id).await
-    }
-
-    async fn accept_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).accept(&ctx).await
-    }
-
-    async fn block_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).block(&ctx).await
-    }
-
-    // for now only text messages, because we only used text messages in desktop thusfar
-    async fn add_device_message(
-        &self,
-        account_id: u32,
-        label: String,
-        text: String,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some(text));
-        let message_id =
-            deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut msg)).await?;
-        Ok(message_id.to_u32())
-    }
-
-    // ---------------------------------------------
-    // message list
-    // ---------------------------------------------
-
-    async fn message_list_get_message_ids(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        flags: u32,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let msg = get_chat_msgs(&ctx, ChatId::new(chat_id), flags).await?;
-        Ok(msg
-            .iter()
-            .filter_map(|chat_item| match chat_item {
-                deltachat::chat::ChatItem::Message { msg_id } => Some(msg_id.to_u32()),
-                _ => None,
-            })
-            .collect())
-    }
-
-    async fn message_get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
-        let ctx = self.get_context(account_id).await?;
-        MessageObject::from_message_id(&ctx, message_id).await
-    }
-
-    async fn message_get_messages(
-        &self,
-        account_id: u32,
-        message_ids: Vec<u32>,
-    ) -> Result<HashMap<u32, MessageObject>> {
-        let ctx = self.get_context(account_id).await?;
-        let mut messages: HashMap<u32, MessageObject> = HashMap::new();
-        for message_id in message_ids {
-            messages.insert(
-                message_id,
-                MessageObject::from_message_id(&ctx, message_id).await?,
-            );
-        }
-        Ok(messages)
-    }
-
-    // ---------------------------------------------
-    //  contact
-    // ---------------------------------------------
-
-    /// Get a single contact options by ID.
-    async fn contacts_get_contact(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<ContactObject> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_id = ContactId::new(contact_id);
-
-        ContactObject::try_from_dc_contact(
-            &ctx,
-            deltachat::contact::Contact::get_by_id(&ctx, contact_id).await?,
-        )
-        .await
-    }
-
-    /// Add a single contact as a result of an explicit user action.
-    ///
-    /// Returns contact id of the created or existing contact
-    async fn contacts_create_contact(
-        &self,
-        account_id: u32,
-        email: String,
-        name: Option<String>,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        if !may_be_valid_addr(&email) {
-            bail!(anyhow!(
-                "provided email address is not a valid email address"
-            ))
-        }
-        let contact_id = Contact::create(&ctx, &name.unwrap_or_default(), &email).await?;
-        Ok(contact_id.to_u32())
-    }
-
-    /// Returns contact id of the created or existing DM chat with that contact
-    async fn contacts_create_chat_by_contact_id(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let contact = Contact::get_by_id(&ctx, ContactId::new(contact_id)).await?;
-        ChatId::create_for_contact(&ctx, contact.id)
-            .await
-            .map(|id| id.to_u32())
-    }
-
-    async fn contacts_block(&self, account_id: u32, contact_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        Contact::block(&ctx, ContactId::new(contact_id)).await
-    }
-
-    async fn contacts_unblock(&self, account_id: u32, contact_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        Contact::unblock(&ctx, ContactId::new(contact_id)).await
-    }
-
-    async fn contacts_get_blocked(&self, account_id: u32) -> Result<Vec<ContactObject>> {
-        let ctx = self.get_context(account_id).await?;
-        let blocked_ids = Contact::get_all_blocked(&ctx).await?;
-        let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len());
-        for id in blocked_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    &ctx,
-                    deltachat::contact::Contact::get_by_id(&ctx, id).await?,
-                )
-                .await?,
-            );
-        }
-        Ok(contacts)
-    }
-
-    async fn contacts_get_contact_ids(
-        &self,
-        account_id: u32,
-        list_flags: u32,
-        query: Option<String>,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts = Contact::get_all(&ctx, list_flags, query.as_deref()).await?;
-        Ok(contacts.into_iter().map(|c| c.to_u32()).collect())
-    }
-
-    /// Get a list of contacts.
-    /// (formerly called getContacts2 in desktop)
-    async fn contacts_get_contacts(
-        &self,
-        account_id: u32,
-        list_flags: u32,
-        query: Option<String>,
-    ) -> Result<Vec<ContactObject>> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_ids = Contact::get_all(&ctx, list_flags, query.as_deref()).await?;
-        let mut contacts: Vec<ContactObject> = Vec::with_capacity(contact_ids.len());
-        for id in contact_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    &ctx,
-                    deltachat::contact::Contact::get_by_id(&ctx, id).await?,
-                )
-                .await?,
-            );
-        }
-        Ok(contacts)
-    }
-
-    async fn contacts_get_contacts_by_ids(
-        &self,
-        account_id: u32,
-        ids: Vec<u32>,
-    ) -> Result<HashMap<u32, ContactObject>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let mut contacts = HashMap::with_capacity(ids.len());
-        for id in ids {
-            contacts.insert(
-                id,
-                ContactObject::try_from_dc_contact(
-                    &ctx,
-                    deltachat::contact::Contact::get_by_id(&ctx, ContactId::new(id)).await?,
-                )
-                .await?,
-            );
-        }
-        Ok(contacts)
-    }
-    // ---------------------------------------------
-    //                   chat
-    // ---------------------------------------------
-
-    /// Returns all message IDs of the given types in a chat.
-    /// Typically used to show a gallery.
-    ///
-    /// The list is already sorted and starts with the oldest message.
-    /// Clients should not try to re-sort the list as this would be an expensive action
-    /// and would result in inconsistencies between clients.
-    async fn chat_get_media(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        message_type: MessageViewtype,
-        or_message_type2: Option<MessageViewtype>,
-        or_message_type3: Option<MessageViewtype>,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let msg_type = message_type.into();
-        let or_msg_type2 = or_message_type2.map_or(Viewtype::Unknown, |v| v.into());
-        let or_msg_type3 = or_message_type3.map_or(Viewtype::Unknown, |v| v.into());
-
-        let media = get_chat_media(
-            &ctx,
-            ChatId::new(chat_id),
-            msg_type,
-            or_msg_type2,
-            or_msg_type3,
-        )
-        .await?;
-        Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
-    }
-
-    // ---------------------------------------------
-    //                   webxdc
-    // ---------------------------------------------
-
-    async fn webxdc_send_status_update(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        update_str: String,
-        description: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.send_webxdc_status_update(MsgId::new(instance_msg_id), &update_str, &description)
-            .await
-    }
-
-    async fn webxdc_get_status_updates(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        last_known_serial: u32,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.get_webxdc_status_updates(
-            MsgId::new(instance_msg_id),
-            StatusUpdateSerial::new(last_known_serial),
-        )
-        .await
-    }
-
-    /// Get info from a webxdc message
-    async fn message_get_webxdc_info(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-    ) -> Result<WebxdcMessageInfo> {
-        let ctx = self.get_context(account_id).await?;
-        WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
-    }
-
-    // ---------------------------------------------
-    //           misc prototyping functions
-    //       that might get removed later again
-    // ---------------------------------------------
-
-    /// Returns the messageid of the sent message
-    async fn misc_send_text_message(
-        &self,
-        account_id: u32,
-        text: String,
-        chat_id: u32,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some(text));
-
-        let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
-        Ok(message_id.to_u32())
-    }
-}
-
-// Helper functions (to prevent code duplication)
-async fn set_config(
-    ctx: &deltachat::context::Context,
-    key: &str,
-    value: Option<&str>,
-) -> Result<(), anyhow::Error> {
-    if key.starts_with("ui.") {
-        ctx.set_ui_config(key, value).await
-    } else {
-        ctx.set_config(Config::from_str(key).context("unknown key")?, value)
-            .await
-    }
-}
-
-async fn get_config(
-    ctx: &deltachat::context::Context,
-    key: &str,
-) -> Result<Option<String>, anyhow::Error> {
-    if key.starts_with("ui.") {
-        ctx.get_ui_config(key).await
-    } else {
-        ctx.get_config(Config::from_str(key).context("unknown key")?)
-            .await
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,19 +0,0 @@
-pub mod account;
-pub mod chat;
-pub mod chat_list;
-pub mod contact;
-pub mod message;
-pub mod provider_info;
-pub mod webxdc;
-
-pub fn color_int_to_hex_string(color: u32) -> String {
-    format!("{:#08x}", color).replace("0x", "#")
-}
-
-fn maybe_empty_string_to_option(string: String) -> Option<String> {
-    if string.is_empty() {
-        None
-    } else {
-        Some(string)
-    }
-}

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

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

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

@@ -1,60 +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>,
-}
-
-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,
-        } = 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),
-        })
-    }
-}

deltachat-jsonrpc/src/lib.rs

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

deltachat-jsonrpc/src/webserver.rs

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

deltachat-jsonrpc/typescript/.gitignore

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

deltachat-jsonrpc/typescript/.npmignore

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

deltachat-jsonrpc/typescript/.prettierignore

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

deltachat-jsonrpc/typescript/deltachat.ts

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

deltachat-jsonrpc/typescript/example.html

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

deltachat-jsonrpc/typescript/example/example.ts

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

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

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

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

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

deltachat-jsonrpc/typescript/generated/client.ts

@@ -1,327 +0,0 @@
-// AUTO-GENERATED by yerpc-derive
-
-import * as T from "./types.js"
-import * as RPC from "./jsonrpc.js"
-
-type RequestMethod = (method: string, params?: RPC.Params) => Promise<unknown>;
-type NotificationMethod = (method: string, params?: RPC.Params) => void;
-
-interface Transport {
-  request: RequestMethod,
-  notification: NotificationMethod
-}
-
-export class RawClient {
-  constructor(private _transport: Transport) {}
-
-  /**
-   * Check if an email address is valid.
-   */
-  public checkEmailValidity(email: string): Promise<boolean> {
-    return (this._transport.request('check_email_validity', [email] as RPC.Params)) as Promise<boolean>;
-  }
-
-  /**
-   * Get general system info.
-   */
-  public getSystemInfo(): Promise<Record<string,string>> {
-    return (this._transport.request('get_system_info', [] as RPC.Params)) as Promise<Record<string,string>>;
-  }
-
-
-  public addAccount(): Promise<T.U32> {
-    return (this._transport.request('add_account', [] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public removeAccount(accountId: T.U32): Promise<null> {
-    return (this._transport.request('remove_account', [accountId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getAllAccountIds(): Promise<(T.U32)[]> {
-    return (this._transport.request('get_all_account_ids', [] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Select account id for internally selected state.
-   * TODO: Likely this is deprecated as all methods take an account id now.
-   */
-  public selectAccount(id: T.U32): Promise<null> {
-    return (this._transport.request('select_account', [id] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get the selected account id of the internal state..
-   * TODO: Likely this is deprecated as all methods take an account id now.
-   */
-  public getSelectedAccountId(): Promise<(T.U32|null)> {
-    return (this._transport.request('get_selected_account_id', [] as RPC.Params)) as Promise<(T.U32|null)>;
-  }
-
-  /**
-   * Get a list of all configured accounts.
-   */
-  public getAllAccounts(): Promise<(T.Account)[]> {
-    return (this._transport.request('get_all_accounts', [] as RPC.Params)) as Promise<(T.Account)[]>;
-  }
-
-  /**
-   * Get top-level info for an account.
-   */
-  public getAccountInfo(accountId: T.U32): Promise<T.Account> {
-    return (this._transport.request('get_account_info', [accountId] as RPC.Params)) as Promise<T.Account>;
-  }
-
-  /**
-   * Returns provider for the given domain.
-   *
-   * This function looks up domain in offline database.
-   *
-   * For compatibility, email address can be passed to this function
-   * instead of the domain.
-   */
-  public getProviderInfo(accountId: T.U32, email: string): Promise<(T.ProviderInfo|null)> {
-    return (this._transport.request('get_provider_info', [accountId, email] as RPC.Params)) as Promise<(T.ProviderInfo|null)>;
-  }
-
-  /**
-   * Checks if the context is already configured.
-   */
-  public isConfigured(accountId: T.U32): Promise<boolean> {
-    return (this._transport.request('is_configured', [accountId] as RPC.Params)) as Promise<boolean>;
-  }
-
-  /**
-   * Get system info for an account.
-   */
-  public getInfo(accountId: T.U32): Promise<Record<string,string>> {
-    return (this._transport.request('get_info', [accountId] as RPC.Params)) as Promise<Record<string,string>>;
-  }
-
-
-  public setConfig(accountId: T.U32, key: string, value: (string|null)): Promise<null> {
-    return (this._transport.request('set_config', [accountId, key, value] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public batchSetConfig(accountId: T.U32, config: Record<string,(string|null)>): Promise<null> {
-    return (this._transport.request('batch_set_config', [accountId, config] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
-   * Before this function is called, dc_check_qr() should confirm the type of the
-   * QR code is DC_QR_ACCOUNT or DC_QR_WEBRTC_INSTANCE.
-   *
-   * Internally, the function will call dc_set_config() with the appropriate keys,
-   * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT
-   * or `webrtc_instance` for DC_QR_WEBRTC_INSTANCE.
-   */
-  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 getConfig(accountId: T.U32, key: string): Promise<(string|null)> {
-    return (this._transport.request('get_config', [accountId, key] as RPC.Params)) as Promise<(string|null)>;
-  }
-
-
-  public batchGetConfig(accountId: T.U32, keys: (string)[]): Promise<Record<string,(string|null)>> {
-    return (this._transport.request('batch_get_config', [accountId, keys] as RPC.Params)) as Promise<Record<string,(string|null)>>;
-  }
-
-  /**
-   * Configures this account with the currently set parameters.
-   * Setup the credential config before calling this.
-   */
-  public configure(accountId: T.U32): Promise<null> {
-    return (this._transport.request('configure', [accountId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Signal an ongoing process to stop.
-   */
-  public stopOngoingProcess(accountId: T.U32): Promise<null> {
-    return (this._transport.request('stop_ongoing_process', [accountId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Returns the message IDs of all _fresh_ messages of any chat.
-   * Typically used for implementing notification summaries
-   * or badge counters e.g. on the app icon.
-   * The list is already sorted and starts with the most recent fresh message.
-   *
-   * Messages belonging to muted chats or to the contact requests are not returned;
-   * these messages should not be notified
-   * and also badge counters should not include these messages.
-   *
-   * To get the number of fresh messages for a single chat, muted or not,
-   * use `get_fresh_msg_cnt()`.
-   */
-  public getFreshMsgs(accountId: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('get_fresh_msgs', [accountId] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Get the number of _fresh_ messages in a chat.
-   * Typically used to implement a badge with a number in the chatlist.
-   *
-   * If the specified chat is muted,
-   * the UI should show the badge counter "less obtrusive",
-   * e.g. using "gray" instead of "red" color.
-   */
-  public getFreshMsgCnt(accountId: T.U32, chatId: T.U32): Promise<T.Usize> {
-    return (this._transport.request('get_fresh_msg_cnt', [accountId, chatId] as RPC.Params)) as Promise<T.Usize>;
-  }
-
-
-  public autocryptInitiateKeyTransfer(accountId: T.U32): Promise<string> {
-    return (this._transport.request('autocrypt_initiate_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-
-  public autocryptContinueKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
-    return (this._transport.request('autocrypt_continue_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getChatlistEntries(accountId: T.U32, listFlags: (T.U32|null), queryString: (string|null), queryContactId: (T.U32|null)): Promise<(T.ChatListEntry)[]> {
-    return (this._transport.request('get_chatlist_entries', [accountId, listFlags, queryString, queryContactId] as RPC.Params)) as Promise<(T.ChatListEntry)[]>;
-  }
-
-
-  public getChatlistItemsByEntries(accountId: T.U32, entries: (T.ChatListEntry)[]): Promise<Record<T.U32,T.ChatListItemFetchResult>> {
-    return (this._transport.request('get_chatlist_items_by_entries', [accountId, entries] as RPC.Params)) as Promise<Record<T.U32,T.ChatListItemFetchResult>>;
-  }
-
-
-  public chatlistGetFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
-    return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
-  }
-
-
-  public acceptChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('accept_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public blockChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('block_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public addDeviceMessage(accountId: T.U32, label: string, text: string): Promise<T.U32> {
-    return (this._transport.request('add_device_message', [accountId, label, text] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public messageListGetMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('message_list_get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public messageGetMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
-    return (this._transport.request('message_get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
-  }
-
-
-  public messageGetMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
-    return (this._transport.request('message_get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
-  }
-
-  /**
-   * Get a single contact options by ID.
-   */
-  public contactsGetContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
-    return (this._transport.request('contacts_get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
-  }
-
-  /**
-   * Add a single contact as a result of an explicit user action.
-   *
-   * Returns contact id of the created or existing contact
-   */
-  public contactsCreateContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
-    return (this._transport.request('contacts_create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Returns contact id of the created or existing DM chat with that contact
-   */
-  public contactsCreateChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
-    return (this._transport.request('contacts_create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public contactsBlock(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('contacts_block', [accountId, contactId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public contactsUnblock(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('contacts_unblock', [accountId, contactId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public contactsGetBlocked(accountId: T.U32): Promise<(T.Contact)[]> {
-    return (this._transport.request('contacts_get_blocked', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
-  }
-
-
-  public contactsGetContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('contacts_get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Get a list of contacts.
-   * (formerly called getContacts2 in desktop)
-   */
-  public contactsGetContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
-    return (this._transport.request('contacts_get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
-  }
-
-
-  public contactsGetContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
-    return (this._transport.request('contacts_get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
-  }
-
-  /**
-   * Returns all message IDs of the given types in a chat.
-   * Typically used to show a gallery.
-   *
-   * The list is already sorted and starts with the oldest message.
-   * Clients should not try to re-sort the list as this would be an expensive action
-   * and would result in inconsistencies between clients.
-   */
-  public chatGetMedia(accountId: T.U32, chatId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('chat_get_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public webxdcSendStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
-    return (this._transport.request('webxdc_send_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public webxdcGetStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
-    return (this._transport.request('webxdc_get_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * Get info from a webxdc message
-   */
-  public messageGetWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
-    return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
-  }
-
-  /**
-   * Returns the messageid of the sent message
-   */
-  public miscSendTextMessage(accountId: T.U32, text: string, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('misc_send_text_message', [accountId, text, chatId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-}

deltachat-jsonrpc/typescript/generated/events.ts

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

deltachat-jsonrpc/typescript/generated/jsonrpc.ts

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

deltachat-jsonrpc/typescript/generated/types.ts

@@ -1,97 +0,0 @@
-// AUTO-GENERATED by typescript-type-def
-
-export type U32=number;
-export type Account=(({"type":"Configured";}&{"id":U32;"displayName":(string|null);"addr":(string|null);"profileImage":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
-export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
-export type Usize=number;
-export type ChatListEntry=[U32,U32];
-export type I64=number;
-export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":string;"avatarPath":(string|null);"color":string;"lastUpdated":(I64|null);"summaryText1":string;"summaryText2":string;"summaryStatus":U32;"isProtected":boolean;"isGroup":boolean;"freshMessageCounter":Usize;"isSelfTalk":boolean;"isDeviceTalk":boolean;"isSendingLocation":boolean;"isSelfInGroup":boolean;"isArchived":boolean;"isPinned":boolean;"isMuted":boolean;"isContactRequest":boolean;
-/**
- * contact id if this is a dm chat (for view profile entry in context menu)
- */
-"dmChatContact":(U32|null);})|{"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;};
-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;};
-export type Viewtype=("Unknown"|
-/**
- * Text message.
- */
-"Text"|
-/**
- * Image message.
- * If the image is an animated GIF, the type `Viewtype.Gif` should be used.
- */
-"Image"|
-/**
- * Animated GIF message.
- */
-"Gif"|
-/**
- * Message containing a sticker, similar to image.
- * If possible, the ui should display the image without borders in a transparent way.
- * A click on a sticker will offer to install the sticker set in some future.
- */
-"Sticker"|
-/**
- * Message containing an Audio file.
- */
-"Audio"|
-/**
- * A voice message that was directly recorded by the user.
- * For all other audio messages, the type `Viewtype.Audio` should be used.
- */
-"Voice"|
-/**
- * Video messages.
- */
-"Video"|
-/**
- * Message containing any file, eg. a PDF.
- */
-"File"|
-/**
- * Message is an invitation to a videochat.
- */
-"VideochatInvitation"|
-/**
- * Message is an webxdc instance.
- */
-"Webxdc");
-export type I32=number;
-export type U64=number;
-export type Message={"id":U32;"chatId":U32;"fromId":U32;"quotedText":(string|null);"quotedMessageId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);};
-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);};
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,U32,null,U32,null,U32,(U32)[],U32,U32,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,null,U32,U32,null,U32,string,string,U32,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,U32,Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,string,U32,U32];

deltachat-jsonrpc/typescript/package.json

@@ -1,51 +0,0 @@
-{
-  "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",
-    "generate-bindings": "cargo test",
-    "build": "run-s generate-bindings build:tsc build:bundle",
-    "build:tsc": "tsc",
-    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
-    "example": "run-s build example:build example:start",
-    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
-    "example:start": "http-server .",
-    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
-    "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
-    "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",
-    "test:report-coverage": "node report_api_coverage.mjs",
-    "docs": "typedoc --out docs deltachat.ts"
-  },
-  "dependencies": {
-    "isomorphic-ws": "^4.0.1",
-    "tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
-    "yerpc": "^0.3.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.21",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.0.0",
-    "@types/node-fetch": "^2.5.7",
-    "@types/ws": "^7.2.4",
-    "c8": "^7.10.0",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.14.11",
-    "http-server": "^14.1.1",
-    "mocha": "^9.1.1",
-    "node-fetch": "^2.6.1",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.2",
-    "typedoc": "^0.23.2",
-    "typescript": "^4.5.5",
-    "ws": "^8.5.0"
-  }
-}