trying to use semaphores

2026-10-12 02:22:45 +00:00 · 2022-06-17 13:56:06 +01:00
159 changed files with 5208 additions and 24660 deletions
@@ -1,4 +1 @@
-* @epoberezkin @spaced4ndy
-/Dockerfile @shumvgolove
-/scripts/docker/ @shumvgolove
-/scripts/main/ @shumvgolove
+* @epoberezkin @efim-poberezkin
@@ -11,54 +11,35 @@ on:

 jobs:
  build:
-    name: build-${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-            platform_name: 20_04-x86-64
-          - os: ubuntu-22.04
-            platform_name: 22_04-x86-64
+    runs-on: ubuntu-20.04
    steps:
      - name: Clone project
        uses: actions/checkout@v2

-      - name: Setup Haskell
+      - name: Setup Stack
        uses: haskell/actions/setup@v1
        with:
          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          enable-stack: true
+          stack-version: "latest"

      - name: Cache dependencies
        uses: actions/cache@v2
        with:
-          path: |
-            ~/.cabal/store
-            dist-newstyle
-          key: ${{ matrix.os }}-${{ hashFiles('cabal.project', 'simplexmq.cabal') }}
+          path: ~/.stack
+          key: ${{ hashFiles('stack.yaml') }}

-      - name: Build
-        shell: bash
-        run: cabal build --enable-tests
-
-      - name: Test
-        timeout-minutes: 30
-        shell: bash
-        run: cabal test --test-show-details=direct
-
-      - name: Prepare binaries
-        if: startsWith(github.ref, 'refs/tags/v')
+      - name: Build & test
+        id: build_test
        shell: bash
        run: |
-          mv $(cabal list-bin smp-server) smp-server-ubuntu-${{ matrix.platform_name}}
-          mv $(cabal list-bin ntf-server) ntf-server-ubuntu-${{ matrix.platform_name}}
-          mv $(cabal list-bin xftp-server) xftp-server-ubuntu-${{ matrix.platform_name}}
-          mv $(cabal list-bin xftp) xftp-ubuntu-${{ matrix.platform_name}}
+          stack build --test --force-dirty
+          install_root=$(stack path --local-install-root)
+          mv ${install_root}/bin/smp-server smp-server-ubuntu-20_04-x86-64
+          mv ${install_root}/bin/ntf-server ntf-server-ubuntu-20_04-x86-64

      - name: Build changelog
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v')
        id: build_changelog
        uses: mikepenz/release-changelog-builder-action@v1
        with:
@@ -69,8 +50,19 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+      - name: Extract release candidate
+        if: startsWith(github.ref, 'refs/tags/v')
+        id: extract_release_candidate
+        shell: bash
+        run: |
+          if [[ ${GITHUB_REF} == *rc* ]]; then
+            echo "::set-output name=release_candidate::true"
+          else
+            echo "::set-output name=release_candidate::false"
+          fi
+
      - name: Create release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v')
        uses: softprops/action-gh-release@v1
        with:
          body: |
@@ -78,13 +70,11 @@ jobs:

            Commits:
            ${{ steps.build_changelog.outputs.changelog }}
-          prerelease: true
+          prerelease: ${{ steps.extract_release_candidate.outputs.release_candidate }}
          files: |
            LICENSE
-            smp-server-ubuntu-${{ matrix.platform_name}}
-            ntf-server-ubuntu-${{ matrix.platform_name}}
-            xftp-server-ubuntu-${{ matrix.platform_name}}
-            xftp-ubuntu-${{ matrix.platform_name}}
+            smp-server-ubuntu-20_04-x86-64
+            ntf-server-ubuntu-20_04-x86-64
          fail_on_unmatched_files: true
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,50 +0,0 @@
-name: Build and push Docker image to Docker Hub
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build-and-push:
-    name: Build and push Docker image
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - app: smp-server
-            app_port: 5223
-          - app: xftp-server
-            app_port: 443 
-    steps:
-      - name: Clone project
-        uses: actions/checkout@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Extract metadata for Docker image
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}
-          flavor: |
-            latest=auto
-          tags: |
-            type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
-            type=semver,pattern=v{{major}}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            APP_PORT=${{ matrix.app_port }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
@@ -4,10 +4,3 @@
 *.session.sql
 tests/tmp
 dist-newstyle/
-
-cabal.project.local
-cabal.project.local~
-
-.hpc/
-*.tix
-.coverage
@@ -1,206 +1,3 @@
-# 5.2.0 (NTF server 1.5.0)
-
-Agent:
- treat agent INACTIVE error as temporary - fixes failed message delivery in some race conditions.
- restore connection confirmations after client restart - fixes failed connections.
- ratchet resynchronization protocol and API.
- increase connection version to mutually supported by both peers on each received message.
-
-Client:
- make timeout for batched functions dependent on the number of batches - fixes expiry on large batches.
-
-Servers:
- add timeout in case of sending TCP traffic and in case of partial delivery of requested blocks to avoid resource leaks.
-
-# 5.1.2, 5.1.3 (NTF server 1.4.1, 1.4.2)
-
-Agent:
- ACK message on decryption error (fixes stuck message delivery bug)
- more robust connection switching logic, API to abort switching the address
-
-Notification server:
- batch subscriptions to SMP servers
-
-# 5.1.1 (NTF server 1.4.0)
-
-Agent:
- store and check hashes of previous encrypted messages to differentiate between duplicates and decryption errors
-
-Server:
- larger processing queues
- expire messages when restoring them
-
-# 5.1.0
-
-XFTP client:
- check encrypted file exists when uploading
- remove user ID from deletion API
-
-Agent:
- vacuum database on migrations
-
-SMP server:
- configure message expiration time in INI file
-
-# 5.0.0
-
-SimpleX File Transfer Protocol (XFTP):
- XFTP server
- XFTP CLI
- support XFTP in the agent
-
-Other changes:
- preserve retry interval for sending messages on agent restarts
- support IPv6 in the servers and in the agent
- support for 32-bit platforms
-
-Read more about XFTP in this post: https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html
-
-# 4.4.1
-
-SMP agent:
-
- fix handling of server addresses.
- prevent message delivery getting stuck on IO error in SMP client.
-
-# 4.4.0
-
-SMP agent:
-
- support multiple user profiles with transport session isolation.
- support optional transport isolation per connection.
- batch connection deletion
- improve asynchronous connection deletion – it may now be completed after the client is restarted as well.
- improve subscription logic to retry if initial attempt fails.
- end SMP client connection after a number of failed PINGs (defalt is 3).
-
-# 4.3.0
-
-SMP server:
-
- additional server usage statistics.
-
-SMP agent:
-
- increase retry interval when sending messages after ERR QUOTA.
-
-# 4.2.0
-
-SMP agent and server:
-
- reduce sender traffic in cases when queue quota is exceeded:
-  - server sends quota exceeded message to the recipient when sender receives ERR QUOTA.
-  - recipient sends QCONT message to the send once the queue is drained (via reply queue).
-  - sender retry delays are increased, reducing traffic, but sender instantly resumes delivery where QCONT is received.
-
-SMP server:
-
- increase internal queue sizes.
-
-SMP agent:
-
- deduplicate connection IDs in connect/disconnect responses.
- unit tests for Crypto.hs.
- fix connection switch to another queue: correctly set primary send queue.
-
-Notification server (v1.3.0):
-
- check token status when sending verification notificaiton.
-
-# 4.1.0
-
-SMP agent and server:
-
- option to toggle TLS handshake error logs (disabled by default).
-
-SMP agent:
-
- include server address in BROKER error.
- api to get hash of double ratchet associated data (for connection verification).
- api to get agent statistics.
-
-# 4.0.0
-
-SMP server:
-
- Basic authentication. The server address can now include an optional password that is required to create messaging queues, so the contacts who message you will not be able to receive messages via your server, unless you share with them the address with the password. It is recommended to enable basic authentication on all private servers by adding `create_password` parameter into AUTH section of server INI file (the previously deployed servers do not have this section, you need to add it).
- Disable creating new queues completely with `new_queues: off` parameter in AUTH section of INI file - it can be used to simplify migrating the exising connections to another server.
- Updated server CLI with changed defaults:
-  - interactive server initialization, use -y flag to initalize the server non-interactively.
-  - store log is now enabled by default, so messaging queues and messages are restored when the server is restarted (to restore undelivered messages the server needs to be stopped with SIGINT signal).
-  - a random password is now generated by default during the server initialization.
-
-SMP agent:
-
- API to test SMP servers. It connects to the server, creates and deletes a messaging queue. The new SimpleX Chat client uses this API to allow you to test that you have the correct server address, with the valid certificate fingerprint and pasword, before enabling the new server.
-
-# 3.4.0
-
-SMP agent:
-
- increase concurrency with connection-level locks
- fix issues identified in security assessment (see the announcement: https://github.com/simplex-chat/simplex-chat/blob/stable/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md)
- manual connection queue rotation
- optional client data in connection requests links
-
-SMP server:
-
- specialize monad stack to improve performance
- log slow commands
-
-# 3.3.0
-
-SMP server:
-
- allow repeated KEY command with the same key (to avoid failures on retries)
-
-SMP agent:
-
- enable/disable connection notifications
- asynchronous commands that retry on network error
- use SQLCipher
-
-# 3.2.0
-
-SMP agent:
-
- Support multiple server hostnames (including onion hostnames) in server addresses.
- Network configuration options.
- Options to define rules to choose server hostname.
-
-# 3.1.0
-
-SMP server and agent:
-
- SMP protocol v4: batching multiple server commands/responses in a transport block.
-
-# 3.0.0
-
-SMP server:
-
- restore undeliverd messages when the server is restarted.
- SMP protocol v3 to support push notification:
-  - updated SEND and MSG to add message flags (for notification flag that contros whether the notification is sent and for any future extensions) and to move message meta-data sent to the recipient into the encrypted envelope.
-  - update NKEY and NID to add e2e encryption keys (for the notification meta-data encryption between SMP server and the client), and update NMSG to include this meta-data.
-  - update ACK command to include message ID (to avoid acknowledging unprocessed message).
-  - add NDEL commands to remove notification subscription credentials from SMP queue.
-  - add GET command to receive messages without subscription - to be used in iOS notification service extension to receive messages without terminating app subscriptions.
-
-SMP agent:
-
- new protocol for duplex connection handshake reducing traffic and connection time.
- support for SMP notifications server and managing device token.
- remove redundant FQDN validation from TLS handshake to prepare for access via Tor.
- support for fully stopping agent and for termporary suspending agent operations.
- improve management of duplicate message delivery.
-
-SMP notifications server v1.0:
-
- SMP notifications protocol with version negotiation during handshake.
- device token registration and verification (via background notification).
- SMP notification subscriptions and push notifications via APNS.
- restoring notification subscriptions when the server is restarted.
-
 # 2.3.0

 SMP server:
@@ -1,62 +0,0 @@
-ARG TAG=22.04
-
-FROM ubuntu:${TAG} AS build
-
-### Build stage
-
-# Install curl and git and simplexmq dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev llvm-12 llvm-12-dev libnuma-dev
-
-# Specify bootstrap Haskell versions
-ENV BOOTSTRAP_HASKELL_GHC_VERSION=8.10.7
-ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.6.2.0
-
-# Install ghcup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
-
-# Adjust PATH
-ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
-
-# Set both as default
-RUN ghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}" && \
-    ghcup set cabal
-
-COPY . /project
-WORKDIR /project
-
-ARG APP
-ARG APP_PORT
-RUN if [ -z "$APP" ] || [ -z "$APP_PORT" ]; then printf "Please spcify \$APP and \$APP_PORT build-arg.\n"; exit 1; fi
-
-# Compile app
-RUN cabal update
-RUN cabal build exe:$APP
-
-# Create new path containing all files needed
-RUN mkdir /final
-WORKDIR /final
-
-# Strip the binary from debug symbols to reduce size
-RUN bin=$(find /project/dist-newstyle -name "$APP" -type f -executable) && \
-    mv "$bin" ./ && \
-    strip ./"$APP" &&\
-    mv /project/scripts/docker/entrypoint-"$APP" ./entrypoint
-
-### Final stage
-FROM ubuntu:${TAG}
-
-# Install OpenSSL dependency
-RUN apt-get update && apt-get install -y openssl libnuma-dev
-
-# Copy compiled app from build stage
-COPY --from=build /final /usr/local/bin/
-
-# Open app listening port
-ARG APP_PORT
-EXPOSE $APP_PORT
-
-# simplexmq requires using SIGINT to correctly preserve undelivered messages and restore them on restart
-STOPSIGNAL SIGINT
-
-# Finally, execute helper script
-ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
@@ -11,7 +11,7 @@ If you have a server deployed please deploy a new server to a new host and retir

 ## Message broker for unidirectional (simplex) queues

-SimpleXMQ is a message broker for managing message queues and sending messages over public network. It consists of SMP server, SMP client library and SMP agent that implement [SMP protocol](./protocol/simplex-messaging.md) for client-server communication and [SMP agent protocol](./protocol/agent-protocol.md) to manage duplex connections via simplex queues on multiple SMP servers.
+SimpleXMQ is a message broker for managing message queues and sending messages over public network. It consists of SMP server, SMP client library and SMP agent that implement [SMP protocol](https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md) for client-server communication and [SMP agent protocol](https://github.com/simplex-chat/simplexmq/blob/master/protocol/agent-protocol.md) to manage duplex connections via simplex queues on multiple SMP servers.

 SMP protocol is inspired by [Redis serialization protocol](https://redis.io/topics/protocol), but it is much simpler - it currently has only 10 client commands and 8 server responses.

@@ -27,7 +27,7 @@ SimpleXMQ is implemented in Haskell - it benefits from robust software transacti

 ### SMP server

-[SMP server](./apps/smp-server/Main.hs) can be run on any Linux distribution, including low power/low memory devices. OpenSSL library is required for initialization.
+[SMP server](https://github.com/simplex-chat/simplexmq/blob/master/apps/smp-server/Main.hs) can be run on any Linux distribution, including low power/low memory devices. OpenSSL library is required for initialization.

 To initialize the server use `smp-server init -n <fqdn>` (or `smp-server init --ip <ip>` for IP based address) command - it will generate keys and certificates for TLS transport. The fingerprint of offline certificate is used as part of the server address to protect client/server connection against man-in-the-middle attacks: `smp://<fingerprint>@<hostname>[:5223]`.

@@ -39,7 +39,7 @@ Starting from version 2.3.0, when store log is enabled, the server would also en

 > **Please note:** On initialization SMP server creates a chain of two certificates: a self-signed CA certificate ("offline") and a server certificate used for TLS handshake ("online"). **You should store CA certificate private key securely and delete it from the server. If server TLS credential is compromised this key can be used to sign a new one, keeping the same server identity and established connections.** CA private key location by default is `/etc/opt/simplex/ca.key`.

-SMP server implements [SMP protocol](./protocol/simplex-messaging.md).
+SMP server implements [SMP protocol](https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md).

 #### Running SMP server on MacOS

@@ -62,7 +62,7 @@ Now `openssl version` should be saying "OpenSSL". You can now run `smp-server in

 ### SMP client library

-[SMP client](./src/Simplex/Messaging/Client.hs) is a Haskell library to connect to SMP servers that allows to:
+[SMP client](https://github.com/simplex-chat/simplexmq/blob/master/src/Simplex/Messaging/Client.hs) is a Haskell library to connect to SMP servers that allows to:

 - execute commands with a functional API.
 - receive messages and other notifications via STM queue.
@@ -70,13 +70,13 @@ Now `openssl version` should be saying "OpenSSL". You can now run `smp-server in

 ### SMP agent

-[SMP agent library](./src/Simplex/Messaging/Agent.hs) can be used to run SMP agent as part of another application and to communicate with the agent via STM queues, without serializing and parsing commands and responses.
+[SMP agent library](https://github.com/simplex-chat/simplexmq/blob/master/src/Simplex/Messaging/Agent.hs) can be used to run SMP agent as part of another application and to communicate with the agent via STM queues, without serializing and parsing commands and responses.

-Haskell type [ACommand](./src/Simplex/Messaging/Agent/Protocol.hs) represents SMP agent protocol to communicate via STM queues.
+Haskell type [ACommand](https://github.com/simplex-chat/simplexmq/blob/master/src/Simplex/Messaging/Agent/Protocol.hs) represents SMP agent protocol to communicate via STM queues.

 See [simplex-chat](https://github.com/simplex-chat/simplex-chat) terminal UI for the example of integrating SMP agent into another application.

-[SMP agent executable](./apps/smp-agent/Main.hs) can be used to run a standalone SMP agent process that implements plaintext [SMP agent protocol](./protocol/agent-protocol.md) via TCP port 5224, so it can be used via telnet. It can be deployed in private networks to share access to the connections between multiple applications and services.
+[SMP agent executable](https://github.com/simplex-chat/simplexmq/blob/master/apps/smp-agent/Main.hs) can be used to run a standalone SMP agent process that implements plaintext [SMP agent protocol](https://github.com/simplex-chat/simplexmq/blob/master/protocol/agent-protocol.md) via TCP port 5224, so it can be used via telnet. It can be deployed in private networks to share access to the connections between multiple applications and services.

 ## Using SMP server and SMP agent

@@ -90,155 +90,27 @@ You can either run your own SMP server locally or deploy using [Linode StackScri

 It's the easiest to try SMP agent via a prototype [simplex-chat](https://github.com/simplex-chat/simplex-chat) terminal UI.

-## Deploy SMP/XFTP servers on Linux
+## Deploy SMP server on Linux

-You can run your SMP/XFTP server as a Linux process, optionally using a service manager for booting and restarts.
+You can run your SMP server as a Linux process, optionally using a service manager for booting and restarts.

-Notice that `smp-server` and `xftp-server` requires `openssl` as run-time dependency (it is used to generate server certificates during initialization). Install it with your packet manager:
+- For Ubuntu you can download a binary from [the latest release](https://github.com/simplex-chat/simplexmq/releases).

-```sh
-# For Ubuntu
-apt update && apt install openssl
-```
+  If you're using other Linux distribution and the binary is incompatible with it, you can build from source using [Haskell stack](https://docs.haskellstack.org/en/stable/README/):

-### Install binaries
-
-#### Using Docker
-
-On Linux, you can deploy smp and xftp server using Docker. This will download image from [Docker Hub](https://hub.docker.com/r/simplexchat).
-
-1. Create directories for persistent Docker configuration:
-
-   ```sh
-   mkdir -p $HOME/simplex/{xftp,smp}/{config,logs} && mkdir -p $HOME/simplex/xftp/files
-   ```
-
-2. Run your Docker container.
-
-   - `smp-server`
-   
-     You must change **your_ip_or_domain**. `-e "pass=password"` is optional variable to password-protect your `smp` server:
-     ```sh
-     docker run -d \
-         -e "ADDR=your_ip_or_domain" \
-         -e "PASS=password" \
-         -p 5223:5223 \
-         -v $HOME/simplex/smp/config:/etc/opt/simplex:z \
-         -v $HOME/simplex/smp/logs:/var/opt/simplex:z \
-         simplexchat/smp-server:latest
-     ```
-
-   - `xftp-server`
-   
-     You must change **your_ip_or_domain** and **maximum_storage**.
-     ```sh
-     docker run -d \
-         -e "ADDR=your_ip_or_domain" \
-         -e "QUOTA=maximum_storage" \
-         -p 443:443 \
-         -v $HOME/simplex/xftp/config:/etc/opt/simplex-xftp:z \
-         -v $HOME/simplex/xftp/logs:/var/opt/simplex-xftp:z \
-         -v $HOME/simplex/xftp/files:/srv/xftp:z \
-         simplexchat/xftp-server:latest
-     ```
-
-#### Using installation script
-
-**Please note** that currently, only Ubuntu distribution is supported.
-
-You can install and setup servers automatically using our script:
-
-```sh
-curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/simplex-chat/simplexmq/stable/install.sh -o simplex-server-install.sh \
-&& if echo 'b8cf2be103f21f9461d9a500bcd3db06ab7d01d68871b07f4bd245195cbead1d simplex-server-install.sh' | sha256sum -c; then chmod +x ./simplex-server-install.sh && ./simplex-server-install.sh; rm ./simplex-server-install.sh; else echo "SHA-256 checksum is incorrect!" && rm ./simplex-server-install.sh; fi
-```
-
-### Build from source
-
-#### Using Docker
-
-> **Please note:** to build the app use source code from [stable branch](https://github.com/simplex-chat/simplexmq/tree/stable).
-
-On Linux, you can build smp server using Docker.
-
-1. Build your images:
-
-   ```sh
-   git clone https://github.com/simplex-chat/simplexmq
-   cd simplexmq
-   git checkout stable
-   DOCKER_BUILDKIT=1 docker build -t local/smp-server --build-arg APP="smp-server" --build-arg APP_PORT="5223" . # For xmp-server
-   DOCKER_BUILDKIT=1 docker build -t local/xftp-server --build-arg APP="xftp-server" --build-arg APP_PORT="443" . # For xftp-server
-   ```
-
-2. Create directories for persistent Docker configuration:
-
-   ```sh
-   mkdir -p $HOME/simplex/{xftp,smp}/{config,logs} && mkdir -p $HOME/simplex/xftp/files
-   ```
-
-3. Run your Docker container.
-
-   - `smp-server`
-   
-     You must change **your_ip_or_domain**. `-e "pass=password"` is optional variable to password-protect your `smp` server:
-     ```sh
-     docker run -d \
-         -e "ADDR=your_ip_or_domain" \
-         -e "PASS=password" \
-         -p 5223:5223 \
-         -v $HOME/simplex/smp/config:/etc/opt/simplex:z \
-         -v $HOME/simplex/smp/logs:/var/opt/simplex:z \
-         simplexchat/smp-server:latest
-     ```
-
-   - `xftp-server`
-   
-     You must change **your_ip_or_domain** and **maximum_storage**.
-     ```sh
-     docker run -d \
-         -e "ADDR=your_ip_or_domain" \
-         -e "QUOTA=maximum_storage" \
-         -p 443:443 \
-         -v $HOME/simplex/xftp/config:/etc/opt/simplex-xftp:z \
-         -v $HOME/simplex/xftp/logs:/var/opt/simplex-xftp:z \
-         -v $HOME/simplex/xftp/files:/srv/xftp:z \
-         simplexchat/xftp-server:latest
-     ```
-
-#### Using your distribution
-
-1. Install [Haskell GHCup](https://www.haskell.org/ghcup/), GHC 8.10.7 and cabal:
-
-   ```sh
-   curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
-   ghcup install ghc 8.10.7
-   ghcup install cabal
-   ghcup set ghc 8.10.7
-   ghcup set cabal
-   ```
-
-2. Build the project:
-
-   ```sh
-   git clone https://github.com/simplex-chat/simplexmq
-   cd simplexmq
-   git checkout stable
-   # On Ubuntu. Depending on your distribution, use your package manager to determine package names.
-   apt-get update && apt-get install -y build-essential libgmp3-dev zlib1g-dev
-   cabal update
-   cabal install
-   ```
+  ```shell
+  curl -sSL https://get.haskellstack.org/ | sh
+  ...
+  stack install
+  ```

 - Initialize SMP server with `smp-server init [-l] -n <fqdn>` or `smp-server init [-l] --ip <ip>` - depending on how you initialize it, either FQDN or IP will be used for server's address.

 - Run `smp-server start` to start SMP server, or you can configure a service manager to run it as a service.

- Optionally, `smp-server` can be setup for having an onion address in `tor` network. See: [`scripts/tor`](./scripts/tor/). In this case, the server address can have both public and onion hostname pointing to the same server, to allow two people connect when only one of them is using Tor. The server address would be: `smp://<fingerprint>@<public_hostname>,<onion_hostname>`
-
 See [this section](#smp-server) for more information. Run `smp-server -h` and `smp-server init -h` for explanation of commands and options.

-[<img alt="Linode" src="./img/linode.svg" align="right" width="200">](https://cloud.linode.com/stackscripts/748014)
+[<img alt="Linode" src="https://raw.githubusercontent.com/simplex-chat/simplexmq/master/img/linode.svg" align="right" width="200">](https://cloud.linode.com/stackscripts/748014)

 ## Deploy SMP server on Linode

@@ -262,7 +134,7 @@ Deployment on Linode is performed via StackScripts, which serve as recipes for L

 Please submit an [issue](https://github.com/simplex-chat/simplexmq/issues) if any problems occur.

-[<img alt="DigitalOcean" src="/img/digitalocean.png" align="right" width="300">](https://marketplace.digitalocean.com/apps/simplex-server)
+[<img alt="DigitalOcean" src="https://raw.githubusercontent.com/simplex-chat/simplexmq/master/img/digitalocean.png" align="right" width="300">](https://marketplace.digitalocean.com/apps/simplex-server)

 ## Deploy SMP server on DigitalOcean

@@ -290,12 +162,12 @@ smp-server init [-l] -n <fqdn>

 ## SMP server design

-![SMP server design](./design/server.svg)
+![SMP server design](https://raw.githubusercontent.com/simplex-chat/simplexmq/master/design/server.svg)

 ## SMP agent design

-![SMP agent design](./design/agent2.svg)
+![SMP agent design](https://raw.githubusercontent.com/simplex-chat/simplexmq/master/design/agent2.svg)

 ## License

-[AGPL v3](./LICENSE)
+[AGPL v3](https://github.com/simplex-chat/simplexmq/blob/master/LICENSE)
@@ -1,7 +1,14 @@
+{-# LANGUAGE NamedFieldPuns #-}
+
 module Main where

 import Control.Logger.Simple
-import Simplex.Messaging.Notifications.Server.Main
+import Simplex.Messaging.Client.Agent (defaultSMPClientAgentConfig)
+import Simplex.Messaging.Notifications.Server (runNtfServer)
+import Simplex.Messaging.Notifications.Server.Env (NtfServerConfig (..))
+import Simplex.Messaging.Notifications.Server.Push.APNS (defaultAPNSPushClientConfig)
+import Simplex.Messaging.Server.CLI (ServerCLIConfig (..), protocolServerCLI)
+import System.FilePath (combine)

 cfgPath :: FilePath
 cfgPath = "/etc/opt/simplex-notifications"
@@ -15,4 +22,53 @@ logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}
 main :: IO ()
 main = do
  setLogLevel LogDebug -- change to LogError in production
-  withGlobalLogging logCfg $ ntfServerCLI cfgPath logPath
+  withGlobalLogging logCfg $ protocolServerCLI ntfServerCLIConfig runNtfServer
+
+ntfServerCLIConfig :: ServerCLIConfig NtfServerConfig
+ntfServerCLIConfig =
+  let caCrtFile = combine cfgPath "ca.crt"
+      serverKeyFile = combine cfgPath "server.key"
+      serverCrtFile = combine cfgPath "server.crt"
+   in ServerCLIConfig
+        { cfgDir = cfgPath,
+          logDir = logPath,
+          iniFile = combine cfgPath "ntf-server.ini",
+          storeLogFile = combine logPath "ntf-server-store.log",
+          caKeyFile = combine cfgPath "ca.key",
+          caCrtFile,
+          serverKeyFile,
+          serverCrtFile,
+          fingerprintFile = combine cfgPath "fingerprint",
+          defaultServerPort = "443",
+          executableName = "ntf-server",
+          serverVersion = "SMP notifications server v0.1.0",
+          mkIniFile = \enableStoreLog defaultServerPort ->
+            "[STORE_LOG]\n\
+            \# The server uses STM memory for persistence,\n\
+            \# that will be lost on restart (e.g., as with redis).\n\
+            \# This option enables saving memory to append only log,\n\
+            \# and restoring it when the server is started.\n\
+            \# Log is compacted on start (deleted objects are removed).\n\
+            \# The messages are not logged.\n"
+              <> ("enable: " <> (if enableStoreLog then "on" else "off  # on") <> "\n\n")
+              <> "[TRANSPORT]\n\
+                 \port: "
+              <> defaultServerPort
+              <> "\n\
+                 \websockets: off\n",
+          mkServerConfig = \_storeLogFile transports _ ->
+            NtfServerConfig
+              { transports,
+                subIdBytes = 24,
+                regCodeBytes = 32,
+                clientQSize = 16,
+                subQSize = 64,
+                pushQSize = 128,
+                smpAgentCfg = defaultSMPClientAgentConfig,
+                apnsConfig = defaultAPNSPushClientConfig,
+                inactiveClientExpiration = Nothing,
+                caCertificateFile = caCrtFile,
+                privateKeyFile = serverKeyFile,
+                certificateFile = serverCrtFile
+              }
+        }
@@ -6,29 +6,18 @@ module Main where

 import Control.Logger.Simple
 import qualified Data.List.NonEmpty as L
-import qualified Data.Map.Strict as M
 import Simplex.Messaging.Agent.Env.SQLite
 import Simplex.Messaging.Agent.Server (runSMPAgent)
-import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..))
-import Simplex.Messaging.Client (defaultNetworkConfig)
 import Simplex.Messaging.Transport (TLS, Transport (..))

 cfg :: AgentConfig
 cfg = defaultAgentConfig

-agentDbFile :: String
-agentDbFile = "smp-agent.db"
-
-agentDbKey :: String
-agentDbKey = ""
-
 servers :: InitialAgentServers
 servers =
  InitialAgentServers
-    { smp = M.fromList [(1, L.fromList ["smp://bU0K-bRg24xWW__lS0umO1Zdw_SXqpJNtm1_RrPLViE=@localhost:5223"])],
-      ntf = [],
-      xftp = M.empty,
-      netCfg = defaultNetworkConfig
+    { smp = L.fromList ["smp://bU0K-bRg24xWW__lS0umO1Zdw_SXqpJNtm1_RrPLViE=@localhost:5223"],
+      ntf = []
    }

 logCfg :: LogConfig
@@ -38,5 +27,4 @@ main :: IO ()
 main = do
  putStrLn $ "SMP agent listening on port " ++ tcpPort (cfg :: AgentConfig)
  setLogLevel LogInfo -- LogError
-  Right st <- createAgentStore agentDbFile agentDbKey MCConsole
-  withGlobalLogging logCfg $ runSMPAgent (transport @TLS) cfg servers st
+  withGlobalLogging logCfg $ runSMPAgent (transport @TLS) cfg servers
@@ -1,7 +1,20 @@
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE NumericUnderscores #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications #-}
+
 module Main where

 import Control.Logger.Simple
-import Simplex.Messaging.Server.Main
+import Data.Functor (($>))
+import Data.Ini (lookupValue)
+import Simplex.Messaging.Server (runSMPServer)
+import Simplex.Messaging.Server.CLI (ServerCLIConfig (..), protocolServerCLI, readStrictIni)
+import Simplex.Messaging.Server.Env.STM (ServerConfig (..), defaultInactiveClientExpiration, defaultMessageExpiration)
+import Simplex.Messaging.Server.Expiration
+import Simplex.Messaging.Transport (simplexMQVersion, supportedSMPServerVRange)
+import System.FilePath (combine)

 cfgPath :: FilePath
 cfgPath = "/etc/opt/simplex"
@@ -14,5 +27,82 @@ logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}

 main :: IO ()
 main = do
-  setLogLevel LogDebug
-  withGlobalLogging logCfg $ smpServerCLI cfgPath logPath
+  setLogLevel LogInfo
+  withGlobalLogging logCfg . protocolServerCLI smpServerCLIConfig $ \cfg@ServerConfig {inactiveClientExpiration} -> do
+    putStrLn $ case inactiveClientExpiration of
+      Just ExpirationConfig {ttl, checkInterval} -> "expiring clients inactive for " <> show ttl <> " seconds every " <> show checkInterval <> " seconds"
+      _ -> "not expiring inactive clients"
+    runSMPServer cfg
+
+smpServerCLIConfig :: ServerCLIConfig ServerConfig
+smpServerCLIConfig =
+  let caCrtFile = combine cfgPath "ca.crt"
+      serverKeyFile = combine cfgPath "server.key"
+      serverCrtFile = combine cfgPath "server.crt"
+   in ServerCLIConfig
+        { cfgDir = cfgPath,
+          logDir = logPath,
+          iniFile = combine cfgPath "smp-server.ini",
+          storeLogFile = combine logPath "smp-server-store.log",
+          caKeyFile = combine cfgPath "ca.key",
+          caCrtFile,
+          serverKeyFile,
+          serverCrtFile,
+          fingerprintFile = combine cfgPath "fingerprint",
+          defaultServerPort = "5223",
+          executableName = "smp-server",
+          serverVersion = "SMP server v" <> simplexMQVersion,
+          mkIniFile = \enableStoreLog defaultServerPort ->
+            "[STORE_LOG]\n\
+            \# The server uses STM memory for persistence,\n\
+            \# that will be lost on restart (e.g., as with redis).\n\
+            \# This option enables saving memory to append only log,\n\
+            \# and restoring it when the server is started.\n\
+            \# Log is compacted on start (deleted objects are removed).\n"
+              <> ("enable: " <> (if enableStoreLog then "on" else "off  # on") <> "\n")
+              <> "# The messages are optionally saved and restored when the server restarts,\n\
+                 \# they are deleted after restarting.\n"
+              <> ("restore_messages: " <> (if enableStoreLog then "on" else "off  # on") <> "\n\n")
+              <> "[TRANSPORT]\n"
+              <> ("port: " <> defaultServerPort <> "\n")
+              <> "websockets: off\n\n"
+              <> "[INACTIVE_CLIENTS]\n\
+                 \# TTL and interval to check inactive clients\n\
+                 \disconnect: off\n"
+              <> ("# ttl: " <> show (ttl defaultInactiveClientExpiration) <> "\n")
+              <> ("# check_interval: " <> show (checkInterval defaultInactiveClientExpiration) <> "\n"),
+          mkServerConfig = \storeLogFile transports ini ->
+            ServerConfig
+              { transports,
+                tbqSize = 16,
+                serverTbqSize = 64,
+                msgQueueQuota = 128,
+                queueIdBytes = 24,
+                msgIdBytes = 24, -- must be at least 24 bytes, it is used as 192-bit nonce for XSalsa20
+                caCertificateFile = caCrtFile,
+                privateKeyFile = serverKeyFile,
+                certificateFile = serverCrtFile,
+                storeLogFile,
+                storeMsgsFile =
+                  let messagesPath = combine logPath "smp-server-messages.log"
+                   in case lookupValue "STORE_LOG" "restore_messages" ini of
+                        Right "on" -> Just messagesPath
+                        Right _ -> Nothing
+                        -- if the setting is not set, it is enabled when store log is enabled
+                        _ -> storeLogFile $> messagesPath,
+                allowNewQueues = True,
+                messageExpiration = Just defaultMessageExpiration,
+                inactiveClientExpiration =
+                  if lookupValue "INACTIVE_CLIENTS" "disconnect" ini == Right "on"
+                    then
+                      Just
+                        ExpirationConfig
+                          { ttl = readStrictIni "INACTIVE_CLIENTS" "ttl" ini,
+                            checkInterval = readStrictIni "INACTIVE_CLIENTS" "check_interval" ini
+                          }
+                    else Nothing,
+                logStatsInterval = Just 86400, -- seconds
+                logStatsStartTime = 0, -- seconds from 00:00 UTC
+                smpServerVRange = supportedSMPServerVRange
+              }
+        }
@@ -1,18 +0,0 @@
-module Main where
-
-import Control.Logger.Simple
-import Simplex.FileTransfer.Server.Main
-
-cfgPath :: FilePath
-cfgPath = "/etc/opt/simplex-xftp"
-
-logPath :: FilePath
-logPath = "/var/opt/simplex-xftp"
-
-logCfg :: LogConfig
-logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}
-
-main :: IO ()
-main = do
-  setLogLevel LogDebug -- change to LogError in production
-  withGlobalLogging logCfg $ xftpServerCLI cfgPath logPath
@@ -1,6 +0,0 @@
-module Main where
-
-import Simplex.FileTransfer.Client.Main
-
-main :: IO ()
-main = xftpClientCLI
@@ -1,29 +1,6 @@
 packages: .
-- packages: . ../direct-sqlcipher ../sqlcipher-simple
-- packages: . ../hs-socks
-- packages: . ../http2

 source-repository-package
    type: git
    location: https://github.com/simplex-chat/aeson.git
    tag: 3eb66f9a68f103b5f1489382aad89f5712a64db7
-
-source-repository-package
-    type: git
-    location: https://github.com/simplex-chat/hs-socks.git
-    tag: a30cc7a79a08d8108316094f8f2f82a0c5e1ac51
-
-source-repository-package
-    type: git
-    location: https://github.com/kazu-yamamoto/http2.git
-    tag: b5a1b7200cf5bc7044af34ba325284271f6dff25
-
-source-repository-package
-    type: git
-    location: https://github.com/simplex-chat/direct-sqlcipher.git
-    tag: 34309410eb2069b029b8fc1872deb1e0db123294
-
-source-repository-package
-    type: git
-    location: https://github.com/simplex-chat/sqlcipher-simple.git
-    tag: 5e154a2aeccc33ead6c243ec07195ab673137221
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 506.94 131.5"><path d="m109.65 58.21-18.21-10.07-15.37 9.38-.19 9.59-7.47-4.92-10.16 6.19-.44-10.48-10.48-7 10-5.17c-.08 0 0 1-1.48-34.34l-23.65-11.39-32.2 10 7.19 34.63 10.81 8.37-8.22 3.9 5.37 26.1 7.55 7.09-5.4 3.29 4.19 20.18 16.94 17.94c.08-.1 1.78-1.41 21.79-17.32l-.58-13.71 8.58 7.28c.12-.12 1.84-1.39 17.56-13.89l.61-10.14 6.48 4.5c.13-.12 1.58-1.22 14.26-11.33z" fill="#231f20"/><path d="m94.54 69 15.11-10.79-18.21-10.07-15.37 9.38z"/><path d="m92.87 88.2 1.67-19.2-18.47-11.48-.38 18.75z" fill="#004b16"/><path d="m68.22 107.73v-19.89l-18.66-14.15 1.47 19.54z" fill="#004b16"/><path d="m68.22 87.84 18.74-13.43-18.55-12.22-18.85 11.5z"/><path d="m38.43 131.48-2.98-20.32-18.15-17.8 4.19 20.18z" fill="#004b16"/><path d="m35.45 111.16 23.91-17.06-18.53-15.09-23.53 14.35z"/><path d="m33.9 100.6-3.94-26.88-20.22-16.81 5.41 26.07z" fill="#004b16"/><path d="m29.96 73.72 27.85-15.82-20.8-13.94-27.27 12.95z"/><path d="m28.07 60.88-5.4-36.81-22.67-14.06 7.19 34.62z" fill="#004b16"/><path d="m22.67 24.07 33.14-12.7-23.61-11.37-32.2 10.01z"/><g fill="#1cb35c"><path d="m107.13 76.87c-14.02 11.13-14.33 11.33-14.26 11.33 1.74-20.1 1.59-19.2 1.67-19.2 16-11.45 15-10.79 15.11-10.79z"/><path d="m85.78 93.84c-17.35 13.8-17.63 13.89-17.56 13.89-.17-20.82-.07-19.89 0-19.89 20-14.3 18.67-13.43 18.74-13.43z"/><path d="m60.22 114.16c-21.66 17.22-21.86 17.32-21.79 17.32-3.07-20.94-3-20.32-3-20.32 25.47-18.16 23.86-17.06 23.93-17.06z"/><path d="m55.81 11.37c1.52 35.37 1.4 34.34 1.48 34.34-28.66 14.89-29.29 15.17-29.22 15.17-5.52-37.63-5.47-36.81-5.4-36.81z"/><path d="m57.81 57.9c1.15 26.81 1 25.88 1.11 25.88-24.81 16.67-25.09 16.82-25 16.82-4-27.58-4-26.88-3.94-26.88z"/></g><path xmlns="http://www.w3.org/2000/svg" d="m151.61 14.24 16.58-4v79.88q0 13.13 7.83 15.65-3.84 7.31-13.13 7.3-11.28 0-11.28-15.66z"/><path d="m186.66 111.72v-57.42h-9.08v-13.6h25.86v71zm8.56-98.54a9.62 9.62 0 1 1 -9.62 9.62 9.63 9.63 0 0 1 9.62-9.62z"/><path d="m262.94 111.74v-41.06c0-6.05-1.16-10.48-3.48-13.26s-6.11-4.18-11.37-4.18a17.74 17.74 0 0 0 -7.8 2.06 18 18 0 0 0 -6.46 5.1v51.34h-16.59v-71h11.94l3 6.64q6.76-8 20-8 12.66 0 20 7.59t7.33 21.19v43.58z"/><path d="m288.42 76.06q0-16.26 9.38-26.47t24.77-10.21q16.19 0 25.14 9.82t9 26.86q0 17-9.12 27t-25 10q-16.18 0-25.17-10.12t-9-26.88zm17.24 0q0 23.47 16.91 23.48a14.54 14.54 0 0 0 12.31-6.11q4.55-6.09 4.54-17.37 0-23.14-16.85-23.15a14.61 14.61 0 0 0 -12.33 6.09q-4.58 6.11-4.58 17.06z"/><path d="m412.37 111.74v-4.31c-1.37 1.5-3.71 2.82-7 3.95a31.33 31.33 0 0 1 -10.15 1.69q-14.87 0-23.38-9.42t-8.52-26.27q0-16.84 9.78-27.42a32 32 0 0 1 24.51-10.58 32.37 32.37 0 0 1 14.72 3.32v-28.46l16.58-4v101.5zm0-54.06a17.6 17.6 0 0 0 -11.07-4.24q-10 0-15.33 6.07t-5.37 17.41q0 22.15 21.36 22.15a16.11 16.11 0 0 0 5.87-1.42c2.32-1 3.83-1.92 4.54-2.89z"/><path d="m505.55 81.3h-50.74q.46 8.49 5.83 13.2t14.46 4.7q11.34 0 17.25-5.9l6.43 12.7q-8.75 7.09-26.13 7.1-16.25 0-25.7-9.52t-9.45-26.58q0-16.78 10.38-27.2a33.91 33.91 0 0 1 24.9-10.41q15.45 0 24.81 9.22t9.35 23.48a46.28 46.28 0 0 1 -1.39 9.21zm-50.15-12.47h34.89q-1.73-15.58-17.24-15.59-14.2 0-17.65 15.59z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 506.94 131.5"><path d="m109.65 58.21-18.21-10.07-15.37 9.38-.19 9.59-7.47-4.92-10.16 6.19-.44-10.48-10.48-7 10-5.17c-.08 0 0 1-1.48-34.34l-23.65-11.39-32.2 10 7.19 34.63 10.81 8.37-8.22 3.9 5.37 26.1 7.55 7.09-5.4 3.29 4.19 20.18 16.94 17.94c.08-.1 1.78-1.41 21.79-17.32l-.58-13.71 8.58 7.28c.12-.12 1.84-1.39 17.56-13.89l.61-10.14 6.48 4.5c.13-.12 1.58-1.22 14.26-11.33z" fill="#231f20"/><path d="m94.54 69 15.11-10.79-18.21-10.07-15.37 9.38z"/><path d="m92.87 88.2 1.67-19.2-18.47-11.48-.38 18.75z" fill="#004b16"/><path d="m68.22 107.73v-19.89l-18.66-14.15 1.47 19.54z" fill="#004b16"/><path d="m68.22 87.84 18.74-13.43-18.55-12.22-18.85 11.5z"/><path d="m38.43 131.48-2.98-20.32-18.15-17.8 4.19 20.18z" fill="#004b16"/><path d="m35.45 111.16 23.91-17.06-18.53-15.09-23.53 14.35z"/><path d="m33.9 100.6-3.94-26.88-20.22-16.81 5.41 26.07z" fill="#004b16"/><path d="m29.96 73.72 27.85-15.82-20.8-13.94-27.27 12.95z"/><path d="m28.07 60.88-5.4-36.81-22.67-14.06 7.19 34.62z" fill="#004b16"/><path d="m22.67 24.07 33.14-12.7-23.61-11.37-32.2 10.01z"/><g fill="#1cb35c"><path d="m107.13 76.87c-14.02 11.13-14.33 11.33-14.26 11.33 1.74-20.1 1.59-19.2 1.67-19.2 16-11.45 15-10.79 15.11-10.79z"/><path d="m85.78 93.84c-17.35 13.8-17.63 13.89-17.56 13.89-.17-20.82-.07-19.89 0-19.89 20-14.3 18.67-13.43 18.74-13.43z"/><path d="m60.22 114.16c-21.66 17.22-21.86 17.32-21.79 17.32-3.07-20.94-3-20.32-3-20.32 25.47-18.16 23.86-17.06 23.93-17.06z"/><path d="m55.81 11.37c1.52 35.37 1.4 34.34 1.48 34.34-28.66 14.89-29.29 15.17-29.22 15.17-5.52-37.63-5.47-36.81-5.4-36.81z"/><path d="m57.81 57.9c1.15 26.81 1 25.88 1.11 25.88-24.81 16.67-25.09 16.82-25 16.82-4-27.58-4-26.88-3.94-26.88z"/></g><path xmlns="http://www.w3.org/2000/svg" d="m151.61 14.24 16.58-4v79.88q0 13.13 7.83 15.65-3.84 7.31-13.13 7.3-11.28 0-11.28-15.66z"/><path d="m186.66 111.72v-57.42h-9.08v-13.6h25.86v71zm8.56-98.54a9.62 9.62 0 1 1 -9.62 9.62 9.63 9.63 0 0 1 9.62-9.62z"/><path d="m262.94 111.74v-41.06c0-6.05-1.16-10.48-3.48-13.26s-6.11-4.18-11.37-4.18a17.74 17.74 0 0 0 -7.8 2.06 18 18 0 0 0 -6.46 5.1v51.34h-16.59v-71h11.94l3 6.64q6.76-8 20-8 12.66 0 20 7.59t7.33 21.19v43.58z"/><path d="m288.42 76.06q0-16.26 9.38-26.47t24.77-10.21q16.19 0 25.14 9.82t9 26.86q0 17-9.12 27t-25 10q-16.18 0-25.17-10.12t-9-26.88zm17.24 0q0 23.47 16.91 23.48a14.54 14.54 0 0 0 12.31-6.11q4.55-6.09 4.54-17.37 0-23.14-16.85-23.15a14.61 14.61 0 0 0 -12.33 6.09q-4.58 6.11-4.58 17.06z"/><path d="m412.37 111.74v-4.31c-1.37 1.5-3.71 2.82-7 3.95a31.33 31.33 0 0 1 -10.15 1.69q-14.87 0-23.38-9.42t-8.52-26.27q0-16.84 9.78-27.42a32 32 0 0 1 24.51-10.58 32.37 32.37 0 0 1 14.72 3.32v-28.46l16.58-4v101.5zm0-54.06a17.6 17.6 0 0 0 -11.07-4.24q-10 0-15.33 6.07t-5.37 17.41q0 22.15 21.36 22.15a16.11 16.11 0 0 0 5.87-1.42c2.32-1 3.83-1.92 4.54-2.89z"/><path d="m505.55 81.3h-50.74q.46 8.49 5.83 13.2t14.46 4.7q11.34 0 17.25-5.9l6.43 12.7q-8.75 7.09-26.13 7.1-16.25 0-25.7-9.52t-9.45-26.58q0-16.78 10.38-27.2a33.91 33.91 0 0 1 24.9-10.41q15.45 0 24.81 9.22t9.35 23.48a46.28 46.28 0 0 1 -1.39 9.21zm-50.15-12.47h34.89q-1.73-15.58-17.24-15.59-14.2 0-17.65 15.59z"/></svg>
@@ -1,144 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-# Links to scripts/configs
-bin="https://github.com/simplex-chat/simplexmq/releases/latest/download"
-bin_smp="$bin/smp-server-ubuntu-20_04-x86-64"
-bin_xftp="$bin/xftp-server-ubuntu-20_04-x86-64"
-
-scripts="https://raw.githubusercontent.com/simplex-chat/simplexmq/stable/scripts/main"
-scripts_systemd_smp="$scripts/smp-server.service"
-scripts_systemd_xftp="$scripts/xftp-server.service"
-scripts_update="$scripts/simplex-servers-update"
-scripts_uninstall="$scripts/simplex-servers-uninstall"
-scripts_stopscript="$scripts/simplex-servers-stopscript"
-
-# Default installation paths
-path_bin="/usr/local/bin"
-path_bin_smp="$path_bin/smp-server"
-path_bin_xftp="$path_bin/xftp-server"
-path_bin_update="$path_bin/simplex-servers-update"
-path_bin_uninstall="$path_bin/simplex-servers-uninstall"
-path_bin_stopscript="$path_bin/simplex-servers-stopscript"
-
-path_conf_etc="/etc/opt"
-path_conf_var="/var/opt"
-path_conf_smp="$path_conf_etc/simplex $path_conf_var/simplex"
-path_conf_xftp="$path_conf_etc/simplex-xftp $path_conf_var/simplex-xftp /srv/xftp"
-
-path_systemd="/etc/systemd/system"
-path_systemd_smp="$path_systemd/smp-server.service"
-path_systemd_xftp="$path_systemd/xftp-server.service"
-
-# Defaut users
-user_smp="smp"
-user_xftp="xftp"
-
-GRN='\033[0;32m'
-BLU='\033[1;34m'
-YLW='\033[1;33m'
-RED='\033[0;31m'
-NC='\033[0m'
-
-logo='
- ____  _                 _     __  __
-/ ___|(_)_ __ ___  _ __ | | ___\ \/ /
-\___ \| | '"'"'_ ` _ \| '"'"'_ \| |/ _ \\  / 
- ___) | | | | | | | |_) | |  __//  \ 
-|____/|_|_| |_| |_| .__/|_|\___/_/\_\
-                  |_|                            
-'
-
-welcome="Welcome to SMP/XFTP installation script! Here's what we're going to do:
-${GRN}1.${NC} Install latest binaries from GitHub releases:
-    - smp: ${YLW}${path_bin_smp}${NC}
-    - xftp: ${YLW}${path_bin_xftp}${NC}
-${GRN}2.${NC} Create server directories:
-    - smp: ${YLW}${path_conf_smp}${NC}
-    - xftp: ${YLW}${path_conf_xftp}${NC}
-${GRN}3.${NC} Setup user for each server:
-    - xmp: ${YLW}${user_smp}${NC}
-    - xftp: ${YLW}${user_xftp}${NC}
-${GRN}4.${NC} Create systemd services:
-    - smp: ${YLW}${path_systemd_smp}${NC}
-    - xftp: ${YLW}${path_systemd_xftp}${NC}
-${GRN}5.${NC} Install stopscript (systemd), update and uninstallation script:
-    - all: ${YLW}${path_bin_update}${NC}, ${YLW}${path_bin_uninstall}${NC}, ${YLW}${path_bin_stopscript}${NC}
-
-Press ${GRN}ENTER${NC} to continue or ${RED}Ctrl+C${NC} to cancel installation"
-
-end="Installtion is complete!
-
-Please checkout our server guides:
- smp: ${GRN}https://simplex.chat/docs/server.html${NC}
- xftp: ${GRN}https://simplex.chat/docs/xftp-server.html${NC}
-
-To uninstall with full clean-up, simply run: ${YLW}sudo /usr/local/bin/simplex-servers-uninstall${NC}
-"
-
-setup_bins() {
- curl --proto '=https' --tlsv1.2 -sSf -L "$bin_smp" -o "$path_bin_smp" && chmod +x "$path_bin_smp"
- curl --proto '=https' --tlsv1.2 -sSf -L "$bin_xftp" -o "$path_bin_xftp" && chmod +x "$path_bin_xftp"
-}
-
-setup_users() {
- useradd -M "$user_smp" 2> /dev/null || true
- useradd -M "$user_xftp" 2> /dev/null || true
-}
-
-setup_dirs() {
- # Unquoted varibles, so field splitting can occur
- mkdir -p $path_conf_smp
- chown "$user_smp":"$user_smp" $path_conf_smp
- mkdir -p $path_conf_xftp
- chown "$user_xftp":"$user_xftp" $path_conf_xftp
-}
-
-setup_systemd() {
- curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_systemd_smp" -o "$path_systemd_smp"
- curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_systemd_xftp" -o "$path_systemd_xftp"
-}
-
-setup_scripts() {
- curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_update" -o "$path_bin_update" && chmod +x "$path_bin_update"
- curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_uninstall" -o "$path_bin_uninstall" && chmod +x "$path_bin_uninstall"
- curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_stopscript" -o "$path_bin_stopscript" && chmod +x "$path_bin_stopscript"
- }
-
-checks() {
- if [ "$(id -u)" -ne 0 ]; then
-  printf "This script is intended to be run with root privileges. Please re-run script using sudo."
-  exit 1
- fi
-}
-
-main() {
- checks
- 
- printf "%b\n%b\n" "${BLU}$logo${NC}" "$welcome"
- read ans
-
- printf "Installing binaries..."
- setup_bins
- printf "${GRN} Done!${NC}\n"
-
- printf "Creating users..."
- setup_users
- printf "${GRN} Done!${NC}\n"
- 
- printf "Creating directories..."
- setup_dirs
- printf "${GRN} Done!${NC}\n"
-
- printf "Creating systemd services..."
- setup_systemd
- printf "${GRN} Done!${NC}\n"
-
- printf "Installing stopscript, update and uninstallation script..."
- setup_scripts
- printf "${GRN} Done!${NC}\n"
-
- printf "%b" "$end"
-}
-
-main
@@ -1,5 +1,5 @@
 name: simplexmq
-version: 5.2.1
+version: 2.3.1
 synopsis: SimpleXMQ message broker
 description: |
  This package includes <./docs/Simplex-Messaging-Server.html server>,
@@ -28,7 +28,7 @@ dependencies:
  - asn1-types == 0.3.*
  - async == 2.2.*
  - attoparsec == 0.14.*
-  - base >= 4.14 && < 5
+  - base >= 4.7 && < 5
  - base64-bytestring >= 1.0 && < 1.3
  - bytestring == 0.10.*
  - case-insensitive == 1.2.*
@@ -38,42 +38,39 @@ dependencies:
  - cryptonite >= 0.27 && < 0.30
  - cryptostore == 0.2.*
  - data-default == 0.7.*
-  - direct-sqlcipher == 2.3.*
+  - direct-sqlite == 2.3.*
  - directory == 1.3.*
  - filepath == 1.4.*
  - http-types == 0.12.*
-  - http2 == 4.1.*
+  - http2 == 3.0.*
  - generic-random >= 1.3 && < 1.5
-  - ini == 0.4.1
-  - iproute == 1.7.*
+  - ini == 0.4.*
  - iso8601-time == 0.1.*
  - memory == 0.15.*
  - mtl == 2.2.*
  - network >= 3.1.2.7 && < 3.2
-  - network-transport == 0.5.4
+  - network-transport == 0.5.*
  - optparse-applicative >= 0.15 && < 0.17
  - QuickCheck == 2.14.*
  - process == 1.6.*
  - random >= 1.1 && < 1.3
  - simple-logger == 0.1.*
-  - socks == 0.6.*
-  - sqlcipher-simple == 0.4.*
+  - sqlite-simple == 0.4.*
  - stm == 2.5.*
  - template-haskell == 2.16.*
-  - temporary == 1.3.*
  - text == 1.2.*
  - time == 1.9.*
  - time-compat == 1.9.*
  - time-manager == 0.0.*
  - tls >= 1.6.0 && < 1.7
  - transformers == 0.5.*
+  - unix == 2.7.*
  - unliftio == 0.2.*
  - unliftio-core == 0.2.*
  - websockets == 0.12.*
  - x509 == 1.7.*
  - x509-store == 1.6.*
  - x509-validation == 1.6.*
-  - yaml == 0.11.*

 flags:
  swift:
@@ -106,14 +103,6 @@ executables:
    ghc-options:
      - -threaded

-  xftp-server:
-    source-dirs: apps/xftp-server
-    main: Main.hs
-    dependencies:
-      - simplexmq
-    ghc-options:
-      - -threaded
-
  smp-agent:
    source-dirs: apps/smp-agent
    main: Main.hs
@@ -122,27 +111,16 @@ executables:
    ghc-options:
      - -threaded

-  xftp:
-    source-dirs: apps/xftp
-    main: Main.hs
-    dependencies:
-      - simplexmq
-    ghc-options:
-      - -threaded
-
 tests:
-  simplexmq-test:
+  smp-server-test:
    source-dirs: tests
    main: Test.hs
    dependencies:
      - simplexmq
-      - deepseq == 1.4.*
      - hspec == 2.7.*
      - hspec-core == 2.7.*
      - HUnit == 1.6.*
      - QuickCheck == 2.14.*
-      - silently == 1.2.*
-      - main-tester == 0.2.*
      - timeit == 2.0.*

 ghc-options:
@@ -24,7 +24,6 @@
    - [Subscribe to queue](#subscribe-to-queue)
    - [Secure queue command](#secure-queue-command)
    - [Enable notifications command](#enable-notifications-command)
-    - [Disable notifications command](#disable-notifications-command)
    - [Acknowledge message delivery](#acknowledge-message-delivery)
    - [Suspend queue](#suspend-queue)
    - [Delete queue](#delete-queue)
@@ -51,8 +50,6 @@ It's designed with the focus on communication security and integrity, under the

 It is designed as a low level protocol for other application protocols to solve the problem of secure and private message transmission, making [MITM attack][1] very difficult at any part of the message transmission system.

-This document describes SMP protocol versions 3 and 4, the previous versions are discontinued.
-
 ## Introduction

 The objective of Simplex Messaging Protocol (SMP) is to facilitate the secure and private unidirectional transfer of messages from senders to recipients via persistent simplex queues managed by the message broker (server).
@@ -149,61 +146,61 @@ To create and start using a simplex queue Alice and Bob follow these steps:

 1. Alice creates a simplex queue on the server:

-   1. Decides which SMP server to use (can be the same or different server that Alice uses for other queues) and opens secure encrypted transport connection to the chosen SMP server (see [Appendix A](#appendix-a)).
+    1. Decides which SMP server to use (can be the same or different server that Alice uses for other queues) and opens secure encrypted transport connection to the chosen SMP server (see [Appendix A](#appendix-a)).

-   2. Generates a new random public/private key pair (encryption key - `EK`) that she did not use before for Bob to encrypt the messages.
+    2. Generates a new random public/private key pair (encryption key - `EK`) that she did not use before for Bob to encrypt the messages.

-   3. Generates another new random public/private key pair (recipient key - `RK`) that she did not use before for her to sign commands and to decrypt the transmissions received from the server.
+    3. Generates another new random public/private key pair (recipient key - `RK`) that she did not use before for her to sign commands and to decrypt the transmissions received from the server.

-   4. Generates one more random key pair (recipient DH key - `RDHK`) to negotiate symmetric key that will be used by the server to encrypt message bodies delivered to Alice (to avoid shared cipher-text inside transport connection).
+    4. Generates one more random key pair (recipient DH key - `RDHK`) to negotiate symmetric key that will be used by the server to encrypt message bodies delivered to Alice (to avoid shared cipher-text inside transport connection).

-   5. Sends `"NEW"` command to the server to create a simplex queue (see `create` in [Create queue command](#create-queue-command)). This command contains previously generated unique "public" keys `RK` and `RDHK`. `RK` will be used to verify the following commands related to the same queue signed by its private counterpart, for example to subscribe to the messages received to this queue or to update the queue, e.g. by setting the key required to send the messages (initially Alice creates the queue that accepts unsigned messages, so anybody could send the message via this queue if they knew the queue sender's ID and server address).
+    5. Sends `"NEW"` command to the server to create a simplex queue (see `create` in [Create queue command](#create-queue-command)). This command contains previously generated unique "public" keys `RK` and `RDHK`. `RK` will be used to verify the following commands related to the same queue signed by its private counterpart, for example to subscribe to the messages received to this queue or to update the queue, e.g. by setting the key required to send the messages (initially Alice creates the queue that accepts unsigned messages, so anybody could send the message via this queue if they knew the queue sender's ID and server address).

-   6. The server sends `"IDS"` response with queue IDs (`queueIds`):
+    6. The server sends `"IDS"` response with queue IDs (`queueIds`):

-      - Recipient ID `RID` for Alice to manage the queue and to receive the messages.
+        - Recipient ID `RID` for Alice to manage the queue and to receive the messages.

-      - Sender ID `SID` for Bob to send messages to the queue.
+        - Sender ID `SID` for Bob to send messages to the queue.

-      - Server public DH key (`SDHK`) to negotiate a shared secret for message body encryption, that Alice uses to derive a shared secret with the server `SS`.
+        - Server public DH key (`SDHK`) to negotiate a shared secret for message body encryption, that Alice uses to derive a shared secret with the server `SS`.

 2. Alice sends an out-of-band message to Bob via the alternative channel that both Alice and Bob trust (see [protocol abstract](#simplex-messaging-protocol-abstract)). The message must include:

-   - Unique "public" key (`EK`) that Bob must use for E2E key agreement.
+    - Unique "public" key (`EK`) that Bob must use for E2E key agreement.

-   - SMP server hostname and information to open secure encrypted transport connection (see [Appendix A](#appendix-a)).
+    - SMP server hostname and information to open secure encrypted transport connection (see [Appendix A](#appendix-a)).

-   - Sender queue ID `SID` for Bob to use.
+    - Sender queue ID `SID` for Bob to use.

 3. Bob, having received the out-of-band message from Alice, connects to the queue:

-   1. Generates a new random public/private key pair (sender key - `SK`) that he did not use before for him to sign messages sent to Alice's server.
+    1. Generates a new random public/private key pair (sender key - `SK`) that he did not use before for him to sign messages sent to Alice's server.

-   2. Prepares the confirmation message for Alice to secure the queue. This message includes:
+    2. Prepares the confirmation message for Alice to secure the queue. This message includes:

-      - Previously generated "public" key `SK` that will be used by Alice's server to authenticate Bob's messages, once the queue is secured.
+        - Previously generated "public" key `SK` that will be used by Alice's server to authenticate Bob's messages, once the queue is secured.

-      - Optionally, any additional information (application specific, e.g. Bob's profile name and details).
+        - Optionally, any additional information (application specific, e.g. Bob's profile name and details).

-   3. Encrypts the confirmation body with the "public" key `EK` (that Alice provided via the out-of-band message).
+    3. Encrypts the confirmation body with the "public" key `EK` (that Alice provided via the out-of-band message).

-   4. Sends the encrypted message to the server with queue ID `SID` (see `send` in [Send message](#send-message)). This initial message to the queue must not be signed - signed messages will be rejected until Alice secures the queue (below).
+    4. Sends the encrypted message to the server with queue ID `SID` (see `send` in [Send message](#send-message)). This initial message to the queue must not be signed - signed messages will be rejected until Alice secures the queue (below).

 4. Alice receives Bob's message from the server using recipient queue ID `RID` (possibly, via the same transport connection she already has opened - see `message` in [Deliver queue message](#deliver-queue-message)):

-   1. She decrypts received message body using the secret `SS`.
+    1. She decrypts received message body using the secret `SS`.

-   2. She decrypts received message with [key agreed with sender using] "private" key `EK`.
+    2. She decrypts received message with [key agreed with sender using] "private" key `EK`.

-   3. Even though anybody could have sent the message to the queue with ID `SID` before it is secured (e.g. if communication is compromised), Alice would ignore all messages until the decryption succeeds (i.e. the result contains the expected message format). Optionally, in the client application, she also may identify Bob using the information provided, but it is out of scope of SMP protocol.
+    3. Even though anybody could have sent the message to the queue with ID `SID` before it is secured (e.g. if communication is compromised), Alice would ignore all messages until the decryption succeeds (i.e. the result contains the expected message format). Optionally, in the client application, she also may identify Bob using the information provided, but it is out of scope of SMP protocol.

 5. Alice secures the queue `RID` with `"KEY"` command so only Bob can send messages to it (see [Secure queue command](#secure-queue-command)):

-   1. She sends the `KEY` command with `RID` signed with "private" key `RK` to update the queue to only accept requests signed by "private" key `SK` provided by Bob. This command contains unique "public" key `SK` previously generated by Bob.
+    1. She sends the `KEY` command with `RID` signed with "private" key `RK` to update the queue to only accept requests signed by "private" key `SK` provided by Bob. This command contains unique "public" key `SK` previously generated by Bob.

-   2. From this moment the server will accept only signed commands to `SID`, so only Bob will be able to send messages to the queue `SID` (corresponding to `RID` that Alice has).
+    2. From this moment the server will accept only signed commands to `SID`, so only Bob will be able to send messages to the queue `SID` (corresponding to `RID` that Alice has).

-   3. Once queue is secured, Alice deletes `SID` and `SK` - even if Alice's client is compromised in the future, the attacker would not be able to send messages pretending to be Bob.
+    3. Once queue is secured, Alice deletes `SID` and `SK` - even if Alice's client is compromised in the future, the attacker would not be able to send messages pretending to be Bob.

 6. The simplex queue `RID` is now ready to be used.

@@ -217,21 +214,21 @@ Bob now can securely send messages to Alice:

 1. Bob sends the message:

-   1. He encrypts the message to Alice with "public" key `EK` (provided by Alice, only known to Bob, used only for one simplex queue).
+    1. He encrypts the message to Alice with "public" key `EK` (provided by Alice, only known to Bob, used only for one simplex queue).

-   2. He signs `"SEND"` command to the server queue `SID` using the "private" key `SK` (that only he knows, used only for this queue).
+    2. He signs `"SEND"` command to the server queue `SID` using the "private" key `SK` (that only he knows, used only for this queue).

-   3. He sends the command to the server (see `send` in [Send message](#send-message)), that the server will authenticate using the "public" key `SK` (that Alice earlier received from Bob and provided to the server via `"KEY"` command).
+    3. He sends the command to the server (see `send` in [Send message](#send-message)), that the server will authenticate using the "public" key `SK` (that Alice earlier received from Bob and provided to the server via `"KEY"` command).

 2. Alice receives the message(s):

-   1. She signs `"SUB"` command to the server to subscribe to the queue `RID` with the "private" key `RK` (see `subscribe` in [Subscribe to queue](#subscribe-to-queue)).
+    1. She signs `"SUB"` command to the server to subscribe to the queue `RID` with the "private" key `RK` (see `subscribe` in [Subscribe to queue](#subscribe-to-queue)).

-   2. The server, having authenticated Alice's command with the "public" key `RK` that she provided, delivers Bob's message(s) (see `message` in [Deliver queue message](#deliver-queue-message)).
+    2. The server, having authenticated Alice's command with the "public" key `RK` that she provided, delivers Bob's message(s) (see `message` in [Deliver queue message](#deliver-queue-message)).

-   3. She decrypts Bob's message(s) with the "private" key `EK` (that only she has).
+    3. She decrypts Bob's message(s) with the "private" key `EK` (that only she has).

-   4. She acknowledges the message reception to the server with `"ACK"` so that the server can delete the message and deliver the next messages.
+    4. She acknowledges the message reception to the server with `"ACK"` so that the server can delete the message and deliver the next messages.

 This flow is show on sequence diagram below.

@@ -358,22 +355,18 @@ To protect the privacy of the recipients, there are several commands in SMP prot
 The clients can optionally instruct a dedicated push notification server to subscribe to notifications and deliver push notifications to the device, which can then retrieve the messages in the background and send local notifications to the user - this is out of scope of SMP protocol. The commands that SMP protocol provides to allow it:

 - `enableNotifications` (`"NKEY"`) with `notifierId` (`"NID"`) response - see [Enable notifications command](#enable-notifications-command).
- `disableNotifications` (`"NDEL"`) - see [Disable notifications command](#disable-notifications-command).
 - `subscribeNotifications` (`"NSUB"`) - see [Subscribe to queue notifications](#subscribe-to-queue-notifications).
 - `messageNotification` (`"NMSG"`) - see [Deliver message notification](#deliver-message-notification).

-[`SEND` command](#send-message) includes the notification flag to instruct SMP server whether to send the notification - this flag is forwarded to the recepient inside encrypted envelope, together with the timestamp and the message body, so even if TLS is compromised this flag cannot be used for traffic correlation.
-
-## SMP Transmission andtransport block structure
+## SMP Transmission structure

 Each transport block (SMP transmission) has a fixed size of 16384 bytes for traffic uniformity.

-From SMP version 4 each block can contain multiple transmissions, version 3 blocks have 1 transmission.
 Some parts of SMP transmission are padded to a fixed size; this padding is uniformly added as a word16 encoded in network byte order - see `paddedString` syntax.

 In places where some part of the transmission should be padded, the syntax for `paddedNotation` is used:

-```abnf
+```
 paddedString = originalLength string pad
 originalLength = 2*2 OCTET
 pad = N*N"#" ; where N = paddedLength - originalLength - 2
@@ -383,9 +376,9 @@ paddedNotation = <padded(string, paddedLength)>
 ; paddedLength - required length after padding, including 2 bytes for originalLength
 ```

-Each transmission/block for SMP v3 between the client and the server must have this format/syntax:
+Each transmission between the client and the server must have this format/syntax:

-```abnf
+```
 paddedTransmission = <padded(transmission), 16384>
 transmission = [signature] SP signed
 signed = sessionIdentifier SP [corrId] SP [queueId] SP smpCommand
@@ -402,23 +395,13 @@ encoded = <base64 encoded binary>

 `base64` encoding should be used with padding, as defined in section 4 of [RFC 4648][9]

-Transport block for SMP v4 has this syntax:
-
-```abnf
-paddedTransportBlock = <padded(transportBlock), 16384>
-transportBlock = transmissionCount transmissions
-transmissionCount = 1*1 OCTET ; equal or greater than 1
-transmissions = transmissionLength transmission [transmissions]
-transmissionLength = 2*2 OCTET ; word16 encoded in network byte order
-```
-
 ## SMP commands

 Commands syntax below is provided using [ABNF][8] with [case-sensitive strings extension][8a].

 ```abnf
 smpCommand = ping / recipientCmd / send / subscribeNotifications / serverMsg
-recipientCmd = create / subscribe / secure / enableNotifications / disableNotifications /
+recipientCmd = create / subscribe / secure / enableNotifications /
               acknowledge / suspend / delete
 serverMsg = queueIds / message / notifierId / messageNotification /
            unsubscribed / ok / error
@@ -519,42 +502,22 @@ Once the queue is secured only signed messages can be sent to it.
 This command is sent by the recipient to the server to add notifier's key to the queue, to allow push notifications server to receive notifications when the message arrives, via a separate queue ID, without receiving message content.

 ```abnf
-enableNotifications = %s"NKEY " notifierKey recipientNotificationDhPublicKey
+enableNotifications = %s"NKEY " notifierKey
 notifierKey = length x509encoded
 ; the notifier's Ed25519 or Ed448 public key public key to verify NSUB command for this queue
-
-recipientNotificationDhPublicKey = length x509encoded
-; the recipient's Curve25519 key for DH exchange to derive the secret
-; that the server will use to encrypt notification metadata (encryptedNMsgMeta in NMSG)
-; using [NaCl crypto_box][16] encryption scheme (curve25519xsalsa20poly1305).
 ```

 The server will respond with `notifierId` response if notifications were enabled and the notifier's key was successfully added to the queue:

 ```abnf
-notifierId = %s"NID " notifierId srvNotificationDhPublicKey
+notifierId = %s"NID " notifierId
 notifierId = length *OCTET ; 16-24 bytes
-srvNotificationDhPublicKey = length x509encoded
-; the server's Curve25519 key for DH exchange to derive the secret
-; that the server will use to encrypt notification metadata to the recipient (encryptedNMsgMeta in NMSG)
 ```

 This response is sent with the recipient's queue ID (the third part of the transmission).

 To receive the message notifications, `subscribeNotifications` command ("NSUB") must be sent signed with the notifier's key.

-#### Disable notifications command
-
-This command is sent by the recipient to the server to remove notifier's credentials from the queue:
-
-```abnf
-disableNotifications = %s"NDEL"
-```
-
-The server must respond `ok` to this command if it was successful.
-
-Once notifier's credentials are removed server will no longer send "NMSG" for this queue to notifier.
-
 #### Acknowledge message delivery

 The recipient should send the acknowledgement of message delivery once the message was stored in the client, to notify the server that the message should be deleted:
@@ -602,9 +565,7 @@ Currently SMP defines only one command that can be used by senders - `send` mess
 This command is sent to the server by the sender both to confirm the queue after the sender received out-of-band message from the recipient and to send messages after the queue is secured:

 ```abnf
-send = %s"SEND " msgFlags SP smpEncMessage
-msgFlags = notificationFlag reserved
-notificationFlag = %s"T" / %s"F"
+send = %s"SEND " smpEncMessage
 smpEncMessage = smpPubHeader sentMsgBody ; message up to 16088 bytes
 smpPubHeader = smpClientVersion ("1" senderPublicDhKey / "0")
 smpClientVersion = word16
@@ -746,11 +707,9 @@ See its syntax in [Create queue command](#create-queue-command)
 The server must deliver messages to all subscribed simplex queues on the currently open transport connection. The syntax for the message delivery is:

 ```abnf
-message = %s"MSG " msgId encryptedRcvMsgBody
+message = %s"MSG " msgId SP timestamp SP encryptedMsgBody
 encryptedMsgBody = <encrypt paddedSentMsgBody> ; server-encrypted padded sent msgBody
 paddedSentMsgBody = <padded(sentMsgBody, maxMessageLength + 2)> ; maxMessageLength = 16088
-encryptedRcvMsgBody = <encrypt rcvMsgBody> ; server-encrypted meta-data and padded sent msgBody
-rcvMsgBody = timestamp msgFlags SP paddedSentMsgBody
 msgId = length 24*24OCTET
 timestamp = 8*8OCTET
 ```
@@ -776,19 +735,10 @@ See its syntax in [Enable notifications command](#enable-notifications-command)
 The server must deliver message notifications to all simplex queues that were subscribed with `subscribeNotifications` command ("NSUB") on the currently open transport connection. The syntax for the message notification delivery is:

 ```abnf
-messageNotification = %s"NMSG " nmsgNonce encryptedNMsgMeta
-
-encryptedNMsgMeta = <encrypted message metadata passed in notification>
-; metadata E2E encrypted between server and recipient containing server's message ID and timestamp (allows extension),
-; to be passed to the recipient by the notifier for them to decrypt
-; with key negotiated in NKEY and NID commands using nmsgNonce
-
-nmsgNonce = <nonce used in NaCl crypto_box encryption scheme>
-; nonce used by the server for encryption of message metadata, to be passed to the recipient by the notifier
-; for them to use in decryption of E2E encrypted metadata
+messageNotification = %s"NMSG"
 ```

-Message notification does not contain any message data or non E2E encrypted metadata.
+Message notification does not contain any message data or meta-data, it only notifies that the message is available.

 #### Subscription END notification

@@ -842,7 +792,6 @@ ok = %s"OK"
 Both the recipient and the sender can use TCP or some other, possibly higher level, transport protocol to communicate with the server. The default TCP port for SMP server is 5223.

 For scenarios when meta-data privacy is critical, it is recommended that clients:
-
 - communicating over Tor network,
 - establish a separate connection for each SMP queue,
 - send noise traffic (using PING command).
@@ -850,14 +799,12 @@ For scenarios when meta-data privacy is critical, it is recommended that clients
 In addition to that, the servers can be deployed as Tor onion services.

 The transport protocol should provide the following:
-
 - server authentication (by matching server certificate hash with `serverIdentity`),
 - forward secrecy (by encrypting the traffic using ephemeral keys agreed during transport handshake),
 - integrity (preventing data modification by the attacker without detection),
 - unique channel binding (`sessionIdentifier`) to include in the signed part of SMP transmissions.

 By default, the client and server communicate using [TLS 1.3 protocol][13] restricted to:
-
 - TLS_CHACHA20_POLY1305_SHA256 cipher suite (for better performance on mobile devices),
 - ed25519 and ed448 EdDSA algorithms for signatures,
 - x25519 and x448 ECDHE groups for key exchange.
@@ -1,160 +0,0 @@
-# SimpleX File Transfer protocol
-
-## Problem
-
-Sending files as currently implemented in SimpleX Chat is inefficient for these reasons:
-
-1. Slow: message delivery requires acknowledgement for each message before the server sends the next message.
-2. Not fully asynchronous:
-   a. SMP queue size is limited, so the whole file cannot be sent/stored in server memory.
-   b. Recipient needs to accept the file before it is sent.
-3. No broadcast: sending the same file to multiple recipients requires sending it multiple times.
-
-## Possible solutions
-
-These problems could be solved within SMP protocol:
-
- streaming messages without waiting for acknowledgements.
- bigger queue sizes stored on hard drive and accepting large files without waiting for the recipient confirmation.
- adding broadcast to SMP servers.
-
-These solution are complex and they do not scale well.
-
-Another approach would be adopting some open-source file storage, possibly S3-compatible, to host files while "in transit". The downsides are:
-
-1. Missing features. S3-compatible file servers require a service layer that we would need to develop to manage user accounts and permissions. There are solutions that allow self-registering users and uploading files without service layer, but they are not flexible enough in managing policies for these files.
-2. Limited meta-data protection, both on the application and on transport layer: same address for sending and receiving a file, file size is known to the server, etc.
-3. More difficult to self-host for the users when the server has 2 components (a 3rd party solution with our service component).
-
-We are not considering P2P solutions because of their bad meta-data privacy and requirement of having a single network - the same reason why P2P design is not used for SimpleX messaging network.
-
-A proposed solution is to develop a file hosting service (SimpleX File Transfer service) that would have better meta-data protection and functionality than the alternatives, using the ideas from SMP protocol design.
-
-The parameters of the solution would be:
-
-1. The server does not have knowledge of the users and actual files – only anonymously uploaded fixed-size chunks (considered 8Mb, maybe we should allow 2 sizes, e.g. 1Mb and 8Mb).
-2. The server should allow broadcast, so that a chunk can be downloaded by multiple recipients.
-3. There should be no identifiers and ciphertext in common inside TLS between sender and recipient traffic, and between the traffic of different recipients of the same file. This approach can be extended to support public chunks that have persistent identifiers.
-4. The server should prevent multiple uploads of the same chunk. This can be extended to allow multiple downloads from the same persistent address.
-5. Clients can send the chunks from the same file via multiple servers, both by splitting chunks between them and for redundancy.
-
-## Design approach
-
-File transfer servers will be chosen by file senders. The servers will allow senders to anonymously upload fixed-size file chunks.
-
-### Transport protocol
-
- binary-encoded commands sent as fixed-size padded block in the body of HTTP2 POST request, similar to SMP and notifications server protocol transmission encodings.
- HTTP2 POST with a fixed size padded block body for file upload and download.
-
-Block size - 4096 bytes (it would fit ~120 Ed25519 recipient keys).
-
-The reasons to use HTTP2:
-
- avoid the need to have two hostnames (or two different ports) for commands and file uploads.
- compatibility with the existing HTTP2 client libraries.
-
-The reason not to use JSON bodies:
-
- bigger request size, so fewer recipient keys would fit in a single request
- signature over command has to be outside of JSON anyway.
-
-The reason not to use URI segments / HTTP verbs / REST semantics is to have consistent request size.
-
-### Required server commands:
-
- File sender:
-  - create file chunk record.
-    - Parameters:
-      - Ed25519 key for subsequent sender commands and Ed25519 keys for commands of each recipient.
-      - chunk size.
-    - Response:
-      - chunk ID for the sender and different IDs for all recipients.
-  - add recipients to file chunk
-    - Parameters:
-      - sender's chunk ID
-      - Ed25519 keys for commands of each recipient.
-    - Response:
-      - chunk IDs for new recipients.
-  - upload file chunk.
-  - delete file chunk (invalidates all recipient IDs).
- File recipient:
-  - download file chunk:
-    - chunk ID
-    - DH key for additional encryption of the chunk.
-    - command should be signed with the key passed by the sender when creating chunk record.
-  - delete file chunk ID (only for one recipient): signed with the same key.
-
-### Storage model
-
-Same as for SMP and notifications server - in-memory storage of the records, with adding to append-only log, restored and compacted on server restart.
-
-### Sending file
-
-To send the file, the sender will:
-
- compute SHA512 digest
- pad the file to match the whole number of chunks in size,
- encrypt it with a randomly chosen symmetric key and IV (e.g., using NaCL crypto_secretbox),
- split into fixed size chunks
- upload each chunk to a randomly chosen server.
-
-The sending client should generate more per-recipient keys than the actual number of recipients, possibly rounding up to a power of 2, to conceal the actual number of intended recipients.
-
-Then the sending client will combine addresses of all chunks and other information into "file description", different for each file recipient, that will include:
-
- an encryption key that was used to encrypt the file (the same for all recipients).
- file SHA512 digest
- list of chunk descriptions; information for each chunk:
-  - private Ed25519 key to sign commands for file transfer server.
-  - chunk address (server host and chunk ID).
-  - chunk sha512 digest
-
-To reduce the size, chunk descriptions will be grouped by the server host.
-
-This "file description" itself will be sent as a small file over an authenticated channel, to prevent file description modification. To estimate its size:
-
- each chunk \* redundancy per chunk, assuming chunks are grouped per server:
-  - 1-based chunk number in the file - 8 bytes (including any overhead)
-  - Ed25519 key (different for each recipient / chunk combination) - 32 bytes \* 4/3 (base64, assuming text encoding)
-  - chunk ID (different for each recipient) - 64 bytes \* 4/3
-  - optional (only in the first chunk occurence) chunk sha512 digests - 64 bytes \* 4/3
- server addresses - say, 128 bytes per server
- sha512 digest - 64 bytes \* 4/3
- encryption key - 32 bytes \* 4/3
- IV - 32 bytes \* 4/3
- encoding overhead - say, 256 bytes
-
-For 1gb file, sent via 4 different servers, in 8Mb chunks, with redundancy 2, the size of "file description", assuming text encoding, will be ~45kb (`128 * (8 + 32 + 64) * 2 * 4/3 + 128 * 64 * 4/3 + 128 * 4 + (64 + 32 + 32) * 4/3 + 256`).
-
-File description format (yml):
-
-```
-name: file.ext
-size: 33200000
-chunk: 8mb
-hash: abc=
-key: abc=
-iv: abc=
-parts:
-  - server: xftp://[email protected]
-    chunks: [1:abc=:def=:ghi=, 3:abc=:def=:ghi=]
-  - server: xftp://[email protected]
-    chunks: [2:abc=:def=:ghi=, 4:abc=:def=:ghi=:2mb]
-  - server: xftp://[email protected]
-    chunks: [1:abc=:def=, 4:abc=:def=]
-  - server: xftp://[email protected]
-    chunks: [2:abc=:def=, 3:abc=:def=]
-```
-
-This file description is sent to all recipients via normal messages, split to 15780 byte chunks if needed.
-
-### Receiving file
-
-Having received the description, the recipient will:
-
- download all chunks falling back to secondary servers, if needed
- combine the chunks into a file
- decrypt the file
- un-pad it
- validate file digest
@@ -1,20 +0,0 @@
-# SMP and SMP agent protocol extensions to manage queue quotas
-
-## Problem
-
-SMP servers define a limit on the number of messages that can be stored on the server. When the sender reaches this limit, they continue trying to send the message with exponential back off, until the server allows it. To reduce the traffic we added expiration on unsent messages of 2 days that:
-
- adds its own set of problems because of expired control messages - e.g., group fragmentation.
- doesn't solve problem of traffic in active groups with many inactive members - there are still too many retries in queues that reached capacity.
-
-## Solution
-
-Sending agent permanently stops trying to send messages having received `ERR QUOTA` (or, for the period of clients migration, increases TTL much more than in cases of network errors).
-
-Add SMP server event that means "quota reached" (e.g. `QTA` or `MSG QUOTA`) - it will be delivered to the recipient once all messages are retrieved at the same point in message stream where the sender received `ERR QUOTA`. Alternatively, it could be a message flag that is set on the last message in the queue at a point the sender received `ERR QUOTA`.
-
-Add SMP agent message that means "quota available, resume sending" (e.g. `A_QTA` or `A_RESUME`) – the receiving agent will send it via the reply queue to the sending agent that will resume sending messages at this point.
-
-Possibly, increase TTL for local messages to 30 days. That might require separately addressing the problem of permanently failing servers.
-
-We discussed a possible solution of merging all messages to one server into one delivery queue, so that having multiple failing queues on this server will not result in multiple connection attempts, and this proposal also answers the question what to do with the messages when quota is exceeded - the whole queue can be marked as suspended, and processed separately from others - TBD.
@@ -1,366 +0,0 @@
-# Re-sync encryption ratchets
-
-## Problem
-
-See https://github.com/simplex-chat/simplexmq/pull/743/files for problem and high-level solution.
-
-## Implementation
-
-### Diagnosing ratchet de-synchronization
-
-Message decryption happens in `agentClientMsg`, in `agentRatchetDecrypt`, which can return decryption result or error. Decryption error can be differentiated in `agentClientMsg` result pattern match, in Left cases, where we already differentiate duplicate error (`AGENT A_DUPLICATE`).
-
-Question: Which decryption errors can be diagnosed as ratchet de-synchronization?
-
-Possibly any `AGENT A_CRYPTO` error. Definitely on `RATCHET_HEADER`, TBC other. See `cryptoError :: C.CryptoError -> AgentErrorType` for conversion from decryption errors to `A_CRYPTO` or other agent errors. We're only interested in crypto errors, as other are either other client implementation errors, internal errors, or already processed duplicate error.
-
-Proposed classification of crypto errors, based on `AgentCryptoError`:
-
-`DECRYPT_AES` -> re-sync allowed (recommended/required?)
-
-`DECRYPT_CB` -> re-sync allowed (recommended/required?)
-
-`RATCHET_HEADER` -> **re-sync required**
-
-`RATCHET_EARLIER` -> re-sync allowed
-
-`RATCHET_SKIPPED` -> **re-sync required**
-
-Ratchet re-synchronization could be started automatically on diagnosing de-synchronization, based on these errors. As a potentially dangerous feature (e.g., implementation error could lead to infinite re-sync loop causing large traffic consumption), initially it will be available via agent functional api for client to call. Ratchet de-synchronization will instead produce an event prompting client to re-synchronize.
-
-Diagnosing possible ratchet de-synchronization also will be recorded as connection state - `ratchet_desync_state` field in `connections` table. Client should be prohibited to start ratchet re-synchronization unless `ratchet_desync_state` is set.
-
-Event should not be repeated for following received messages that can't be decrypted - based on `ratchet_desync_state`. If a received message can be decrypted, `ratchet_desync_state` should be set to NULL and a new event sent, indicating ratchet has healed.
-
-New event - `RDESYNC :: RatchetDesyncState -> ConnectionStats -> ACommand Agent AEConn`
-
-```haskell
-data RatchetDesyncState
-  = RDResyncAllowed
-  | RDResyncRequired
-  | RDHealed
-```
-
-New field should be added to `ConnectionStats` - `ratchetDesyncState :: Maybe RatchetDesyncState`, based on `ratchet_desync_state`.
-
-> On `RDESYNC` events chat should create chat item, prompting ratchet re-synchronization or notifying it has healed.
-> If connection has diagnosed ratchet de-sync, chat item should have a button to start ratchet re-sync.
-> We'd have to get `ConnectionStats` on chat level for this instead of chat info.
-> This wouldn't work for groups. One option is to add `ConnectionStats` to `GroupMember` type and update on events.
-> Same could be done for `Contact` then.
-
-To consider - allow to start ratchet re-synchronization at any time regardless of this field as an experimental feature. In chat it could be behind "Developer tools" + additional "Experimental" toggle. Agent api would have `force :: Bool` as parameter, allowing to bypass `ratchet_desync_state`. Should `ratchet_resync_state` (see below) still be honored in this case?
-
-### Re-synchronization process
-
-\*\*\*\*\*
-
-Basic idea is the following:
-
-Both agents send new ratchet keys and compute a new shared secret. Agent that starts re-synchronization should record this fact in the connection state. Agent that receives a new key should respond with a key of its own, unless it has recorded that it itself started re-synchronization in the connection state.
-
-It can happen that both agents start re-synchronizing simultaneously. In this case they both would record it in the connection state and would not respond with a new message - instead they would use each other's already sent keys.
-
-Agent has both keys if:
-
- It initiates with the first key, and then receives the second key;
- It receives the first key and then generates its own in response.
-
-After agent has both keys, it initiates new ratchet depending on keys ordering. The agent that sent the lower key should use `initRcvRatchet` function, the agent that sent the greater key should use `initSndRatchet` (or vice versa - but they should deterministically choose different sides).
-
-\*\*\*\*\*
-
-State whether the ratchet re-synchronization is in progress should be tracked in database via `connections` table new `ratchet_resync_state` field.
-
-New functional api:
-
-```haskell
-resyncConnectionRatchet :: AgentErrorMonad m => AgentClient -> ConnId -> m ConnectionStats
-```
-
-or if we want to allow re-synchronizing ratchet at any time even if de-synchronization wasn't diagnosed:
-
-```haskell
-resyncConnectionRatchet :: AgentErrorMonad m => AgentClient -> ConnId -> Bool -> m ConnectionStats
-resyncConnectionRatchet c connId force = ...
-```
-
-Possibly client command?
-
-``` haskell
-data ACommand (p :: AParty) (e :: AEntity) where
-  ...
-  RESYNC_RATCHET :: Bool -> ACommand Client AEConn
-```
-
-New event - `RRESYNC :: RatchetResyncState -> ConnectionStats -> ACommand Agent AEConn`
-
-```haskell
-data RatchetResyncState
-  = RRStarted
-  | RRAgreedSnd
-  | RRAgreedRcv
-  | RRComplete
-```
-
-New `ConnectionStats` field - `ratchetResyncState :: Maybe RatchetResyncState`.
-
-When called, it should:
-
- Generate new keys.
- Update database connection state.
-  - Set `ratchet_desync_state` to NULL.
-  - Set `ratchet_resync_state` to `RRStarted`.
-  - Delete old ratchet from `ratchets` (is it safe?), create new ratchet.
- Send `AgentRatchetKey` message.
- Return updated `ConnectionStats` to client.
-
-> On `RRESYNC` events chat should create chat item, and reset connection verification.
-> Parameterized `RRESYNC` allows to distinguish: start and end of re-synchronization for initiating party; chat item direction - `RRESYNC RRStarted` is snd, `RRESYNC RRAgreedSnd/Rcv` and `RRESYNC RRComplete` are rcv (`RRESYNC RRAgreedSnd/Rcv` chat item could be omitted).
-
-AgentRatchetKey is a new message on the level of AgentMsgEnvelope - encrypted with queue level e2e encryption, but not with connection level e2e encryption (since ratchet de-synchronized).
-
-```haskell
-data AgentMsgEnvelope
-  = ...
-  | AgentRatchetKey
-      { agentVersion :: Version,
-        e2eEncryption :: E2ERatchetParams 'C.X448,
-        info :: ByteString -- for extension
-      }
-```
-
-On receiving `AgentRatchetKey`, if the receiving client hasn't started the ratchet re-synchronization itself (check `ratchet_resync_state`), it should:
-
- Generate new keys and compute new shared secret, initializing ratchet based on keys comparison.
- Update database connection state.
-  - Set `ratchet_resync_state` to `RRAgreedSnd/Rcv` (depending on whether ratchet was initialized as sending or receiving).
-  - Delete old ratchet from `ratchets`, create new ratchet.
- Reply with its own `AgentRatchetKey`.
- Notify client with `RRESYNC RRAgreedSnd/Rcv`.
- If ratchet was initialized as sending, send `EREADY` message, notifying other agent ratchet is re-synced.
-
-New agent message:
-
-```haskell
-data AMessage
-  = ...
-  | -- ratchet re-synchronization is complete, with last decrypted sender message id
-    EREADY PrevExternalSndId
-```
-
-On receiving `AgentRatchetKey`, if the receiving client started re-sync:
-
- Compute new shared secret, initializing ratchet based on keys comparison.
- Update database connection state.
-  - Set `ratchet_resync_state` to `RRAgreedSnd/Rcv` (depending on whether ratchet was initialized as sending or receiving).
-  - Update ratchet.
- Notify client with `RRESYNC RRAgreedSnd/Rcv`.
- If ratchet was initialized as sending, send `EREADY` message.
-
-After agent receives `EREADY` (or any other message that successfully decrypts):
-
- Reset `ratchet_resync_state` to NULL.
- Notify client with `RRESYNC RRComplete`.
- If ratchet was initialized as receiving, send reply `EREADY` message.
-
-### State transitions
-
-For initiating party:
-
-```
-    +------------+
-    | Ratchet ok |
-    +------------+
-          |
-          | message received, decryption error
-   * ---->|-----------------------------------+
-          |                                   |
-          V          new (clarifying)         V
-  +-----------------+     error      +------------------+
-  | Re-sync allowed |--------------->| Re-sync required |
-  +-----------------+                +------------------+
-          |                                   |
-          |-----------------------------------|
-          |                                   | alternative - message received,
-          | re-sync started by client         | successfully decrypted
-          V                                   V
-  +-----------------+                   +------------+
-  | Re-sync started |                   | Ratchet ok |
-  +-----------------+                   +------------+
-          |
-          | other party replied with new ratchet key
-          V
-  +----------------+
-  | Re-sync agreed |----> * message received, decryption error
-  |   snd / rcv    |        (should remember agreed state for reply EREADY?)
-  +----------------+
-          |
-          | message received, successfully decrypted
-          | (can be, but not necessarily, EREADY)
-          V
-    +------------+
-    | Ratchet ok |
-    +------------+
-```
-
-For replying party:
-
-```
-    +------------+
-    | Ratchet ok |
-    +------------+
-          |
-          | other party sent new ratchet key
-          V
-  +----------------+
-  | Re-sync agreed |
-  |   snd / rcv    |
-  +----------------+
-          |
-          | message received, successfully decrypted
-          | (can be, but not necessarily, EREADY)
-          V
-    +------------+
-    | Ratchet ok |
-    +------------+
-```
-
-### Ratchet state model
-
-#### 2 state variables
-
-Above we considered model with separate de-sync and re-sync state.
-
-| Desync \ Resync      | Nothing | RRStarted | RRAgreedSnd | RRAgreedRcv |
-| ---                  |  :---:  |   :---:   |    :---:    |    :---:    |
-| **Nothing**          | 1       | 3         | 4           | 4           |
-| **RDResyncAllowed**  | 2       |           | 5           | 5           |
-| **RDResyncRequired** | 2       |           | 5           | 5           |
-
-1: Ratchet is ok.
-
-2: Re-sync diagnosed, not in progress.
-
-3: Rs-sync started, diagnosing de-sync is prohibited.
-
-4: Re-sync agreed.
-
-5: Re-sync agreed, new de-sync is diagnosed.
-
-Combination 5 is possible in case de-sync was diagnosed before message that could be decrypted is received, for example if `EREADY` failed to deliver and no other decryptable message followed. We shouldn't prohibit diagnosing de-sync in this case, because agent may never exit "Agreed" state (if new decryptable message is never received). We also shouldn't overwrite/forget state of re-sync, even if we diagnose new possible de-sync, because if the decryptable `EREADY` is received and ratchet is in `RRAgreedRcv` state, it should respond with reply `EREADY`.
-
-Some combinations should be impossible:
-
-  - `RDResyncAllowed` with `RRStarted`.
-
-  - `RDResyncRequired` with `RRStarted`.
-
-`RDHealed` is equivalent to `Nothing` and only used for `RDESYNC` event, `Maybe RatchetDesyncState` can be replaced with `RatchetDesyncState`, with single new constructor `RDNoDesync` replacing `Nothing` and `RDHealed`.
-
-`RRComplete` is equivalent to `Nothing` and only used for `RRESYNC` event, `Maybe RatchetResyncState` can be replaced with `RatchetResyncState`, with single new constructor `RDNoResync` replacing `Nothing` and `RRComplete`.
-
-#### Single state variable
-
-Another option is two have a single state variable describing ratchet.
-
-```haskell
-data RatchetState
-  = RSOk
-  | RSResyncAllowed
-  | RSResyncRequired
-  | RSResyncStarted
-  | RRResyncAgreedSnd
-  | RRResyncAgreedRcv
-
-- When `resyncConnectionRatchet` is not prohibited. Can override with `force`.
-- Currently we check:`(isJust ratchetDesyncState || force) && ratchetResyncState /= Just RRStarted`.
-resyncConnectionRatchetAllowed :: RatchetState -> Bool
-resyncConnectionRatchetAllowed = \case
-  RSOk -> False
-  RSResyncAllowed -> True
-  RSResyncRequired -> True
-  RSResyncStarted -> False -- `force` shouldn't override
-  RRResyncAgreedSnd -> False
-  RRResyncAgreedRcv -> False
-
-- When we register and notify about ratchet de-synchronization.
-- Currently we check: `(isNothing ratchetDesyncState && ratchetResyncState /= Just RRStarted)`.
-- We should also allow to update from Allowed to Required.
-shouldNotifyRDESYNC :: RatchetState -> Bool
-shouldNotifyRDESYNC = \case
-  RSOk -> True
-  RSResyncAllowed -> False -- only if new error implies Required
-  RSResyncRequired -> False
-  RSResyncStarted -> False
-  RRResyncAgreedSnd -> True
-  RRResyncAgreedRcv -> True
-
-- When we prohibit connection switch, for `checkRatchetDesync`.
-- Currently we check: `(ratchetDesyncState == Just RDResyncRequired || ratchetResyncState == Just RRStarted)`
-- Also use in `runSmpQueueMsgDelivery` to pause delivery?
-ratchetDesynced :: RatchetState -> Bool
-ratchetDesynced = \case
-  RSOk -> False
-  RSResyncAllowed -> False
-  RSResyncRequired -> True
-  RSResyncStarted -> True
-  RRResyncAgreedSnd -> False
-  RRResyncAgreedRcv -> False
-```
-
-Having a single state variable limits differentiation described for combination 5 in matrix. It also limits possible differentiations in client between events when ratchet is healed on its own, and when ratchet re-sync is completed after agents negotiation. Overall, since matrix is not very sparse and allows for more fine-grained decision-making, having separate state variables for de-sync and re-sync seems preferred.
-
-#### Single state variable simplified (final version)
-
-```haskell
-data RatchetSyncState
-  = RSOk
-  | RSAllowed
-  | RSRequired
-  | RSStarted
-  | RSAgreed
-
-- event
-RSYNC :: RatchetSyncState -> ConnectionStats -> ACommand Agent AEConn`
-
-- ConnectionStats field
-ratchetSyncState :: RatchetSyncState
-```
-
-Updated design decisions:
-
-1. Single constructor for "Agreed" state. Differentiating `RRResyncAgreedSnd` and `RRResyncAgreedRcv` allowed for easier processing of `EREADY` by helping to determine whether reply `EREADY` has to be sent. However, it duplicated information already present in ratchet's state, and can be instead worked around by remembering and analyzing ratchet state pre decryption.
-
-2. Prohibit transition from "Agreed" state to "Desync" states. This would make possible edge-cases that leave ratchet in de-synchronized state without ability to progress (e.g. failed delivery of `AgentRatchetKey`), but would simplify state machine by removing dedicated "Desync" variable. Besides, there's still a recovery way with a `force` option.
-
-3. Treat "Agreed" as unfinished state - prohibit new messages to be enqueued, etc. Reception of any decryptable message transitions ratchet to "Ok" state.
-
-Possible improvements:
-
- Repeatedly triggering re-synchronization while in "Started"/"Agreed" state re-sends same keys and EREADY.
- Cooldown period, during which repeat re-synchronization is prohibited.
-
-### Skipped messages
-
-Options:
-
-1. Ignore skipped messages.
-2. Stop sending new messages while connection re-synchronizes (can use `ratchet_resync_state`).
-
- Initiator shouldn't send new messages until receives `AgentRatchetKey` from second party.
- Second party knows new shared secret immediately after processing first `AgentRatchetKey`, so it's not necessary to limit?
-
-3. 2 + Re-send skipped messages first.
-
- Add `last_external_snd_msg_id` to `AgentRatchetKey`? + see link above
-
-4. Re-send only messages after the latest ratchet step. \*
-
-It may be okay to ignore skipped messages, or at most implement option 2, as ratchet de-synchronization is usually caused by misuse (human error) - the most common cause of ratchet de-sync seems to be sending and receiving messages after running agent with old database backup. In this case user has already seen most skipped messages, and it can be expected to not have them after switching to an old backup. So in this case the only "really skipped" messages are those that were sent during the latest ratchet step and failed to decrypt, triggering ratchet re-sync (\* another option is to only re-send those).
-
-Besides, depending on time of backup there may be an arbitrary large number of skipped messages, which may consume a lot of traffic and may halt delivery of up-to-date messages for some time.
-
-It may be better to have request for repeat delivery as a separate feature, that can be requested in necessary contexts - for example for group stability.
-
-Can servers delivery failure lead to de-sync? If message is lost on server and never delivered, ratchet wouldn't advance, so there's no room for de-sync? If yes, re-evaluate.
@@ -1,26 +0,0 @@
-# Accessing SMP servers via Tor
-
-## Problem
-
-While SMP protocol is focussed on minimizing application-level meta-data by using pair-wise identifiers instead of user profile identifiers, it is important for many users to protect their IP addresses.
-
-Further, even if IP addresses are hidden by onion routing, clients should be able to choose to use a separate TCP connection to subscribe to each queue, even though it increases traffic and battery consumption, as otherwise the servers can observe multiple queues accessed by the same client.
-
-## Solution and requirements
-
-While some users may want to access SMP servers via tor, some other users (even their contacts) may want the opposite - e.g., if they use the network when accessing Tor would be suspicious (or blocked).
-
-Therefore we need to support the connections when one of the user accesses the same server via Tor (and, possibly, via onion address), while another user accesses this server without Tor.
-
-At the same time the user accessing the server via Tor may not want that their contacts access this server without Tor, and it also may be possible that the server is not available under a normal (not .onion) address.
-
-The proposed options for connecting via Tor are:
-
-1. Access servers via Socks proxy: no/yes (specify port?)
-2. Use .onion addresses: no/when available/warn/always
-3. Require senders to use .onion addresses: yes/no
-4. Use separate TCP connection for each queue
-
-While it should be possible for SMP servers to have two addresses (with and without Tor), the queues should only use one server address - if the queue started being accessed via .onion address it should not be possible to access it via a normal address. Queue addresses in connection invitations should support dual server addresses (when senders are not required ot use .onion address).
-
-At the same time, the queue with the normal addresses can be accessed with and without Tor, depending on the current device settings.
@@ -1,53 +0,0 @@
-# SMP queue rotation and redundancy
-
-## Problem
-
-1. Long term usage of the queue allows the servers to analyze long term traffic patterns.
-
-2. If the user changes the configured SMP server(s), the previously created contacts do not migrate to the new server(s).
-
-3. Server can lose messages.
-
-## Solution
-
-Additional messages exchanged by SMP agents to negotiate addition and removal of queues to the connection.
-
-This approach allows for both rotation and redundancy, as changing queue will be done be adding a queue and then removing the existing queue.
-
-The reason for this approach is that otherwise it's non-trivial to switch from one queue to another without losing messages or delivering them out of order, it's easier to have messages delivered via both queues during the switch, however short or long time it is.
-
-### Messages
-
-Additional agent messages required for the protocol:
-
-    QADD_ -> "QA"
-    QKEY_ -> "QK"
-    QUSE_ -> "QU"
-    QTEST_ -> "QT"
-
-`QADD`: add the new queue address(es), the same format as `REPLY` message, encoded as `QA`.
-
-`QKEY`: pass sender's key via existing connection (SMP confirmation message will not be used, to avoid the same "race" of the initial key exchange that would create the risk of intercepting the queue for the attacker), encoded as `QK`.
-
-`QUSE`: instruct the sender to use the new queue with sender's queue ID as parameter, encoded as `QU`.
-
-`QTEST`: send test message to the new connection, encoded as `QT`. Any other message can be sent if available to continue rotation, the absence of this message is not an error. Once this message is successfully sent the sender will stop using the old queue. Once this message (or any other message in the new queue) is received, the recipient will stop using the old queue and delete it.
-
-### Protocol
-
-```
-participant A as Alice
-participant B as Bob
-participant R as Server that has A's receive queue
-participant S as Server that has A's send queue (B's receive queue)
-participant R' as Server that hosts the new A's receive queue
-
-A ->> R': create new queue
-A ->> S ->> B: QADD (R'): snd address of the new queue(s)
-B ->> S(R) ->> A: QKEY (R'): sender's key for the new queue(s) (to avoid the race of SMP confirmation for the initial exchange)
-A ->> S(R'): secure new queue
-A ->> S ->> B: QUSE (R'): instruction to use new queue(s)
-B ->> S(R') ->> A: QTEST
-A ->> S(R): DEL: delete the old queue
-B ->> S(R') ->> A: send all new messages to the new queue
-```
@@ -1,27 +0,0 @@
-# SMP Basic Auth
-
-## Problem
-
-Users who host their own servers do not want unknown people to be able to create messaging queues on their servers after discovering server address in groups or after making a connection. As the number of self-hosted servers is growing it became more important than it was when we excluded it from the original design.
-
-## Solution
-
-Single access password that can be optionally included in server address that is passed to app configuration. It will not be allowed in the existing contexts (and parsing will fail), to avoid accidentally leaking it. Server address with password will look this way: `smp://fingerprint:password@hosts`
-
-## Implementation plan
-
-1. A separate type to include server and password, so it can only be used where allowed.
-
-2. Server password to create queues will be configured in TRANSPORT section of INI file, as `create_password` parameter.
-
-3. The password will only be required in server configuration/address to create queues only, it won't be required for other receiving queue operations on already existing queues.
-
-4. If new command is attempted in the session that does not allow creating queues, the server will send `ERR AUTH` response
-
-5. Passing password to the server can be done in one of the several ways, we need to decide:
-
-  - as a parameter of NEW command. Pros: a local change, that only needs checking when queue is created. Cons: protocol version change.
-  - as a separate command AUTH. Pros: allows to include additional parameters and potentially be extended beyond basic auth. Cons: more complex to manage server state, can be more difficult syntax in the future, if extended.
-  - as part of handshake (we currently ignore the unparsed part of handshake block, so it can be extended). Pros: probably, the simplest, and independent of the commands protocol – establishes create permission for the current session. Cons: the client won't know about whether it is able to create the queue until it tries (same as in case 1).
-
-  My preference is the last option. As a variant of the last option, we can add a server response/message that includes permission to create queues - it will only be sent to the clients who pass credential in handshake - that might simplify testing server connection (we currently do not do it). It might be unnecessary, as we could simply create and delete queue in case credential is passed as part of testing connection (and even sending a message to it).
@@ -1,48 +0,0 @@
-#!/usr/bin/env sh
-confd='/etc/opt/simplex'
-logd='/var/opt/simplex/'
-
-# Check if server has been initialized
-if [ ! -f "${confd}/smp-server.ini" ]; then
-  # If not, determine ip or domain
-  case "${ADDR}" in
-    '') printf 'Please specify $ADDR environment variable.\n'; exit 1 ;;
-    *[a-zA-Z]*)
-      case "${ADDR}" in
-        *:*) set -- --ip "${ADDR}" ;;
-        *) set -- -n "${ADDR}" ;;
-      esac
-      ;;
-    *) set -- --ip "${ADDR}" ;;
-  esac
-
-  # Optionally, set password
-  case "${PASS}" in
-    '') set -- "$@" --no-password ;;
-    *) set -- "$@" --password "${PASS}" ;;
-  esac
-
-  # And init certificates and configs
-  smp-server init -y -l "$@"
-fi
-
-# Backup store log just in case
-#
-# Uses the UTC (universal) time zone and this
-# format: YYYY-mm-dd'T'HH:MM:SS
-# year, month, day, letter T, hour, minute, second
-#
-# This is the ISO 8601 format without the time zone at the end.
-#
-_file="${logd}/smp-server-store.log"
-if [ -f "${_file}" ]; then
-  _backup_extension="$(date -u '+%Y-%m-%dT%H:%M:%S')"
-  cp -v -p "${_file}" "${_file}.${_backup_extension:-date-failed}"
-  unset -v _backup_extension
-fi
-unset -v _file
-
-# Finally, run smp-sever. Notice that "exec" here is important:
-# smp-server replaces our helper script, so that it can catch INT signal
-exec smp-server start +RTS -N -RTS
-
@@ -1,48 +0,0 @@
-#!/usr/bin/env sh
-confd='/etc/opt/simplex-xftp'
-logd='/var/opt/simplex-xftp'
-
-# Check if server has been initialized
-if [ ! -f "${confd}/file-server.ini" ]; then
-  # If not, determine ip or domain
-  case "${ADDR}" in
-    '') printf 'Please specify $ADDR environment variable.\n'; exit 1 ;;
-    *[a-zA-Z]*)
-      case "${ADDR}" in
-        *:*) set -- --ip "${ADDR}" ;;
-        *) set -- -n "${ADDR}" ;;
-      esac
-      ;;
-    *) set -- --ip "${ADDR}" ;;
-  esac
-
-  # Set quota
-  case "${QUOTA}" in
-    '') printf 'Please specify $QUOTA environment variable.\n'; exit 1 ;;
-    *) set -- "$@" --quota "${QUOTA}" ;;
-  esac
-
-  # Init the certificates and configs
-  xftp-server init -l -p /srv/xftp "$@"
-fi
-
-# Backup store log just in case
-#
-# Uses the UTC (universal) time zone and this
-# format: YYYY-mm-dd'T'HH:MM:SS
-# year, month, day, letter T, hour, minute, second
-#
-# This is the ISO 8601 format without the time zone at the end.
-#
-_file="${logd}/file-server-store.log"
-if [ -f "${_file}" ]; then
-  _backup_extension="$(date -u '+%Y-%m-%dT%H:%M:%S')"
-  cp -v -p "${_file}" "${_file}.${_backup_extension:-date-failed}"
-  unset -v _backup_extension
-fi
-unset -v _file
-
-# Finally, run xftp-sever. Notice that "exec" here is important:
-# smp-server replaces our helper script, so that it can catch INT signal
-exec xftp-server start +RTS -N -RTS
-
@@ -1,30 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-path_conf_var="/var/opt"
-path_conf_smp="$path_conf_var/simplex"
-path_conf_xftp="$path_conf_var/simplex-xftp"
-path_conf_storelog_smp="$path_conf_smp/smp-server-store.log"
-path_conf_storelog_xftp="$path_conf_xftp/file-server-store.log"
-date="$(date -u '+%Y-%m-%dT%H:%M:%S')"
-
-backup_smp() {
- if [ -e "$path_conf_storelog_smp" ]; then
-  cp "$path_conf_storelog_smp" "${path_conf_storelog_smp}.${date:-date-failed}"
- fi
-}
-
-backup_xftp() {
- if [ -e "$path_conf_storelog_xftp" ]; then
-  cp "$path_conf_storelog_xftp" "${path_conf_storelog_xftp}.${date:-date-failed}"
- fi
-}
-
-if [ "$1" = 'smp-server' ]; then
- backup_smp
-elif [ "$1" = 'xftp-server' ]; then
- backup_xftp
-else
- backup_smp
- backup_xftp
-fi
@@ -1,23 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-GRN='\033[0;32m'
-RED='\033[0;31m'
-NC='\033[0m'
-
-if [ "$(id -u)" -ne 0 ]; then
-  printf "This script is intended to be run with root privileges. Please re-run script using sudo."
-  exit 1
-fi
-
-printf "${RED}This action will permanently remove all configs, directories, binaries from Installation Script. Please backup any relevant configs if they are needed.${NC}\n\nPress ${GRN}ENTER${NC} to continue or ${RED}Ctrl+C${NC} to cancel installation"
-read ans
-
-systemctl stop smp-server
-systemctl stop xftp-server
-
-rm -rf /var/opt/simplex /etc/opt/simplex /var/opt/simplex-xftp /etc/opt/simplex-xftp /srv/xftp /etc/systemd/system/smp-server.service /etc/systemd/system/xftp-server.service /usr/local/bin/smp-server /usr/local/bin/xftp-server /usr/local/bin/simplex-servers-update /usr/local/bin/simplex-servers-uninstall
-
-userdel smp && userdel xftp
-
-printf "Uninstallation is complete! Thanks for trying out SimpleX!\n"
@@ -1,174 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-# Links to scripts/configs
-bin="https://github.com/simplex-chat/simplexmq/releases/latest/download"
-bin_smp="$bin/smp-server-ubuntu-20_04-x86-64"
-bin_xftp="$bin/xftp-server-ubuntu-20_04-x86-64"
-
-scripts="https://raw.githubusercontent.com/simplex-chat/simplexmq/stable/scripts/main"
-scripts_systemd_smp="$scripts/smp-server.service"
-scripts_systemd_xftp="$scripts/xftp-server.service"
-scripts_update="$scripts/simplex-servers-update"
-scripts_uninstall="$scripts/simplex-servers-uninstall"
-scripts_stopscript="$scripts/simplex-servers-stopscript"
-
-# Default installation paths
-path_bin="/usr/local/bin"
-path_bin_smp="$path_bin/smp-server"
-path_bin_xftp="$path_bin/xftp-server"
-path_bin_update="$path_bin/simplex-servers-update"
-path_bin_uninstall="$path_bin/simplex-servers-uninstall"
-path_bin_stopscript="$path_bin/simplex-servers-stopscript"
-
-path_systemd="/etc/systemd/system"
-path_systemd_smp="$path_systemd/smp-server.service"
-path_systemd_xftp="$path_systemd/xftp-server.service"
-
-# Temporary paths
-path_tmp_bin="$(mktemp -d)"
-path_tmp_bin_update="$path_tmp_bin/simplex-servers-update"
-path_tmp_bin_uninstall="$path_tmp_bin/simplex-servers-uninstall"
-path_tmp_bin_stopscript="$path_tmp_bin/simplex-servers-stopscript"
-path_tmp_systemd_smp="$path_tmp_bin/smp-server.service"
-path_tmp_systemd_xftp="$path_tmp_bin/xftp-server.service"
-
-GRN='\033[0;32m'
-BLU='\033[1;36m'
-YLW='\033[1;33m'
-RED='\033[0;31m'
-NC='\033[0m'
-
-# Currently, XFTP default to v0.1.0, so it doesn't make sense to check its version
-local_version="$($path_bin_smp -v | awk '{print $3}')"
-remote_version="$(curl --proto '=https' --tlsv1.2 -sSf -L https://api.github.com/repos/simplex-chat/simplexmq/releases/latest | grep -i "tag_name" | awk -F \" '{print $4}')"
-
-update_scripts() {
-  curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_update" -o "$path_tmp_bin_update" && chmod +x "$path_tmp_bin_update"
-  curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_uninstall" -o "$path_tmp_bin_uninstall" && chmod +x "$path_tmp_bin_uninstall"
-  curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_stopscript" -o "$path_tmp_bin_stopscript" && chmod +x "$path_tmp_bin_stopscript"
-
-  if diff -q "$path_bin_uninstall" "$path_tmp_bin_uninstall" > /dev/null 2>&1; then
-    printf -- "- ${YLW}Uninstall script is up-to-date${NC}.\n"
-    rm "$path_tmp_bin_uninstall"
-  else
-    printf -- "- Updating uninstall script..."
-    mv "$path_tmp_bin_uninstall" "$path_bin_uninstall"
-    printf "${GRN}Done!${NC}\n"
-  fi
-  if diff -q "$path_bin_stopscript" "$path_tmp_bin_stopscript" > /dev/null 2>&1; then
-    printf -- "- ${YLW}Stopscript script is up-to-date${NC}.\n"
-    rm "$path_tmp_bin_stopscript"
-  else
-    printf -- "- Updating stopscript script..."
-    mv "$path_tmp_bin_stopscript" "$path_bin_stopscript"
-    printf "${GRN}Done!${NC}\n"
-  fi
-  if diff -q "$path_bin_update" "$path_tmp_bin_update" > /dev/null 2>&1; then
-    printf -- "- ${YLW}Update script is up-to-date${NC}.\n"
-    rm "$path_tmp_bin_update"
-  else
-    printf -- "- Updating update script..."
-    mv "$path_tmp_bin_update" "$path_bin_update"
-    printf "${GRN}Done!${NC}\n"
-    printf "Re-executing Update script with latest updates..."
-    exec sh "$path_bin_update" "continue"
-  fi
-}
-
-update_systemd() {
-  curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_systemd_smp" -o "$path_tmp_systemd_smp"
-  curl --proto '=https' --tlsv1.2 -sSf -L "$scripts_systemd_xftp" -o "$path_tmp_systemd_xftp"
-
-  if diff -q "$path_systemd_smp" "$path_tmp_systemd_smp" > /dev/null 2>&1; then
-    printf -- "- ${YLW}smp-server service is up-to-date${NC}.\n"
-    rm "$path_tmp_systemd_smp"
-  else
-    printf -- "- Updating smp-server service..."
-    mv "$path_tmp_systemd_smp" "$path_systemd_smp"
-    systemctl daemon-reload
-    printf "${GRN}Done!${NC}\n"
-  fi
-  if diff -q "$path_systemd_xftp" "$path_tmp_systemd_xftp" > /dev/null 2>&1; then
-    printf -- "- ${YLW}xftp-server service is up-to-date${NC}.\n"
-    rm "$path_tmp_systemd_xftp"
-  else
-    printf -- "- Updating xftp-server service..."
-    mv "$path_tmp_systemd_xftp" "$path_systemd_xftp"
-    systemctl daemon-reload
-    printf "${GRN}Done!${NC}\n"
-  fi
-}
-
-update_bins() {
-  if [ "$local_version" != "$remote_version" ]; then
-    if systemctl is-active --quiet smp-server; then
-      printf -- "- Stopping smp-server service..."
-      systemctl stop smp-server
-      printf "${GRN}Done!${NC}\n"
-
-      printf -- "- Updating smp-server bin to %s..." "$remote_version"
-      curl --proto '=https' --tlsv1.2 -sSf -L "$bin_smp" -o "$path_bin_smp" && chmod +x "$path_bin_smp"
-      printf "${GRN}Done!${NC}\n"
-      
-      printf -- "- Starting smp-server service..."
-      systemctl start smp-server
-      printf "${GRN}Done!${NC}\n"
-    else
-      printf -- "- Updating smp-server bin..."
-      curl --proto '=https' --tlsv1.2 -sSf -L "$bin_smp" -o "$path_bin_smp" && chmod +x "$path_bin_smp"
-      printf "${GRN}Done!${NC}\n"
-    fi
-
-    if systemctl is-active --quiet xftp-server; then
-      printf -- "- Stopping xftp-server service..."
-      systemctl stop xftp-server
-      printf "${GRN}Done!${NC}\n"
-
-      printf -- "- Updating xftp-server bin to %s..." "$remote_version"
-      curl --proto '=https' --tlsv1.2 -sSf -L "$bin_xftp" -o "$path_bin_xftp" && chmod +x "$path_bin_xftp"
-      printf "${GRN}Done!${NC}\n"
-      
-      printf -- "- Starting xftp-server service..."
-      systemctl start xftp-server
-      printf "${GRN}Done!${NC}\n"
-    else
-      printf -- "- Updating xftp-server bin..."
-      curl --proto '=https' --tlsv1.2 -sSf -L "$bin_smp" -o "$path_bin_xftp" && chmod +x "$path_bin_xftp"
-      printf "${GRN}Done!${NC}\n"
-    fi
-  else
-    printf -- "- ${YLW}smp-server and xftp-server binaries is up-to-date${NC}.\n"
-  fi
-}
-
-checks() {
-  if [ "$(id -u)" -ne 0 ]; then
-    printf "This script is intended to be run with root privileges. Please re-run script using sudo.\n"
-    exit 1
-  fi
-}
-
-main() {
-  checks
-
-  set +u
-  if [ "$1" != "continue" ]; then
-    set -u
-    printf "Updating scripts...\n"
-    update_scripts
-  else
-    set -u
-    printf "${GRN}Done!${NC}\n"
-  fi
-
-  printf "Updating systemd services...\n"
-  update_systemd
-  
-  printf "Updating simplex server binaries...\n"
-  update_bins
-
-  rm -rf "$path_tmp_bin"
-}
-
-main "$@"
@@ -1,15 +0,0 @@
-[Unit]
-Description=SMP server
-
-[Service]
-User=smp
-Group=smp
-Type=simple
-ExecStart=/usr/local/bin/smp-server start +RTS -N -RTS 
-ExecStopPost=/usr/local/bin/simplex-servers-stopscript smp-server
-LimitNOFILE=65535
-KillSignal=SIGINT
-TimeoutStopSec=infinity
-
-[Install]
-WantedBy=multi-user.target
@@ -1,16 +0,0 @@
-[Unit]
-Description=XFTP server
-
-[Service]
-User=xftp
-Group=xftp
-Type=simple
-ExecStart=/usr/local/bin/xftp-server start +RTS -N -RTS
-ExecStopPost=/usr/local/bin/simplex-servers-stopscript xftp-server
-LimitNOFILE=65535
-KillSignal=SIGINT
-TimeoutStopSec=infinity
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-   
-[Install]
-WantedBy=multi-user.target
@@ -1,178 +0,0 @@
-#!/bin/bash
-
-# <UDF name="enable_store_log" label="Store log - persist notification subscriptions to append only log and restore them upon server restart." default="on" oneof="on, off" />
-# <UDF name="api_token" label="Linode API token - enable Linode to create tags with server address, fingerprint and version. Note: minimal permissions token should have are read/write access to `linodes` (to create tags) and `domains` (to add A record for the third level domain if FQDN is provided)." default="" />
-# <UDF name="fqdn" label="FQDN (Fully Qualified Domain Name) - provide third level domain name (e.g. ntf.example.com). If provided use `ntf://fingerprint@FQDN` as server address in the client. If FQDN is not provided use `ntf://fingerprint@IP` instead." default="" />
-# <UDF name="apns_key_id" label="APNS key ID." default="" />
-
-# Log all stdout output to stackscript.log
-exec &> >(tee -i /var/log/stackscript.log)
-
-# Uncomment next line to enable debugging features
-# set -xeo pipefail
-
-cd $HOME
-
-# https://superuser.com/questions/1638779/automatic-yess-to-linux-update-upgrade
-# https://superuser.com/questions/1412054/non-interactive-apt-upgrade
-sudo DEBIAN_FRONTEND=noninteractive \
-  apt-get \
-  -o Dpkg::Options::=--force-confold \
-  -o Dpkg::Options::=--force-confdef \
-  -y --allow-downgrades --allow-remove-essential --allow-change-held-packages \
-  update
-
-sudo DEBIAN_FRONTEND=noninteractive \
-  apt-get \
-  -o Dpkg::Options::=--force-confold \
-  -o Dpkg::Options::=--force-confdef \
-  -y --allow-downgrades --allow-remove-essential --allow-change-held-packages \
-  dist-upgrade
-
-# TODO install unattended-upgrades
-sudo DEBIAN_FRONTEND=noninteractive \
-  apt-get \
-  -o Dpkg::Options::=--force-confold \
-  -o Dpkg::Options::=--force-confdef \
-  -y --allow-downgrades --allow-remove-essential --allow-change-held-packages \
-  install jq
-
-# Add firewall
-echo "y" | ufw enable
-
-# Open ports
-ufw allow ssh
-ufw allow https
-ufw allow 5223
-
-# Increase file descriptors limit
-echo 'fs.file-max = 1000000' >> /etc/sysctl.conf
-echo 'fs.inode-max = 1000000' >> /etc/sysctl.conf
-echo 'root soft nofile unlimited' >> /etc/security/limits.conf
-echo 'root hard nofile unlimited' >> /etc/security/limits.conf
-
-# Download latest release
-bin_dir="/opt/simplex-notifications/bin"
-binary="$bin_dir/ntf-server"
-mkdir -p $bin_dir
-curl -L -o $binary https://github.com/simplex-chat/simplexmq/releases/latest/download/ntf-server-ubuntu-20_04-x86-64
-chmod +x $binary
-
-# / Add to PATH
-cat > /etc/profile.d/simplex.sh << EOF
-#!/bin/bash
-
-export PATH="$PATH:$bin_dir"
-
-EOF
-# Add to PATH /
-
-# Source and test PATH
-source /etc/profile.d/simplex.sh
-ntf-server --version
-
-# Initialize server
-init_opts=()
-
-[[ $ENABLE_STORE_LOG == "on" ]] && init_opts+=(-l)
-
-ip_address=$(curl ifconfig.me)
-init_opts+=(--ip $ip_address)
-
-[[ -n "$FQDN" ]] && init_opts+=(-n $FQDN)
-
-ntf-server init "${init_opts[@]}"
-
-# Server fingerprint
-fingerprint=$(cat /etc/opt/simplex-notifications/fingerprint)
-
-# Determine server address to specify in welcome script and Linode tag
-if [[ -n "$FQDN" ]]; then
-  server_address=$FQDN
-else
-  server_address=$ip_address
-fi
-
-# Set up welcome script
-on_login_script="/opt/simplex-notifications/on_login.sh"
-
-# / Welcome script
-cat > $on_login_script << EOF
-#!/bin/bash
-
-fingerprint=\$1
-server_address=\$2
-
-cat << EOF2
-********************************************************************************
-
-SimpleX notifications server address: ntf://\$fingerprint@\$server_address
-Check server status with: systemctl status ntf-server
-
-To keep this server secure, the UFW firewall is enabled.
-All ports are BLOCKED except 22 (SSH), 443 (HTTPS), 5223 (notifications server).
-
-********************************************************************************
-To stop seeing this message delete line - bash /opt/simplex-notifications/on_login.sh - from /root/.bashrc
-EOF2
-
-EOF
-# Welcome script /
-
-chmod +x $on_login_script
-echo "bash $on_login_script $fingerprint $server_address" >> /root/.bashrc
-
-# Create A record and update Linode's tags
-if [[ -n "$API_TOKEN" ]]; then
-  if [[ -n "$FQDN" ]]; then
-    domain_address=$(echo $FQDN | rev | cut -d "." -f 1,2 | rev)
-    domain_id=$(curl -H "Authorization: Bearer $API_TOKEN" https://api.linode.com/v4/domains \
-    | jq --arg da "$domain_address" '.data[] | select( .domain == $da ) | .id')
-    if [[ -n $domain_id ]]; then
-      curl \
-        -s -H "Content-Type: application/json" \
-        -H "Authorization: Bearer $API_TOKEN" \
-        -X POST -d "{\"type\":\"A\",\"name\":\"$FQDN\",\"target\":\"$ip_address\"}" \
-        https://api.linode.com/v4/domains/${domain_id}/records
-    fi
-  fi
-
-  version=$(ntf-server --version | cut -d ' ' -f 3-)
-
-  curl \
-    -s -H "Content-Type: application/json" \
-    -H "Authorization: Bearer $API_TOKEN" \
-    -X PUT -d "{\"tags\":[\"$server_address\",\"$fingerprint\",\"$version\"]}" \
-    https://api.linode.com/v4/linode/instances/$LINODE_ID
-fi
-
-# / Create systemd service
-cat > /etc/systemd/system/ntf-server.service << EOF
-[Unit]
-Description=SimpleX notifications server
-
-[Service]
-Environment="APNS_KEY_FILE=/etc/opt/simplex-notifications/AuthKey.p8"
-Environment="APNS_KEY_ID=$APNS_KEY_ID"
-Type=simple
-ExecStart=/bin/sh -c "exec $binary start >> /var/opt/simplex-notifications/ntf-server.log 2>&1"
-KillSignal=SIGINT
-Restart=always
-RestartSec=10
-LimitNOFILE=1000000
-LimitNOFILESoft=1000000
-
-[Install]
-WantedBy=multi-user.target
-
-EOF
-# Create systemd service /
-
-# Start systemd service
-chmod 644 /etc/systemd/system/ntf-server.service
-sudo systemctl enable ntf-server
-# ! APNS key file and certificate have to be copied manually
-# sudo systemctl start ntf-server
-
-# Reboot Linode to apply upgrades
-# sudo reboot
@@ -86,6 +86,10 @@ smp-server init "${init_opts[@]}"
 fingerprint=$(cat /etc/opt/simplex/fingerprint)

 # Determine server address to specify in welcome script and Linode tag
+# ! If FQDN was provided and used as part of server initialization, server's certificate will not pass validation at client
+# ! if client tries to connect by server's IP address, so we have to specify FQDN as server address in Linode tag and
+# ! in welcome script regardless of creation of A record in Linode
+# ! https://hackage.haskell.org/package/x509-validation-1.6.10/docs/src/Data-X509-Validation.html#validateCertificateName
 if [[ -n "$FQDN" ]]; then
  server_address=$FQDN
 else
@@ -154,7 +158,6 @@ Description=SMP server
 Type=simple
 ExecStart=/bin/sh -c "exec $binary start >> /var/opt/simplex/smp-server.log 2>&1"
 KillSignal=SIGINT
-TimeoutStopSec=infinity
 Restart=always
 RestartSec=10
 LimitNOFILE=1000000
@@ -1,37 +0,0 @@
-1. Install `tor` following [official guide](https://community.torproject.org/onion-services/setup/install/).
-
-2. Modify `/etc/tor/torrc` configuration file:
-
-```sh
-...
-# Disable anonymous mode for better connectivity
-## Needed for HiddenServiceNonAnonymousMode
-SOCKSPort 0
-## Needed for HiddenServiceSingleHopMode
-HiddenServiceNonAnonymousMode 1
-## Flag to disable anonymous mode
-## This option reduces the latency of server connection, but it makes server itself not anonymous,
-## it only protects the anonymity of the users connecting to the server.
-## In case your server address has both public and onion hostnames it is not anonymous anyway,
-## so this is what you want.
-HiddenServiceSingleHopMode 1
-
-# Specify folder for smp-tor
-## Folder for keys, address, etc.
-HiddenServiceDir /var/lib/tor/simplex-smp/
-## Map smp port (5223) to tor
-HiddenServicePort 5223 localhost:5223
-...
-```
-
-3. Restart `tor` system service:
-
-```
-sudo systemctl restart tor
-```
-
-4. Onion address can be obtained from following file:
-
-```sh
-sudo cat /var/lib/tor/simplex-smp/hostname
-```
@@ -1,11 +1,11 @@
 cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.1.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack

 name:           simplexmq
-version:        5.2.1
+version:        2.3.1
 synopsis:       SimpleXMQ message broker
 description:    This package includes <./docs/Simplex-Messaging-Server.html server>,
                <./docs/Simplex-Messaging-Client.html client> and
@@ -34,28 +34,9 @@ flag swift

 library
  exposed-modules:
-      Simplex.FileTransfer
-      Simplex.FileTransfer.Agent
-      Simplex.FileTransfer.Client
-      Simplex.FileTransfer.Client.Agent
-      Simplex.FileTransfer.Client.Main
-      Simplex.FileTransfer.Client.Presets
-      Simplex.FileTransfer.Crypto
-      Simplex.FileTransfer.Description
-      Simplex.FileTransfer.Protocol
-      Simplex.FileTransfer.Server
-      Simplex.FileTransfer.Server.Env
-      Simplex.FileTransfer.Server.Main
-      Simplex.FileTransfer.Server.Stats
-      Simplex.FileTransfer.Server.Store
-      Simplex.FileTransfer.Server.StoreLog
-      Simplex.FileTransfer.Transport
-      Simplex.FileTransfer.Types
-      Simplex.FileTransfer.Util
      Simplex.Messaging.Agent
      Simplex.Messaging.Agent.Client
      Simplex.Messaging.Agent.Env.SQLite
-      Simplex.Messaging.Agent.Lock
      Simplex.Messaging.Agent.NtfSubSupervisor
      Simplex.Messaging.Agent.Protocol
      Simplex.Messaging.Agent.QueryString
@@ -63,34 +44,14 @@ library
      Simplex.Messaging.Agent.Server
      Simplex.Messaging.Agent.Store
      Simplex.Messaging.Agent.Store.SQLite
-      Simplex.Messaging.Agent.Store.SQLite.Common
      Simplex.Messaging.Agent.Store.SQLite.Migrations
      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220101_initial
      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220301_snd_queue_keys
      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220322_notifications
      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220608_v2
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220625_v2_ntf_mode
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220811_onion_hosts
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220817_connection_ntfs
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220905_commands
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220915_connection_queues
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230110_users
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230117_fkey_indexes
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230120_delete_errors
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230217_server_key_hash
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230223_files
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230320_retry_state
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230401_snd_files
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230510_files_pending_replicas_indexes
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230516_encrypted_rcv_message_hashes
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230531_switch_status
-      Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230615_ratchet_sync
-      Simplex.Messaging.Agent.TAsyncs
-      Simplex.Messaging.Agent.TRcvQueues
      Simplex.Messaging.Client
      Simplex.Messaging.Client.Agent
      Simplex.Messaging.Crypto
-      Simplex.Messaging.Crypto.Lazy
      Simplex.Messaging.Crypto.Ratchet
      Simplex.Messaging.Encoding
      Simplex.Messaging.Encoding.String
@@ -98,29 +59,22 @@ library
      Simplex.Messaging.Notifications.Protocol
      Simplex.Messaging.Notifications.Server
      Simplex.Messaging.Notifications.Server.Env
-      Simplex.Messaging.Notifications.Server.Main
      Simplex.Messaging.Notifications.Server.Push.APNS
-      Simplex.Messaging.Notifications.Server.Stats
      Simplex.Messaging.Notifications.Server.Store
-      Simplex.Messaging.Notifications.Server.StoreLog
      Simplex.Messaging.Notifications.Transport
-      Simplex.Messaging.Notifications.Types
      Simplex.Messaging.Parsers
      Simplex.Messaging.Protocol
      Simplex.Messaging.Server
      Simplex.Messaging.Server.CLI
      Simplex.Messaging.Server.Env.STM
      Simplex.Messaging.Server.Expiration
-      Simplex.Messaging.Server.Main
      Simplex.Messaging.Server.MsgStore
      Simplex.Messaging.Server.MsgStore.STM
      Simplex.Messaging.Server.QueueStore
      Simplex.Messaging.Server.QueueStore.STM
-      Simplex.Messaging.Server.Stats
      Simplex.Messaging.Server.StoreLog
      Simplex.Messaging.TMap
      Simplex.Messaging.Transport
-      Simplex.Messaging.Transport.Buffer
      Simplex.Messaging.Transport.Client
      Simplex.Messaging.Transport.HTTP2
      Simplex.Messaging.Transport.HTTP2.Client
@@ -143,7 +97,7 @@ library
    , asn1-types ==0.3.*
    , async ==2.2.*
    , attoparsec ==0.14.*
-    , base >=4.14 && <5
+    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
@@ -153,44 +107,41 @@ library
    , cryptonite >=0.27 && <0.30
    , cryptostore ==0.2.*
    , data-default ==0.7.*
-    , direct-sqlcipher ==2.3.*
+    , direct-sqlite ==2.3.*
    , directory ==1.3.*
    , filepath ==1.4.*
    , generic-random >=1.3 && <1.5
    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
+    , http2 ==3.0.*
+    , ini ==0.4.*
    , iso8601-time ==0.1.*
    , memory ==0.15.*
    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
+    , network-transport ==0.5.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
    , simple-logger ==0.1.*
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
+    , sqlite-simple ==0.4.*
    , stm ==2.5.*
    , template-haskell ==2.16.*
-    , temporary ==1.3.*
    , text ==1.2.*
    , time ==1.9.*
    , time-compat ==1.9.*
    , time-manager ==0.0.*
    , tls >=1.6.0 && <1.7
    , transformers ==0.5.*
+    , unix ==2.7.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
    , x509 ==1.7.*
    , x509-store ==1.6.*
    , x509-validation ==1.6.*
-    , yaml ==0.11.*
-  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
+  default-language: Haskell2010

 executable ntf-server
  main-is: Main.hs
@@ -207,7 +158,7 @@ executable ntf-server
    , asn1-types ==0.3.*
    , async ==2.2.*
    , attoparsec ==0.14.*
-    , base >=4.14 && <5
+    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
@@ -217,45 +168,42 @@ executable ntf-server
    , cryptonite >=0.27 && <0.30
    , cryptostore ==0.2.*
    , data-default ==0.7.*
-    , direct-sqlcipher ==2.3.*
+    , direct-sqlite ==2.3.*
    , directory ==1.3.*
    , filepath ==1.4.*
    , generic-random >=1.3 && <1.5
    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
+    , http2 ==3.0.*
+    , ini ==0.4.*
    , iso8601-time ==0.1.*
    , memory ==0.15.*
    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
+    , network-transport ==0.5.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
    , simple-logger ==0.1.*
    , simplexmq
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
+    , sqlite-simple ==0.4.*
    , stm ==2.5.*
    , template-haskell ==2.16.*
-    , temporary ==1.3.*
    , text ==1.2.*
    , time ==1.9.*
    , time-compat ==1.9.*
    , time-manager ==0.0.*
    , tls >=1.6.0 && <1.7
    , transformers ==0.5.*
+    , unix ==2.7.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
    , x509 ==1.7.*
    , x509-store ==1.6.*
    , x509-validation ==1.6.*
-    , yaml ==0.11.*
-  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
+  default-language: Haskell2010

 executable smp-agent
  main-is: Main.hs
@@ -272,7 +220,7 @@ executable smp-agent
    , asn1-types ==0.3.*
    , async ==2.2.*
    , attoparsec ==0.14.*
-    , base >=4.14 && <5
+    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
@@ -282,45 +230,42 @@ executable smp-agent
    , cryptonite >=0.27 && <0.30
    , cryptostore ==0.2.*
    , data-default ==0.7.*
-    , direct-sqlcipher ==2.3.*
+    , direct-sqlite ==2.3.*
    , directory ==1.3.*
    , filepath ==1.4.*
    , generic-random >=1.3 && <1.5
    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
+    , http2 ==3.0.*
+    , ini ==0.4.*
    , iso8601-time ==0.1.*
    , memory ==0.15.*
    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
+    , network-transport ==0.5.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
    , simple-logger ==0.1.*
    , simplexmq
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
+    , sqlite-simple ==0.4.*
    , stm ==2.5.*
    , template-haskell ==2.16.*
-    , temporary ==1.3.*
    , text ==1.2.*
    , time ==1.9.*
    , time-compat ==1.9.*
    , time-manager ==0.0.*
    , tls >=1.6.0 && <1.7
    , transformers ==0.5.*
+    , unix ==2.7.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
    , x509 ==1.7.*
    , x509-store ==1.6.*
    , x509-validation ==1.6.*
-    , yaml ==0.11.*
-  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
+  default-language: Haskell2010

 executable smp-server
  main-is: Main.hs
@@ -337,7 +282,7 @@ executable smp-server
    , asn1-types ==0.3.*
    , async ==2.2.*
    , attoparsec ==0.14.*
-    , base >=4.14 && <5
+    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
@@ -347,177 +292,44 @@ executable smp-server
    , cryptonite >=0.27 && <0.30
    , cryptostore ==0.2.*
    , data-default ==0.7.*
-    , direct-sqlcipher ==2.3.*
+    , direct-sqlite ==2.3.*
    , directory ==1.3.*
    , filepath ==1.4.*
    , generic-random >=1.3 && <1.5
    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
+    , http2 ==3.0.*
+    , ini ==0.4.*
    , iso8601-time ==0.1.*
    , memory ==0.15.*
    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
+    , network-transport ==0.5.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
    , simple-logger ==0.1.*
    , simplexmq
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
+    , sqlite-simple ==0.4.*
    , stm ==2.5.*
    , template-haskell ==2.16.*
-    , temporary ==1.3.*
    , text ==1.2.*
    , time ==1.9.*
    , time-compat ==1.9.*
    , time-manager ==0.0.*
    , tls >=1.6.0 && <1.7
    , transformers ==0.5.*
+    , unix ==2.7.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
    , x509 ==1.7.*
    , x509-store ==1.6.*
    , x509-validation ==1.6.*
-    , yaml ==0.11.*
-  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-
-executable xftp
-  main-is: Main.hs
-  other-modules:
-      Paths_simplexmq
-  hs-source-dirs:
-      apps/xftp
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
-  build-depends:
-      QuickCheck ==2.14.*
-    , aeson ==2.0.*
-    , ansi-terminal >=0.10 && <0.12
-    , asn1-encoding ==0.9.*
-    , asn1-types ==0.3.*
-    , async ==2.2.*
-    , attoparsec ==0.14.*
-    , base >=4.14 && <5
-    , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
-    , case-insensitive ==1.2.*
-    , composition ==1.0.*
-    , constraints >=0.12 && <0.14
-    , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
-    , cryptostore ==0.2.*
-    , data-default ==0.7.*
-    , direct-sqlcipher ==2.3.*
-    , directory ==1.3.*
-    , filepath ==1.4.*
-    , generic-random >=1.3 && <1.5
-    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
-    , iso8601-time ==0.1.*
-    , memory ==0.15.*
-    , mtl ==2.2.*
-    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
-    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
-    , random >=1.1 && <1.3
-    , simple-logger ==0.1.*
-    , simplexmq
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
-    , stm ==2.5.*
-    , template-haskell ==2.16.*
-    , temporary ==1.3.*
-    , text ==1.2.*
-    , time ==1.9.*
-    , time-compat ==1.9.*
-    , time-manager ==0.0.*
-    , tls >=1.6.0 && <1.7
-    , transformers ==0.5.*
-    , unliftio ==0.2.*
-    , unliftio-core ==0.2.*
-    , websockets ==0.12.*
-    , x509 ==1.7.*
-    , x509-store ==1.6.*
-    , x509-validation ==1.6.*
-    , yaml ==0.11.*
  default-language: Haskell2010
-  if flag(swift)
-    cpp-options: -DswiftJSON

-executable xftp-server
-  main-is: Main.hs
-  other-modules:
-      Paths_simplexmq
-  hs-source-dirs:
-      apps/xftp-server
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
-  build-depends:
-      QuickCheck ==2.14.*
-    , aeson ==2.0.*
-    , ansi-terminal >=0.10 && <0.12
-    , asn1-encoding ==0.9.*
-    , asn1-types ==0.3.*
-    , async ==2.2.*
-    , attoparsec ==0.14.*
-    , base >=4.14 && <5
-    , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
-    , case-insensitive ==1.2.*
-    , composition ==1.0.*
-    , constraints >=0.12 && <0.14
-    , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
-    , cryptostore ==0.2.*
-    , data-default ==0.7.*
-    , direct-sqlcipher ==2.3.*
-    , directory ==1.3.*
-    , filepath ==1.4.*
-    , generic-random >=1.3 && <1.5
-    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
-    , iso8601-time ==0.1.*
-    , memory ==0.15.*
-    , mtl ==2.2.*
-    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
-    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
-    , random >=1.1 && <1.3
-    , simple-logger ==0.1.*
-    , simplexmq
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
-    , stm ==2.5.*
-    , template-haskell ==2.16.*
-    , temporary ==1.3.*
-    , text ==1.2.*
-    , time ==1.9.*
-    , time-compat ==1.9.*
-    , time-manager ==0.0.*
-    , tls >=1.6.0 && <1.7
-    , transformers ==0.5.*
-    , unliftio ==0.2.*
-    , unliftio-core ==0.2.*
-    , websockets ==0.12.*
-    , x509 ==1.7.*
-    , x509-store ==1.6.*
-    , x509-validation ==1.6.*
-    , yaml ==0.11.*
-  default-language: Haskell2010
-  if flag(swift)
-    cpp-options: -DswiftJSON
-
-test-suite simplexmq-test
+test-suite smp-server-test
  type: exitcode-stdio-1.0
  main-is: Test.hs
  other-modules:
@@ -525,27 +337,17 @@ test-suite simplexmq-test
      AgentTests.ConnectionRequestTests
      AgentTests.DoubleRatchetTests
      AgentTests.FunctionalAPITests
-      AgentTests.MigrationTests
      AgentTests.NotificationTests
      AgentTests.SchemaDump
      AgentTests.SQLiteTests
-      CLITests
-      CoreTests.CryptoTests
      CoreTests.EncodingTests
      CoreTests.ProtocolErrorTests
-      CoreTests.RetryIntervalTests
-      CoreTests.UtilTests
      CoreTests.VersionRangeTests
-      FileDescriptionTests
      NtfClient
      NtfServerTests
      ServerTests
      SMPAgentClient
      SMPClient
-      XFTPAgent
-      XFTPCLI
-      XFTPClient
-      XFTPServerTests
      Paths_simplexmq
  hs-source-dirs:
      tests
@@ -559,7 +361,7 @@ test-suite simplexmq-test
    , asn1-types ==0.3.*
    , async ==2.2.*
    , attoparsec ==0.14.*
-    , base >=4.14 && <5
+    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
@@ -569,34 +371,28 @@ test-suite simplexmq-test
    , cryptonite >=0.27 && <0.30
    , cryptostore ==0.2.*
    , data-default ==0.7.*
-    , deepseq ==1.4.*
-    , direct-sqlcipher ==2.3.*
+    , direct-sqlite ==2.3.*
    , directory ==1.3.*
    , filepath ==1.4.*
    , generic-random >=1.3 && <1.5
    , hspec ==2.7.*
    , hspec-core ==2.7.*
    , http-types ==0.12.*
-    , http2 ==4.1.*
-    , ini ==0.4.1
-    , iproute ==1.7.*
+    , http2 ==3.0.*
+    , ini ==0.4.*
    , iso8601-time ==0.1.*
-    , main-tester ==0.2.*
    , memory ==0.15.*
    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
-    , network-transport ==0.5.4
+    , network-transport ==0.5.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
    , random >=1.1 && <1.3
-    , silently ==1.2.*
    , simple-logger ==0.1.*
    , simplexmq
-    , socks ==0.6.*
-    , sqlcipher-simple ==0.4.*
+    , sqlite-simple ==0.4.*
    , stm ==2.5.*
    , template-haskell ==2.16.*
-    , temporary ==1.3.*
    , text ==1.2.*
    , time ==1.9.*
    , time-compat ==1.9.*
@@ -604,13 +400,13 @@ test-suite simplexmq-test
    , timeit ==2.0.*
    , tls >=1.6.0 && <1.7
    , transformers ==0.5.*
+    , unix ==2.7.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
    , x509 ==1.7.*
    , x509-store ==1.6.*
    , x509-validation ==1.6.*
-    , yaml ==0.11.*
-  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
+  default-language: Haskell2010
@@ -1,14 +0,0 @@
-module Simplex.FileTransfer where
-
-- TODO
-- Protocol
-- Store (in memory storage)
-- StoreLog (append only log)
-- FileDescription
-- Server
-- Client
-- Server/Main (server CLI)
-- Client/Main (client CLI)
--
-- Transport for HTTP2 ?
-- streaming Crypto
@@ -1,645 +0,0 @@
-{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
-{-# LANGUAGE TypeApplications #-}
-
-module Simplex.FileTransfer.Agent
-  ( startWorkers,
-    closeXFTPAgent,
-    toFSFilePath,
-    -- Receiving files
-    receiveFile,
-    deleteRcvFile,
-    -- Sending files
-    sendFileExperimental,
-    sendFile,
-    deleteSndFileInternal,
-    deleteSndFileRemote,
-  )
-where
-
-import Control.Concurrent.STM (stateTVar)
-import Control.Logger.Simple (logError)
-import Control.Monad
-import Control.Monad.Except
-import Control.Monad.Reader
-import Crypto.Random (ChaChaDRG, randomBytesGenerate)
-import Data.Bifunctor (first)
-import Data.ByteString (ByteString)
-import qualified Data.ByteString.Base64.URL as U
-import qualified Data.ByteString.Char8 as B
-import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Composition ((.:))
-import Data.Int (Int64)
-import Data.List (foldl', isSuffixOf, partition, sortOn)
-import Data.List.NonEmpty (nonEmpty)
-import qualified Data.List.NonEmpty as L
-import Data.Map (Map)
-import qualified Data.Map.Strict as M
-import Data.Text (Text)
-import Data.Time.Clock (getCurrentTime)
-import Data.Time.Format (defaultTimeLocale, formatTime)
-import Simplex.FileTransfer.Client (XFTPChunkSpec (..))
-import Simplex.FileTransfer.Client.Main
-import Simplex.FileTransfer.Crypto
-import Simplex.FileTransfer.Description
-import Simplex.FileTransfer.Protocol (FileParty (..), FilePartyI, SFileParty (..))
-import Simplex.FileTransfer.Transport (XFTPRcvChunkSpec (..))
-import Simplex.FileTransfer.Types
-import Simplex.FileTransfer.Util (removePath, uniqueCombine)
-import Simplex.Messaging.Agent.Client
-import Simplex.Messaging.Agent.Env.SQLite
-import Simplex.Messaging.Agent.Protocol
-import Simplex.Messaging.Agent.RetryInterval
-import Simplex.Messaging.Agent.Store.SQLite
-import qualified Simplex.Messaging.Crypto as C
-import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.Messaging.Encoding
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (EntityId, XFTPServer, XFTPServerWithAuth)
-import Simplex.Messaging.TMap (TMap)
-import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Util (liftError, liftIOEither, tshow, unlessM, whenM)
-import System.FilePath (takeFileName, (</>))
-import UnliftIO
-import UnliftIO.Concurrent
-import UnliftIO.Directory
-
-startWorkers :: AgentMonad m => AgentClient -> Maybe FilePath -> m ()
-startWorkers c workDir = do
-  wd <- asks $ xftpWorkDir . xftpAgent
-  atomically $ writeTVar wd workDir
-  startRcvFiles
-  startSndFiles
-  startDelFiles
-  where
-    startRcvFiles = do
-      rcvFilesTTL <- asks $ rcvFilesTTL . config
-      pendingRcvServers <- withStore' c (`getPendingRcvFilesServers` rcvFilesTTL)
-      forM_ pendingRcvServers $ \s -> addXFTPRcvWorker c (Just s)
-      -- start local worker for files pending decryption,
-      -- no need to make an extra query for the check
-      -- as the worker will check the store anyway
-      addXFTPRcvWorker c Nothing
-    startSndFiles = do
-      sndFilesTTL <- asks $ sndFilesTTL . config
-      -- start worker for files pending encryption/creation
-      addXFTPSndWorker c Nothing
-      pendingSndServers <- withStore' c (`getPendingSndFilesServers` sndFilesTTL)
-      forM_ pendingSndServers $ \s -> addXFTPSndWorker c (Just s)
-    startDelFiles = do
-      rcvFilesTTL <- asks $ rcvFilesTTL . config
-      pendingDelServers <- withStore' c (`getPendingDelFilesServers` rcvFilesTTL)
-      forM_ pendingDelServers $ addXFTPDelWorker c
-
-closeXFTPAgent :: MonadUnliftIO m => XFTPAgent -> m ()
-closeXFTPAgent XFTPAgent {xftpRcvWorkers, xftpSndWorkers} = do
-  stopWorkers xftpRcvWorkers
-  stopWorkers xftpSndWorkers
-  where
-    stopWorkers wsSel = do
-      ws <- atomically $ stateTVar wsSel (,M.empty)
-      mapM_ (uninterruptibleCancel . snd) ws
-
-receiveFile :: AgentMonad m => AgentClient -> UserId -> ValidFileDescription 'FRecipient -> m RcvFileId
-receiveFile c userId (ValidFileDescription fd@FileDescription {chunks}) = do
-  g <- asks idsDrg
-  prefixPath <- getPrefixPath "rcv.xftp"
-  createDirectory prefixPath
-  let relPrefixPath = takeFileName prefixPath
-      relTmpPath = relPrefixPath </> "xftp.encrypted"
-      relSavePath = relPrefixPath </> "xftp.decrypted"
-  createDirectory =<< toFSFilePath relTmpPath
-  createEmptyFile =<< toFSFilePath relSavePath
-  fId <- withStore c $ \db -> createRcvFile db g userId fd relPrefixPath relTmpPath relSavePath
-  forM_ chunks downloadChunk
-  pure fId
-  where
-    downloadChunk :: AgentMonad m => FileChunk -> m ()
-    downloadChunk FileChunk {replicas = (FileChunkReplica {server} : _)} = do
-      addXFTPRcvWorker c (Just server)
-    downloadChunk _ = throwError $ INTERNAL "no replicas"
-
-getPrefixPath :: AgentMonad m => String -> m FilePath
-getPrefixPath suffix = do
-  workPath <- getXFTPWorkPath
-  ts <- liftIO getCurrentTime
-  let isoTime = formatTime defaultTimeLocale "%Y%m%d_%H%M%S_%6q" ts
-  uniqueCombine workPath (isoTime <> "_" <> suffix)
-
-toFSFilePath :: AgentMonad m => FilePath -> m FilePath
-toFSFilePath f = (</> f) <$> getXFTPWorkPath
-
-createEmptyFile :: AgentMonad m => FilePath -> m ()
-createEmptyFile fPath = do
-  h <- openFile fPath AppendMode
-  liftIO $ B.hPut h "" >> hFlush h
-
-addXFTPRcvWorker :: AgentMonad m => AgentClient -> Maybe XFTPServer -> m ()
-addXFTPRcvWorker c = addWorker c xftpRcvWorkers runXFTPRcvWorker runXFTPRcvLocalWorker
-
-addWorker ::
-  AgentMonad m =>
-  AgentClient ->
-  (XFTPAgent -> TMap (Maybe XFTPServer) (TMVar (), Async ())) ->
-  (AgentClient -> XFTPServer -> TMVar () -> m ()) ->
-  (AgentClient -> TMVar () -> m ()) ->
-  Maybe XFTPServer ->
-  m ()
-addWorker c wsSel runWorker runWorkerNoSrv srv_ = do
-  ws <- asks $ wsSel . xftpAgent
-  atomically (TM.lookup srv_ ws) >>= \case
-    Nothing -> do
-      doWork <- newTMVarIO ()
-      let runWorker' = case srv_ of
-            Just srv -> runWorker c srv doWork
-            Nothing -> runWorkerNoSrv c doWork
-      worker <- async $ runWorker' `agentFinally` atomically (TM.delete srv_ ws)
-      atomically $ TM.insert srv_ (doWork, worker) ws
-    Just (doWork, _) ->
-      void . atomically $ tryPutTMVar doWork ()
-
-runXFTPRcvWorker :: forall m. AgentMonad m => AgentClient -> XFTPServer -> TMVar () -> m ()
-runXFTPRcvWorker c srv doWork = do
-  forever $ do
-    void . atomically $ readTMVar doWork
-    atomically $ assertAgentForeground c
-    runXFTPOperation
-  where
-    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    runXFTPOperation :: m ()
-    runXFTPOperation = do
-      rcvFilesTTL <- asks (rcvFilesTTL . config)
-      nextChunk <- withStore' c $ \db -> getNextRcvChunkToDownload db srv rcvFilesTTL
-      case nextChunk of
-        Nothing -> noWorkToDo
-        Just RcvFileChunk {rcvFileId, rcvFileEntityId, fileTmpPath, replicas = []} -> rcvWorkerInternalError c rcvFileId rcvFileEntityId (Just fileTmpPath) "chunk has no replicas"
-        Just fc@RcvFileChunk {userId, rcvFileId, rcvFileEntityId, digest, fileTmpPath, replicas = replica@RcvFileChunkReplica {rcvChunkReplicaId, server, delay} : _} -> do
-          ri <- asks $ reconnectInterval . config
-          let ri' = maybe ri (\d -> ri {initialInterval = d, increaseAfter = 0}) delay
-          withRetryInterval ri' $ \delay' loop ->
-            downloadFileChunk fc replica
-              `catchAgentError` \e -> retryOnError "XFTP rcv worker" (retryLoop loop e delay') (retryDone e) e
-          where
-            retryLoop loop e replicaDelay = do
-              flip catchAgentError (\_ -> pure ()) $ do
-                notifyOnRetry <- asks (xftpNotifyErrsOnRetry . config)
-                when notifyOnRetry $ notify c rcvFileEntityId $ RFERR e
-                closeXFTPServerClient c userId server digest
-                withStore' c $ \db -> updateRcvChunkReplicaDelay db rcvChunkReplicaId replicaDelay
-              atomically $ assertAgentForeground c
-              loop
-            retryDone e = rcvWorkerInternalError c rcvFileId rcvFileEntityId (Just fileTmpPath) (show e)
-    downloadFileChunk :: RcvFileChunk -> RcvFileChunkReplica -> m ()
-    downloadFileChunk RcvFileChunk {userId, rcvFileId, rcvFileEntityId, rcvChunkId, chunkNo, chunkSize, digest, fileTmpPath} replica = do
-      fsFileTmpPath <- toFSFilePath fileTmpPath
-      chunkPath <- uniqueCombine fsFileTmpPath $ show chunkNo
-      let chunkSpec = XFTPRcvChunkSpec chunkPath (unFileSize chunkSize) (unFileDigest digest)
-          relChunkPath = fileTmpPath </> takeFileName chunkPath
-      agentXFTPDownloadChunk c userId digest replica chunkSpec
-      (complete, progress) <- withStore c $ \db -> runExceptT $ do
-        liftIO $ updateRcvFileChunkReceived db (rcvChunkReplicaId replica) rcvChunkId relChunkPath
-        RcvFile {size = FileSize total, chunks} <- ExceptT $ getRcvFile db rcvFileId
-        let rcvd = receivedSize chunks
-            complete = all chunkReceived chunks
-        liftIO . when complete $ updateRcvFileStatus db rcvFileId RFSReceived
-        pure (complete, RFPROG rcvd total)
-      notify c rcvFileEntityId progress
-      when complete $ addXFTPRcvWorker c Nothing
-      where
-        receivedSize :: [RcvFileChunk] -> Int64
-        receivedSize = foldl' (\sz ch -> sz + receivedChunkSize ch) 0
-        receivedChunkSize ch@RcvFileChunk {chunkSize = s}
-          | chunkReceived ch = fromIntegral (unFileSize s)
-          | otherwise = 0
-        chunkReceived RcvFileChunk {replicas} = any received replicas
-
-retryOnError :: AgentMonad m => Text -> m a -> m a -> AgentErrorType -> m a
-retryOnError name loop done e = do
-  logError $ name <> " error: " <> tshow e
-  if temporaryAgentError e
-    then loop
-    else done
-
-rcvWorkerInternalError :: AgentMonad m => AgentClient -> DBRcvFileId -> RcvFileId -> Maybe FilePath -> String -> m ()
-rcvWorkerInternalError c rcvFileId rcvFileEntityId tmpPath internalErrStr = do
-  forM_ tmpPath (removePath <=< toFSFilePath)
-  withStore' c $ \db -> updateRcvFileError db rcvFileId internalErrStr
-  notify c rcvFileEntityId $ RFERR $ INTERNAL internalErrStr
-
-runXFTPRcvLocalWorker :: forall m. AgentMonad m => AgentClient -> TMVar () -> m ()
-runXFTPRcvLocalWorker c doWork = do
-  forever $ do
-    void . atomically $ readTMVar doWork
-    atomically $ assertAgentForeground c
-    runXFTPOperation
-  where
-    runXFTPOperation :: m ()
-    runXFTPOperation = do
-      rcvFilesTTL <- asks (rcvFilesTTL . config)
-      nextFile <- withStore' c (`getNextRcvFileToDecrypt` rcvFilesTTL)
-      case nextFile of
-        Nothing -> noWorkToDo
-        Just f@RcvFile {rcvFileId, rcvFileEntityId, tmpPath} ->
-          decryptFile f `catchAgentError` (rcvWorkerInternalError c rcvFileId rcvFileEntityId tmpPath . show)
-    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    decryptFile :: RcvFile -> m ()
-    decryptFile RcvFile {rcvFileId, rcvFileEntityId, key, nonce, tmpPath, savePath, status, chunks} = do
-      fsSavePath <- toFSFilePath savePath
-      when (status == RFSDecrypting) $
-        whenM (doesFileExist fsSavePath) (removeFile fsSavePath >> createEmptyFile fsSavePath)
-      withStore' c $ \db -> updateRcvFileStatus db rcvFileId RFSDecrypting
-      chunkPaths <- getChunkPaths chunks
-      encSize <- liftIO $ foldM (\s path -> (s +) . fromIntegral <$> getFileSize path) 0 chunkPaths
-      void $ liftError (INTERNAL . show) $ decryptChunks encSize chunkPaths key nonce $ \_ -> pure fsSavePath
-      notify c rcvFileEntityId $ RFDONE fsSavePath
-      forM_ tmpPath (removePath <=< toFSFilePath)
-      withStore' c (`updateRcvFileComplete` rcvFileId)
-      where
-        getChunkPaths :: [RcvFileChunk] -> m [FilePath]
-        getChunkPaths [] = pure []
-        getChunkPaths (RcvFileChunk {chunkTmpPath = Just path} : cs) = do
-          ps <- getChunkPaths cs
-          fsPath <- toFSFilePath path
-          pure $ fsPath : ps
-        getChunkPaths (RcvFileChunk {chunkTmpPath = Nothing} : _cs) =
-          throwError $ INTERNAL "no chunk path"
-
-deleteRcvFile :: AgentMonad m => AgentClient -> RcvFileId -> m ()
-deleteRcvFile c rcvFileEntityId = do
-  RcvFile {rcvFileId, prefixPath, status} <- withStore c $ \db -> getRcvFileByEntityId db rcvFileEntityId
-  if status == RFSComplete || status == RFSError
-    then do
-      removePath prefixPath
-      withStore' c (`deleteRcvFile'` rcvFileId)
-    else withStore' c (`updateRcvFileDeleted` rcvFileId)
-
-sendFileExperimental :: forall m. AgentMonad m => AgentClient -> UserId -> FilePath -> Int -> m SndFileId
-sendFileExperimental c@AgentClient {xftpServers} userId filePath numRecipients = do
-  g <- asks idsDrg
-  sndFileId <- liftIO $ randomId g 12
-  xftpSrvs <- atomically $ TM.lookup userId xftpServers
-  void $ forkIO $ sendCLI sndFileId $ maybe [] L.toList xftpSrvs
-  pure sndFileId
-  where
-    randomId :: TVar ChaChaDRG -> Int -> IO ByteString
-    randomId gVar n = U.encode <$> (atomically . stateTVar gVar $ randomBytesGenerate n)
-    sendCLI :: SndFileId -> [XFTPServerWithAuth] -> m ()
-    sendCLI sndFileId xftpSrvs = do
-      let fileName = takeFileName filePath
-      workPath <- getXFTPWorkPath
-      outputDir <- uniqueCombine workPath $ fileName <> ".descr"
-      createDirectory outputDir
-      let tempPath = workPath </> "snd"
-      createDirectoryIfMissing False tempPath
-      runSend fileName outputDir tempPath `catchAgentError` \e -> do
-        cleanup outputDir tempPath
-        notify c sndFileId $ SFERR e
-      where
-        runSend :: String -> FilePath -> FilePath -> m ()
-        runSend fileName outputDir tempPath = do
-          let sendOptions =
-                SendOptions
-                  { filePath,
-                    outputDir = Just outputDir,
-                    numRecipients,
-                    xftpServers = xftpSrvs,
-                    retryCount = 3,
-                    tempPath = Just tempPath,
-                    verbose = False
-                  }
-          liftCLI $ cliSendFileOpts sendOptions False $ notify c sndFileId .: SFPROG
-          (sndDescr, rcvDescrs) <- readDescrs outputDir fileName
-          cleanup outputDir tempPath
-          notify c sndFileId $ SFDONE sndDescr rcvDescrs
-        cleanup :: FilePath -> FilePath -> m ()
-        cleanup outputDir tempPath = do
-          removePath tempPath
-          removePath outputDir
-    liftCLI :: ExceptT CLIError IO () -> m ()
-    liftCLI = either (throwError . INTERNAL . show) pure <=< liftIO . runExceptT
-    readDescrs :: FilePath -> FilePath -> m (ValidFileDescription 'FSender, [ValidFileDescription 'FRecipient])
-    readDescrs outDir fileName = do
-      let descrDir = outDir </> (fileName <> ".xftp")
-      files <- listDirectory descrDir
-      let (sdFiles, rdFiles) = partition ("snd.xftp.private" `isSuffixOf`) files
-          sdFile = maybe "" (\l -> descrDir </> L.head l) (nonEmpty sdFiles)
-          rdFiles' = map (descrDir </>) rdFiles
-      (,) <$> readDescr sdFile <*> mapM readDescr rdFiles'
-    readDescr :: FilePartyI p => FilePath -> m (ValidFileDescription p)
-    readDescr f = liftIOEither $ first INTERNAL . strDecode <$> B.readFile f
-
-notify :: forall m e. (MonadUnliftIO m, AEntityI e) => AgentClient -> EntityId -> ACommand 'Agent e -> m ()
-notify c entId cmd = atomically $ writeTBQueue (subQ c) ("", entId, APC (sAEntity @e) cmd)
-
-sendFile :: AgentMonad m => AgentClient -> UserId -> FilePath -> Int -> m SndFileId
-sendFile c userId filePath numRecipients = do
-  g <- asks idsDrg
-  prefixPath <- getPrefixPath "snd.xftp"
-  createDirectory prefixPath
-  let relPrefixPath = takeFileName prefixPath
-  key <- liftIO C.randomSbKey
-  nonce <- liftIO C.randomCbNonce
-  -- saving absolute filePath will not allow to restore file encryption after app update, but it's a short window
-  fId <- withStore c $ \db -> createSndFile db g userId numRecipients filePath relPrefixPath key nonce
-  addXFTPSndWorker c Nothing
-  pure fId
-
-addXFTPSndWorker :: AgentMonad m => AgentClient -> Maybe XFTPServer -> m ()
-addXFTPSndWorker c = addWorker c xftpSndWorkers runXFTPSndWorker runXFTPSndPrepareWorker
-
-runXFTPSndPrepareWorker :: forall m. AgentMonad m => AgentClient -> TMVar () -> m ()
-runXFTPSndPrepareWorker c doWork = do
-  forever $ do
-    void . atomically $ readTMVar doWork
-    atomically $ assertAgentForeground c
-    runXFTPOperation
-  where
-    runXFTPOperation :: m ()
-    runXFTPOperation = do
-      sndFilesTTL <- asks (sndFilesTTL . config)
-      nextFile <- withStore' c (`getNextSndFileToPrepare` sndFilesTTL)
-      case nextFile of
-        Nothing -> noWorkToDo
-        Just f@SndFile {sndFileId, sndFileEntityId, prefixPath} ->
-          prepareFile f `catchAgentError` (sndWorkerInternalError c sndFileId sndFileEntityId prefixPath . show)
-    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    prepareFile :: SndFile -> m ()
-    prepareFile SndFile {prefixPath = Nothing} =
-      throwError $ INTERNAL "no prefix path"
-    prepareFile sndFile@SndFile {sndFileId, userId, prefixPath = Just ppath, status} = do
-      SndFile {numRecipients, chunks} <-
-        if status /= SFSEncrypted -- status is SFSNew or SFSEncrypting
-          then do
-            fsEncPath <- toFSFilePath $ sndFileEncPath ppath
-            when (status == SFSEncrypting) $
-              whenM (doesFileExist fsEncPath) $ removeFile fsEncPath
-            withStore' c $ \db -> updateSndFileStatus db sndFileId SFSEncrypting
-            (digest, chunkSpecsDigests) <- encryptFileForUpload sndFile fsEncPath
-            withStore c $ \db -> do
-              updateSndFileEncrypted db sndFileId digest chunkSpecsDigests
-              getSndFile db sndFileId
-          else pure sndFile
-      maxRecipients <- asks (xftpMaxRecipientsPerRequest . config)
-      let numRecipients' = min numRecipients maxRecipients
-      -- concurrently?
-      forM_ (filter (not . chunkCreated) chunks) $ createChunk numRecipients'
-      withStore' c $ \db -> updateSndFileStatus db sndFileId SFSUploading
-      where
-        encryptFileForUpload :: SndFile -> FilePath -> m (FileDigest, [(XFTPChunkSpec, FileDigest)])
-        encryptFileForUpload SndFile {key, nonce, filePath} fsEncPath = do
-          let fileName = takeFileName filePath
-          fileSize <- fromInteger <$> getFileSize filePath
-          when (fileSize > maxFileSize) $ throwError $ INTERNAL "max file size exceeded"
-          let fileHdr = smpEncode FileHeader {fileName, fileExtra = Nothing}
-              fileSize' = fromIntegral (B.length fileHdr) + fileSize
-              chunkSizes = prepareChunkSizes $ fileSize' + fileSizeLen + authTagSize
-              chunkSizes' = map fromIntegral chunkSizes
-              encSize = sum chunkSizes'
-          void $ liftError (INTERNAL . show) $ encryptFile filePath fileHdr key nonce fileSize' encSize fsEncPath
-          digest <- liftIO $ LC.sha512Hash <$> LB.readFile fsEncPath
-          let chunkSpecs = prepareChunkSpecs fsEncPath chunkSizes
-          chunkDigests <- map FileDigest <$> mapM (liftIO . getChunkDigest) chunkSpecs
-          pure (FileDigest digest, zip chunkSpecs chunkDigests)
-        chunkCreated :: SndFileChunk -> Bool
-        chunkCreated SndFileChunk {replicas} =
-          any (\SndFileChunkReplica {replicaStatus} -> replicaStatus == SFRSCreated) replicas
-        createChunk :: Int -> SndFileChunk -> m ()
-        createChunk numRecipients' ch = do
-          atomically $ assertAgentForeground c
-          (replica, ProtoServerWithAuth srv _) <- tryCreate
-          withStore' c $ \db -> createSndFileReplica db ch replica
-          addXFTPSndWorker c $ Just srv
-          where
-            tryCreate = do
-              ri <- asks $ messageRetryInterval . config
-              usedSrvs <- newTVarIO ([] :: [XFTPServer])
-              withRetryInterval (riFast ri) $ \_ loop ->
-                createWithNextSrv usedSrvs
-                  `catchAgentError` \e -> retryOnError "XFTP prepare worker" (retryLoop loop) (throwError e) e
-              where
-                retryLoop loop = atomically (assertAgentForeground c) >> loop
-            createWithNextSrv usedSrvs = do
-              deleted <- withStore' c $ \db -> getSndFileDeleted db sndFileId
-              when deleted $ throwError $ INTERNAL "file deleted, aborting chunk creation"
-              withNextSrv c userId usedSrvs [] $ \srvAuth -> do
-                replica <- agentXFTPNewChunk c ch numRecipients' srvAuth
-                pure (replica, srvAuth)
-
-sndWorkerInternalError :: AgentMonad m => AgentClient -> DBSndFileId -> SndFileId -> Maybe FilePath -> String -> m ()
-sndWorkerInternalError c sndFileId sndFileEntityId prefixPath internalErrStr = do
-  forM_ prefixPath $ removePath <=< toFSFilePath
-  withStore' c $ \db -> updateSndFileError db sndFileId internalErrStr
-  notify c sndFileEntityId $ SFERR $ INTERNAL internalErrStr
-
-runXFTPSndWorker :: forall m. AgentMonad m => AgentClient -> XFTPServer -> TMVar () -> m ()
-runXFTPSndWorker c srv doWork = do
-  forever $ do
-    void . atomically $ readTMVar doWork
-    atomically $ assertAgentForeground c
-    runXFTPOperation
-  where
-    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    runXFTPOperation :: m ()
-    runXFTPOperation = do
-      sndFilesTTL <- asks (sndFilesTTL . config)
-      nextChunk <- withStore' c $ \db -> getNextSndChunkToUpload db srv sndFilesTTL
-      case nextChunk of
-        Nothing -> noWorkToDo
-        Just SndFileChunk {sndFileId, sndFileEntityId, filePrefixPath, replicas = []} -> sndWorkerInternalError c sndFileId sndFileEntityId (Just filePrefixPath) "chunk has no replicas"
-        Just fc@SndFileChunk {userId, sndFileId, sndFileEntityId, filePrefixPath, digest, replicas = replica@SndFileChunkReplica {sndChunkReplicaId, server, delay} : _} -> do
-          ri <- asks $ reconnectInterval . config
-          let ri' = maybe ri (\d -> ri {initialInterval = d, increaseAfter = 0}) delay
-          withRetryInterval ri' $ \delay' loop ->
-            uploadFileChunk fc replica
-              `catchAgentError` \e -> retryOnError "XFTP snd worker" (retryLoop loop e delay') (retryDone e) e
-          where
-            retryLoop loop e replicaDelay = do
-              flip catchAgentError (\_ -> pure ()) $ do
-                notifyOnRetry <- asks (xftpNotifyErrsOnRetry . config)
-                when notifyOnRetry $ notify c sndFileEntityId $ SFERR e
-                closeXFTPServerClient c userId server digest
-                withStore' c $ \db -> updateSndChunkReplicaDelay db sndChunkReplicaId replicaDelay
-              atomically $ assertAgentForeground c
-              loop
-            retryDone e = sndWorkerInternalError c sndFileId sndFileEntityId (Just filePrefixPath) (show e)
-    uploadFileChunk :: SndFileChunk -> SndFileChunkReplica -> m ()
-    uploadFileChunk sndFileChunk@SndFileChunk {sndFileId, userId, chunkSpec = chunkSpec@XFTPChunkSpec {filePath}, digest = chunkDigest} replica = do
-      replica'@SndFileChunkReplica {sndChunkReplicaId} <- addRecipients sndFileChunk replica
-      fsFilePath <- toFSFilePath filePath
-      unlessM (doesFileExist fsFilePath) $ throwError $ INTERNAL "encrypted file doesn't exist on upload"
-      let chunkSpec' = chunkSpec {filePath = fsFilePath} :: XFTPChunkSpec
-      atomically $ assertAgentForeground c
-      agentXFTPUploadChunk c userId chunkDigest replica' chunkSpec'
-      sf@SndFile {sndFileEntityId, prefixPath, chunks} <- withStore c $ \db -> do
-        updateSndChunkReplicaStatus db sndChunkReplicaId SFRSUploaded
-        getSndFile db sndFileId
-      let uploaded = uploadedSize chunks
-          total = totalSize chunks
-          complete = all chunkUploaded chunks
-      notify c sndFileEntityId $ SFPROG uploaded total
-      when complete $ do
-        (sndDescr, rcvDescrs) <- sndFileToDescrs sf
-        notify c sndFileEntityId $ SFDONE sndDescr rcvDescrs
-        forM_ prefixPath $ removePath <=< toFSFilePath
-        withStore' c $ \db -> updateSndFileComplete db sndFileId
-      where
-        addRecipients :: SndFileChunk -> SndFileChunkReplica -> m SndFileChunkReplica
-        addRecipients ch@SndFileChunk {numRecipients} cr@SndFileChunkReplica {rcvIdsKeys}
-          | length rcvIdsKeys > numRecipients = throwError $ INTERNAL "too many recipients"
-          | length rcvIdsKeys == numRecipients = pure cr
-          | otherwise = do
-            maxRecipients <- asks $ xftpMaxRecipientsPerRequest . config
-            let numRecipients' = min (numRecipients - length rcvIdsKeys) maxRecipients
-            rcvIdsKeys' <- agentXFTPAddRecipients c userId chunkDigest cr numRecipients'
-            cr' <- withStore' c $ \db -> addSndChunkReplicaRecipients db cr $ L.toList rcvIdsKeys'
-            addRecipients ch cr'
-        sndFileToDescrs :: SndFile -> m (ValidFileDescription 'FSender, [ValidFileDescription 'FRecipient])
-        sndFileToDescrs SndFile {digest = Nothing} = throwError $ INTERNAL "snd file has no digest"
-        sndFileToDescrs SndFile {chunks = []} = throwError $ INTERNAL "snd file has no chunks"
-        sndFileToDescrs SndFile {digest = Just digest, key, nonce, chunks = chunks@(fstChunk : _)} = do
-          let chunkSize = FileSize $ sndChunkSize fstChunk
-              size = FileSize $ sum $ map (fromIntegral . sndChunkSize) chunks
-          -- snd description
-          sndDescrChunks <- mapM toSndDescrChunk chunks
-          let fdSnd = FileDescription {party = SFSender, size, digest, key, nonce, chunkSize, chunks = sndDescrChunks}
-          validFdSnd <- either (throwError . INTERNAL) pure $ validateFileDescription fdSnd
-          -- rcv descriptions
-          let fdRcv = FileDescription {party = SFRecipient, size, digest, key, nonce, chunkSize, chunks = []}
-              fdRcvs = createRcvFileDescriptions fdRcv chunks
-          validFdRcvs <- either (throwError . INTERNAL) pure $ mapM validateFileDescription fdRcvs
-          pure (validFdSnd, validFdRcvs)
-        toSndDescrChunk :: SndFileChunk -> m FileChunk
-        toSndDescrChunk SndFileChunk {replicas = []} = throwError $ INTERNAL "snd file chunk has no replicas"
-        toSndDescrChunk ch@SndFileChunk {chunkNo, digest = chDigest, replicas = (SndFileChunkReplica {server, replicaId, replicaKey} : _)} = do
-          let chunkSize = FileSize $ sndChunkSize ch
-              replicas = [FileChunkReplica {server, replicaId, replicaKey}]
-          pure FileChunk {chunkNo, digest = chDigest, chunkSize, replicas}
-        createRcvFileDescriptions :: FileDescription 'FRecipient -> [SndFileChunk] -> [FileDescription 'FRecipient]
-        createRcvFileDescriptions fd sndChunks = map (\chunks -> (fd :: (FileDescription 'FRecipient)) {chunks}) rcvChunks
-          where
-            rcvReplicas :: [SentRecipientReplica]
-            rcvReplicas = concatMap toSentRecipientReplicas sndChunks
-            toSentRecipientReplicas :: SndFileChunk -> [SentRecipientReplica]
-            toSentRecipientReplicas ch@SndFileChunk {chunkNo, digest, replicas} =
-              let chunkSize = FileSize $ sndChunkSize ch
-               in concatMap
-                    ( \SndFileChunkReplica {server, rcvIdsKeys} ->
-                        zipWith
-                          (\rcvNo (replicaId, replicaKey) -> SentRecipientReplica {chunkNo, server, rcvNo, replicaId, replicaKey, digest, chunkSize})
-                          [1 ..]
-                          rcvIdsKeys
-                    )
-                    replicas
-            rcvChunks :: [[FileChunk]]
-            rcvChunks = map (sortChunks . M.elems) $ M.elems $ foldl' addRcvChunk M.empty rcvReplicas
-            sortChunks :: [FileChunk] -> [FileChunk]
-            sortChunks = map reverseReplicas . sortOn (chunkNo :: FileChunk -> Int)
-            reverseReplicas ch@FileChunk {replicas} = (ch :: FileChunk) {replicas = reverse replicas}
-            addRcvChunk :: Map Int (Map Int FileChunk) -> SentRecipientReplica -> Map Int (Map Int FileChunk)
-            addRcvChunk m SentRecipientReplica {chunkNo, server, rcvNo, replicaId, replicaKey, digest, chunkSize} =
-              M.alter (Just . addOrChangeRecipient) rcvNo m
-              where
-                addOrChangeRecipient :: Maybe (Map Int FileChunk) -> Map Int FileChunk
-                addOrChangeRecipient = \case
-                  Just m' -> M.alter (Just . addOrChangeChunk) chunkNo m'
-                  _ -> M.singleton chunkNo $ FileChunk {chunkNo, digest, chunkSize, replicas = [replica']}
-                addOrChangeChunk :: Maybe FileChunk -> FileChunk
-                addOrChangeChunk = \case
-                  Just ch@FileChunk {replicas} -> ch {replicas = replica' : replicas}
-                  _ -> FileChunk {chunkNo, digest, chunkSize, replicas = [replica']}
-                replica' = FileChunkReplica {server, replicaId, replicaKey}
-        uploadedSize :: [SndFileChunk] -> Int64
-        uploadedSize = foldl' (\sz ch -> sz + uploadedChunkSize ch) 0
-        uploadedChunkSize ch
-          | chunkUploaded ch = fromIntegral (sndChunkSize ch)
-          | otherwise = 0
-        totalSize :: [SndFileChunk] -> Int64
-        totalSize = foldl' (\sz ch -> sz + fromIntegral (sndChunkSize ch)) 0
-        chunkUploaded :: SndFileChunk -> Bool
-        chunkUploaded SndFileChunk {replicas} =
-          any (\SndFileChunkReplica {replicaStatus} -> replicaStatus == SFRSUploaded) replicas
-
-deleteSndFileInternal :: AgentMonad m => AgentClient -> SndFileId -> m ()
-deleteSndFileInternal c sndFileEntityId = do
-  SndFile {sndFileId, prefixPath, status} <- withStore c $ \db -> getSndFileByEntityId db sndFileEntityId
-  if status == SFSComplete || status == SFSError
-    then do
-      forM_ prefixPath $ removePath <=< toFSFilePath
-      withStore' c (`deleteSndFile'` sndFileId)
-    else withStore' c (`updateSndFileDeleted` sndFileId)
-
-deleteSndFileRemote :: forall m. AgentMonad m => AgentClient -> UserId -> SndFileId -> ValidFileDescription 'FSender -> m ()
-deleteSndFileRemote c userId sndFileEntityId (ValidFileDescription FileDescription {chunks}) = do
-  deleteSndFileInternal c sndFileEntityId `catchAgentError` (notify c sndFileEntityId . SFERR)
-  forM_ chunks $ \ch -> deleteFileChunk ch `catchAgentError` (notify c sndFileEntityId . SFERR)
-  where
-    deleteFileChunk :: FileChunk -> m ()
-    deleteFileChunk FileChunk {digest, replicas = replica@FileChunkReplica {server} : _} = do
-      withStore' c $ \db -> createDeletedSndChunkReplica db userId replica digest
-      addXFTPDelWorker c server
-    deleteFileChunk _ = pure ()
-
-addXFTPDelWorker :: AgentMonad m => AgentClient -> XFTPServer -> m ()
-addXFTPDelWorker c srv = do
-  ws <- asks $ xftpDelWorkers . xftpAgent
-  atomically (TM.lookup srv ws) >>= \case
-    Nothing -> do
-      doWork <- newTMVarIO ()
-      worker <- async $ runXFTPDelWorker c srv doWork `agentFinally` atomically (TM.delete srv ws)
-      atomically $ TM.insert srv (doWork, worker) ws
-    Just (doWork, _) ->
-      void . atomically $ tryPutTMVar doWork ()
-
-runXFTPDelWorker :: forall m. AgentMonad m => AgentClient -> XFTPServer -> TMVar () -> m ()
-runXFTPDelWorker c srv doWork = do
-  forever $ do
-    void . atomically $ readTMVar doWork
-    atomically $ assertAgentForeground c
-    runXFTPOperation
-  where
-    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    runXFTPOperation :: m ()
-    runXFTPOperation = do
-      -- no point in deleting files older than rcv ttl, as they will be expired on server
-      rcvFilesTTL <- asks (rcvFilesTTL . config)
-      nextReplica <- withStore' c $ \db -> getNextDeletedSndChunkReplica db srv rcvFilesTTL
-      case nextReplica of
-        Nothing -> noWorkToDo
-        Just replica@DeletedSndChunkReplica {deletedSndChunkReplicaId, userId, server, chunkDigest, delay} -> do
-          ri <- asks $ reconnectInterval . config
-          let ri' = maybe ri (\d -> ri {initialInterval = d, increaseAfter = 0}) delay
-          withRetryInterval ri' $ \delay' loop ->
-            deleteChunkReplica replica
-              `catchAgentError` \e -> retryOnError "XFTP del worker" (retryLoop loop e delay') (retryDone e) e
-          where
-            retryLoop loop e replicaDelay = do
-              flip catchAgentError (\_ -> pure ()) $ do
-                notifyOnRetry <- asks (xftpNotifyErrsOnRetry . config)
-                when notifyOnRetry $ notify c "" $ SFERR e
-                closeXFTPServerClient c userId server chunkDigest
-                withStore' c $ \db -> updateDeletedSndChunkReplicaDelay db deletedSndChunkReplicaId replicaDelay
-              atomically $ assertAgentForeground c
-              loop
-            retryDone e = delWorkerInternalError c deletedSndChunkReplicaId e
-    deleteChunkReplica :: DeletedSndChunkReplica -> m ()
-    deleteChunkReplica replica@DeletedSndChunkReplica {userId, deletedSndChunkReplicaId} = do
-      agentXFTPDeleteChunk c userId replica
-      withStore' c $ \db -> deleteDeletedSndChunkReplica db deletedSndChunkReplicaId
-
-delWorkerInternalError :: AgentMonad m => AgentClient -> Int64 -> AgentErrorType -> m ()
-delWorkerInternalError c deletedSndChunkReplicaId e = do
-  withStore' c $ \db -> deleteDeletedSndChunkReplica db deletedSndChunkReplicaId
-  notify c "" $ SFERR e
-
-assertAgentForeground :: AgentClient -> STM ()
-assertAgentForeground c = do
-  throwWhenInactive c
-  waitUntilForeground c
@@ -1,219 +0,0 @@
-{-# LANGUAGE BlockArguments #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
-
-module Simplex.FileTransfer.Client where
-
-import Control.Monad.Except
-import Data.Bifunctor (first)
-import Data.ByteString.Builder (Builder, byteString)
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import Data.Int (Int64)
-import Data.List.NonEmpty (NonEmpty (..))
-import Data.Time (UTCTime)
-import Data.Word (Word32)
-import qualified Network.HTTP.Types as N
-import qualified Network.HTTP2.Client as H
-import Simplex.FileTransfer.Description (mb)
-import Simplex.FileTransfer.Protocol
-import Simplex.FileTransfer.Transport
-import Simplex.Messaging.Client
-  ( NetworkConfig (..),
-    ProtocolClientError (..),
-    TransportSession,
-    chooseTransportHost,
-    defaultNetworkConfig,
-    proxyUsername,
-    transportClientConfig,
-  )
-import Simplex.Messaging.Client.Agent ()
-import qualified Simplex.Messaging.Crypto as C
-import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol
-  ( BasicAuth,
-    Protocol (..),
-    ProtocolServer (..),
-    RecipientId,
-    SenderId,
-  )
-import Simplex.Messaging.Transport (supportedParameters)
-import Simplex.Messaging.Transport.Client (TransportClientConfig, TransportHost)
-import Simplex.Messaging.Transport.HTTP2
-import Simplex.Messaging.Transport.HTTP2.Client
-import Simplex.Messaging.Util (bshow, liftEitherError, whenM)
-import UnliftIO
-import UnliftIO.Directory
-
-data XFTPClient = XFTPClient
-  { http2Client :: HTTP2Client,
-    transportSession :: TransportSession FileResponse,
-    config :: XFTPClientConfig
-  }
-
-data XFTPClientConfig = XFTPClientConfig
-  { xftpNetworkConfig :: NetworkConfig,
-    uploadTimeoutPerMb :: Int64
-  }
-
-data XFTPChunkBody = XFTPChunkBody
-  { chunkSize :: Int,
-    chunkPart :: Int -> IO ByteString,
-    http2Body :: HTTP2Body
-  }
-
-data XFTPChunkSpec = XFTPChunkSpec
-  { filePath :: FilePath,
-    chunkOffset :: Int64,
-    chunkSize :: Word32
-  }
-  deriving (Eq, Show)
-
-type XFTPClientError = ProtocolClientError XFTPErrorType
-
-defaultXFTPClientConfig :: XFTPClientConfig
-defaultXFTPClientConfig =
-  XFTPClientConfig
-    { xftpNetworkConfig = defaultNetworkConfig,
-      uploadTimeoutPerMb = 10000000 -- 10 seconds
-    }
-
-getXFTPClient :: TransportSession FileResponse -> XFTPClientConfig -> (XFTPClient -> IO ()) -> IO (Either XFTPClientError XFTPClient)
-getXFTPClient transportSession@(_, srv, _) config@XFTPClientConfig {xftpNetworkConfig} disconnected = runExceptT $ do
-  let tcConfig = transportClientConfig xftpNetworkConfig
-      http2Config = xftpHTTP2Config tcConfig config
-      username = proxyUsername transportSession
-      ProtocolServer _ host port keyHash = srv
-  useHost <- liftEither $ chooseTransportHost xftpNetworkConfig host
-  clientVar <- newTVarIO Nothing
-  let usePort = if null port then "443" else port
-      clientDisconnected = readTVarIO clientVar >>= mapM_ disconnected
-  http2Client <- liftEitherError xftpClientError $ getVerifiedHTTP2Client (Just username) useHost usePort (Just keyHash) Nothing http2Config clientDisconnected
-  let c = XFTPClient {http2Client, transportSession, config}
-  atomically $ writeTVar clientVar $ Just c
-  pure c
-
-closeXFTPClient :: XFTPClient -> IO ()
-closeXFTPClient XFTPClient {http2Client} = closeHTTP2Client http2Client
-
-xftpClientServer :: XFTPClient -> String
-xftpClientServer = B.unpack . strEncode . snd3 . transportSession
-  where
-    snd3 (_, s, _) = s
-
-xftpTransportHost :: XFTPClient -> TransportHost
-xftpTransportHost = (host :: HClient -> TransportHost) . client_ . http2Client
-
-xftpSessionTs :: XFTPClient -> UTCTime
-xftpSessionTs = sessionTs . http2Client
-
-xftpHTTP2Config :: TransportClientConfig -> XFTPClientConfig -> HTTP2ClientConfig
-xftpHTTP2Config transportConfig XFTPClientConfig {xftpNetworkConfig = NetworkConfig {tcpConnectTimeout}} =
-  defaultHTTP2ClientConfig
-    { bodyHeadSize = xftpBlockSize,
-      suportedTLSParams = supportedParameters,
-      connTimeout = tcpConnectTimeout,
-      transportConfig
-    }
-
-xftpClientError :: HTTP2ClientError -> XFTPClientError
-xftpClientError = \case
-  HCResponseTimeout -> PCEResponseTimeout
-  HCNetworkError -> PCENetworkError
-  HCIOError e -> PCEIOError e
-
-sendXFTPCommand :: forall p. FilePartyI p => XFTPClient -> C.APrivateSignKey -> XFTPFileId -> FileCommand p -> Maybe XFTPChunkSpec -> ExceptT XFTPClientError IO (FileResponse, HTTP2Body)
-sendXFTPCommand XFTPClient {config, http2Client = http2@HTTP2Client {sessionId}} pKey fId cmd chunkSpec_ = do
-  t <-
-    liftEither . first PCETransportError $
-      xftpEncodeTransmission sessionId (Just pKey) ("", fId, FileCmd (sFileParty @p) cmd)
-  let req = H.requestStreaming N.methodPost "/" [] $ streamBody t
-      reqTimeout = (\XFTPChunkSpec {chunkSize} -> chunkTimeout config chunkSize) <$> chunkSpec_
-  HTTP2Response {respBody = body@HTTP2Body {bodyHead}} <- liftEitherError xftpClientError $ sendRequest http2 req reqTimeout
-  when (B.length bodyHead /= xftpBlockSize) $ throwError $ PCEResponseError BLOCK
-  -- TODO validate that the file ID is the same as in the request?
-  (_, _, (_, _fId, respOrErr)) <- liftEither . first PCEResponseError $ xftpDecodeTransmission sessionId bodyHead
-  case respOrErr of
-    Right r -> case protocolError r of
-      Just e -> throwError $ PCEProtocolError e
-      _ -> pure (r, body)
-    Left e -> throwError $ PCEResponseError e
-  where
-    streamBody :: ByteString -> (Builder -> IO ()) -> IO () -> IO ()
-    streamBody t send done = do
-      send $ byteString t
-      forM_ chunkSpec_ $ \XFTPChunkSpec {filePath, chunkOffset, chunkSize} ->
-        withFile filePath ReadMode $ \h -> do
-          hSeek h AbsoluteSeek $ fromIntegral chunkOffset
-          sendFile h send $ fromIntegral chunkSize
-      done
-
-createXFTPChunk ::
-  XFTPClient ->
-  C.APrivateSignKey ->
-  FileInfo ->
-  NonEmpty C.APublicVerifyKey ->
-  Maybe BasicAuth ->
-  ExceptT XFTPClientError IO (SenderId, NonEmpty RecipientId)
-createXFTPChunk c spKey file rcps auth_ =
-  sendXFTPCommand c spKey "" (FNEW file rcps auth_) Nothing >>= \case
-    (FRSndIds sId rIds, body) -> noFile body (sId, rIds)
-    (r, _) -> throwError . PCEUnexpectedResponse $ bshow r
-
-addXFTPRecipients :: XFTPClient -> C.APrivateSignKey -> XFTPFileId -> NonEmpty C.APublicVerifyKey -> ExceptT XFTPClientError IO (NonEmpty RecipientId)
-addXFTPRecipients c spKey fId rcps =
-  sendXFTPCommand c spKey fId (FADD rcps) Nothing >>= \case
-    (FRRcvIds rIds, body) -> noFile body rIds
-    (r, _) -> throwError . PCEUnexpectedResponse $ bshow r
-
-uploadXFTPChunk :: XFTPClient -> C.APrivateSignKey -> XFTPFileId -> XFTPChunkSpec -> ExceptT XFTPClientError IO ()
-uploadXFTPChunk c spKey fId chunkSpec =
-  sendXFTPCommand c spKey fId FPUT (Just chunkSpec) >>= okResponse
-
-downloadXFTPChunk :: XFTPClient -> C.APrivateSignKey -> XFTPFileId -> XFTPRcvChunkSpec -> ExceptT XFTPClientError IO ()
-downloadXFTPChunk c@XFTPClient {config} rpKey fId chunkSpec@XFTPRcvChunkSpec {filePath, chunkSize} = do
-  (rDhKey, rpDhKey) <- liftIO C.generateKeyPair'
-  sendXFTPCommand c rpKey fId (FGET rDhKey) Nothing >>= \case
-    (FRFile sDhKey cbNonce, HTTP2Body {bodyHead = _bg, bodySize = _bs, bodyPart}) -> case bodyPart of
-      -- TODO atm bodySize is set to 0, so chunkSize will be incorrect - validate once set
-      Just chunkPart -> do
-        let dhSecret = C.dh' sDhKey rpDhKey
-        cbState <- liftEither . first PCECryptoError $ LC.cbInit dhSecret cbNonce
-        let t = chunkTimeout config chunkSize
-        t `timeout` download cbState >>= maybe (throwError PCEResponseTimeout) pure
-        where
-          download cbState =
-            withExceptT PCEResponseError $
-              receiveEncFile chunkPart cbState chunkSpec `catchError` \e ->
-                whenM (doesFileExist filePath) (removeFile filePath) >> throwError e
-      _ -> throwError $ PCEResponseError NO_FILE
-    (r, _) -> throwError . PCEUnexpectedResponse $ bshow r
-
-chunkTimeout :: XFTPClientConfig -> Word32 -> Int
-chunkTimeout config chunkSize = fromIntegral $ (fromIntegral chunkSize * uploadTimeoutPerMb config) `div` mb 1
-
-deleteXFTPChunk :: XFTPClient -> C.APrivateSignKey -> SenderId -> ExceptT XFTPClientError IO ()
-deleteXFTPChunk c spKey sId = sendXFTPCommand c spKey sId FDEL Nothing >>= okResponse
-
-ackXFTPChunk :: XFTPClient -> C.APrivateSignKey -> RecipientId -> ExceptT XFTPClientError IO ()
-ackXFTPChunk c rpKey rId = sendXFTPCommand c rpKey rId FACK Nothing >>= okResponse
-
-okResponse :: (FileResponse, HTTP2Body) -> ExceptT XFTPClientError IO ()
-okResponse = \case
-  (FROk, body) -> noFile body ()
-  (r, _) -> throwError . PCEUnexpectedResponse $ bshow r
-
-- TODO this currently does not check anything because response size is not set and bodyPart is always Just
-noFile :: HTTP2Body -> a -> ExceptT XFTPClientError IO a
-noFile HTTP2Body {bodyPart} a = case bodyPart of
-  Just _ -> pure a -- throwError $ PCEResponseError HAS_FILE
-  _ -> pure a
-
-- FACK :: FileCommand Recipient
-- PING :: FileCommand Recipient
@@ -1,127 +0,0 @@
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Simplex.FileTransfer.Client.Agent where
-
-import Control.Logger.Simple (logInfo)
-import Control.Monad.Except
-import Data.Bifunctor (first)
-import qualified Data.ByteString.Char8 as B
-import Data.Text (Text)
-import Data.Text.Encoding (decodeUtf8)
-import Simplex.FileTransfer.Client
-import Simplex.Messaging.Agent.RetryInterval
-import Simplex.Messaging.Client (NetworkConfig (..), ProtocolClientError (..), temporaryClientError)
-import Simplex.Messaging.Client.Agent ()
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (ProtocolServer (..), XFTPServer)
-import Simplex.Messaging.TMap (TMap)
-import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Util (catchAll_, tryError)
-import UnliftIO
-
-type XFTPClientVar = TMVar (Either XFTPClientAgentError XFTPClient)
-
-data XFTPClientAgent = XFTPClientAgent
-  { xftpClients :: TMap XFTPServer XFTPClientVar,
-    config :: XFTPClientAgentConfig
-  }
-
-data XFTPClientAgentConfig = XFTPClientAgentConfig
-  { xftpConfig :: XFTPClientConfig,
-    reconnectInterval :: RetryInterval
-  }
-
-defaultXFTPClientAgentConfig :: XFTPClientAgentConfig
-defaultXFTPClientAgentConfig =
-  XFTPClientAgentConfig
-    { xftpConfig = defaultXFTPClientConfig,
-      reconnectInterval =
-        RetryInterval
-          { initialInterval = 5_000000,
-            increaseAfter = 10_000000,
-            maxInterval = 60_000000
-          }
-    }
-
-data XFTPClientAgentError = XFTPClientAgentError XFTPServer XFTPClientError
-  deriving (Show, Exception)
-
-newXFTPAgent :: XFTPClientAgentConfig -> STM XFTPClientAgent
-newXFTPAgent config = do
-  xftpClients <- TM.empty
-  pure XFTPClientAgent {xftpClients, config}
-
-type ME a = ExceptT XFTPClientAgentError IO a
-
-getXFTPServerClient :: XFTPClientAgent -> XFTPServer -> ME XFTPClient
-getXFTPServerClient XFTPClientAgent {xftpClients, config} srv = do
-  atomically getClientVar >>= either newXFTPClient waitForXFTPClient
-  where
-    connectClient :: ME XFTPClient
-    connectClient =
-      ExceptT $
-        first (XFTPClientAgentError srv)
-          <$> getXFTPClient (1, srv, Nothing) (xftpConfig config) clientDisconnected
-
-    clientDisconnected :: XFTPClient -> IO ()
-    clientDisconnected _ = do
-      atomically $ TM.delete srv xftpClients
-      logInfo $ "disconnected from " <> showServer srv
-
-    getClientVar :: STM (Either XFTPClientVar XFTPClientVar)
-    getClientVar = maybe (Left <$> newClientVar) (pure . Right) =<< TM.lookup srv xftpClients
-      where
-        newClientVar :: STM XFTPClientVar
-        newClientVar = do
-          var <- newEmptyTMVar
-          TM.insert srv var xftpClients
-          pure var
-
-    waitForXFTPClient :: XFTPClientVar -> ME XFTPClient
-    waitForXFTPClient clientVar = do
-      let XFTPClientConfig {xftpNetworkConfig = NetworkConfig {tcpConnectTimeout}} = xftpConfig config
-      client_ <- tcpConnectTimeout `timeout` atomically (readTMVar clientVar)
-      liftEither $ case client_ of
-        Just (Right c) -> Right c
-        Just (Left e) -> Left e
-        Nothing -> Left $ XFTPClientAgentError srv PCEResponseTimeout
-
-    newXFTPClient :: XFTPClientVar -> ME XFTPClient
-    newXFTPClient clientVar = tryConnectClient tryConnectAsync
-      where
-        tryConnectClient :: ME () -> ME XFTPClient
-        tryConnectClient retryAction =
-          tryError connectClient >>= \r -> case r of
-            Right client -> do
-              logInfo $ "connected to " <> showServer srv
-              atomically $ putTMVar clientVar r
-              pure client
-            Left e@(XFTPClientAgentError _ e') -> do
-              if temporaryClientError e'
-                then retryAction
-                else atomically $ do
-                  putTMVar clientVar r
-                  TM.delete srv xftpClients
-              throwError e
-        tryConnectAsync :: ME ()
-        tryConnectAsync = void . async $ do
-          withRetryInterval (reconnectInterval config) $ \_ loop -> void $ tryConnectClient loop
-
-showServer :: XFTPServer -> Text
-showServer ProtocolServer {host, port} =
-  decodeUtf8 $ strEncode host <> B.pack (if null port then "" else ':' : port)
-
-closeXFTPServerClient :: XFTPClientAgent -> XFTPServer -> IO ()
-closeXFTPServerClient XFTPClientAgent {xftpClients, config} srv =
-  atomically (TM.lookupDelete srv xftpClients) >>= mapM_ closeClient
-  where
-    closeClient cVar = do
-      let NetworkConfig {tcpConnectTimeout} = xftpNetworkConfig $ xftpConfig config
-      tcpConnectTimeout `timeout` atomically (readTMVar cVar) >>= \case
-        Just (Right client) -> closeXFTPClient client `catchAll_` pure ()
-        _ -> pure ()
@@ -1,601 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
-
-module Simplex.FileTransfer.Client.Main
-  ( SendOptions (..),
-    CLIError (..),
-    xftpClientCLI,
-    cliSendFile,
-    cliSendFileOpts,
-    prepareChunkSizes,
-    prepareChunkSpecs,
-    chunkSize1,
-    chunkSize2,
-    chunkSize3,
-    maxFileSize,
-    fileSizeLen,
-    getChunkDigest,
-    SentRecipientReplica (..),
-  )
-where
-
-import Control.Concurrent.STM (stateTVar)
-import Control.Logger.Simple
-import Control.Monad
-import Control.Monad.Except
-import Crypto.Random (getRandomBytes)
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import Data.Bifunctor (first)
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Char (toLower)
-import Data.Int (Int64)
-import Data.List (foldl', sortOn)
-import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
-import qualified Data.List.NonEmpty as L
-import Data.Map (Map)
-import qualified Data.Map as M
-import Data.Maybe (fromMaybe)
-import qualified Data.Text as T
-import Data.Word (Word32)
-import GHC.Records (HasField (getField))
-import Options.Applicative
-import Simplex.FileTransfer.Client
-import Simplex.FileTransfer.Client.Agent
-import Simplex.FileTransfer.Client.Presets
-import Simplex.FileTransfer.Crypto
-import Simplex.FileTransfer.Description
-import Simplex.FileTransfer.Protocol
-import Simplex.FileTransfer.Transport (XFTPRcvChunkSpec (..))
-import Simplex.FileTransfer.Types
-import Simplex.FileTransfer.Util (uniqueCombine)
-import qualified Simplex.Messaging.Crypto as C
-import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.Messaging.Encoding
-import Simplex.Messaging.Encoding.String (StrEncoding (..))
-import Simplex.Messaging.Parsers (parseAll)
-import Simplex.Messaging.Protocol (ProtoServerWithAuth (..), SenderId, SndPrivateSignKey, XFTPServer, XFTPServerWithAuth)
-import Simplex.Messaging.Server.CLI (getCliCommand')
-import Simplex.Messaging.Util (groupAllOn, ifM, tshow, whenM)
-import System.Exit (exitFailure)
-import System.FilePath (splitFileName, (</>))
-import System.IO.Temp (getCanonicalTemporaryDirectory)
-import System.Random (StdGen, newStdGen, randomR)
-import UnliftIO
-import UnliftIO.Directory
-
-xftpClientVersion :: String
-xftpClientVersion = "1.0.1"
-
-chunkSize1 :: Word32
-chunkSize1 = kb 256
-
-chunkSize2 :: Word32
-chunkSize2 = mb 1
-
-chunkSize3 :: Word32
-chunkSize3 = mb 4
-
-maxFileSize :: Int64
-maxFileSize = gb 1
-
-maxFileSizeStr :: String
-maxFileSizeStr = B.unpack . strEncode $ FileSize maxFileSize
-
-fileSizeLen :: Int64
-fileSizeLen = 8
-
-newtype CLIError = CLIError String
-  deriving (Eq, Show, Exception)
-
-cliCryptoError :: FTCryptoError -> CLIError
-cliCryptoError = \case
-  FTCECryptoError e -> CLIError $ "Error decrypting file: " <> show e
-  FTCEInvalidHeader e -> CLIError $ "Invalid file header: " <> e
-  FTCEInvalidAuthTag -> CLIError "Error decrypting file: incorrect auth tag"
-  FTCEFileIOError e -> CLIError $ "File IO error: " <> show e
-
-data CliCommand
-  = SendFile SendOptions
-  | ReceiveFile ReceiveOptions
-  | DeleteFile DeleteOptions
-  | RandomFile RandomFileOptions
-  | FileDescrInfo InfoOptions
-
-data SendOptions = SendOptions
-  { filePath :: FilePath,
-    outputDir :: Maybe FilePath,
-    numRecipients :: Int,
-    xftpServers :: [XFTPServerWithAuth],
-    retryCount :: Int,
-    tempPath :: Maybe FilePath,
-    verbose :: Bool
-  }
-  deriving (Show)
-
-data ReceiveOptions = ReceiveOptions
-  { fileDescription :: FilePath,
-    filePath :: Maybe FilePath,
-    retryCount :: Int,
-    tempPath :: Maybe FilePath,
-    verbose :: Bool,
-    yes :: Bool
-  }
-  deriving (Show)
-
-data DeleteOptions = DeleteOptions
-  { fileDescription :: FilePath,
-    retryCount :: Int,
-    verbose :: Bool,
-    yes :: Bool
-  }
-  deriving (Show)
-
-newtype InfoOptions = InfoOptions
-  { fileDescription :: FilePath
-  }
-  deriving (Show)
-
-data RandomFileOptions = RandomFileOptions
-  { filePath :: FilePath,
-    fileSize :: FileSize Int64
-  }
-  deriving (Show)
-
-defaultRetryCount :: Int
-defaultRetryCount = 3
-
-cliCommandP :: Parser CliCommand
-cliCommandP =
-  hsubparser
-    ( command "send" (info (SendFile <$> sendP) (progDesc "Send file"))
-        <> command "recv" (info (ReceiveFile <$> receiveP) (progDesc "Receive file"))
-        <> command "del" (info (DeleteFile <$> deleteP) (progDesc "Delete file from server(s)"))
-        <> command "info" (info (FileDescrInfo <$> infoP) (progDesc "Show file description"))
-    )
-    <|> hsubparser (command "rand" (info (RandomFile <$> randomP) (progDesc "Generate a random file of a given size")) <> internal)
-  where
-    sendP :: Parser SendOptions
-    sendP =
-      SendOptions
-        <$> argument str (metavar "FILE" <> help "File to send")
-        <*> optional (argument str $ metavar "DIR" <> help "Directory to save file descriptions (default: current directory)")
-        <*> option auto (short 'n' <> metavar "COUNT" <> help "Number of recipients" <> value 1 <> showDefault)
-        <*> xftpServers
-        <*> retryCountP
-        <*> temp
-        <*> verboseP
-    receiveP :: Parser ReceiveOptions
-    receiveP =
-      ReceiveOptions
-        <$> fileDescrArg
-        <*> optional (argument str $ metavar "DIR" <> help "Directory to save file (default: system Downloads directory)")
-        <*> retryCountP
-        <*> temp
-        <*> verboseP
-        <*> yesP
-    deleteP :: Parser DeleteOptions
-    deleteP =
-      DeleteOptions
-        <$> fileDescrArg
-        <*> retryCountP
-        <*> verboseP
-        <*> yesP
-    infoP :: Parser InfoOptions
-    infoP = InfoOptions <$> fileDescrArg
-    randomP :: Parser RandomFileOptions
-    randomP =
-      RandomFileOptions
-        <$> argument str (metavar "FILE" <> help "Path to save file")
-        <*> argument str (metavar "SIZE" <> help "File size (bytes/kb/mb/gb)")
-    fileDescrArg = argument str (metavar "FILE" <> help "File description file")
-    retryCountP = option auto (long "retry" <> short 'r' <> metavar "RETRY" <> help "Number of network retries" <> value defaultRetryCount <> showDefault)
-    temp = optional (strOption $ long "tmp" <> metavar "TMP" <> help "Directory for temporary encrypted file (default: system temp directory)")
-    verboseP = switch (long "verbose" <> short 'v' <> help "Verbose output")
-    yesP = switch (long "yes" <> short 'y' <> help "Yes to questions")
-    xftpServers =
-      option
-        parseXFTPServers
-        ( long "servers"
-            <> short 's'
-            <> metavar "SERVER"
-            <> help "Semicolon-separated list of XFTP server(s) to use (each server can have more than one hostname)"
-            <> value []
-        )
-    parseXFTPServers = eitherReader $ parseAll xftpServersP . B.pack
-    xftpServersP = strP `A.sepBy1` A.char ';'
-
-data SentFileChunk = SentFileChunk
-  { chunkNo :: Int,
-    sndId :: SenderId,
-    sndPrivateKey :: SndPrivateSignKey,
-    chunkSize :: FileSize Word32,
-    digest :: FileDigest,
-    replicas :: [SentFileChunkReplica]
-  }
-  deriving (Eq, Show)
-
-data SentFileChunkReplica = SentFileChunkReplica
-  { server :: XFTPServer,
-    recipients :: [(ChunkReplicaId, C.APrivateSignKey)]
-  }
-  deriving (Eq, Show)
-
-data SentRecipientReplica = SentRecipientReplica
-  { chunkNo :: Int,
-    server :: XFTPServer,
-    rcvNo :: Int,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey,
-    digest :: FileDigest,
-    chunkSize :: FileSize Word32
-  }
-
-logCfg :: LogConfig
-logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}
-
-xftpClientCLI :: IO ()
-xftpClientCLI =
-  getCliCommand' cliCommandP clientVersion >>= \case
-    SendFile opts -> runLogE opts $ cliSendFile opts
-    ReceiveFile opts -> runLogE opts $ cliReceiveFile opts
-    DeleteFile opts -> runLogE opts $ cliDeleteFile opts
-    FileDescrInfo opts -> runE $ cliFileDescrInfo opts
-    RandomFile opts -> cliRandomFile opts
-  where
-    clientVersion = "SimpleX XFTP client v" <> xftpClientVersion
-
-runLogE :: HasField "verbose" a Bool => a -> ExceptT CLIError IO () -> IO ()
-runLogE opts a
-  | getField @"verbose" opts = setLogLevel LogDebug >> withGlobalLogging logCfg (runE a)
-  | otherwise = runE a
-
-runE :: ExceptT CLIError IO () -> IO ()
-runE a =
-  runExceptT a >>= \case
-    Left (CLIError e) -> putStrLn e >> exitFailure
-    _ -> pure ()
-
-cliSendFile :: SendOptions -> ExceptT CLIError IO ()
-cliSendFile opts = cliSendFileOpts opts True $ printProgress "Uploaded"
-
-cliSendFileOpts :: SendOptions -> Bool -> (Int64 -> Int64 -> IO ()) -> ExceptT CLIError IO ()
-cliSendFileOpts SendOptions {filePath, outputDir, numRecipients, xftpServers, retryCount, tempPath, verbose} printInfo notifyProgress = do
-  let (_, fileName) = splitFileName filePath
-  liftIO $ when printInfo $ printNoNewLine "Encrypting file..."
-  (encPath, fdRcv, fdSnd, chunkSpecs, encSize) <- encryptFileForUpload fileName
-  liftIO $ when printInfo $ printNoNewLine "Uploading file..."
-  uploadedChunks <- newTVarIO []
-  sentChunks <- uploadFile chunkSpecs uploadedChunks encSize
-  whenM (doesFileExist encPath) $ removeFile encPath
-  -- TODO if only small chunks, use different default size
-  liftIO $ do
-    let fdRcvs = createRcvFileDescriptions fdRcv sentChunks
-        fdSnd' = createSndFileDescription fdSnd sentChunks
-    (fdRcvPaths, fdSndPath) <- writeFileDescriptions fileName fdRcvs fdSnd'
-    when printInfo $ do
-      printNoNewLine "File uploaded!"
-      putStrLn $ "\nSender file description: " <> fdSndPath
-      putStrLn "Pass file descriptions to the recipient(s):"
-    forM_ fdRcvPaths putStrLn
-  where
-    encryptFileForUpload :: String -> ExceptT CLIError IO (FilePath, FileDescription 'FRecipient, FileDescription 'FSender, [XFTPChunkSpec], Int64)
-    encryptFileForUpload fileName = do
-      fileSize <- fromInteger <$> getFileSize filePath
-      when (fileSize > maxFileSize) $ throwError $ CLIError $ "Files bigger than " <> maxFileSizeStr <> " are not supported"
-      encPath <- getEncPath tempPath "xftp"
-      key <- liftIO C.randomSbKey
-      nonce <- liftIO C.randomCbNonce
-      let fileHdr = smpEncode FileHeader {fileName, fileExtra = Nothing}
-          fileSize' = fromIntegral (B.length fileHdr) + fileSize
-          chunkSizes = prepareChunkSizes $ fileSize' + fileSizeLen + authTagSize
-          defChunkSize = head chunkSizes
-          chunkSizes' = map fromIntegral chunkSizes
-          encSize = sum chunkSizes'
-      withExceptT (CLIError . show) $ encryptFile filePath fileHdr key nonce fileSize' encSize encPath
-      digest <- liftIO $ LC.sha512Hash <$> LB.readFile encPath
-      let chunkSpecs = prepareChunkSpecs encPath chunkSizes
-          fdRcv = FileDescription {party = SFRecipient, size = FileSize encSize, digest = FileDigest digest, key, nonce, chunkSize = FileSize defChunkSize, chunks = []}
-          fdSnd = FileDescription {party = SFSender, size = FileSize encSize, digest = FileDigest digest, key, nonce, chunkSize = FileSize defChunkSize, chunks = []}
-      logInfo $ "encrypted file to " <> tshow encPath
-      pure (encPath, fdRcv, fdSnd, chunkSpecs, encSize)
-    uploadFile :: [XFTPChunkSpec] -> TVar [Int64] -> Int64 -> ExceptT CLIError IO [SentFileChunk]
-    uploadFile chunks uploadedChunks encSize = do
-      a <- atomically $ newXFTPAgent defaultXFTPClientAgentConfig
-      gen <- newTVarIO =<< liftIO newStdGen
-      let xftpSrvs = fromMaybe defaultXFTPServers (nonEmpty xftpServers)
-      srvs <- liftIO $ replicateM (length chunks) $ getXFTPServer gen xftpSrvs
-      let thd3 (_, _, x) = x
-          chunks' = groupAllOn thd3 $ zip3 [1 ..] chunks srvs
-      -- TODO shuffle/unshuffle chunks
-      -- the reason we don't do pooled downloads here within one server is that http2 library doesn't handle cleint concurrency, even though
-      -- upload doesn't allow other requests within the same client until complete (but download does allow).
-      logInfo $ "uploading " <> tshow (length chunks) <> " chunks..."
-      map snd . sortOn fst . concat <$> pooledForConcurrentlyN 16 chunks' (mapM $ uploadFileChunk a)
-      where
-        uploadFileChunk :: XFTPClientAgent -> (Int, XFTPChunkSpec, XFTPServerWithAuth) -> ExceptT CLIError IO (Int, SentFileChunk)
-        uploadFileChunk a (chunkNo, chunkSpec@XFTPChunkSpec {chunkSize}, ProtoServerWithAuth xftpServer auth) = do
-          logInfo $ "uploading chunk " <> tshow chunkNo <> " to " <> showServer xftpServer <> "..."
-          (sndKey, spKey) <- liftIO $ C.generateSignatureKeyPair C.SEd25519
-          rKeys <- liftIO $ L.fromList <$> replicateM numRecipients (C.generateSignatureKeyPair C.SEd25519)
-          digest <- liftIO $ getChunkDigest chunkSpec
-          let ch = FileInfo {sndKey, size = fromIntegral chunkSize, digest}
-          c <- withRetry retryCount $ getXFTPServerClient a xftpServer
-          (sndId, rIds) <- withRetry retryCount $ createXFTPChunk c spKey ch (L.map fst rKeys) auth
-          withReconnect a xftpServer retryCount $ \c' -> uploadXFTPChunk c' spKey sndId chunkSpec
-          logInfo $ "uploaded chunk " <> tshow chunkNo
-          uploaded <- atomically . stateTVar uploadedChunks $ \cs ->
-            let cs' = fromIntegral chunkSize : cs in (sum cs', cs')
-          liftIO $ do
-            notifyProgress uploaded encSize
-            when verbose $ putStrLn ""
-          let recipients = L.toList $ L.map ChunkReplicaId rIds `L.zip` L.map snd rKeys
-              replicas = [SentFileChunkReplica {server = xftpServer, recipients}]
-          pure (chunkNo, SentFileChunk {chunkNo, sndId, sndPrivateKey = spKey, chunkSize = FileSize $ fromIntegral chunkSize, digest = FileDigest digest, replicas})
-        getXFTPServer :: TVar StdGen -> NonEmpty XFTPServerWithAuth -> IO XFTPServerWithAuth
-        getXFTPServer gen = \case
-          srv :| [] -> pure srv
-          servers -> do
-            atomically $ (servers L.!!) <$> stateTVar gen (randomR (0, L.length servers - 1))
-
-    -- M chunks, R replicas, N recipients
-    -- rcvReplicas: M[SentFileChunk] -> M * R * N [SentRecipientReplica]
-    -- rcvChunks: M * R * N [SentRecipientReplica] -> N[ M[FileChunk] ]
-    createRcvFileDescriptions :: FileDescription 'FRecipient -> [SentFileChunk] -> [FileDescription 'FRecipient]
-    createRcvFileDescriptions fd sentChunks = map (\chunks -> (fd :: (FileDescription 'FRecipient)) {chunks}) rcvChunks
-      where
-        rcvReplicas :: [SentRecipientReplica]
-        rcvReplicas =
-          concatMap
-            ( \SentFileChunk {chunkNo, digest, chunkSize, replicas} ->
-                concatMap
-                  ( \SentFileChunkReplica {server, recipients} ->
-                      zipWith (\rcvNo (replicaId, replicaKey) -> SentRecipientReplica {chunkNo, server, rcvNo, replicaId, replicaKey, digest, chunkSize}) [1 ..] recipients
-                  )
-                  replicas
-            )
-            sentChunks
-        rcvChunks :: [[FileChunk]]
-        rcvChunks = map (sortChunks . M.elems) $ M.elems $ foldl' addRcvChunk M.empty rcvReplicas
-        sortChunks :: [FileChunk] -> [FileChunk]
-        sortChunks = map reverseReplicas . sortOn (chunkNo :: FileChunk -> Int)
-        reverseReplicas ch@FileChunk {replicas} = (ch :: FileChunk) {replicas = reverse replicas}
-        addRcvChunk :: Map Int (Map Int FileChunk) -> SentRecipientReplica -> Map Int (Map Int FileChunk)
-        addRcvChunk m SentRecipientReplica {chunkNo, server, rcvNo, replicaId, replicaKey, digest, chunkSize} =
-          M.alter (Just . addOrChangeRecipient) rcvNo m
-          where
-            addOrChangeRecipient :: Maybe (Map Int FileChunk) -> Map Int FileChunk
-            addOrChangeRecipient = \case
-              Just m' -> M.alter (Just . addOrChangeChunk) chunkNo m'
-              _ -> M.singleton chunkNo $ FileChunk {chunkNo, digest, chunkSize, replicas = [replica]}
-            addOrChangeChunk :: Maybe FileChunk -> FileChunk
-            addOrChangeChunk = \case
-              Just ch@FileChunk {replicas} -> ch {replicas = replica : replicas}
-              _ -> FileChunk {chunkNo, digest, chunkSize, replicas = [replica]}
-            replica = FileChunkReplica {server, replicaId, replicaKey}
-    createSndFileDescription :: FileDescription 'FSender -> [SentFileChunk] -> FileDescription 'FSender
-    createSndFileDescription fd sentChunks = fd {chunks = sndChunks}
-      where
-        sndChunks :: [FileChunk]
-        sndChunks =
-          map
-            ( \SentFileChunk {chunkNo, sndId, sndPrivateKey, chunkSize, digest, replicas} ->
-                FileChunk {chunkNo, digest, chunkSize, replicas = sndReplicas replicas (ChunkReplicaId sndId) sndPrivateKey}
-            )
-            sentChunks
-        -- SentFileChunk having sndId and sndPrivateKey represents the current implementation's limitation
-        -- that sender uploads each chunk only to one server, so we can use the first replica's server for FileChunkReplica
-        sndReplicas :: [SentFileChunkReplica] -> ChunkReplicaId -> C.APrivateSignKey -> [FileChunkReplica]
-        sndReplicas [] _ _ = []
-        sndReplicas (SentFileChunkReplica {server} : _) replicaId replicaKey = [FileChunkReplica {server, replicaId, replicaKey}]
-    writeFileDescriptions :: String -> [FileDescription 'FRecipient] -> FileDescription 'FSender -> IO ([FilePath], FilePath)
-    writeFileDescriptions fileName fdRcvs fdSnd = do
-      outDir <- uniqueCombine (fromMaybe "." outputDir) (fileName <> ".xftp")
-      createDirectoryIfMissing True outDir
-      fdRcvPaths <- forM (zip [1 ..] fdRcvs) $ \(i :: Int, fd) -> do
-        let fdPath = outDir </> ("rcv" <> show i <> ".xftp")
-        B.writeFile fdPath $ strEncode fd
-        pure fdPath
-      let fdSndPath = outDir </> "snd.xftp.private"
-      B.writeFile fdSndPath $ strEncode fdSnd
-      pure (fdRcvPaths, fdSndPath)
-
-getChunkDigest :: XFTPChunkSpec -> IO ByteString
-getChunkDigest XFTPChunkSpec {filePath = chunkPath, chunkOffset, chunkSize} =
-  withFile chunkPath ReadMode $ \h -> do
-    hSeek h AbsoluteSeek $ fromIntegral chunkOffset
-    LC.sha256Hash <$> LB.hGet h (fromIntegral chunkSize)
-
-cliReceiveFile :: ReceiveOptions -> ExceptT CLIError IO ()
-cliReceiveFile ReceiveOptions {fileDescription, filePath, retryCount, tempPath, verbose, yes} =
-  getFileDescription' fileDescription >>= receiveFile
-  where
-    receiveFile :: ValidFileDescription 'FRecipient -> ExceptT CLIError IO ()
-    receiveFile (ValidFileDescription FileDescription {size, digest, key, nonce, chunks}) = do
-      encPath <- getEncPath tempPath "xftp"
-      createDirectory encPath
-      a <- atomically $ newXFTPAgent defaultXFTPClientAgentConfig
-      liftIO $ printNoNewLine "Downloading file..."
-      downloadedChunks <- newTVarIO []
-      let srv FileChunk {replicas} = server (head replicas :: FileChunkReplica)
-          srvChunks = groupAllOn srv chunks
-      chunkPaths <- map snd . sortOn fst . concat <$> pooledForConcurrentlyN 16 srvChunks (mapM $ downloadFileChunk a encPath size downloadedChunks)
-      encDigest <- liftIO $ LC.sha512Hash <$> readChunks chunkPaths
-      when (encDigest /= unFileDigest digest) $ throwError $ CLIError "File digest mismatch"
-      encSize <- liftIO $ foldM (\s path -> (s +) . fromIntegral <$> getFileSize path) 0 chunkPaths
-      when (FileSize encSize /= size) $ throwError $ CLIError "File size mismatch"
-      liftIO $ printNoNewLine "Decrypting file..."
-      path <- withExceptT cliCryptoError $ decryptChunks encSize chunkPaths key nonce getFilePath
-      forM_ chunks $ acknowledgeFileChunk a
-      whenM (doesPathExist encPath) $ removeDirectoryRecursive encPath
-      liftIO $ do
-        printNoNewLine $ "File downloaded: " <> path
-        removeFD yes fileDescription
-    downloadFileChunk :: XFTPClientAgent -> FilePath -> FileSize Int64 -> TVar [Int64] -> FileChunk -> ExceptT CLIError IO (Int, FilePath)
-    downloadFileChunk a encPath (FileSize encSize) downloadedChunks FileChunk {chunkNo, chunkSize, digest, replicas = replica : _} = do
-      let FileChunkReplica {server, replicaId, replicaKey} = replica
-      logInfo $ "downloading chunk " <> tshow chunkNo <> " from " <> showServer server <> "..."
-      chunkPath <- uniqueCombine encPath $ show chunkNo
-      let chunkSpec = XFTPRcvChunkSpec chunkPath (unFileSize chunkSize) (unFileDigest digest)
-      withReconnect a server retryCount $ \c -> downloadXFTPChunk c replicaKey (unChunkReplicaId replicaId) chunkSpec
-      logInfo $ "downloaded chunk " <> tshow chunkNo <> " to " <> T.pack chunkPath
-      downloaded <- atomically . stateTVar downloadedChunks $ \cs ->
-        let cs' = fromIntegral (unFileSize chunkSize) : cs in (sum cs', cs')
-      liftIO $ do
-        printProgress "Downloaded" downloaded encSize
-        when verbose $ putStrLn ""
-      pure (chunkNo, chunkPath)
-    downloadFileChunk _ _ _ _ _ = throwError $ CLIError "chunk has no replicas"
-    getFilePath :: String -> ExceptT String IO FilePath
-    getFilePath name =
-      case filePath of
-        Just path ->
-          ifM (doesDirectoryExist path) (uniqueCombine path name) $
-            ifM (doesFileExist path) (throwError "File already exists") (pure path)
-        _ -> (`uniqueCombine` name) . (</> "Downloads") =<< getHomeDirectory
-    acknowledgeFileChunk :: XFTPClientAgent -> FileChunk -> ExceptT CLIError IO ()
-    acknowledgeFileChunk a FileChunk {replicas = replica : _} = do
-      let FileChunkReplica {server, replicaId, replicaKey} = replica
-      c <- withRetry retryCount $ getXFTPServerClient a server
-      withRetry retryCount $ ackXFTPChunk c replicaKey (unChunkReplicaId replicaId)
-    acknowledgeFileChunk _ _ = throwError $ CLIError "chunk has no replicas"
-
-printProgress :: String -> Int64 -> Int64 -> IO ()
-printProgress s part total = printNoNewLine $ s <> " " <> show ((part * 100) `div` total) <> "%"
-
-printNoNewLine :: String -> IO ()
-printNoNewLine s = do
-  putStr $ s <> replicate (max 0 $ 25 - length s) ' ' <> "\r"
-  hFlush stdout
-
-cliDeleteFile :: DeleteOptions -> ExceptT CLIError IO ()
-cliDeleteFile DeleteOptions {fileDescription, retryCount, yes} = do
-  getFileDescription' fileDescription >>= deleteFile
-  where
-    deleteFile :: ValidFileDescription 'FSender -> ExceptT CLIError IO ()
-    deleteFile (ValidFileDescription FileDescription {chunks}) = do
-      a <- atomically $ newXFTPAgent defaultXFTPClientAgentConfig
-      forM_ chunks $ deleteFileChunk a
-      liftIO $ do
-        printNoNewLine "File deleted!"
-        removeFD yes fileDescription
-    deleteFileChunk :: XFTPClientAgent -> FileChunk -> ExceptT CLIError IO ()
-    deleteFileChunk a FileChunk {chunkNo, replicas = replica : _} = do
-      let FileChunkReplica {server, replicaId, replicaKey} = replica
-      withReconnect a server retryCount $ \c -> deleteXFTPChunk c replicaKey (unChunkReplicaId replicaId)
-      logInfo $ "deleted chunk " <> tshow chunkNo <> " from " <> showServer server
-    deleteFileChunk _ _ = throwError $ CLIError "chunk has no replicas"
-
-cliFileDescrInfo :: InfoOptions -> ExceptT CLIError IO ()
-cliFileDescrInfo InfoOptions {fileDescription} = do
-  getFileDescription fileDescription >>= \case
-    AVFD (ValidFileDescription FileDescription {party, size, chunkSize, chunks}) -> do
-      let replicas = groupReplicasByServer chunkSize chunks
-      liftIO $ do
-        printParty
-        putStrLn $ "File download size: " <> strEnc size
-        putStrLn "File server(s):"
-        forM_ replicas $ \srvReplicas -> do
-          let srv = replicaServer $ head srvReplicas
-              chSizes = map (\FileServerReplica {chunkSize = chSize_} -> unFileSize $ fromMaybe chunkSize chSize_) srvReplicas
-          putStrLn $ strEnc srv <> ": " <> strEnc (FileSize $ sum chSizes)
-      where
-        printParty :: IO ()
-        printParty = case party of
-          SFRecipient -> putStrLn "Recipient file description"
-          SFSender -> putStrLn "Sender file description"
-
-strEnc :: StrEncoding a => a -> String
-strEnc = B.unpack . strEncode
-
-getFileDescription :: FilePath -> ExceptT CLIError IO AValidFileDescription
-getFileDescription path =
-  ExceptT $ first (CLIError . ("Failed to parse file description: " <>)) . strDecode <$> B.readFile path
-
-getFileDescription' :: FilePartyI p => FilePath -> ExceptT CLIError IO (ValidFileDescription p)
-getFileDescription' path =
-  getFileDescription path >>= \case
-    AVFD fd -> either (throwError . CLIError) pure $ checkParty fd
-
-prepareChunkSizes :: Int64 -> [Word32]
-prepareChunkSizes size' = prepareSizes size'
-  where
-    (smallSize, bigSize) = if size' > size34 chunkSize3 then (chunkSize2, chunkSize3) else (chunkSize1, chunkSize2)
-    size34 sz = (fromIntegral sz * 3) `div` 4
-    prepareSizes 0 = []
-    prepareSizes size
-      | size >= fromIntegral bigSize = replicate (fromIntegral n1) bigSize <> prepareSizes remSz
-      | size > size34 bigSize = [bigSize]
-      | otherwise = replicate (fromIntegral n2') smallSize
-      where
-        (n1, remSz) = size `divMod` fromIntegral bigSize
-        n2' = let (n2, remSz2) = (size `divMod` fromIntegral smallSize) in if remSz2 == 0 then n2 else n2 + 1
-
-prepareChunkSpecs :: FilePath -> [Word32] -> [XFTPChunkSpec]
-prepareChunkSpecs filePath chunkSizes = reverse . snd $ foldl' addSpec (0, []) chunkSizes
-  where
-    addSpec :: (Int64, [XFTPChunkSpec]) -> Word32 -> (Int64, [XFTPChunkSpec])
-    addSpec (chunkOffset, specs) sz =
-      let spec = XFTPChunkSpec {filePath, chunkOffset, chunkSize = fromIntegral sz}
-       in (chunkOffset + fromIntegral sz, spec : specs)
-
-getEncPath :: MonadIO m => Maybe FilePath -> String -> m FilePath
-getEncPath path name = (`uniqueCombine` (name <> ".encrypted")) =<< maybe (liftIO getCanonicalTemporaryDirectory) pure path
-
-withReconnect :: Show e => XFTPClientAgent -> XFTPServer -> Int -> (XFTPClient -> ExceptT e IO a) -> ExceptT CLIError IO a
-withReconnect a srv n run = withRetry n $ do
-  c <- withRetry n $ getXFTPServerClient a srv
-  withExceptT (CLIError . show) (run c) `catchError` \e -> do
-    liftIO $ closeXFTPServerClient a srv
-    throwError e
-
-withRetry :: Show e => Int -> ExceptT e IO a -> ExceptT CLIError IO a
-withRetry retryCount = withRetry' retryCount . withExceptT (CLIError . show)
-  where
-    withRetry' :: Int -> ExceptT CLIError IO a -> ExceptT CLIError IO a
-    withRetry' 0 _ = throwError $ CLIError "internal: no retry attempts"
-    withRetry' 1 a = a
-    withRetry' n a =
-      a `catchError` \e -> do
-        logWarn ("retrying: " <> tshow e)
-        withRetry' (n - 1) a
-
-removeFD :: Bool -> FilePath -> IO ()
-removeFD yes fd
-  | yes = do
-    removeFile fd
-    putStrLn $ "\nFile description " <> fd <> " is deleted."
-  | otherwise = do
-    y <- liftIO . getConfirmation $ "\nFile description " <> fd <> " can't be used again. Delete it"
-    when y $ removeFile fd
-
-getConfirmation :: String -> IO Bool
-getConfirmation prompt = do
-  putStr $ prompt <> " (Y/n): "
-  hFlush stdout
-  s <- getLine
-  case map toLower s of
-    "y" -> pure True
-    "" -> pure True
-    "n" -> pure False
-    _ -> getConfirmation prompt
-
-cliRandomFile :: RandomFileOptions -> IO ()
-cliRandomFile RandomFileOptions {filePath, fileSize = FileSize size} = do
-  withFile filePath WriteMode (`saveRandomFile` size)
-  putStrLn $ "File created: " <> filePath
-  where
-    saveRandomFile h sz = do
-      bytes <- getRandomBytes $ fromIntegral $ min mb' sz
-      B.hPut h bytes
-      when (sz > mb') $ saveRandomFile h (sz - mb')
-    mb' = mb 1
@@ -1,17 +0,0 @@
-{-# LANGUAGE OverloadedLists #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Simplex.FileTransfer.Client.Presets where
-
-import Data.List.NonEmpty (NonEmpty)
-import Simplex.Messaging.Protocol (XFTPServerWithAuth)
-
-defaultXFTPServers :: NonEmpty XFTPServerWithAuth
-defaultXFTPServers =
-  [ "xftp://[email protected],blisztokwh6alt5oem45f2eksm2xdowxszmhjesntcyolmhutoon7sid.onion",
-    "xftp://[email protected],jk6jybnel5hin2am5omd7g3hyvb4tfkyl7ea4vx5ldi7gpvz5ogqtcqd.onion",
-    "xftp://[email protected],pqhchr4bpkzef5wra4hnmzvppn5j5mjrpzkh5ixx6mhylnxxd6lmwnad.onion",
-    "xftp://[email protected],q2lrjgiyo2efyweksavwxh3dlsrxetaxjztde2x5nateugrtrwzvmdid.onion",
-    "xftp://[email protected],2kikdbdhlrluburwt6q6rnoxvezcm2ifx2hj463jlunkeftlzm7hf3qd.onion",
-    "xftp://[email protected],tg3fmu6houq7vfqlsipm2qqzhtpgxesnuydqozx3khojxydhs53sbbyd.onion"
-  ]
@@ -1,115 +0,0 @@
-{-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Simplex.FileTransfer.Crypto where
-
-import Control.Monad.Except
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import Data.Bifunctor (first)
-import qualified Data.ByteArray as BA
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Int (Int64)
-import Simplex.FileTransfer.Types (FileHeader (..), authTagSize)
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Crypto.Lazy (LazyByteString)
-import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.Messaging.Encoding
-import Simplex.Messaging.Util (liftEitherWith)
-import UnliftIO
-import UnliftIO.Directory (removeFile)
-
-encryptFile :: FilePath -> ByteString -> C.SbKey -> C.CbNonce -> Int64 -> Int64 -> FilePath -> ExceptT FTCryptoError IO ()
-encryptFile filePath fileHdr key nonce fileSize' encSize encFile = do
-  sb <- liftEitherWith FTCECryptoError $ LC.sbInit key nonce
-  withFile filePath ReadMode $ \r -> withFile encFile WriteMode $ \w -> do
-    let lenStr = smpEncode fileSize'
-        (hdr, !sb') = LC.sbEncryptChunk sb $ lenStr <> fileHdr
-        padLen = encSize - authTagSize - fileSize' - 8
-    liftIO $ B.hPut w hdr
-    sb2 <- encryptChunks r w (sb', fileSize' - fromIntegral (B.length fileHdr))
-    sb3 <- encryptPad w (sb2, padLen)
-    let tag = BA.convert $ LC.sbAuth sb3
-    liftIO $ B.hPut w tag
-  where
-    encryptChunks r = encryptChunks_ $ liftIO . B.hGet r . fromIntegral
-    encryptPad = encryptChunks_ $ \sz -> pure $ B.replicate (fromIntegral sz) '#'
-    encryptChunks_ :: (Int64 -> IO ByteString) -> Handle -> (LC.SbState, Int64) -> ExceptT FTCryptoError IO LC.SbState
-    encryptChunks_ get w (!sb, !len)
-      | len == 0 = pure sb
-      | otherwise = do
-        let chSize = min len 65536
-        ch <- liftIO $ get chSize
-        when (B.length ch /= fromIntegral chSize) $ throwError $ FTCEFileIOError "encrypting file: unexpected EOF"
-        let (ch', sb') = LC.sbEncryptChunk sb ch
-        liftIO $ B.hPut w ch'
-        encryptChunks_ get w (sb', len - chSize)
-
-decryptChunks :: Int64 -> [FilePath] -> C.SbKey -> C.CbNonce -> (String -> ExceptT String IO String) -> ExceptT FTCryptoError IO FilePath
-decryptChunks _ [] _ _ _ = throwError $ FTCEInvalidHeader "empty"
-decryptChunks encSize (chPath : chPaths) key nonce getFilePath = case reverse chPaths of
-  [] -> do
-    (!authOk, !f) <- liftEither . first FTCECryptoError . LC.sbDecryptTailTag key nonce (encSize - authTagSize) =<< liftIO (LB.readFile chPath)
-    unless authOk $ throwError FTCEInvalidAuthTag
-    (FileHeader {fileName}, !f') <- parseFileHeader f
-    path <- withExceptT FTCEFileIOError $ getFilePath fileName
-    liftIO $ LB.writeFile path f'
-    pure path
-  lastPath : chPaths' -> do
-    (state, expectedLen, ch) <- decryptFirstChunk
-    (FileHeader {fileName}, ch') <- parseFileHeader ch
-    path <- withExceptT FTCEFileIOError $ getFilePath fileName
-    authOk <- liftIO . withFile path WriteMode $ \h -> do
-      liftIO $ LB.hPut h ch'
-      state' <- foldM (decryptChunk h) state $ reverse chPaths'
-      decryptLastChunk h state' expectedLen
-    unless authOk $ do
-      removeFile path
-      throwError FTCEInvalidAuthTag
-    pure path
-    where
-      decryptFirstChunk = do
-        sb <- liftEitherWith FTCECryptoError $ LC.sbInit key nonce
-        ch <- liftIO $ LB.readFile chPath
-        let (ch1, !sb') = LC.sbDecryptChunkLazy sb ch
-        (!expectedLen, ch2) <- liftEitherWith FTCECryptoError $ LC.splitLen ch1
-        let len1 = LB.length ch2
-        pure ((sb', len1), expectedLen, ch2)
-      decryptChunk h (!sb, !len) chPth = do
-        ch <- LB.readFile chPth
-        let len' = len + LB.length ch
-            (ch', sb') = LC.sbDecryptChunkLazy sb ch
-        LB.hPut h ch'
-        pure (sb', len')
-      decryptLastChunk h (!sb, !len) expectedLen = do
-        ch <- LB.readFile lastPath
-        let (ch1, tag') = LB.splitAt (LB.length ch - authTagSize) ch
-            tag'' = LB.toStrict tag'
-            (ch2, sb') = LC.sbDecryptChunkLazy sb ch1
-            len' = len + LB.length ch2
-            ch3 = LB.take (LB.length ch2 - len' + expectedLen) ch2
-            tag :: ByteString = BA.convert (LC.sbAuth sb')
-        LB.hPut h ch3
-        pure $ B.length tag'' == 16 && BA.constEq tag'' tag
-  where
-    parseFileHeader :: LazyByteString -> ExceptT FTCryptoError IO (FileHeader, LazyByteString)
-    parseFileHeader s = do
-      let (hdrStr, s') = LB.splitAt 1024 s
-      case A.parse smpP $ LB.toStrict hdrStr of
-        A.Fail _ _ e -> throwError $ FTCEInvalidHeader e
-        A.Partial _ -> throwError $ FTCEInvalidHeader "incomplete"
-        A.Done rest hdr -> pure (hdr, LB.fromStrict rest <> s')
-
-readChunks :: [FilePath] -> IO LB.ByteString
-readChunks = foldM (\s path -> (s <>) <$> LB.readFile path) ""
-
-data FTCryptoError
-  = FTCECryptoError C.CryptoError
-  | FTCEInvalidHeader String
-  | FTCEInvalidAuthTag
-  | FTCEFileIOError String
-  deriving (Show, Eq, Exception)
@@ -1,356 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE PatternSynonyms #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Simplex.FileTransfer.Description
-  ( FileDescription (..),
-    AFileDescription (..),
-    ValidFileDescription, -- constructor is not exported, use pattern
-    pattern ValidFileDescription,
-    AValidFileDescription (..),
-    FileDigest (..),
-    FileChunk (..),
-    FileChunkReplica (..),
-    FileServerReplica (..),
-    FileSize (..),
-    ChunkReplicaId (..),
-    YAMLFileDescription (..), -- for tests
-    YAMLServerReplicas (..), -- for tests
-    validateFileDescription,
-    groupReplicasByServer,
-    replicaServer,
-    fdSeparator,
-    kb,
-    mb,
-    gb,
-  )
-where
-
-import Control.Applicative (optional)
-import Control.Monad ((<=<))
-import Data.Aeson (FromJSON, ToJSON)
-import qualified Data.Aeson as J
-import Data.Attoparsec.ByteString.Char8 (Parser)
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import Data.Bifunctor (first)
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import Data.Int (Int64)
-import Data.List (foldl', sortOn)
-import Data.Map (Map)
-import qualified Data.Map as M
-import Data.Maybe (fromMaybe)
-import Data.String
-import Data.Word (Word32)
-import qualified Data.Yaml as Y
-import Database.SQLite.Simple.FromField (FromField (..))
-import Database.SQLite.Simple.ToField (ToField (..))
-import GHC.Generics (Generic)
-import Simplex.FileTransfer.Protocol
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (parseAll)
-import Simplex.Messaging.Protocol (XFTPServer)
-import Simplex.Messaging.Util (bshow, groupAllOn, (<$?>))
-
-data FileDescription (p :: FileParty) = FileDescription
-  { party :: SFileParty p,
-    size :: FileSize Int64,
-    digest :: FileDigest,
-    key :: C.SbKey,
-    nonce :: C.CbNonce,
-    chunkSize :: FileSize Word32,
-    chunks :: [FileChunk]
-  }
-  deriving (Eq, Show)
-
-data AFileDescription = forall p. FilePartyI p => AFD (FileDescription p)
-
-newtype ValidFileDescription p = ValidFD (FileDescription p)
-  deriving (Eq, Show)
-
-pattern ValidFileDescription :: FileDescription p -> ValidFileDescription p
-pattern ValidFileDescription fd = ValidFD fd
-
-{-# COMPLETE ValidFileDescription #-}
-
-data AValidFileDescription = forall p. FilePartyI p => AVFD (ValidFileDescription p)
-
-fdSeparator :: IsString s => s
-fdSeparator = "################################\n"
-
-newtype FileDigest = FileDigest {unFileDigest :: ByteString}
-  deriving (Eq, Show)
-
-instance StrEncoding FileDigest where
-  strEncode (FileDigest fd) = strEncode fd
-  strDecode s = FileDigest <$> strDecode s
-  strP = FileDigest <$> strP
-
-instance FromJSON FileDigest where
-  parseJSON = strParseJSON "FileDigest"
-
-instance ToJSON FileDigest where
-  toJSON = strToJSON
-  toEncoding = strToJEncoding
-
-instance FromField FileDigest where fromField f = FileDigest <$> fromField f
-
-instance ToField FileDigest where toField (FileDigest s) = toField s
-
-data FileChunk = FileChunk
-  { chunkNo :: Int,
-    chunkSize :: FileSize Word32,
-    digest :: FileDigest,
-    replicas :: [FileChunkReplica]
-  }
-  deriving (Eq, Show)
-
-data FileChunkReplica = FileChunkReplica
-  { server :: XFTPServer,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey
-  }
-  deriving (Eq, Show)
-
-newtype ChunkReplicaId = ChunkReplicaId {unChunkReplicaId :: ByteString}
-  deriving (Eq, Show)
-
-instance StrEncoding ChunkReplicaId where
-  strEncode (ChunkReplicaId fid) = strEncode fid
-  strP = ChunkReplicaId <$> strP
-
-instance FromJSON ChunkReplicaId where
-  parseJSON = strParseJSON "ChunkReplicaId"
-
-instance ToJSON ChunkReplicaId where
-  toJSON = strToJSON
-  toEncoding = strToJEncoding
-
-instance FromField ChunkReplicaId where fromField f = ChunkReplicaId <$> fromField f
-
-instance ToField ChunkReplicaId where toField (ChunkReplicaId s) = toField s
-
-data YAMLFileDescription = YAMLFileDescription
-  { party :: FileParty,
-    size :: String,
-    digest :: FileDigest,
-    key :: C.SbKey,
-    nonce :: C.CbNonce,
-    chunkSize :: String,
-    replicas :: [YAMLServerReplicas]
-  }
-  deriving (Eq, Show, Generic, FromJSON)
-
-instance ToJSON YAMLFileDescription where
-  toJSON = J.genericToJSON J.defaultOptions
-  toEncoding = J.genericToEncoding J.defaultOptions
-
-data YAMLServerReplicas = YAMLServerReplicas
-  { server :: XFTPServer,
-    chunks :: [String]
-  }
-  deriving (Eq, Show, Generic, FromJSON)
-
-instance ToJSON YAMLServerReplicas where
-  toJSON = J.genericToJSON J.defaultOptions
-  toEncoding = J.genericToEncoding J.defaultOptions
-
-data FileServerReplica = FileServerReplica
-  { chunkNo :: Int,
-    server :: XFTPServer,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey,
-    digest :: Maybe FileDigest,
-    chunkSize :: Maybe (FileSize Word32)
-  }
-  deriving (Show)
-
-instance FilePartyI p => StrEncoding (ValidFileDescription p) where
-  strEncode (ValidFD fd) = strEncode fd
-  strDecode s = strDecode s >>= (\(AVFD fd) -> checkParty fd)
-  strP = strDecode <$?> A.takeByteString
-
-instance StrEncoding AValidFileDescription where
-  strEncode (AVFD fd) = strEncode fd
-  strDecode = (\(AFD fd) -> AVFD <$> validateFileDescription fd) <=< strDecode
-  strP = strDecode <$?> A.takeByteString
-
-instance FilePartyI p => StrEncoding (FileDescription p) where
-  strEncode = Y.encode . encodeFileDescription
-  strDecode s = strDecode s >>= (\(AFD fd) -> checkParty fd)
-  strP = strDecode <$?> A.takeByteString
-
-instance StrEncoding AFileDescription where
-  strEncode (AFD fd) = strEncode fd
-  strDecode = decodeFileDescription <=< first show . Y.decodeEither'
-  strP = strDecode <$?> A.takeByteString
-
-validateFileDescription :: FileDescription p -> Either String (ValidFileDescription p)
-validateFileDescription fd@FileDescription {size, chunks}
-  | chunkNos /= [1 .. length chunks] = Left "chunk numbers are not sequential"
-  | chunksSize chunks /= unFileSize size = Left "chunks total size is different than file size"
-  | otherwise = Right $ ValidFD fd
-  where
-    chunkNos = map (chunkNo :: FileChunk -> Int) chunks
-    chunksSize = fromIntegral . foldl' (\s FileChunk {chunkSize} -> s + unFileSize chunkSize) 0
-
-encodeFileDescription :: FileDescription p -> YAMLFileDescription
-encodeFileDescription FileDescription {party, size, digest, key, nonce, chunkSize, chunks} =
-  YAMLFileDescription
-    { party = toFileParty party,
-      size = B.unpack $ strEncode size,
-      digest,
-      key,
-      nonce,
-      chunkSize = B.unpack $ strEncode chunkSize,
-      replicas = encodeFileReplicas chunkSize chunks
-    }
-
-newtype FileSize a = FileSize {unFileSize :: a}
-  deriving (Eq, Show)
-
-instance (Integral a, Show a) => StrEncoding (FileSize a) where
-  strEncode (FileSize b)
-    | b' /= 0 = bshow b
-    | ks' /= 0 = bshow ks <> "kb"
-    | ms' /= 0 = bshow ms <> "mb"
-    | otherwise = bshow gs <> "gb"
-    where
-      (ks, b') = b `divMod` 1024
-      (ms, ks') = ks `divMod` 1024
-      (gs, ms') = ms `divMod` 1024
-  strP =
-    FileSize
-      <$> A.choice
-        [ gb <$> A.decimal <* "gb",
-          mb <$> A.decimal <* "mb",
-          kb <$> A.decimal <* "kb",
-          A.decimal
-        ]
-
-kb :: Integral a => a -> a
-kb n = 1024 * n
-{-# INLINE kb #-}
-
-mb :: Integral a => a -> a
-mb n = 1024 * kb n
-{-# INLINE mb #-}
-
-gb :: Integral a => a -> a
-gb n = 1024 * mb n
-{-# INLINE gb #-}
-
-instance (Integral a, Show a) => IsString (FileSize a) where
-  fromString = either error id . strDecode . B.pack
-
-instance (FromField a) => FromField (FileSize a) where fromField f = FileSize <$> fromField f
-
-instance (ToField a) => ToField (FileSize a) where toField (FileSize s) = toField s
-
-groupReplicasByServer :: FileSize Word32 -> [FileChunk] -> [[FileServerReplica]]
-groupReplicasByServer defChunkSize =
-  groupAllOn replicaServer . unfoldChunksToReplicas defChunkSize
-
-encodeFileReplicas :: FileSize Word32 -> [FileChunk] -> [YAMLServerReplicas]
-encodeFileReplicas defChunkSize =
-  map encodeServerReplicas . groupReplicasByServer defChunkSize
-  where
-    encodeServerReplicas fs =
-      YAMLServerReplicas
-        { server = replicaServer $ head fs, -- groupAllOn guarantees that fs is not empty
-          chunks = map (B.unpack . encodeServerReplica) fs
-        }
-
-replicaServer :: FileServerReplica -> XFTPServer
-replicaServer = server
-
-encodeServerReplica :: FileServerReplica -> ByteString
-encodeServerReplica FileServerReplica {chunkNo, replicaId, replicaKey, digest, chunkSize} =
-  bshow chunkNo
-    <> ":"
-    <> strEncode replicaId
-    <> ":"
-    <> strEncode replicaKey
-    <> maybe "" ((":" <>) . strEncode) digest
-    <> maybe "" ((":" <>) . strEncode) chunkSize
-
-serverReplicaP :: XFTPServer -> Parser FileServerReplica
-serverReplicaP server = do
-  chunkNo <- A.decimal
-  replicaId <- A.char ':' *> strP
-  replicaKey <- A.char ':' *> strP
-  digest <- optional (A.char ':' *> strP)
-  chunkSize <- optional (A.char ':' *> strP)
-  pure FileServerReplica {chunkNo, server, replicaId, replicaKey, digest, chunkSize}
-
-unfoldChunksToReplicas :: FileSize Word32 -> [FileChunk] -> [FileServerReplica]
-unfoldChunksToReplicas defChunkSize = concatMap chunkReplicas
-  where
-    chunkReplicas c@FileChunk {replicas} = zipWith (replicaToServerReplica c) [1 ..] replicas
-    replicaToServerReplica :: FileChunk -> Int -> FileChunkReplica -> FileServerReplica
-    replicaToServerReplica FileChunk {chunkNo, digest, chunkSize} replicaNo FileChunkReplica {server, replicaId, replicaKey} =
-      let chunkSize' = if chunkSize /= defChunkSize && replicaNo == 1 then Just chunkSize else Nothing
-          digest' = if replicaNo == 1 then Just digest else Nothing
-       in FileServerReplica {chunkNo, server, replicaId, replicaKey, digest = digest', chunkSize = chunkSize'}
-
-decodeFileDescription :: YAMLFileDescription -> Either String AFileDescription
-decodeFileDescription YAMLFileDescription {party, size, digest, key, nonce, chunkSize, replicas} = do
-  size' <- strDecode $ B.pack size
-  chunkSize' <- strDecode $ B.pack chunkSize
-  replicas' <- decodeFileParts replicas
-  chunks <- foldReplicasToChunks chunkSize' replicas'
-  pure $ case aFileParty party of
-    AFP party' -> AFD FileDescription {party = party', size = size', digest, key, nonce, chunkSize = chunkSize', chunks}
-  where
-    decodeFileParts = fmap concat . mapM decodeYAMLServerReplicas
-
-decodeYAMLServerReplicas :: YAMLServerReplicas -> Either String [FileServerReplica]
-decodeYAMLServerReplicas YAMLServerReplicas {server, chunks} =
-  mapM (parseAll (serverReplicaP server) . B.pack) chunks
-
-- this function should fail if:
-- 1. no replica has digest or two replicas have different digests
-- 2. two replicas have different chunk sizes
-foldReplicasToChunks :: FileSize Word32 -> [FileServerReplica] -> Either String [FileChunk]
-foldReplicasToChunks defChunkSize fs = do
-  sd <- foldSizesDigests fs
-  -- TODO validate (check that chunks match) or in separate function
-  sortOn (chunkNo :: FileChunk -> Int) . map reverseReplicas . M.elems <$> foldChunks sd fs
-  where
-    foldSizesDigests :: [FileServerReplica] -> Either String (Map Int (FileSize Word32), Map Int FileDigest)
-    foldSizesDigests = foldl' addSizeDigest $ Right (M.empty, M.empty)
-    addSizeDigest :: Either String (Map Int (FileSize Word32), Map Int FileDigest) -> FileServerReplica -> Either String (Map Int (FileSize Word32), Map Int FileDigest)
-    addSizeDigest (Left e) _ = Left e
-    addSizeDigest (Right (ms, md)) FileServerReplica {chunkNo, chunkSize, digest} =
-      (,) <$> combineChunk ms chunkNo chunkSize <*> combineChunk md chunkNo digest
-    combineChunk :: Eq a => Map Int a -> Int -> Maybe a -> Either String (Map Int a)
-    combineChunk m _ Nothing = Right m
-    combineChunk m chunkNo (Just value) = case M.lookup chunkNo m of
-      Nothing -> Right $ M.insert chunkNo value m
-      Just v -> if v == value then Right m else Left "different size or digest in chunk replicas"
-    foldChunks :: (Map Int (FileSize Word32), Map Int FileDigest) -> [FileServerReplica] -> Either String (Map Int FileChunk)
-    foldChunks sd = foldl' (addReplica sd) (Right M.empty)
-    addReplica :: (Map Int (FileSize Word32), Map Int FileDigest) -> Either String (Map Int FileChunk) -> FileServerReplica -> Either String (Map Int FileChunk)
-    addReplica _ (Left e) _ = Left e
-    addReplica (ms, md) (Right cs) FileServerReplica {chunkNo, server, replicaId, replicaKey} = do
-      case M.lookup chunkNo cs of
-        Just chunk@FileChunk {replicas} ->
-          let replica = FileChunkReplica {server, replicaId, replicaKey}
-           in Right $ M.insert chunkNo ((chunk :: FileChunk) {replicas = replica : replicas}) cs
-        _ -> do
-          case M.lookup chunkNo md of
-            Just digest' ->
-              let replica = FileChunkReplica {server, replicaId, replicaKey}
-                  chunkSize' = fromMaybe defChunkSize $ M.lookup chunkNo ms
-                  chunk = FileChunk {chunkNo, digest = digest', chunkSize = chunkSize', replicas = [replica]}
-               in Right $ M.insert chunkNo chunk cs
-            _ -> Left "no digest for chunk"
-    reverseReplicas c@FileChunk {replicas} = (c :: FileChunk) {replicas = reverse replicas}
@@ -1,434 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# OPTIONS_GHC -fno-warn-unticked-promoted-constructors #-}
-
-module Simplex.FileTransfer.Protocol where
-
-import Control.Applicative ((<|>))
-import Data.Aeson (FromJSON, ToJSON)
-import qualified Data.Aeson as J
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import Data.Bifunctor (first)
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import Data.Kind (Type)
-import Data.List.NonEmpty (NonEmpty (..))
-import Data.Maybe (isNothing)
-import Data.Type.Equality
-import Data.Word (Word32)
-import GHC.Generics (Generic)
-import Generic.Random (genericArbitraryU)
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Notifications.Transport (ntfClientHandshake)
-import Simplex.Messaging.Parsers
-import Simplex.Messaging.Protocol
-  ( BasicAuth,
-    CommandError (..),
-    Protocol (..),
-    ProtocolEncoding (..),
-    ProtocolErrorType (..),
-    ProtocolMsgTag (..),
-    ProtocolType (..),
-    RcvPublicDhKey,
-    RcvPublicVerifyKey,
-    RecipientId,
-    SenderId,
-    SentRawTransmission,
-    SignedTransmission,
-    SndPublicVerifyKey,
-    Transmission,
-    encodeTransmission,
-    messageTagP,
-    tDecodeParseValidate,
-    tEncode,
-    tEncodeBatch,
-    tParse,
-    _smpP,
-  )
-import Simplex.Messaging.Transport (SessionId, TransportError (..))
-import Simplex.Messaging.Util (bshow, (<$?>))
-import Simplex.Messaging.Version
-import Test.QuickCheck (Arbitrary (..))
-
-currentXFTPVersion :: Version
-currentXFTPVersion = 1
-
-xftpBlockSize :: Int
-xftpBlockSize = 16384
-
-- | File protocol clients
-data FileParty = FRecipient | FSender
-  deriving (Eq, Show, Generic)
-
-instance FromJSON FileParty where
-  parseJSON = J.genericParseJSON . enumJSON $ dropPrefix "F"
-
-instance ToJSON FileParty where
-  toJSON = J.genericToJSON . enumJSON $ dropPrefix "F"
-  toEncoding = J.genericToEncoding . enumJSON $ dropPrefix "F"
-
-data SFileParty :: FileParty -> Type where
-  SFRecipient :: SFileParty FRecipient
-  SFSender :: SFileParty FSender
-
-instance TestEquality SFileParty where
-  testEquality SFRecipient SFRecipient = Just Refl
-  testEquality SFSender SFSender = Just Refl
-  testEquality _ _ = Nothing
-
-deriving instance Eq (SFileParty p)
-
-deriving instance Show (SFileParty p)
-
-data AFileParty = forall p. FilePartyI p => AFP (SFileParty p)
-
-toFileParty :: SFileParty p -> FileParty
-toFileParty = \case
-  SFRecipient -> FRecipient
-  SFSender -> FSender
-
-aFileParty :: FileParty -> AFileParty
-aFileParty = \case
-  FRecipient -> AFP SFRecipient
-  FSender -> AFP SFSender
-
-class FilePartyI (p :: FileParty) where sFileParty :: SFileParty p
-
-instance FilePartyI FRecipient where sFileParty = SFRecipient
-
-instance FilePartyI FSender where sFileParty = SFSender
-
-data FileCommandTag (p :: FileParty) where
-  FNEW_ :: FileCommandTag FSender
-  FADD_ :: FileCommandTag FSender
-  FPUT_ :: FileCommandTag FSender
-  FDEL_ :: FileCommandTag FSender
-  FGET_ :: FileCommandTag FRecipient
-  FACK_ :: FileCommandTag FRecipient
-  PING_ :: FileCommandTag FRecipient
-
-deriving instance Show (FileCommandTag p)
-
-data FileCmdTag = forall p. FilePartyI p => FCT (SFileParty p) (FileCommandTag p)
-
-instance FilePartyI p => Encoding (FileCommandTag p) where
-  smpEncode = \case
-    FNEW_ -> "FNEW"
-    FADD_ -> "FADD"
-    FPUT_ -> "FPUT"
-    FDEL_ -> "FDEL"
-    FGET_ -> "FGET"
-    FACK_ -> "FACK"
-    PING_ -> "PING"
-  smpP = messageTagP
-
-instance Encoding FileCmdTag where
-  smpEncode (FCT _ t) = smpEncode t
-  smpP = messageTagP
-
-instance ProtocolMsgTag FileCmdTag where
-  decodeTag = \case
-    "FNEW" -> Just $ FCT SFSender FNEW_
-    "FADD" -> Just $ FCT SFSender FADD_
-    "FPUT" -> Just $ FCT SFSender FPUT_
-    "FDEL" -> Just $ FCT SFSender FDEL_
-    "FGET" -> Just $ FCT SFRecipient FGET_
-    "FACK" -> Just $ FCT SFRecipient FACK_
-    "PING" -> Just $ FCT SFRecipient PING_
-    _ -> Nothing
-
-instance FilePartyI p => ProtocolMsgTag (FileCommandTag p) where
-  decodeTag s = decodeTag s >>= (\(FCT _ t) -> checkParty' t)
-
-instance Protocol XFTPErrorType FileResponse where
-  type ProtoCommand FileResponse = FileCmd
-  type ProtoType FileResponse = 'PXFTP
-  protocolClientHandshake = ntfClientHandshake
-  protocolPing = FileCmd SFRecipient PING
-  protocolError = \case
-    FRErr e -> Just e
-    _ -> Nothing
-
-data FileCommand (p :: FileParty) where
-  FNEW :: FileInfo -> NonEmpty RcvPublicVerifyKey -> Maybe BasicAuth -> FileCommand FSender
-  FADD :: NonEmpty RcvPublicVerifyKey -> FileCommand FSender
-  FPUT :: FileCommand FSender
-  FDEL :: FileCommand FSender
-  FGET :: RcvPublicDhKey -> FileCommand FRecipient
-  FACK :: FileCommand FRecipient
-  PING :: FileCommand FRecipient
-
-deriving instance Show (FileCommand p)
-
-data FileCmd = forall p. FilePartyI p => FileCmd (SFileParty p) (FileCommand p)
-
-deriving instance Show FileCmd
-
-data FileInfo = FileInfo
-  { sndKey :: SndPublicVerifyKey,
-    size :: Word32,
-    digest :: ByteString
-  }
-  deriving (Eq, Show)
-
-type XFTPFileId = ByteString
-
-instance FilePartyI p => ProtocolEncoding XFTPErrorType (FileCommand p) where
-  type Tag (FileCommand p) = FileCommandTag p
-  encodeProtocol _v = \case
-    FNEW file rKeys auth_ -> e (FNEW_, ' ', file, rKeys, auth_)
-    FADD rKeys -> e (FADD_, ' ', rKeys)
-    FPUT -> e FPUT_
-    FDEL -> e FDEL_
-    FGET rKey -> e (FGET_, ' ', rKey)
-    FACK -> e FACK_
-    PING -> e PING_
-    where
-      e :: Encoding a => a -> ByteString
-      e = smpEncode
-
-  protocolP v tag = (\(FileCmd _ c) -> checkParty c) <$?> protocolP v (FCT (sFileParty @p) tag)
-
-  fromProtocolError = fromProtocolError @XFTPErrorType @FileResponse
-  {-# INLINE fromProtocolError #-}
-
-  checkCredentials (sig, _, fileId, _) cmd = case cmd of
-    -- FNEW must not have signature and chunk ID
-    FNEW {}
-      | isNothing sig -> Left $ CMD NO_AUTH
-      | not (B.null fileId) -> Left $ CMD HAS_AUTH
-      | otherwise -> Right cmd
-    PING
-      | isNothing sig && B.null fileId -> Right cmd
-      | otherwise -> Left $ CMD HAS_AUTH
-    -- other client commands must have both signature and queue ID
-    _
-      | isNothing sig || B.null fileId -> Left $ CMD NO_AUTH
-      | otherwise -> Right cmd
-
-instance ProtocolEncoding XFTPErrorType FileCmd where
-  type Tag FileCmd = FileCmdTag
-  encodeProtocol _v (FileCmd _ c) = encodeProtocol _v c
-
-  protocolP _v = \case
-    FCT SFSender tag ->
-      FileCmd SFSender <$> case tag of
-        FNEW_ -> FNEW <$> _smpP <*> smpP <*> smpP
-        FADD_ -> FADD <$> _smpP
-        FPUT_ -> pure FPUT
-        FDEL_ -> pure FDEL
-    FCT SFRecipient tag ->
-      FileCmd SFRecipient <$> case tag of
-        FGET_ -> FGET <$> _smpP
-        FACK_ -> pure FACK
-        PING_ -> pure PING
-
-  fromProtocolError = fromProtocolError @XFTPErrorType @FileResponse
-  {-# INLINE fromProtocolError #-}
-
-  checkCredentials t (FileCmd p c) = FileCmd p <$> checkCredentials t c
-
-instance Encoding FileInfo where
-  smpEncode FileInfo {sndKey, size, digest} = smpEncode (sndKey, size, digest)
-  smpP = FileInfo <$> smpP <*> smpP <*> smpP
-
-instance StrEncoding FileInfo where
-  strEncode FileInfo {sndKey, size, digest} = strEncode (sndKey, size, digest)
-  strP = FileInfo <$> strP_ <*> strP_ <*> strP
-
-data FileResponseTag
-  = FRSndIds_
-  | FRRcvIds_
-  | FRFile_
-  | FROk_
-  | FRErr_
-  | FRPong_
-  deriving (Show)
-
-instance Encoding FileResponseTag where
-  smpEncode = \case
-    FRSndIds_ -> "SIDS"
-    FRRcvIds_ -> "RIDS"
-    FRFile_ -> "FILE"
-    FROk_ -> "OK"
-    FRErr_ -> "ERR"
-    FRPong_ -> "PONG"
-  smpP = messageTagP
-
-instance ProtocolMsgTag FileResponseTag where
-  decodeTag = \case
-    "SIDS" -> Just FRSndIds_
-    "RIDS" -> Just FRRcvIds_
-    "FILE" -> Just FRFile_
-    "OK" -> Just FROk_
-    "ERR" -> Just FRErr_
-    "PONG" -> Just FRPong_
-    _ -> Nothing
-
-data FileResponse
-  = FRSndIds SenderId (NonEmpty RecipientId)
-  | FRRcvIds (NonEmpty RecipientId)
-  | FRFile RcvPublicDhKey C.CbNonce
-  | FROk
-  | FRErr XFTPErrorType
-  | FRPong
-  deriving (Show)
-
-instance ProtocolEncoding XFTPErrorType FileResponse where
-  type Tag FileResponse = FileResponseTag
-  encodeProtocol _v = \case
-    FRSndIds fId rIds -> e (FRSndIds_, ' ', fId, rIds)
-    FRRcvIds rIds -> e (FRRcvIds_, ' ', rIds)
-    FRFile rDhKey nonce -> e (FRFile_, ' ', rDhKey, nonce)
-    FROk -> e FROk_
-    FRErr err -> e (FRErr_, ' ', err)
-    FRPong -> e FRPong_
-    where
-      e :: Encoding a => a -> ByteString
-      e = smpEncode
-
-  protocolP _v = \case
-    FRSndIds_ -> FRSndIds <$> _smpP <*> smpP
-    FRRcvIds_ -> FRRcvIds <$> _smpP
-    FRFile_ -> FRFile <$> _smpP <*> smpP
-    FROk_ -> pure FROk
-    FRErr_ -> FRErr <$> _smpP
-    FRPong_ -> pure FRPong
-
-  fromProtocolError = \case
-    PECmdSyntax -> CMD SYNTAX
-    PECmdUnknown -> CMD UNKNOWN
-    PESession -> SESSION
-    PEBlock -> BLOCK
-  {-# INLINE fromProtocolError #-}
-
-  checkCredentials (_, _, entId, _) cmd = case cmd of
-    FRSndIds {} -> noEntity
-    -- ERR response does not always have entity ID
-    FRErr _ -> Right cmd
-    -- PONG response must not have queue ID
-    FRPong -> noEntity
-    -- other server responses must have entity ID
-    _
-      | B.null entId -> Left $ CMD NO_ENTITY
-      | otherwise -> Right cmd
-    where
-      noEntity
-        | B.null entId = Right cmd
-        | otherwise = Left $ CMD HAS_AUTH
-
-data XFTPErrorType
-  = -- | incorrect block format, encoding or signature size
-    BLOCK
-  | -- | incorrect SMP session ID (TLS Finished message / tls-unique binding RFC5929)
-    SESSION
-  | -- | SMP command is unknown or has invalid syntax
-    CMD {cmdErr :: CommandError}
-  | -- | command authorization error - bad signature or non-existing SMP queue
-    AUTH
-  | -- | incorrent file size
-    SIZE
-  | -- | storage quota exceeded
-    QUOTA
-  | -- | incorrent file digest
-    DIGEST
-  | -- | file encryption/decryption failed
-    CRYPTO
-  | -- | no expected file body in request/response or no file on the server
-    NO_FILE
-  | -- | unexpected file body
-    HAS_FILE
-  | -- | file IO error
-    FILE_IO
-  | -- | internal server error
-    INTERNAL
-  | -- | used internally, never returned by the server (to be removed)
-    DUPLICATE_ -- not part of SMP protocol, used internally
-  deriving (Eq, Generic, Read, Show)
-
-instance ToJSON XFTPErrorType where
-  toJSON = J.genericToJSON $ sumTypeJSON id
-  toEncoding = J.genericToEncoding $ sumTypeJSON id
-
-instance StrEncoding XFTPErrorType where
-  strEncode = \case
-    CMD e -> "CMD " <> bshow e
-    e -> bshow e
-  strP = "CMD " *> (CMD <$> parseRead1) <|> parseRead1
-
-instance Arbitrary XFTPErrorType where arbitrary = genericArbitraryU
-
-instance Encoding XFTPErrorType where
-  smpEncode = \case
-    BLOCK -> "BLOCK"
-    SESSION -> "SESSION"
-    CMD err -> "CMD " <> smpEncode err
-    AUTH -> "AUTH"
-    SIZE -> "SIZE"
-    QUOTA -> "QUOTA"
-    DIGEST -> "DIGEST"
-    CRYPTO -> "CRYPTO"
-    NO_FILE -> "NO_FILE"
-    HAS_FILE -> "HAS_FILE"
-    FILE_IO -> "FILE_IO"
-    INTERNAL -> "INTERNAL"
-    DUPLICATE_ -> "DUPLICATE_"
-
-  smpP =
-    A.takeTill (== ' ') >>= \case
-      "BLOCK" -> pure BLOCK
-      "SESSION" -> pure SESSION
-      "CMD" -> CMD <$> _smpP
-      "AUTH" -> pure AUTH
-      "SIZE" -> pure SIZE
-      "QUOTA" -> pure QUOTA
-      "DIGEST" -> pure DIGEST
-      "CRYPTO" -> pure CRYPTO
-      "NO_FILE" -> pure NO_FILE
-      "HAS_FILE" -> pure HAS_FILE
-      "FILE_IO" -> pure FILE_IO
-      "INTERNAL" -> pure INTERNAL
-      "DUPLICATE_" -> pure DUPLICATE_
-      _ -> fail "bad error type"
-
-checkParty :: forall t p p'. (FilePartyI p, FilePartyI p') => t p' -> Either String (t p)
-checkParty c = case testEquality (sFileParty @p) (sFileParty @p') of
-  Just Refl -> Right c
-  Nothing -> Left "incorrect XFTP party"
-
-checkParty' :: forall t p p'. (FilePartyI p, FilePartyI p') => t p' -> Maybe (t p)
-checkParty' c = case testEquality (sFileParty @p) (sFileParty @p') of
-  Just Refl -> Just c
-  _ -> Nothing
-
-xftpEncodeTransmission :: ProtocolEncoding e c => SessionId -> Maybe C.APrivateSignKey -> Transmission c -> Either TransportError ByteString
-xftpEncodeTransmission sessionId pKey (corrId, fId, msg) = do
-  let t = encodeTransmission currentXFTPVersion sessionId (corrId, fId, msg)
-  xftpEncodeBatch1 $ signTransmission t
-  where
-    signTransmission :: ByteString -> SentRawTransmission
-    signTransmission t = ((`C.sign` t) <$> pKey, t)
-
-- this function uses batch syntax but puts only one transmission in the batch
-xftpEncodeBatch1 :: (Maybe C.ASignature, ByteString) -> Either TransportError ByteString
-xftpEncodeBatch1 (sig, t) =
-  let t' = tEncodeBatch 1 . smpEncode . Large $ tEncode (sig, t)
-   in first (const TELargeMsg) $ C.pad t' xftpBlockSize
-
-xftpDecodeTransmission :: ProtocolEncoding e c => SessionId -> ByteString -> Either XFTPErrorType (SignedTransmission e c)
-xftpDecodeTransmission sessionId t = do
-  t' <- first (const BLOCK) $ C.unPad t
-  case tParse True t' of
-    t'' :| [] -> Right $ tDecodeParseValidate sessionId currentXFTPVersion t''
-    _ -> Left BLOCK
@@ -1,403 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE OverloadedLists #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Simplex.FileTransfer.Server where
-
-import Control.Logger.Simple
-import Control.Monad.Except
-import Control.Monad.IO.Unlift (MonadUnliftIO)
-import Control.Monad.Reader
-import Crypto.Random (getRandomBytes)
-import Data.Bifunctor (first)
-import qualified Data.ByteString.Base64.URL as B64
-import Data.ByteString.Builder (byteString)
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import Data.Functor (($>))
-import Data.Int (Int64)
-import Data.List (intercalate)
-import Data.List.NonEmpty (NonEmpty)
-import qualified Data.List.NonEmpty as L
-import qualified Data.Map.Strict as M
-import qualified Data.Text as T
-import Data.Time.Clock (UTCTime (..), diffTimeToPicoseconds, getCurrentTime)
-import Data.Time.Clock.System (SystemTime (..), getSystemTime)
-import Data.Time.Format.ISO8601 (iso8601Show)
-import Data.Word (Word32)
-import qualified Network.HTTP.Types as N
-import qualified Network.HTTP2.Server as H
-import Simplex.FileTransfer.Protocol
-import Simplex.FileTransfer.Server.Env
-import Simplex.FileTransfer.Server.Stats
-import Simplex.FileTransfer.Server.Store
-import Simplex.FileTransfer.Server.StoreLog
-import Simplex.FileTransfer.Transport
-import qualified Simplex.Messaging.Crypto as C
-import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (CorrId, RcvPublicDhKey, RcvPublicVerifyKey, RecipientId)
-import Simplex.Messaging.Server (dummyVerifyCmd, verifyCmdSignature)
-import Simplex.Messaging.Server.Expiration
-import Simplex.Messaging.Server.Stats
-import Simplex.Messaging.Transport.HTTP2
-import Simplex.Messaging.Transport.HTTP2.Server
-import Simplex.Messaging.Util
-import System.Exit (exitFailure)
-import System.FilePath ((</>))
-import System.IO (BufferMode (..), hPutStrLn, hSetBuffering)
-import UnliftIO (IOMode (..), withFile)
-import UnliftIO.Concurrent (threadDelay)
-import UnliftIO.Directory (doesFileExist, removeFile, renameFile)
-import UnliftIO.Exception
-import UnliftIO.STM
-
-type M a = ReaderT XFTPEnv IO a
-
-runXFTPServer :: XFTPServerConfig -> IO ()
-runXFTPServer cfg = do
-  started <- newEmptyTMVarIO
-  runXFTPServerBlocking started cfg
-
-runXFTPServerBlocking :: TMVar Bool -> XFTPServerConfig -> IO ()
-runXFTPServerBlocking started cfg = newXFTPServerEnv cfg >>= runReaderT (xftpServer cfg started)
-
-xftpServer :: XFTPServerConfig -> TMVar Bool -> M ()
-xftpServer cfg@XFTPServerConfig {xftpPort, transportConfig} started = do
-  restoreServerStats
-  raceAny_ (runServer : expireFilesThread_ cfg <> serverStatsThread_ cfg) `finally` stopServer
-  where
-    runServer :: M ()
-    runServer = do
-      serverParams <- asks tlsServerParams
-      env <- ask
-      liftIO $
-        runHTTP2Server started xftpPort defaultHTTP2BufferSize serverParams transportConfig $ \sessionId r sendResponse -> do
-          reqBody <- getHTTP2Body r xftpBlockSize
-          processRequest HTTP2Request {sessionId, request = r, reqBody, sendResponse} `runReaderT` env
-
-    stopServer :: M ()
-    stopServer = do
-      withFileLog closeStoreLog
-      saveServerStats
-
-    expireFilesThread_ :: XFTPServerConfig -> [M ()]
-    expireFilesThread_ XFTPServerConfig {fileExpiration = Just fileExp} = [expireFiles fileExp]
-    expireFilesThread_ _ = []
-
-    expireFiles :: ExpirationConfig -> M ()
-    expireFiles expCfg = do
-      st <- asks store
-      let interval = checkInterval expCfg * 1000000
-      forever $ do
-        liftIO $ threadDelay' interval
-        old <- liftIO $ expireBeforeEpoch expCfg
-        sIds <- M.keysSet <$> readTVarIO (files st)
-        forM_ sIds $ \sId -> do
-          threadDelay 100000
-          atomically (expiredFilePath st sId old)
-            >>= mapM_ (remove $ delete st sId)
-      where
-        remove del filePath =
-          ifM
-            (doesFileExist filePath)
-            (removeFile filePath >> del `catch` \(e :: SomeException) -> logError $ "failed to remove expired file " <> tshow filePath <> ": " <> tshow e)
-            del
-        delete st sId = do
-          withFileLog (`logDeleteFile` sId)
-          void $ atomically $ deleteFile st sId
-
-    serverStatsThread_ :: XFTPServerConfig -> [M ()]
-    serverStatsThread_ XFTPServerConfig {logStatsInterval = Just interval, logStatsStartTime, serverStatsLogFile} =
-      [logServerStats logStatsStartTime interval serverStatsLogFile]
-    serverStatsThread_ _ = []
-
-    logServerStats :: Int64 -> Int64 -> FilePath -> M ()
-    logServerStats startAt logInterval statsFilePath = do
-      initialDelay <- (startAt -) . fromIntegral . (`div` 1000000_000000) . diffTimeToPicoseconds . utctDayTime <$> liftIO getCurrentTime
-      liftIO $ putStrLn $ "server stats log enabled: " <> statsFilePath
-      liftIO $ threadDelay' $ 1_000_000 * (initialDelay + if initialDelay < 0 then 86_400 else 0)
-      FileServerStats {fromTime, filesCreated, fileRecipients, filesUploaded, filesDeleted, filesDownloaded, fileDownloads, fileDownloadAcks, filesCount, filesSize} <- asks serverStats
-      let interval = 1_000_000 * logInterval
-      forever $ do
-        withFile statsFilePath AppendMode $ \h -> liftIO $ do
-          hSetBuffering h LineBuffering
-          ts <- getCurrentTime
-          fromTime' <- atomically $ swapTVar fromTime ts
-          filesCreated' <- atomically $ swapTVar filesCreated 0
-          fileRecipients' <- atomically $ swapTVar fileRecipients 0
-          filesUploaded' <- atomically $ swapTVar filesUploaded 0
-          filesDeleted' <- atomically $ swapTVar filesDeleted 0
-          files <- atomically $ periodStatCounts filesDownloaded ts
-          fileDownloads' <- atomically $ swapTVar fileDownloads 0
-          fileDownloadAcks' <- atomically $ swapTVar fileDownloadAcks 0
-          filesCount' <- atomically $ swapTVar filesCount 0
-          filesSize' <- atomically $ swapTVar filesSize 0
-          hPutStrLn h $
-            intercalate
-              ","
-              [ iso8601Show $ utctDay fromTime',
-                show filesCreated',
-                show fileRecipients',
-                show filesUploaded',
-                show filesDeleted',
-                dayCount files,
-                weekCount files,
-                monthCount files,
-                show fileDownloads',
-                show fileDownloadAcks',
-                show filesCount',
-                show filesSize'
-              ]
-        liftIO $ threadDelay' interval
-
-data ServerFile = ServerFile
-  { filePath :: FilePath,
-    fileSize :: Word32,
-    sbState :: LC.SbState
-  }
-
-processRequest :: HTTP2Request -> M ()
-processRequest HTTP2Request {sessionId, reqBody = body@HTTP2Body {bodyHead}, sendResponse}
-  | B.length bodyHead /= xftpBlockSize = sendXFTPResponse ("", "", FRErr BLOCK) Nothing
-  | otherwise = do
-    case xftpDecodeTransmission sessionId bodyHead of
-      Right (sig_, signed, (corrId, fId, cmdOrErr)) -> do
-        case cmdOrErr of
-          Right cmd -> do
-            verifyXFTPTransmission sig_ signed fId cmd >>= \case
-              VRVerified req -> uncurry send =<< processXFTPRequest body req
-              VRFailed -> send (FRErr AUTH) Nothing
-          Left e -> send (FRErr e) Nothing
-        where
-          send resp = sendXFTPResponse (corrId, fId, resp)
-      Left e -> sendXFTPResponse ("", "", FRErr e) Nothing
-  where
-    sendXFTPResponse :: (CorrId, XFTPFileId, FileResponse) -> Maybe ServerFile -> M ()
-    sendXFTPResponse (corrId, fId, resp) serverFile_ = do
-      let t_ = xftpEncodeTransmission sessionId Nothing (corrId, fId, resp)
-      liftIO $ sendResponse $ H.responseStreaming N.ok200 [] $ streamBody t_
-      where
-        streamBody t_ send done = do
-          case t_ of
-            Left _ -> do
-              send "padding error" -- TODO respond with BLOCK error?
-              done
-            Right t -> do
-              send $ byteString t
-              -- timeout sending file in the same way as receiving
-              forM_ serverFile_ $ \ServerFile {filePath, fileSize, sbState} -> do
-                withFile filePath ReadMode $ \h -> sendEncFile h send sbState (fromIntegral fileSize)
-          done
-
-data VerificationResult = VRVerified XFTPRequest | VRFailed
-
-verifyXFTPTransmission :: Maybe C.ASignature -> ByteString -> XFTPFileId -> FileCmd -> M VerificationResult
-verifyXFTPTransmission sig_ signed fId cmd =
-  case cmd of
-    FileCmd SFSender (FNEW file rcps auth) -> pure $ XFTPReqNew file rcps auth `verifyWith` sndKey file
-    FileCmd SFRecipient PING -> pure $ VRVerified XFTPReqPing
-    FileCmd party _ -> verifyCmd party
-  where
-    verifyCmd :: SFileParty p -> M VerificationResult
-    verifyCmd party = do
-      st <- asks store
-      atomically $ verify <$> getFile st party fId
-      where
-        verify = \case
-          Right (fr, k) -> XFTPReqCmd fId fr cmd `verifyWith` k
-          _ -> maybe False (dummyVerifyCmd signed) sig_ `seq` VRFailed
-    req `verifyWith` k = if verifyCmdSignature sig_ signed k then VRVerified req else VRFailed
-
-processXFTPRequest :: HTTP2Body -> XFTPRequest -> M (FileResponse, Maybe ServerFile)
-processXFTPRequest HTTP2Body {bodyPart} = \case
-  XFTPReqNew file rks auth -> noFile =<< ifM allowNew (createFile file rks) (pure $ FRErr AUTH)
-    where
-      allowNew = do
-        XFTPServerConfig {allowNewFiles, newFileBasicAuth} <- asks config
-        pure $ allowNewFiles && maybe True ((== auth) . Just) newFileBasicAuth
-  XFTPReqCmd fId fr (FileCmd _ cmd) -> case cmd of
-    FADD rks -> noFile =<< addRecipients fId rks
-    FPUT -> noFile =<< receiveServerFile fr
-    FDEL -> noFile =<< deleteServerFile fr
-    FGET rDhKey -> sendServerFile fr rDhKey
-    FACK -> noFile =<< ackFileReception fId fr
-    -- it should never get to the commands below, they are passed in other constructors of XFTPRequest
-    FNEW {} -> noFile $ FRErr INTERNAL
-    PING -> noFile FRPong
-  XFTPReqPing -> noFile FRPong
-  where
-    noFile resp = pure (resp, Nothing)
-    createFile :: FileInfo -> NonEmpty RcvPublicVerifyKey -> M FileResponse
-    createFile file rks = do
-      st <- asks store
-      r <- runExceptT $ do
-        sizes <- asks $ allowedChunkSizes . config
-        unless (size file `elem` sizes) $ throwError SIZE
-        ts <- liftIO getSystemTime
-        -- TODO validate body empty
-        sId <- ExceptT $ addFileRetry st file 3 ts
-        rcps <- mapM (ExceptT . addRecipientRetry st 3 sId) rks
-        withFileLog $ \sl -> do
-          logAddFile sl sId file ts
-          logAddRecipients sl sId rcps
-        stats <- asks serverStats
-        atomically $ modifyTVar' (filesCreated stats) (+ 1)
-        atomically $ modifyTVar' (fileRecipients stats) (+ length rks)
-        let rIds = L.map (\(FileRecipient rId _) -> rId) rcps
-        pure $ FRSndIds sId rIds
-      pure $ either FRErr id r
-    addFileRetry :: FileStore -> FileInfo -> Int -> SystemTime -> M (Either XFTPErrorType XFTPFileId)
-    addFileRetry st file n ts =
-      retryAdd n $ \sId -> runExceptT $ do
-        ExceptT $ addFile st sId file ts
-        pure sId
-    addRecipientRetry :: FileStore -> Int -> XFTPFileId -> RcvPublicVerifyKey -> M (Either XFTPErrorType FileRecipient)
-    addRecipientRetry st n sId rpk =
-      retryAdd n $ \rId -> runExceptT $ do
-        let rcp = FileRecipient rId rpk
-        ExceptT $ addRecipient st sId rcp
-        pure rcp
-    retryAdd :: Int -> (XFTPFileId -> STM (Either XFTPErrorType a)) -> M (Either XFTPErrorType a)
-    retryAdd 0 _ = pure $ Left INTERNAL
-    retryAdd n add = do
-      fId <- getFileId
-      atomically (add fId) >>= \case
-        Left DUPLICATE_ -> retryAdd (n - 1) add
-        r -> pure r
-    addRecipients :: XFTPFileId -> NonEmpty RcvPublicVerifyKey -> M FileResponse
-    addRecipients sId rks = do
-      st <- asks store
-      r <- runExceptT $ do
-        rcps <- mapM (ExceptT . addRecipientRetry st 3 sId) rks
-        withFileLog $ \sl -> logAddRecipients sl sId rcps
-        stats <- asks serverStats
-        atomically $ modifyTVar' (fileRecipients stats) (+ length rks)
-        let rIds = L.map (\(FileRecipient rId _) -> rId) rcps
-        pure $ FRRcvIds rIds
-      pure $ either FRErr id r
-    receiveServerFile :: FileRec -> M FileResponse
-    receiveServerFile fr@FileRec {senderId, fileInfo} = case bodyPart of
-      -- TODO do not allow repeated file upload
-      Nothing -> pure $ FRErr SIZE
-      Just getBody -> do
-        -- TODO validate body size before downloading, once it's populated
-        path <- asks $ filesPath . config
-        let fPath = path </> B.unpack (B64.encode senderId)
-            FileInfo {size, digest} = fileInfo
-        withFileLog $ \sl -> logPutFile sl senderId fPath
-        st <- asks store
-        quota_ <- asks $ fileSizeQuota . config
-        -- TODO timeout file upload, remove partially uploaded files
-        stats <- asks serverStats
-        liftIO $
-          runExceptT (receiveFile getBody (XFTPRcvChunkSpec fPath size digest)) >>= \case
-            Right () -> do
-              used <- readTVarIO $ usedStorage st
-              if maybe False (used + fromIntegral size >) quota_
-                then remove fPath $> FRErr QUOTA
-                else do
-                  atomically (setFilePath' st fr fPath)
-                  atomically $ modifyTVar' (filesUploaded stats) (+ 1)
-                  atomically $ modifyTVar' (filesCount stats) (+ 1)
-                  atomically $ modifyTVar' (filesSize stats) (+ fromIntegral size)
-                  pure FROk
-            Left e -> remove fPath $> FRErr e
-        where
-          remove fPath = whenM (doesFileExist fPath) (removeFile fPath) `catch` logFileError
-
-    sendServerFile :: FileRec -> RcvPublicDhKey -> M (FileResponse, Maybe ServerFile)
-    sendServerFile FileRec {senderId, filePath, fileInfo = FileInfo {size}} rDhKey = do
-      readTVarIO filePath >>= \case
-        Just path -> do
-          (sDhKey, spDhKey) <- liftIO C.generateKeyPair'
-          let dhSecret = C.dh' rDhKey spDhKey
-          cbNonce <- liftIO C.randomCbNonce
-          case LC.cbInit dhSecret cbNonce of
-            Right sbState -> do
-              stats <- asks serverStats
-              atomically $ modifyTVar' (fileDownloads stats) (+ 1)
-              atomically $ updatePeriodStats (filesDownloaded stats) senderId
-              pure (FRFile sDhKey cbNonce, Just ServerFile {filePath = path, fileSize = size, sbState})
-            _ -> pure (FRErr INTERNAL, Nothing)
-        _ -> pure (FRErr NO_FILE, Nothing)
-
-    deleteServerFile :: FileRec -> M FileResponse
-    deleteServerFile FileRec {senderId, fileInfo, filePath} = do
-      withFileLog (`logDeleteFile` senderId)
-      r <- runExceptT $ do
-        path <- readTVarIO filePath
-        stats <- asks serverStats
-        ExceptT $ first (\(_ :: SomeException) -> FILE_IO) <$> try (forM_ path $ \p -> whenM (doesFileExist p) (removeFile p >> deletedStats stats))
-        st <- asks store
-        void $ atomically $ deleteFile st senderId
-        atomically $ modifyTVar' (filesDeleted stats) (+ 1)
-        pure FROk
-      either (pure . FRErr) pure r
-      where
-        deletedStats stats = do
-          atomically $ modifyTVar' (filesCount stats) (subtract 1)
-          atomically $ modifyTVar' (filesSize stats) (subtract $ fromIntegral $ size fileInfo)
-
-    logFileError :: SomeException -> IO ()
-    logFileError e = logError $ "Error deleting file: " <> tshow e
-
-    ackFileReception :: RecipientId -> FileRec -> M FileResponse
-    ackFileReception rId fr = do
-      withFileLog (`logAckFile` rId)
-      st <- asks store
-      atomically $ deleteRecipient st rId fr
-      stats <- asks serverStats
-      atomically $ modifyTVar' (fileDownloadAcks stats) (+ 1)
-      pure FROk
-
-randomId :: (MonadUnliftIO m, MonadReader XFTPEnv m) => Int -> m ByteString
-randomId n = do
-  gVar <- asks idsDrg
-  atomically (C.pseudoRandomBytes n gVar)
-
-getFileId :: M XFTPFileId
-getFileId = liftIO . getRandomBytes =<< asks (fileIdSize . config)
-
-withFileLog :: (MonadIO m, MonadReader XFTPEnv m) => (StoreLog 'WriteMode -> IO a) -> m ()
-withFileLog action = liftIO . mapM_ action =<< asks storeLog
-
-incFileStat :: (FileServerStats -> TVar Int) -> M ()
-incFileStat statSel = do
-  stats <- asks serverStats
-  atomically $ modifyTVar (statSel stats) (+ 1)
-
-saveServerStats :: M ()
-saveServerStats =
-  asks (serverStatsBackupFile . config)
-    >>= mapM_ (\f -> asks serverStats >>= atomically . getFileServerStatsData >>= liftIO . saveStats f)
-  where
-    saveStats f stats = do
-      logInfo $ "saving server stats to file " <> T.pack f
-      B.writeFile f $ strEncode stats
-      logInfo "server stats saved"
-
-restoreServerStats :: M ()
-restoreServerStats = asks (serverStatsBackupFile . config) >>= mapM_ restoreStats
-  where
-    restoreStats f = whenM (doesFileExist f) $ do
-      logInfo $ "restoring server stats from file " <> T.pack f
-      liftIO (strDecode <$> B.readFile f) >>= \case
-        Right d -> do
-          s <- asks serverStats
-          fs <- readTVarIO . files =<< asks store
-          let _filesCount = length $ M.keys fs
-              _filesSize = M.foldl' (\n -> (n +) . fromIntegral . size . fileInfo) 0 fs
-          atomically $ setFileServerStats s d {_filesCount, _filesSize}
-          renameFile f $ f <> ".bak"
-          logInfo "server stats restored"
-        Left e -> do
-          logInfo $ "error restoring server stats: " <> T.pack e
-          liftIO exitFailure
@@ -1,98 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE StrictData #-}
-
-module Simplex.FileTransfer.Server.Env where
-
-import Control.Logger.Simple (logInfo)
-import Control.Monad
-import Control.Monad.IO.Unlift
-import Crypto.Random
-import Data.Int (Int64)
-import Data.List.NonEmpty (NonEmpty)
-import Data.Time.Clock (getCurrentTime)
-import Data.Word (Word32)
-import Data.X509.Validation (Fingerprint (..))
-import Network.Socket
-import qualified Network.TLS as T
-import Simplex.FileTransfer.Protocol (FileCmd, FileInfo, XFTPFileId)
-import Simplex.FileTransfer.Server.Stats
-import Simplex.FileTransfer.Server.Store
-import Simplex.FileTransfer.Server.StoreLog
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Protocol (BasicAuth, RcvPublicVerifyKey)
-import Simplex.Messaging.Server.Expiration
-import Simplex.Messaging.Transport.Server (loadFingerprint, loadTLSServerParams, TransportServerConfig)
-import Simplex.Messaging.Util (tshow)
-import System.IO (IOMode (..))
-import UnliftIO.STM
-
-data XFTPServerConfig = XFTPServerConfig
-  { xftpPort :: ServiceName,
-    fileIdSize :: Int,
-    storeLogFile :: Maybe FilePath,
-    filesPath :: FilePath,
-    -- | server storage quota
-    fileSizeQuota :: Maybe Int64,
-    -- | allowed file chunk sizes
-    allowedChunkSizes :: [Word32],
-    -- | set to False to prohibit creating new files
-    allowNewFiles :: Bool,
-    -- | simple password that the clients need to pass in handshake to be able to create new files
-    newFileBasicAuth :: Maybe BasicAuth,
-    -- | time after which the files can be removed and check interval, seconds
-    fileExpiration :: Maybe ExpirationConfig,
-    -- CA certificate private key is not needed for initialization
-    caCertificateFile :: FilePath,
-    privateKeyFile :: FilePath,
-    certificateFile :: FilePath,
-    -- stats config - see SMP server config
-    logStatsInterval :: Maybe Int64,
-    logStatsStartTime :: Int64,
-    serverStatsLogFile :: FilePath,
-    serverStatsBackupFile :: Maybe FilePath,
-    transportConfig :: TransportServerConfig
-  }
-
-data XFTPEnv = XFTPEnv
-  { config :: XFTPServerConfig,
-    store :: FileStore,
-    storeLog :: Maybe (StoreLog 'WriteMode),
-    idsDrg :: TVar ChaChaDRG,
-    serverIdentity :: C.KeyHash,
-    tlsServerParams :: T.ServerParams,
-    serverStats :: FileServerStats
-  }
-
-defFileExpirationHours :: Int64
-defFileExpirationHours = 48
-
-defaultFileExpiration :: ExpirationConfig
-defaultFileExpiration =
-  ExpirationConfig
-    { ttl = defFileExpirationHours * 3600, -- seconds
-      checkInterval = 2 * 3600 -- seconds, 2 hours
-    }
-
-newXFTPServerEnv :: (MonadUnliftIO m, MonadRandom m) => XFTPServerConfig -> m XFTPEnv
-newXFTPServerEnv config@XFTPServerConfig {storeLogFile, fileSizeQuota, caCertificateFile, certificateFile, privateKeyFile} = do
-  idsDrg <- drgNew >>= newTVarIO
-  store <- atomically newFileStore
-  storeLog <- liftIO $ mapM (`readWriteFileStore` store) storeLogFile
-  used <- readTVarIO (usedStorage store)
-  forM_ fileSizeQuota $ \quota -> do
-    logInfo $ "Total / available storage: " <> tshow quota <> " / " <> tshow (quota - used)
-    when (quota < used) $ logInfo "WARNING: storage quota is less than used storage, no files can be uploaded!"
-  tlsServerParams <- liftIO $ loadTLSServerParams caCertificateFile certificateFile privateKeyFile
-  Fingerprint fp <- liftIO $ loadFingerprint caCertificateFile
-  serverStats <- atomically . newFileServerStats =<< liftIO getCurrentTime
-  pure XFTPEnv {config, store, storeLog, idsDrg, tlsServerParams, serverIdentity = C.KeyHash fp, serverStats}
-
-data XFTPRequest
-  = XFTPReqNew FileInfo (NonEmpty RcvPublicVerifyKey) (Maybe BasicAuth)
-  | XFTPReqCmd XFTPFileId FileRec FileCmd
-  | XFTPReqPing
@@ -1,227 +0,0 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedLists #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE PatternSynonyms #-}
-
-module Simplex.FileTransfer.Server.Main where
-
-import qualified Data.ByteString.Char8 as B
-import Data.Either (fromRight)
-import Data.Functor (($>))
-import Data.Ini (lookupValue, readIniFile)
-import Data.Int (Int64)
-import Data.Maybe (fromMaybe)
-import qualified Data.Text as T
-import Network.Socket (HostName)
-import Options.Applicative
-import Simplex.FileTransfer.Description (FileSize (..), kb, mb)
-import Simplex.FileTransfer.Server (runXFTPServer)
-import Simplex.FileTransfer.Server.Env (XFTPServerConfig (..), defaultFileExpiration, defFileExpirationHours)
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (ProtoServerWithAuth (..), pattern XFTPServer)
-import Simplex.Messaging.Server.CLI
-import Simplex.Messaging.Server.Expiration
-import Simplex.Messaging.Transport.Client (TransportHost (..))
-import Simplex.Messaging.Transport.Server (TransportServerConfig (..), defaultTransportServerConfig)
-import System.Directory (createDirectoryIfMissing, doesFileExist)
-import System.FilePath (combine)
-import System.IO (BufferMode (..), hSetBuffering, stderr, stdout)
-import Text.Read (readMaybe)
-
-xftpServerVersion :: String
-xftpServerVersion = "1.0.1"
-
-xftpServerCLI :: FilePath -> FilePath -> IO ()
-xftpServerCLI cfgPath logPath = do
-  getCliCommand' (cliCommandP cfgPath logPath iniFile) serverVersion >>= \case
-    Init opts ->
-      doesFileExist iniFile >>= \case
-        True -> exitError $ "Error: server is already initialized (" <> iniFile <> " exists).\nRun `" <> executableName <> " start`."
-        _ -> initializeServer opts
-    Start ->
-      doesFileExist iniFile >>= \case
-        True -> readIniFile iniFile >>= either exitError runServer
-        _ -> exitError $ "Error: server is not initialized (" <> iniFile <> " does not exist).\nRun `" <> executableName <> " init`."
-    Delete -> do
-      confirmOrExit "WARNING: deleting the server will make all queues inaccessible, because the server identity (certificate fingerprint) will change.\nTHIS CANNOT BE UNDONE!"
-      deleteDirIfExists cfgPath
-      deleteDirIfExists logPath
-      putStrLn "Deleted configuration and log files"
-  where
-    iniFile = combine cfgPath "file-server.ini"
-    serverVersion = "SimpleX XFTP server v" <> xftpServerVersion
-    defaultServerPort = "443"
-    executableName = "file-server"
-    storeLogFilePath = combine logPath "file-server-store.log"
-    initializeServer InitOptions {enableStoreLog, signAlgorithm, ip, fqdn, filesPath, fileSizeQuota} = do
-      clearDirIfExists cfgPath
-      clearDirIfExists logPath
-      createDirectoryIfMissing True cfgPath
-      createDirectoryIfMissing True logPath
-      let x509cfg = defaultX509Config {commonName = fromMaybe ip fqdn, signAlgorithm}
-      fp <- createServerX509 cfgPath x509cfg
-      let host = fromMaybe (if ip == "127.0.0.1" then "<hostnames>" else ip) fqdn
-          srv = ProtoServerWithAuth (XFTPServer [THDomainName host] "" (C.KeyHash fp)) Nothing
-      writeFile iniFile $ iniFileContent host
-      putStrLn $ "Server initialized, you can modify configuration in " <> iniFile <> ".\nRun `" <> executableName <> " start` to start server."
-      warnCAPrivateKeyFile cfgPath x509cfg
-      printServiceInfo serverVersion srv
-      where
-        iniFileContent host =
-          "[STORE_LOG]\n\
-          \# The server uses STM memory for persistence,\n\
-          \# that will be lost on restart (e.g., as with redis).\n\
-          \# This option enables saving memory to append only log,\n\
-          \# and restoring it when the server is started.\n\
-          \# Log is compacted on start (deleted objects are removed).\n"
-            <> ("enable: " <> onOff enableStoreLog <> "\n\n")
-            <> "# Expire files after the specified number of hours.\n"
-            <> ("expire_files_hours: " <> show defFileExpirationHours <> "\n\n")
-            <> "log_stats: off\n\
-               \\n\
-               \[AUTH]\n\
-               \# Set new_files option to off to completely prohibit uploading new files.\n\
-               \# This can be useful when you want to decommission the server, but still allow downloading the existing files.\n\
-               \new_files: on\n\
-               \\n\
-               \# Use create_password option to enable basic auth to upload new files.\n\
-               \# The password should be used as part of server address in client configuration:\n\
-               \# xftp://fingerprint:password@host1,host2\n\
-               \# The password will not be shared with file recipients, you must share it only\n\
-               \# with the users who you want to allow uploading files to your server.\n\
-               \# create_password: password to upload files (any printable ASCII characters without whitespace, '@', ':' and '/')\n\
-               \\n\
-               \[TRANSPORT]\n\
-               \# host is only used to print server address on start\n"
-            <> ("host: " <> host <> "\n")
-            <> ("port: " <> defaultServerPort <> "\n")
-            <> "log_tls_errors: off\n\
-               \\n\
-               \[FILES]\n"
-            <> ("path: " <> filesPath <> "\n")
-            <> ("storage_quota: " <> B.unpack (strEncode fileSizeQuota) <> "\n")
-    runServer ini = do
-      hSetBuffering stdout LineBuffering
-      hSetBuffering stderr LineBuffering
-      fp <- checkSavedFingerprint cfgPath defaultX509Config
-      let host = fromRight "<hostnames>" $ T.unpack <$> lookupValue "TRANSPORT" "host" ini
-          port = T.unpack $ strictIni "TRANSPORT" "port" ini
-          srv = ProtoServerWithAuth (XFTPServer [THDomainName host] (if port == "443" then "" else port) (C.KeyHash fp)) Nothing
-      printServiceInfo serverVersion srv
-      printXFTPConfig serverConfig
-      runXFTPServer serverConfig
-      where
-        enableStoreLog = settingIsOn "STORE_LOG" "enable" ini
-        logStats = settingIsOn "STORE_LOG" "log_stats" ini
-        c = combine cfgPath . ($ defaultX509Config)
-        printXFTPConfig XFTPServerConfig {allowNewFiles, newFileBasicAuth, xftpPort, storeLogFile, fileExpiration} = do
-          putStrLn $ case storeLogFile of
-            Just f -> "Store log: " <> f
-            _ -> "Store log disabled."
-          putStrLn $ case fileExpiration of
-            Just ExpirationConfig {ttl} -> "expiring files after " <> showTTL ttl
-            _ -> "not expiring files"
-          putStrLn $
-            "Uploading new files "
-              <> if allowNewFiles
-                then maybe "allowed." (const "requires password.") newFileBasicAuth
-                else "NOT allowed."
-          putStrLn $ "Listening on port " <> xftpPort <> "..."
-
-        serverConfig =
-          XFTPServerConfig
-            { xftpPort = T.unpack $ strictIni "TRANSPORT" "port" ini,
-              fileIdSize = 16,
-              storeLogFile = enableStoreLog $> storeLogFilePath,
-              filesPath = T.unpack $ strictIni "FILES" "path" ini,
-              fileSizeQuota = either error unFileSize <$> strDecodeIni "FILES" "storage_quota" ini,
-              allowedChunkSizes = [kb 256, mb 1, mb 4],
-              allowNewFiles = fromMaybe True $ iniOnOff "AUTH" "new_files" ini,
-              newFileBasicAuth = either error id <$> strDecodeIni "AUTH" "create_password" ini,
-              fileExpiration =
-                Just defaultFileExpiration
-                  { ttl = 3600 * readIniDefault defFileExpirationHours "STORE_LOG" "expire_files_hours" ini
-                  },
-              caCertificateFile = c caCrtFile,
-              privateKeyFile = c serverKeyFile,
-              certificateFile = c serverCrtFile,
-              logStatsInterval = logStats $> 86400, -- seconds
-              logStatsStartTime = 0, -- seconds from 00:00 UTC
-              serverStatsLogFile = combine logPath "file-server-stats.daily.log",
-              serverStatsBackupFile = logStats $> combine logPath "file-server-stats.log",
-              transportConfig =
-                defaultTransportServerConfig
-                  { logTLSErrors = fromMaybe False $ iniOnOff "TRANSPORT" "log_tls_errors" ini
-                  }
-            }
-
-data CliCommand
-  = Init InitOptions
-  | Start
-  | Delete
-
-data InitOptions = InitOptions
-  { enableStoreLog :: Bool,
-    signAlgorithm :: SignAlgorithm,
-    ip :: HostName,
-    fqdn :: Maybe HostName,
-    filesPath :: FilePath,
-    fileSizeQuota :: FileSize Int64
-  }
-  deriving (Show)
-
-cliCommandP :: FilePath -> FilePath -> FilePath -> Parser CliCommand
-cliCommandP cfgPath logPath iniFile =
-  hsubparser
-    ( command "init" (info (Init <$> initP) (progDesc $ "Initialize server - creates " <> cfgPath <> " and " <> logPath <> " directories and configuration files"))
-        <> command "start" (info (pure Start) (progDesc $ "Start server (configuration: " <> iniFile <> ")"))
-        <> command "delete" (info (pure Delete) (progDesc "Delete configuration and log files"))
-    )
-  where
-    initP :: Parser InitOptions
-    initP =
-      InitOptions
-        <$> switch
-          ( long "store-log"
-              <> short 'l'
-              <> help "Enable store log for persistence"
-          )
-        <*> option
-          (maybeReader readMaybe)
-          ( long "sign-algorithm"
-              <> short 'a'
-              <> help "Signature algorithm used for TLS certificates: ED25519, ED448"
-              <> value ED448
-              <> showDefault
-              <> metavar "ALG"
-          )
-        <*> strOption
-          ( long "ip"
-              <> help
-                "Server IP address, used as Common Name for TLS online certificate if FQDN is not supplied"
-              <> value "127.0.0.1"
-              <> showDefault
-              <> metavar "IP"
-          )
-        <*> (optional . strOption)
-          ( long "fqdn"
-              <> short 'n'
-              <> help "Server FQDN used as Common Name for TLS online certificate"
-              <> showDefault
-              <> metavar "FQDN"
-          )
-        <*> strOption
-          ( long "path"
-              <> short 'p'
-              <> help "Path to the directory to store files"
-              <> metavar "PATH"
-          )
-        <*> strOption
-          ( long "quota"
-              <> short 'q'
-              <> help "File storage quota (e.g. 100gb)"
-              <> metavar "QUOTA"
-          )
@@ -1,106 +0,0 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Simplex.FileTransfer.Server.Stats where
-
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import qualified Data.ByteString.Char8 as B
-import Data.Int (Int64)
-import Data.Time.Clock (UTCTime)
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (SenderId)
-import Simplex.Messaging.Server.Stats (PeriodStats, PeriodStatsData, getPeriodStatsData, newPeriodStats, setPeriodStats)
-import UnliftIO.STM
-
-data FileServerStats = FileServerStats
-  { fromTime :: TVar UTCTime,
-    filesCreated :: TVar Int,
-    fileRecipients :: TVar Int,
-    filesUploaded :: TVar Int,
-    filesDeleted :: TVar Int,
-    filesDownloaded :: PeriodStats SenderId,
-    fileDownloads :: TVar Int,
-    fileDownloadAcks :: TVar Int,
-    filesCount :: TVar Int,
-    filesSize :: TVar Int64
-  }
-
-data FileServerStatsData = FileServerStatsData
-  { _fromTime :: UTCTime,
-    _filesCreated :: Int,
-    _fileRecipients :: Int,
-    _filesUploaded :: Int,
-    _filesDeleted :: Int,
-    _filesDownloaded :: PeriodStatsData SenderId,
-    _fileDownloads :: Int,
-    _fileDownloadAcks :: Int,
-    _filesCount :: Int,
-    _filesSize :: Int64
-  }
-  deriving (Show)
-
-newFileServerStats :: UTCTime -> STM FileServerStats
-newFileServerStats ts = do
-  fromTime <- newTVar ts
-  filesCreated <- newTVar 0
-  fileRecipients <- newTVar 0
-  filesUploaded <- newTVar 0
-  filesDeleted <- newTVar 0
-  filesDownloaded <- newPeriodStats
-  fileDownloads <- newTVar 0
-  fileDownloadAcks <- newTVar 0
-  filesCount <- newTVar 0
-  filesSize <- newTVar 0
-  pure FileServerStats {fromTime, filesCreated, fileRecipients, filesUploaded, filesDeleted, filesDownloaded, fileDownloads, fileDownloadAcks, filesCount, filesSize}
-
-getFileServerStatsData :: FileServerStats -> STM FileServerStatsData
-getFileServerStatsData s = do
-  _fromTime <- readTVar $ fromTime (s :: FileServerStats)
-  _filesCreated <- readTVar $ filesCreated s
-  _fileRecipients <- readTVar $ fileRecipients s
-  _filesUploaded <- readTVar $ filesUploaded s
-  _filesDeleted <- readTVar $ filesDeleted s
-  _filesDownloaded <- getPeriodStatsData $ filesDownloaded s
-  _fileDownloads <- readTVar $ fileDownloads s
-  _fileDownloadAcks <- readTVar $ fileDownloadAcks s
-  _filesCount <- readTVar $ filesCount s
-  _filesSize <- readTVar $ filesSize s
-  pure FileServerStatsData {_fromTime, _filesCreated, _fileRecipients, _filesUploaded, _filesDeleted, _filesDownloaded, _fileDownloads, _fileDownloadAcks, _filesCount, _filesSize}
-
-setFileServerStats :: FileServerStats -> FileServerStatsData -> STM ()
-setFileServerStats s d = do
-  writeTVar (fromTime (s :: FileServerStats)) $! _fromTime (d :: FileServerStatsData)
-  writeTVar (filesCreated s) $! _filesCreated d
-  writeTVar (fileRecipients s) $! _fileRecipients d
-  writeTVar (filesUploaded s) $! _filesUploaded d
-  writeTVar (filesDeleted s) $! _filesDeleted d
-  setPeriodStats (filesDownloaded s) $! _filesDownloaded d
-  writeTVar (fileDownloads s) $! _fileDownloads d
-  writeTVar (fileDownloadAcks s) $! _fileDownloadAcks d
-  writeTVar (filesCount s) $! _filesCount d
-  writeTVar (filesSize s) $! _filesSize d
-
-instance StrEncoding FileServerStatsData where
-  strEncode FileServerStatsData {_fromTime, _filesCreated, _fileRecipients, _filesUploaded, _filesDeleted, _filesDownloaded, _fileDownloads, _fileDownloadAcks} =
-    B.unlines
-      [ "fromTime=" <> strEncode _fromTime,
-        "filesCreated=" <> strEncode _filesCreated,
-        "fileRecipients=" <> strEncode _fileRecipients,
-        "filesUploaded=" <> strEncode _filesUploaded,
-        "filesDeleted=" <> strEncode _filesDeleted,
-        "filesDownloaded:",
-        strEncode _filesDownloaded,
-        "fileDownloads=" <> strEncode _fileDownloads,
-        "fileDownloadAcks=" <> strEncode _fileDownloadAcks
-      ]
-  strP = do
-    _fromTime <- "fromTime=" *> strP <* A.endOfLine
-    _filesCreated <- "filesCreated=" *> strP <* A.endOfLine
-    _fileRecipients <- "fileRecipients=" *> strP <* A.endOfLine
-    _filesUploaded <- "filesUploaded=" *> strP <* A.endOfLine
-    _filesDeleted <- "filesDeleted=" *> strP <* A.endOfLine
-    _filesDownloaded <- "filesDownloaded:" *> A.endOfLine *> strP <* A.endOfLine
-    _fileDownloads <- "fileDownloads=" *> strP <* A.endOfLine
-    _fileDownloadAcks <- "fileDownloadAcks=" *> strP <* A.endOfLine
-    pure FileServerStatsData {_fromTime, _filesCreated, _fileRecipients, _filesUploaded, _filesDeleted, _filesDownloaded, _fileDownloads, _fileDownloadAcks, _filesCount = 0, _filesSize = 0}
@@ -1,145 +0,0 @@
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TupleSections #-}
-
-module Simplex.FileTransfer.Server.Store
-  ( FileStore (..),
-    FileRec (..),
-    FileRecipient (..),
-    newFileStore,
-    addFile,
-    setFilePath,
-    setFilePath',
-    addRecipient,
-    deleteFile,
-    deleteRecipient,
-    expiredFilePath,
-    getFile,
-    ackFile,
-  )
-where
-
-import Control.Concurrent.STM
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import Data.Functor (($>))
-import Data.Int (Int64)
-import Data.Set (Set)
-import qualified Data.Set as S
-import Data.Time.Clock.System (SystemTime (..))
-import Simplex.FileTransfer.Protocol (FileInfo (..), SFileParty (..), XFTPErrorType (..), XFTPFileId)
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (RcvPublicVerifyKey, RecipientId, SenderId)
-import Simplex.Messaging.TMap (TMap)
-import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Util (ifM, ($>>=))
-
-data FileStore = FileStore
-  { files :: TMap SenderId FileRec,
-    recipients :: TMap RecipientId (SenderId, RcvPublicVerifyKey),
-    usedStorage :: TVar Int64
-  }
-
-data FileRec = FileRec
-  { senderId :: SenderId,
-    fileInfo :: FileInfo,
-    filePath :: TVar (Maybe FilePath),
-    recipientIds :: TVar (Set RecipientId),
-    createdAt :: SystemTime
-  }
-  deriving (Eq)
-
-data FileRecipient = FileRecipient RecipientId RcvPublicVerifyKey
-
-instance StrEncoding FileRecipient where
-  strEncode (FileRecipient rId rKey) = strEncode rId <> ":" <> strEncode rKey
-  strP = FileRecipient <$> strP <* A.char ':' <*> strP
-
-newFileStore :: STM FileStore
-newFileStore = do
-  files <- TM.empty
-  recipients <- TM.empty
-  usedStorage <- newTVar 0
-  pure FileStore {files, recipients, usedStorage}
-
-addFile :: FileStore -> SenderId -> FileInfo -> SystemTime -> STM (Either XFTPErrorType ())
-addFile FileStore {files} sId fileInfo createdAt =
-  ifM (TM.member sId files) (pure $ Left DUPLICATE_) $ do
-    f <- newFileRec sId fileInfo createdAt
-    TM.insert sId f files
-    pure $ Right ()
-
-newFileRec :: SenderId -> FileInfo -> SystemTime -> STM FileRec
-newFileRec senderId fileInfo createdAt = do
-  recipientIds <- newTVar S.empty
-  filePath <- newTVar Nothing
-  pure FileRec {senderId, fileInfo, filePath, recipientIds, createdAt}
-
-setFilePath :: FileStore -> SenderId -> FilePath -> STM (Either XFTPErrorType ())
-setFilePath st sId fPath =
-  withFile st sId $ \fr -> setFilePath' st fr fPath $> Right ()
-
-setFilePath' :: FileStore -> FileRec -> FilePath -> STM ()
-setFilePath' st FileRec {fileInfo, filePath} fPath = do
-  writeTVar filePath (Just fPath)
-  modifyTVar' (usedStorage st) (+ fromIntegral (size fileInfo))
-
-addRecipient :: FileStore -> SenderId -> FileRecipient -> STM (Either XFTPErrorType ())
-addRecipient st@FileStore {recipients} senderId (FileRecipient rId rKey) =
-  withFile st senderId $ \FileRec {recipientIds} -> do
-    rIds <- readTVar recipientIds
-    mem <- TM.member rId recipients
-    if rId `S.member` rIds || mem
-      then pure $ Left DUPLICATE_
-      else do
-        writeTVar recipientIds $! S.insert rId rIds
-        TM.insert rId (senderId, rKey) recipients
-        pure $ Right ()
-
-- this function must be called after the file is deleted from the file system
-deleteFile :: FileStore -> SenderId -> STM (Either XFTPErrorType ())
-deleteFile FileStore {files, recipients, usedStorage} senderId = do
-  TM.lookupDelete senderId files >>= \case
-    Just FileRec {fileInfo, recipientIds} -> do
-      readTVar recipientIds >>= mapM_ (`TM.delete` recipients)
-      modifyTVar' usedStorage $ subtract (fromIntegral $ size fileInfo)
-      pure $ Right ()
-    _ -> pure $ Left AUTH
-
-deleteRecipient :: FileStore -> RecipientId -> FileRec -> STM ()
-deleteRecipient FileStore {recipients} rId FileRec {recipientIds} = do
-  TM.delete rId recipients
-  modifyTVar' recipientIds $ S.delete rId
-
-getFile :: FileStore -> SFileParty p -> XFTPFileId -> STM (Either XFTPErrorType (FileRec, C.APublicVerifyKey))
-getFile st party fId = case party of
-  SFSender -> withFile st fId $ pure . Right . (\f -> (f, sndKey $ fileInfo f))
-  SFRecipient ->
-    TM.lookup fId (recipients st) >>= \case
-      Just (sId, rKey) -> withFile st sId $ pure . Right . (,rKey)
-      _ -> pure $ Left AUTH
-
-expiredFilePath :: FileStore -> XFTPFileId -> Int64 -> STM (Maybe FilePath)
-expiredFilePath FileStore {files} sId old =
-  TM.lookup sId files
-    $>>= \FileRec {filePath, createdAt} ->
-      if systemSeconds createdAt < old
-        then readTVar filePath
-        else pure Nothing
-
-ackFile :: FileStore -> RecipientId -> STM (Either XFTPErrorType ())
-ackFile st@FileStore {recipients} recipientId = do
-  TM.lookupDelete recipientId recipients >>= \case
-    Just (sId, _) ->
-      withFile st sId $ \FileRec {recipientIds} -> do
-        modifyTVar' recipientIds $ S.delete recipientId
-        pure $ Right ()
-    _ -> pure $ Left AUTH
-
-withFile :: FileStore -> SenderId -> (FileRec -> STM (Either XFTPErrorType a)) -> STM (Either XFTPErrorType a)
-withFile FileStore {files} sId a =
-  TM.lookup sId files >>= \case
-    Just f -> a f
-    _ -> pure $ Left AUTH
@@ -1,124 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Simplex.FileTransfer.Server.StoreLog
-  ( StoreLog,
-    FileStoreLogRecord (..),
-    closeStoreLog,
-    readWriteFileStore,
-    logAddFile,
-    logPutFile,
-    logAddRecipients,
-    logDeleteFile,
-    logAckFile,
-  )
-where
-
-import Control.Concurrent.STM
-import Control.Monad.Except
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import qualified Data.ByteString.Char8 as B
-import Data.Composition ((.:), (.:.))
-import Data.List.NonEmpty (NonEmpty)
-import qualified Data.List.NonEmpty as L
-import Data.Map.Strict (Map)
-import qualified Data.Map.Strict as M
-import Data.Time.Clock.System (SystemTime)
-import Simplex.FileTransfer.Protocol (FileInfo (..))
-import Simplex.FileTransfer.Server.Store
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (RcvPublicVerifyKey, RecipientId, SenderId)
-import Simplex.Messaging.Server.StoreLog
-import Simplex.Messaging.Util (bshow, whenM)
-import System.Directory (doesFileExist, renameFile)
-import System.IO
-
-data FileStoreLogRecord
-  = AddFile SenderId FileInfo SystemTime
-  | PutFile SenderId FilePath
-  | AddRecipients SenderId (NonEmpty FileRecipient)
-  | DeleteFile SenderId
-  | AckFile RecipientId
-
-instance StrEncoding FileStoreLogRecord where
-  strEncode = \case
-    AddFile sId file createdAt -> strEncode (Str "FNEW", sId, file, createdAt)
-    PutFile sId path -> strEncode (Str "FPUT", sId, path)
-    AddRecipients sId rcps -> strEncode (Str "FADD", sId, rcps)
-    DeleteFile sId -> strEncode (Str "FDEL", sId)
-    AckFile rId -> strEncode (Str "FACK", rId)
-  strP =
-    A.choice
-      [ "FNEW " *> (AddFile <$> strP_ <*> strP_ <*> strP),
-        "FPUT " *> (PutFile <$> strP_ <*> strP),
-        "FADD " *> (AddRecipients <$> strP_ <*> strP),
-        "FDEL " *> (DeleteFile <$> strP),
-        "FACK " *> (AckFile <$> strP)
-      ]
-
-logFileStoreRecord :: StoreLog 'WriteMode -> FileStoreLogRecord -> IO ()
-logFileStoreRecord = writeStoreLogRecord
-
-logAddFile :: StoreLog 'WriteMode -> SenderId -> FileInfo -> SystemTime -> IO ()
-logAddFile s = logFileStoreRecord s .:. AddFile
-
-logPutFile :: StoreLog 'WriteMode -> SenderId -> FilePath -> IO ()
-logPutFile s = logFileStoreRecord s .: PutFile
-
-logAddRecipients :: StoreLog 'WriteMode -> SenderId -> NonEmpty FileRecipient -> IO ()
-logAddRecipients s = logFileStoreRecord s .: AddRecipients
-
-logDeleteFile :: StoreLog 'WriteMode -> SenderId -> IO ()
-logDeleteFile s = logFileStoreRecord s . DeleteFile
-
-logAckFile :: StoreLog 'WriteMode -> RecipientId -> IO ()
-logAckFile s = logFileStoreRecord s . AckFile
-
-readWriteFileStore :: FilePath -> FileStore -> IO (StoreLog 'WriteMode)
-readWriteFileStore f st = do
-  whenM (doesFileExist f) $ do
-    readFileStore f st
-    renameFile f $ f <> ".bak"
-  s <- openWriteStoreLog f
-  writeFileStore s st
-  pure s
-
-readFileStore :: FilePath -> FileStore -> IO ()
-readFileStore f st = mapM_ addFileLogRecord . B.lines =<< B.readFile f
-  where
-    addFileLogRecord s = case strDecode s of
-      Left e -> B.putStrLn $ "Log parsing error (" <> B.pack e <> "): " <> B.take 100 s
-      Right lr ->
-        atomically (addToStore lr) >>= \case
-          Left e -> B.putStrLn $ "Log processing error (" <> bshow e <> "): " <> B.take 100 s
-          _ -> pure ()
-    addToStore = \case
-      AddFile sId file createdAt -> addFile st sId file createdAt
-      PutFile qId path -> setFilePath st qId path
-      AddRecipients sId rcps -> runExceptT $ addRecipients sId rcps
-      DeleteFile sId -> deleteFile st sId
-      AckFile rId -> ackFile st rId
-    addRecipients sId rcps = mapM_ (ExceptT . addRecipient st sId) rcps
-
-writeFileStore :: StoreLog 'WriteMode -> FileStore -> IO ()
-writeFileStore s FileStore {files, recipients} = do
-  allRcps <- readTVarIO recipients
-  readTVarIO files >>= mapM_ (logFile allRcps)
-  where
-    logFile :: Map RecipientId (SenderId, RcvPublicVerifyKey) -> FileRec -> IO ()
-    logFile allRcps FileRec {senderId, fileInfo, filePath, recipientIds, createdAt} = do
-      logAddFile s senderId fileInfo createdAt
-      (rcpErrs, rcps) <- M.mapEither getRcp . M.fromSet id <$> readTVarIO recipientIds
-      mapM_ (logAddRecipients s senderId) $ L.nonEmpty $ M.elems rcps
-      mapM_ (B.putStrLn . ("Error storing log: " <>)) rcpErrs
-      readTVarIO filePath >>= mapM_ (logPutFile s senderId)
-      where
-        getRcp rId = case M.lookup rId allRcps of
-          Just (sndId, rKey)
-            | sndId == senderId -> Right $ FileRecipient rId rKey
-            | otherwise -> Left $ "sender ID for recipient ID " <> bshow rId <> " does not match FileRec"
-          Nothing -> Left $ "recipient ID " <> bshow rId <> " not found"
@@ -1,113 +0,0 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiWayIf #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Simplex.FileTransfer.Transport
-  ( supportedFileServerVRange,
-    XFTPRcvChunkSpec (..),
-    sendFile,
-    receiveFile,
-    sendEncFile,
-    receiveEncFile,
-  )
-where
-
-import qualified Control.Exception as E
-import Control.Monad.Except
-import qualified Data.ByteArray as BA
-import Data.ByteString.Builder (Builder, byteString)
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Word (Word32)
-import GHC.IO.Handle.Internals (ioe_EOF)
-import Simplex.FileTransfer.Protocol (XFTPErrorType (..))
-import qualified Simplex.Messaging.Crypto as C
-import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.Messaging.Version
-import System.IO (Handle, IOMode (..), withFile)
-
-data XFTPRcvChunkSpec = XFTPRcvChunkSpec
-  { filePath :: FilePath,
-    chunkSize :: Word32,
-    chunkDigest :: ByteString
-  }
-  deriving (Show)
-
-supportedFileServerVRange :: VersionRange
-supportedFileServerVRange = mkVersionRange 1 1
-
-fileBlockSize :: Int
-fileBlockSize = 16 * 1024
-
-sendFile :: Handle -> (Builder -> IO ()) -> Word32 -> IO ()
-sendFile h send = go
-  where
-    go 0 = pure ()
-    go sz =
-      getFileChunk h sz >>= \ch -> do
-        send $ byteString ch
-        go $ sz - fromIntegral (B.length ch)
-
-sendEncFile :: Handle -> (Builder -> IO ()) -> LC.SbState -> Word32 -> IO ()
-sendEncFile h send = go
-  where
-    go sbState 0 = do
-      let authTag = BA.convert (LC.sbAuth sbState)
-      send $ byteString authTag
-    go sbState sz =
-      getFileChunk h sz >>= \ch -> do
-        let (encCh, sbState') = LC.sbEncryptChunk sbState ch
-        send (byteString encCh) `E.catch` \(e :: E.SomeException) -> print e >> E.throwIO e
-        go sbState' $ sz - fromIntegral (B.length ch)
-
-getFileChunk :: Handle -> Word32 -> IO ByteString
-getFileChunk h sz =
-  B.hGet h fileBlockSize >>= \case
-    "" -> ioe_EOF
-    ch -> pure $ B.take (fromIntegral sz) ch -- sz >= xftpBlockSize
-
-receiveFile :: (Int -> IO ByteString) -> XFTPRcvChunkSpec -> ExceptT XFTPErrorType IO ()
-receiveFile getBody = receiveFile_ receive
-  where
-    receive h sz = do
-      ch <- getBody fileBlockSize
-      let chSize = fromIntegral $ B.length ch
-      if
-          | chSize > sz -> pure $ Left SIZE
-          | chSize > 0 -> B.hPut h ch >> receive h (sz - chSize)
-          | sz == 0 -> pure $ Right ()
-          | otherwise -> pure $ Left SIZE
-
-receiveEncFile :: (Int -> IO ByteString) -> LC.SbState -> XFTPRcvChunkSpec -> ExceptT XFTPErrorType IO ()
-receiveEncFile getBody = receiveFile_ . receive
-  where
-    receive sbState h sz = do
-      ch <- getBody fileBlockSize
-      let chSize = fromIntegral $ B.length ch
-      if
-          | chSize > sz + authSz -> pure $ Left SIZE
-          | chSize > 0 -> do
-            let (ch', rest) = B.splitAt (fromIntegral sz) ch
-                (decCh, sbState') = LC.sbDecryptChunk sbState ch'
-                sz' = sz - fromIntegral (B.length ch')
-            B.hPut h decCh
-            if sz' > 0
-              then receive sbState' h sz'
-              else do
-                let tag' = B.take C.authTagSize rest
-                    tagSz = B.length tag'
-                    tag = LC.sbAuth sbState'
-                tag'' <- if tagSz == C.authTagSize then pure tag' else (tag' <>) <$> getBody (C.authTagSize - tagSz)
-                pure $ if BA.constEq tag'' tag then Right () else Left CRYPTO
-          | otherwise -> pure $ Left SIZE
-    authSz = fromIntegral C.authTagSize
-
-receiveFile_ :: (Handle -> Word32 -> IO (Either XFTPErrorType ())) -> XFTPRcvChunkSpec -> ExceptT XFTPErrorType IO ()
-receiveFile_ receive XFTPRcvChunkSpec {filePath, chunkSize, chunkDigest} = do
-  ExceptT $ withFile filePath WriteMode (`receive` chunkSize)
-  digest' <- liftIO $ LC.sha256Hash <$> LB.readFile filePath
-  when (digest' /= chunkDigest) $ throwError DIGEST
@@ -1,228 +0,0 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Simplex.FileTransfer.Types where
-
-import Data.Int (Int64)
-import Data.Word (Word32)
-import Database.SQLite.Simple.FromField (FromField (..))
-import Database.SQLite.Simple.ToField (ToField (..))
-import Simplex.FileTransfer.Client (XFTPChunkSpec (..))
-import Simplex.FileTransfer.Description
-import Simplex.Messaging.Agent.Protocol (RcvFileId, SndFileId)
-import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (fromTextField_)
-import Simplex.Messaging.Protocol
-import System.FilePath ((</>))
-
-authTagSize :: Int64
-authTagSize = fromIntegral C.authTagSize
-
-- fileExtra is added to allow header extension in future versions
-data FileHeader = FileHeader
-  { fileName :: String,
-    fileExtra :: Maybe String
-  }
-  deriving (Eq, Show)
-
-instance Encoding FileHeader where
-  smpEncode FileHeader {fileName, fileExtra} = smpEncode (fileName, fileExtra)
-  smpP = do
-    (fileName, fileExtra) <- smpP
-    pure FileHeader {fileName, fileExtra}
-
-type DBRcvFileId = Int64
-
-data RcvFile = RcvFile
-  { rcvFileId :: DBRcvFileId,
-    rcvFileEntityId :: RcvFileId,
-    userId :: Int64,
-    size :: FileSize Int64,
-    digest :: FileDigest,
-    key :: C.SbKey,
-    nonce :: C.CbNonce,
-    chunkSize :: FileSize Word32,
-    chunks :: [RcvFileChunk],
-    prefixPath :: FilePath,
-    tmpPath :: Maybe FilePath,
-    savePath :: FilePath,
-    status :: RcvFileStatus,
-    deleted :: Bool
-  }
-  deriving (Eq, Show)
-
-data RcvFileStatus
-  = RFSReceiving
-  | RFSReceived
-  | RFSDecrypting
-  | RFSComplete
-  | RFSError
-  deriving (Eq, Show)
-
-instance FromField RcvFileStatus where fromField = fromTextField_ textDecode
-
-instance ToField RcvFileStatus where toField = toField . textEncode
-
-instance TextEncoding RcvFileStatus where
-  textDecode = \case
-    "receiving" -> Just RFSReceiving
-    "received" -> Just RFSReceived
-    "decrypting" -> Just RFSDecrypting
-    "complete" -> Just RFSComplete
-    "error" -> Just RFSError
-    _ -> Nothing
-  textEncode = \case
-    RFSReceiving -> "receiving"
-    RFSReceived -> "received"
-    RFSDecrypting -> "decrypting"
-    RFSComplete -> "complete"
-    RFSError -> "error"
-
-data RcvFileChunk = RcvFileChunk
-  { rcvFileId :: DBRcvFileId,
-    rcvFileEntityId :: RcvFileId,
-    userId :: Int64,
-    rcvChunkId :: Int64,
-    chunkNo :: Int,
-    chunkSize :: FileSize Word32,
-    digest :: FileDigest,
-    replicas :: [RcvFileChunkReplica],
-    fileTmpPath :: FilePath,
-    chunkTmpPath :: Maybe FilePath
-  }
-  deriving (Eq, Show)
-
-data RcvFileChunkReplica = RcvFileChunkReplica
-  { rcvChunkReplicaId :: Int64,
-    server :: XFTPServer,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey,
-    received :: Bool,
-    delay :: Maybe Int64,
-    retries :: Int
-  }
-  deriving (Eq, Show)
-
-- Sending files
-
-type DBSndFileId = Int64
-
-data SndFile = SndFile
-  { sndFileId :: DBSndFileId,
-    sndFileEntityId :: SndFileId,
-    userId :: Int64,
-    numRecipients :: Int,
-    digest :: Maybe FileDigest,
-    key :: C.SbKey,
-    nonce :: C.CbNonce,
-    chunks :: [SndFileChunk],
-    filePath :: FilePath,
-    prefixPath :: Maybe FilePath,
-    status :: SndFileStatus,
-    deleted :: Bool
-  }
-  deriving (Eq, Show)
-
-sndFileEncPath :: FilePath -> FilePath
-sndFileEncPath prefixPath = prefixPath </> "xftp.encrypted"
-
-data SndFileStatus
-  = SFSNew -- db record created
-  | SFSEncrypting -- encryption started
-  | SFSEncrypted -- encryption complete
-  | SFSUploading -- all chunk replicas are created on servers
-  | SFSComplete -- all chunk replicas are uploaded
-  | SFSError -- permanent error
-  deriving (Eq, Show)
-
-instance FromField SndFileStatus where fromField = fromTextField_ textDecode
-
-instance ToField SndFileStatus where toField = toField . textEncode
-
-instance TextEncoding SndFileStatus where
-  textDecode = \case
-    "new" -> Just SFSNew
-    "encrypting" -> Just SFSEncrypting
-    "encrypted" -> Just SFSEncrypted
-    "uploading" -> Just SFSUploading
-    "complete" -> Just SFSComplete
-    "error" -> Just SFSError
-    _ -> Nothing
-  textEncode = \case
-    SFSNew -> "new"
-    SFSEncrypting -> "encrypting"
-    SFSEncrypted -> "encrypted"
-    SFSUploading -> "uploading"
-    SFSComplete -> "complete"
-    SFSError -> "error"
-
-data SndFileChunk = SndFileChunk
-  { sndFileId :: DBSndFileId,
-    sndFileEntityId :: SndFileId,
-    userId :: Int64,
-    numRecipients :: Int,
-    sndChunkId :: Int64,
-    chunkNo :: Int,
-    chunkSpec :: XFTPChunkSpec,
-    filePrefixPath :: FilePath,
-    digest :: FileDigest,
-    replicas :: [SndFileChunkReplica]
-  }
-  deriving (Eq, Show)
-
-sndChunkSize :: SndFileChunk -> Word32
-sndChunkSize SndFileChunk {chunkSpec = XFTPChunkSpec {chunkSize}} = chunkSize
-
-data NewSndChunkReplica = NewSndChunkReplica
-  { server :: XFTPServer,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey,
-    rcvIdsKeys :: [(ChunkReplicaId, C.APrivateSignKey)]
-  }
-  deriving (Eq, Show)
-
-data SndFileChunkReplica = SndFileChunkReplica
-  { sndChunkReplicaId :: Int64,
-    server :: XFTPServer,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey,
-    rcvIdsKeys :: [(ChunkReplicaId, C.APrivateSignKey)],
-    replicaStatus :: SndFileReplicaStatus,
-    delay :: Maybe Int64,
-    retries :: Int
-  }
-  deriving (Eq, Show)
-
-data SndFileReplicaStatus
-  = SFRSCreated
-  | SFRSUploaded
-  deriving (Eq, Show)
-
-instance FromField SndFileReplicaStatus where fromField = fromTextField_ textDecode
-
-instance ToField SndFileReplicaStatus where toField = toField . textEncode
-
-instance TextEncoding SndFileReplicaStatus where
-  textDecode = \case
-    "created" -> Just SFRSCreated
-    "uploaded" -> Just SFRSUploaded
-    _ -> Nothing
-  textEncode = \case
-    SFRSCreated -> "created"
-    SFRSUploaded -> "uploaded"
-
-data DeletedSndChunkReplica = DeletedSndChunkReplica
-  { deletedSndChunkReplicaId :: Int64,
-    userId :: Int64,
-    server :: XFTPServer,
-    replicaId :: ChunkReplicaId,
-    replicaKey :: C.APrivateSignKey,
-    chunkDigest :: FileDigest,
-    delay :: Maybe Int64,
-    retries :: Int
-  }
-  deriving (Eq, Show)
@@ -1,24 +0,0 @@
-module Simplex.FileTransfer.Util
-  ( uniqueCombine,
-    removePath,
-  )
-where
-
-import Simplex.Messaging.Util (ifM, whenM)
-import System.FilePath (splitExtensions, (</>))
-import UnliftIO
-import UnliftIO.Directory
-
-uniqueCombine :: MonadIO m => FilePath -> String -> m FilePath
-uniqueCombine filePath fileName = tryCombine (0 :: Int)
-  where
-    tryCombine n =
-      let (name, ext) = splitExtensions fileName
-          suffix = if n == 0 then "" else "_" <> show n
-          f = filePath </> (name <> suffix <> ext)
-       in ifM (doesPathExist f) (tryCombine $ n + 1) (pure f)
-
-removePath :: MonadIO m => FilePath -> m ()
-removePath p = do
-  ifM (doesDirectoryExist p) (removeDirectoryRecursive p) $
-    whenM (doesFileExist p) (removeFile p)
@@ -3,30 +3,25 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -fno-warn-unticked-promoted-constructors #-}

 module Simplex.Messaging.Agent.Env.SQLite
  ( AgentMonad,
-    AgentMonad',
    AgentConfig (..),
    InitialAgentServers (..),
-    NetworkConfig (..),
    defaultAgentConfig,
    defaultReconnectInterval,
-    tryAgentError,
-    catchAgentError,
-    agentFinally,
    Env (..),
+    AgentOperation (..),
+    disallowedOperations,
    newSMPAgentEnv,
-    createAgentStore,
    NtfSupervisor (..),
    NtfSupervisorCommand (..),
-    XFTPAgent (..),
  )
 where

@@ -34,14 +29,10 @@ import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
 import Crypto.Random
-import Data.Int (Int64)
 import Data.List.NonEmpty (NonEmpty)
-import Data.Map (Map)
 import Data.Time.Clock (NominalDiffTime, nominalDay)
-import Data.Word (Word16)
 import Network.Socket
 import Numeric.Natural
-import Simplex.FileTransfer.Client (XFTPClientConfig (..), defaultXFTPClientConfig)
 import Simplex.Messaging.Agent.Protocol
 import Simplex.Messaging.Agent.RetryInterval
 import Simplex.Messaging.Agent.Store.SQLite
@@ -49,28 +40,21 @@ import qualified Simplex.Messaging.Agent.Store.SQLite.Migrations as Migrations
 import Simplex.Messaging.Client
 import Simplex.Messaging.Client.Agent ()
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Crypto.Ratchet (supportedE2EEncryptVRange)
-import Simplex.Messaging.Notifications.Types
-import Simplex.Messaging.Protocol (NtfServer, XFTPServer, XFTPServerWithAuth, supportedSMPClientVRange)
+import Simplex.Messaging.Notifications.Client (NtfServer, NtfToken)
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport (TLS, Transport (..))
-import Simplex.Messaging.Transport.Client (defaultSMPPort)
-import Simplex.Messaging.Util (allFinally, catchAllErrors, tryAllErrors)
 import Simplex.Messaging.Version
 import System.Random (StdGen, newStdGen)
-import UnliftIO (Async, SomeException)
+import UnliftIO (Async)
 import UnliftIO.STM

-type AgentMonad' m = (MonadUnliftIO m, MonadReader Env m)
-
-type AgentMonad m = (AgentMonad' m, MonadError AgentErrorType m)
+-- | Agent monad with MonadReader Env and MonadError AgentErrorType
+type AgentMonad m = (MonadUnliftIO m, MonadReader Env m, MonadError AgentErrorType m)

 data InitialAgentServers = InitialAgentServers
-  { smp :: Map UserId (NonEmpty SMPServerWithAuth),
-    ntf :: [NtfServer],
-    xftp :: Map UserId (NonEmpty XFTPServerWithAuth),
-    netCfg :: NetworkConfig
+  { smp :: NonEmpty SMPServer,
+    ntf :: [NtfServer]
  }

 data AgentConfig = AgentConfig
@@ -78,63 +62,32 @@ data AgentConfig = AgentConfig
    cmdSignAlg :: C.SignAlg,
    connIdBytes :: Int,
    tbqSize :: Natural,
+    dbFile :: FilePath,
+    dbSemName :: Maybe String,
+    yesToMigrations :: Bool,
    smpCfg :: ProtocolClientConfig,
    ntfCfg :: ProtocolClientConfig,
-    xftpCfg :: XFTPClientConfig,
    reconnectInterval :: RetryInterval,
-    messageRetryInterval :: RetryInterval2,
-    messageTimeout :: NominalDiffTime,
    helloTimeout :: NominalDiffTime,
-    initialCleanupDelay :: Int64,
-    cleanupInterval :: Int64,
-    rcvMsgHashesTTL :: NominalDiffTime,
-    processedRatchetKeyHashesTTL :: NominalDiffTime,
-    rcvFilesTTL :: NominalDiffTime,
-    sndFilesTTL :: NominalDiffTime,
-    xftpNotifyErrsOnRetry :: Bool,
-    xftpMaxRecipientsPerRequest :: Int,
-    deleteErrorCount :: Int,
-    ntfCron :: Word16,
-    ntfWorkerDelay :: Int,
-    ntfSMPWorkerDelay :: Int,
+    resubscriptionConcurrency :: Int,
+    ntfWorkerThrottle :: Int,
    ntfSubCheckInterval :: NominalDiffTime,
-    ntfMaxMessages :: Int,
    caCertificateFile :: FilePath,
    privateKeyFile :: FilePath,
    certificateFile :: FilePath,
-    e2eEncryptVRange :: VersionRange,
-    smpAgentVRange :: VersionRange,
-    smpClientVRange :: VersionRange,
-    initialClientId :: Int
+    smpAgentVersion :: Version,
+    smpAgentVRange :: VersionRange
  }

 defaultReconnectInterval :: RetryInterval
 defaultReconnectInterval =
  RetryInterval
-    { initialInterval = 2_000000,
-      increaseAfter = 10_000000,
-      maxInterval = 180_000000
-    }
-
-defaultMessageRetryInterval :: RetryInterval2
-defaultMessageRetryInterval =
-  RetryInterval2
-    { riFast =
-        RetryInterval
-          { initialInterval = 1_000000,
-            increaseAfter = 10_000000,
-            maxInterval = 60_000000
-          },
-      riSlow =
-        -- TODO: these timeouts can be increased in v5.0 once most clients are updated
-        -- to resume sending on QCONT messages.
-        -- After that local message expiration period should be also increased.
-        RetryInterval
-          { initialInterval = 60_000000,
-            increaseAfter = 60_000000,
-            maxInterval = 3600_000000 -- 1 hour
-          }
+    { initialInterval = second,
+      increaseAfter = 10 * second,
+      maxInterval = 10 * second
    }
+  where
+    second = 1_000_000

 defaultAgentConfig :: AgentConfig
 defaultAgentConfig =
@@ -143,36 +96,23 @@ defaultAgentConfig =
      cmdSignAlg = C.SignAlg C.SEd448,
      connIdBytes = 12,
      tbqSize = 64,
-      smpCfg = defaultClientConfig {defaultTransport = (show defaultSMPPort, transport @TLS)},
+      dbFile = "smp-agent.db",
+      dbSemName = Nothing,
+      yesToMigrations = False,
+      smpCfg = defaultClientConfig {defaultTransport = ("5223", transport @TLS)},
      ntfCfg = defaultClientConfig {defaultTransport = ("443", transport @TLS)},
-      xftpCfg = defaultXFTPClientConfig,
      reconnectInterval = defaultReconnectInterval,
-      messageRetryInterval = defaultMessageRetryInterval,
-      messageTimeout = 2 * nominalDay,
      helloTimeout = 2 * nominalDay,
-      initialCleanupDelay = 30 * 1000000, -- 30 seconds
-      cleanupInterval = 30 * 60 * 1000000, -- 30 minutes
-      rcvMsgHashesTTL = 30 * nominalDay,
-      processedRatchetKeyHashesTTL = 30 * nominalDay,
-      rcvFilesTTL = 2 * nominalDay,
-      sndFilesTTL = nominalDay,
-      xftpNotifyErrsOnRetry = True,
-      xftpMaxRecipientsPerRequest = 200,
-      deleteErrorCount = 10,
-      ntfCron = 20, -- minutes
-      ntfWorkerDelay = 100000, -- microseconds
-      ntfSMPWorkerDelay = 500000, -- microseconds
+      resubscriptionConcurrency = 16,
+      ntfWorkerThrottle = 1000000, -- microseconds
      ntfSubCheckInterval = nominalDay,
-      ntfMaxMessages = 4,
      -- CA certificate private key is not needed for initialization
      -- ! we do not generate these
      caCertificateFile = "/etc/opt/simplex-agent/ca.crt",
      privateKeyFile = "/etc/opt/simplex-agent/agent.key",
      certificateFile = "/etc/opt/simplex-agent/agent.crt",
-      e2eEncryptVRange = supportedE2EEncryptVRange,
-      smpAgentVRange = supportedSMPAgentVRange,
-      smpClientVRange = supportedSMPClientVRange,
-      initialClientId = 0
+      smpAgentVersion = currentSMPAgentVersion,
+      smpAgentVRange = supportedSMPAgentVRange
    }

 data Env = Env
@@ -181,21 +121,30 @@ data Env = Env
    idsDrg :: TVar ChaChaDRG,
    clientCounter :: TVar Int,
    randomServer :: TVar StdGen,
-    ntfSupervisor :: NtfSupervisor,
-    xftpAgent :: XFTPAgent
+    agentPhase :: TVar (AgentPhase, Bool),
+    agentOperations :: TMap AgentOperation Int,
+    ntfSupervisor :: NtfSupervisor
  }

-newSMPAgentEnv :: AgentConfig -> SQLiteStore -> IO Env
-newSMPAgentEnv config@AgentConfig {initialClientId} store = do
-  idsDrg <- newTVarIO =<< liftIO drgNew
-  clientCounter <- newTVarIO initialClientId
-  randomServer <- newTVarIO =<< liftIO newStdGen
-  ntfSupervisor <- atomically . newNtfSubSupervisor $ tbqSize config
-  xftpAgent <- atomically newXFTPAgent
-  pure Env {config, store, idsDrg, clientCounter, randomServer, ntfSupervisor, xftpAgent}
+data AgentOperation = AONetwork | AODatabase
+  deriving (Eq, Ord)

-createAgentStore :: FilePath -> String -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
-createAgentStore dbFilePath dbKey = createSQLiteStore dbFilePath dbKey Migrations.app
+disallowedOperations :: AgentPhase -> [AgentOperation]
+disallowedOperations = \case
+  APActive -> []
+  APPaused -> [AONetwork]
+  APSuspended -> [AONetwork, AODatabase]
+
+newSMPAgentEnv :: (MonadUnliftIO m, MonadRandom m) => AgentConfig -> m Env
+newSMPAgentEnv config@AgentConfig {dbFile, dbSemName, yesToMigrations} = do
+  idsDrg <- newTVarIO =<< drgNew
+  store <- liftIO $ createSQLiteStore dbFile dbSemName Migrations.app yesToMigrations
+  clientCounter <- newTVarIO 0
+  randomServer <- newTVarIO =<< liftIO newStdGen
+  agentPhase <- newTVarIO (APActive, True)
+  agentOperations <- atomically TM.empty
+  ntfSupervisor <- atomically . newNtfSubSupervisor $ tbqSize config
+  return Env {config, store, idsDrg, clientCounter, randomServer, agentPhase, agentOperations, ntfSupervisor}

 data NtfSupervisor = NtfSupervisor
  { ntfTkn :: TVar (Maybe NtfToken),
@@ -204,8 +153,7 @@ data NtfSupervisor = NtfSupervisor
    ntfSMPWorkers :: TMap SMPServer (TMVar (), Async ())
  }

-data NtfSupervisorCommand = NSCCreate | NSCDelete | NSCSmpDelete | NSCNtfWorker NtfServer | NSCNtfSMPWorker SMPServer
-  deriving (Show)
+data NtfSupervisorCommand = NSCCreate | NSCDelete | NSCNtfWorker NtfServer

 newNtfSubSupervisor :: Natural -> STM NtfSupervisor
 newNtfSubSupervisor qSize = do
@@ -214,35 +162,3 @@ newNtfSubSupervisor qSize = do
  ntfWorkers <- TM.empty
  ntfSMPWorkers <- TM.empty
  pure NtfSupervisor {ntfTkn, ntfSubQ, ntfWorkers, ntfSMPWorkers}
-
-data XFTPAgent = XFTPAgent
-  { -- if set, XFTP file paths will be considered as relative to this directory
-    xftpWorkDir :: TVar (Maybe FilePath),
-    xftpRcvWorkers :: TMap (Maybe XFTPServer) (TMVar (), Async ()),
-    xftpSndWorkers :: TMap (Maybe XFTPServer) (TMVar (), Async ()),
-    xftpDelWorkers :: TMap XFTPServer (TMVar (), Async ())
-  }
-
-newXFTPAgent :: STM XFTPAgent
-newXFTPAgent = do
-  xftpWorkDir <- newTVar Nothing
-  xftpRcvWorkers <- TM.empty
-  xftpSndWorkers <- TM.empty
-  xftpDelWorkers <- TM.empty
-  pure XFTPAgent {xftpWorkDir, xftpRcvWorkers, xftpSndWorkers, xftpDelWorkers}
-
-tryAgentError :: AgentMonad m => m a -> m (Either AgentErrorType a)
-tryAgentError = tryAllErrors mkInternal
-{-# INLINE tryAgentError #-}
-
-catchAgentError :: AgentMonad m => m a -> (AgentErrorType -> m a) -> m a
-catchAgentError = catchAllErrors mkInternal
-{-# INLINE catchAgentError #-}
-
-agentFinally :: AgentMonad m => m a -> m b -> m a
-agentFinally = allFinally mkInternal
-{-# INLINE agentFinally #-}
-
-mkInternal :: SomeException -> AgentErrorType
-mkInternal = INTERNAL . show
-{-# INLINE mkInternal #-}
@@ -1,28 +0,0 @@
-{-# LANGUAGE NamedFieldPuns #-}
-
-module Simplex.Messaging.Agent.Lock where
-
-import Control.Monad (void)
-import Control.Monad.IO.Unlift
-import Data.Functor (($>))
-import qualified UnliftIO.Exception as E
-import UnliftIO.STM
-
-type Lock = TMVar String
-
-createLock :: STM Lock
-createLock = newEmptyTMVar
-{-# INLINE createLock #-}
-
-withLock :: MonadUnliftIO m => Lock -> String -> m a -> m a
-withLock lock name =
-  E.bracket_
-    (atomically $ putTMVar lock name)
-    (void . atomically $ takeTMVar lock)
-
-withGetLock :: MonadUnliftIO m => STM Lock -> String -> m a -> m a
-withGetLock getLock name a =
-  E.bracket
-    (atomically $ getLock >>= \l -> putTMVar l name $> l)
-    (atomically . takeTMVar)
-    (const a)
@@ -4,322 +4,217 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}

 module Simplex.Messaging.Agent.NtfSubSupervisor
  ( runNtfSupervisor,
    nsUpdateToken,
    nsRemoveNtfToken,
    sendNtfSubCommand,
-    instantNotifications,
    closeNtfSupervisor,
    getNtfServer,
  )
 where

+import Control.Concurrent.Async (Async, uninterruptibleCancel)
 import Control.Concurrent.STM (stateTVar)
-import Control.Logger.Simple (logError, logInfo)
 import Control.Monad
-import Control.Monad.Except
+import Control.Monad.Except (runExceptT)
+import Control.Monad.IO.Unlift (MonadUnliftIO)
 import Control.Monad.Reader
 import Data.Bifunctor (first)
+import Data.Fixed (Fixed (MkFixed), Pico)
 import qualified Data.Map.Strict as M
-import Data.Text (Text)
-import Data.Time (UTCTime, addUTCTime, getCurrentTime)
-import Data.Time.Clock (diffUTCTime)
+import Data.Time (UTCTime, addUTCTime, diffUTCTime, getCurrentTime, nominalDiffTimeToSeconds)
 import Simplex.Messaging.Agent.Client
 import Simplex.Messaging.Agent.Env.SQLite
-import Simplex.Messaging.Agent.Protocol (ACommand (..), APartyCmd (..), AgentErrorType (..), BrokerErrorType (..), ConnId, NotificationsMode (..), SAEntity (..))
-import Simplex.Messaging.Agent.RetryInterval
+import Simplex.Messaging.Agent.Protocol (ConnId)
+import qualified Simplex.Messaging.Agent.Protocol as AP
 import Simplex.Messaging.Agent.Store
-import Simplex.Messaging.Agent.Store.SQLite
 import Simplex.Messaging.Client.Agent ()
 import qualified Simplex.Messaging.Crypto as C
+import Simplex.Messaging.Notifications.Client
 import Simplex.Messaging.Notifications.Protocol (NtfSubStatus (..), NtfTknStatus (..), SMPQueueNtf (..))
-import Simplex.Messaging.Notifications.Types
-import Simplex.Messaging.Protocol (NtfServer, ProtocolServer, SMPServer, sameSrvAddr)
+import Simplex.Messaging.Protocol
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Util (diffToMicroseconds, threadDelay', tshow, unlessM)
+import Simplex.Messaging.Util (unlessM)
 import System.Random (randomR)
-import UnliftIO
+import UnliftIO (async)
 import UnliftIO.Concurrent (forkIO, threadDelay)
 import qualified UnliftIO.Exception as E
+import UnliftIO.STM

-runNtfSupervisor :: forall m. AgentMonad' m => AgentClient -> m ()
-runNtfSupervisor c = do
+runNtfSupervisor :: (MonadUnliftIO m, MonadReader Env m) => AgentClient -> m ()
+runNtfSupervisor c = forever $ do
  ns <- asks ntfSupervisor
-  forever $ do
-    cmd@(connId, _) <- atomically . readTBQueue $ ntfSubQ ns
-    handleError connId . agentOperationBracket c AONtfNetwork waitUntilActive $
-      runExceptT (processNtfSub c cmd) >>= \case
-        Left e -> notifyErr connId e
-        Right _ -> return ()
-  where
-    handleError :: ConnId -> m () -> m ()
-    handleError connId = E.handle $ \(e :: E.SomeException) -> do
-      logError $ "runNtfSupervisor error " <> tshow e
-      notifyErr connId e
-    notifyErr connId e = notifyInternalError c connId $ "runNtfSupervisor error " <> show e
+  cmd <- atomically . readTBQueue $ ntfSubQ ns
+  runExceptT (processNtfSub c cmd) >>= \case
+    Left e -> liftIO $ print e
+    Right _ -> return ()

 processNtfSub :: forall m. AgentMonad m => AgentClient -> (ConnId, NtfSupervisorCommand) -> m ()
 processNtfSub c (connId, cmd) = do
-  logInfo $ "processNtfSub - connId = " <> tshow connId <> " - cmd = " <> tshow cmd
+  ntfServer_ <- getNtfServer c
  case cmd of
    NSCCreate -> do
-      (a, RcvQueue {server = smpServer, clientNtfCreds}) <- withStore c $ \db -> runExceptT $ do
-        a <- liftIO $ getNtfSubscription db connId
-        q <- ExceptT $ getPrimaryRcvQueue db connId
-        pure (a, q)
-      logInfo $ "processNtfSub, NSCCreate - a = " <> tshow a
-      case a of
-        Nothing -> do
-          withNtfServer c $ \ntfServer -> do
-            case clientNtfCreds of
-              Just ClientNtfCreds {notifierId} -> do
-                let newSub = newNtfSubscription connId smpServer (Just notifierId) ntfServer NASKey
-                withStore c $ \db -> createNtfSubscription db newSub $ NtfSubNTFAction NSACreate
-                addNtfNTFWorker ntfServer
-              Nothing -> do
-                let newSub = newNtfSubscription connId smpServer Nothing ntfServer NASNew
-                withStore c $ \db -> createNtfSubscription db newSub $ NtfSubSMPAction NSASmpKey
-                addNtfSMPWorker smpServer
-        (Just (sub@NtfSubscription {ntfSubStatus, ntfServer = subNtfServer, smpServer = smpServer', ntfQueueId}, action_)) -> do
-          case (clientNtfCreds, ntfQueueId) of
-            (Just ClientNtfCreds {notifierId}, Just ntfQueueId')
-              | sameSrvAddr smpServer smpServer' && notifierId == ntfQueueId' -> create
-              | otherwise -> rotate
-            (Nothing, Nothing) -> create
-            _ -> rotate
-          where
-            create :: m ()
-            create = case action_ of
-              -- action was set to NULL after worker internal error
-              Nothing -> resetSubscription
-              Just (action, _)
-                -- subscription was marked for deletion / is being deleted
-                | isDeleteNtfSubAction action -> do
-                  if ntfSubStatus == NASNew || ntfSubStatus == NASOff || ntfSubStatus == NASDeleted
-                    then resetSubscription
-                    else withNtfServer c $ \ntfServer -> do
-                      withStore' c $ \db -> supervisorUpdateNtfSub db sub {ntfServer} (NtfSubNTFAction NSACreate)
-                      addNtfNTFWorker ntfServer
-                | otherwise -> case action of
-                  NtfSubNTFAction _ -> addNtfNTFWorker subNtfServer
-                  NtfSubSMPAction _ -> addNtfSMPWorker smpServer
-            rotate :: m ()
-            rotate = do
-              withStore' c $ \db -> supervisorUpdateNtfSub db sub (NtfSubNTFAction NSARotate)
-              addNtfNTFWorker subNtfServer
-            resetSubscription :: m ()
-            resetSubscription =
-              withNtfServer c $ \ntfServer -> do
-                let sub' = sub {ntfQueueId = Nothing, ntfServer, ntfSubId = Nothing, ntfSubStatus = NASNew}
-                withStore' c $ \db -> supervisorUpdateNtfSub db sub' (NtfSubSMPAction NSASmpKey)
-                addNtfSMPWorker smpServer
-    NSCDelete -> do
-      sub_ <- withStore' c $ \db -> do
-        supervisorUpdateNtfAction db connId (NtfSubNTFAction NSADelete)
-        getNtfSubscription db connId
-      logInfo $ "processNtfSub, NSCDelete - sub_ = " <> tshow sub_
-      case sub_ of
-        (Just (NtfSubscription {ntfServer}, _)) -> addNtfNTFWorker ntfServer
-        _ -> pure () -- err "NSCDelete - no subscription"
-    NSCSmpDelete -> do
-      withStore' c (`getPrimaryRcvQueue` connId) >>= \case
-        Right rq@RcvQueue {server = smpServer} -> do
-          logInfo $ "processNtfSub, NSCSmpDelete - rq = " <> tshow rq
-          withStore' c $ \db -> supervisorUpdateNtfAction db connId (NtfSubSMPAction NSASmpDelete)
+      -- TODO merge getNtfSubscription and getRcvQueue into one method to read both in same transaction?
+      sub_ <- withStore c $ \st -> getNtfSubscription st connId
+      RcvQueue {notifierId, server = smpServer} <- withStore c $ \st -> getRcvQueue st connId
+      case (sub_, ntfServer_) of
+        (Nothing, Just ntfServer) -> do
+          currentTime <- liftIO getCurrentTime
+          case notifierId of
+            (Just nId) -> do
+              let newSub = newNtfSubscription connId smpServer (Just nId) ntfServer NASKey currentTime
+              withStore c $ \st -> createNtfSubscription st newSub (NtfSubAction NSACreate)
+            _ -> do
+              let newSub = newNtfSubscription connId smpServer Nothing ntfServer NASNew currentTime
+              withStore c $ \st -> createNtfSubscription st newSub (NtfSubSMPAction NSAKey)
+          -- TODO optimize?
+          -- TODO - read action in getNtfSubscription and decide which worker to create
+          -- TODO - SMP worker can create Ntf worker on NKEY completion
          addNtfSMPWorker smpServer
-        _ -> notifyInternalError c connId "NSCSmpDelete - no rcv queue"
-    NSCNtfWorker ntfServer -> addNtfNTFWorker ntfServer
-    NSCNtfSMPWorker smpServer -> addNtfSMPWorker smpServer
+          addNtfWorker ntfServer
+        (Just _, Just ntfServer) -> do
+          -- TODO subscription may have to be updated depending on current state:
+          -- TODO - e.g., if it was previously marked for deletion action has to be updated
+          -- TODO - should action depend on subscription status or always be NSAKey (NSACreate if notifierId exists)
+          -- TODO   in case worker is currently deleting it? When deleting worker should check for updated_by_supervisor
+          -- TODO   and if it is set perform update instead of delete. If worker was not deleting it yet it should
+          -- TODO   idempotently replay commands.
+          addNtfSMPWorker smpServer
+          addNtfWorker ntfServer
+        _ -> pure () -- error - notification server not configured
+    NSCDelete -> do
+      -- TODO delete notifier ID and Key from SMP server (SDEL, then NDEL)
+      withStore c $ \st -> markNtfSubscriptionForDeletion st connId
+      case ntfServer_ of
+        (Just ntfServer) -> addNtfWorker ntfServer
+        _ -> pure ()
+    NSCNtfWorker ntfServer ->
+      addNtfWorker ntfServer
  where
-    addNtfNTFWorker = addWorker ntfWorkers runNtfWorker
+    addNtfWorker = addWorker ntfWorkers runNtfWorker
    addNtfSMPWorker = addWorker ntfSMPWorkers runNtfSMPWorker
    addWorker ::
-      (NtfSupervisor -> TMap (ProtocolServer s) (TMVar (), Async ())) ->
-      (AgentClient -> ProtocolServer s -> TMVar () -> m ()) ->
-      ProtocolServer s ->
+      (NtfSupervisor -> TMap ProtocolServer (TMVar (), Async ())) ->
+      (AgentClient -> ProtocolServer -> TMVar () -> m ()) ->
+      ProtocolServer ->
      m ()
    addWorker wsSel runWorker srv = do
      ws <- asks $ wsSel . ntfSupervisor
      atomically (TM.lookup srv ws) >>= \case
        Nothing -> do
          doWork <- newTMVarIO ()
-          worker <- async $ runWorker c srv doWork `agentFinally` atomically (TM.delete srv ws)
+          worker <- async $ runWorker c srv doWork `E.finally` atomically (TM.delete srv ws)
          atomically $ TM.insert srv (doWork, worker) ws
        Just (doWork, _) ->
          void . atomically $ tryPutTMVar doWork ()

-withNtfServer :: AgentMonad' m => AgentClient -> (NtfServer -> m ()) -> m ()
-withNtfServer c action = getNtfServer c >>= mapM_ action
-
-runNtfWorker :: forall m. AgentMonad m => AgentClient -> NtfServer -> TMVar () -> m ()
-runNtfWorker c srv doWork = do
-  delay <- asks $ ntfWorkerDelay . config
-  forever $ do
-    void . atomically $ readTMVar doWork
-    agentOperationBracket c AONtfNetwork throwWhenInactive runNtfOperation
-    threadDelay delay
-  where
-    runNtfOperation :: m ()
-    runNtfOperation = do
-      nextSub_ <- withStore' c (`getNextNtfSubNTFAction` srv)
-      logInfo $ "runNtfWorker, nextSub_ " <> tshow nextSub_
+runNtfWorker :: AgentMonad m => AgentClient -> NtfServer -> TMVar () -> m ()
+runNtfWorker c srv doWork = forever $ do
+  void . atomically $ readTMVar doWork
+  getNtfToken >>= \case
+    Just tkn@NtfToken {ntfTokenId = Just tknId, ntfTknStatus} -> do
+      nextSub_ <- withStore c (`getNextNtfSubAction` srv)
+      ts <- liftIO getCurrentTime
      case nextSub_ of
        Nothing -> noWorkToDo
-        Just a@(NtfSubscription {connId}, _, _) -> do
-          ri <- asks $ reconnectInterval . config
-          withRetryInterval ri $ \_ loop ->
-            processAction a
-              `catchAgentError` retryOnError c "NtfWorker" loop (workerInternalError c connId . show)
+        Just (ntfSub@NtfSubscription {connId, smpServer, ntfSubId}, ntfSubAction, RcvQueue {ntfPrivateKey, notifierId}) ->
+          unlessM (rescheduleAction doWork ts ntfSub) $
+            case ntfSubAction of
+              NSACreate -> case (ntfPrivateKey, notifierId) of
+                (Just ntfPrivKey, Just nId)
+                  | ntfTknStatus == NTActive -> do
+                    nSubId <- agentNtfCreateSubscription c tknId tkn (SMPQueueNtf smpServer nId) ntfPrivKey
+                    let actionTs = addUTCTime 30 ts
+                    withStore c $ \st ->
+                      updateNtfSubscription st connId ntfSub {ntfSubId = Just nSubId, ntfSubStatus = NASCreated NSNew, ntfSubActionTs = actionTs} (NtfSubAction NSACheck)
+                  | otherwise -> ntfInternalError c connId "NSACreate - token not active"
+                _ -> ntfInternalError c connId "NSACreate - no notifier key or ID"
+              NSACheck -> case ntfSubId of
+                Just nSubId ->
+                  agentNtfCheckSubscription c nSubId tkn >>= \case
+                    NSNew -> updateSubNextCheck NSNew
+                    NSPending -> updateSubNextCheck NSPending
+                    NSActive -> updateSubNextCheck NSActive
+                    NSEnd -> updateSubNextCheck NSEnd
+                    NSSMPAuth -> updateSub (NASCreated NSSMPAuth) (NtfSubAction NSADelete) ts
+                Nothing -> ntfInternalError c connId "NSACheck - no subscription ID"
+              NSADelete -> pure ()
+          where
+            updateSubNextCheck toStatus = do
+              checkInterval <- asks $ ntfSubCheckInterval . config
+              let nextCheckTs = addUTCTime checkInterval ts
+              updateSub (NASCreated toStatus) (NtfSubAction NSACheck) nextCheckTs
+            updateSub toStatus toAction actionTs =
+              withStore c $ \st ->
+                updateNtfSubscription st connId ntfSub {ntfSubStatus = toStatus, ntfSubActionTs = actionTs} toAction
+    _ -> noWorkToDo
+  delay <- asks $ ntfWorkerThrottle . config
+  liftIO $ threadDelay delay
+  where
    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    processAction :: (NtfSubscription, NtfSubNTFAction, NtfActionTs) -> m ()
-    processAction (sub@NtfSubscription {connId, smpServer, ntfSubId}, action, actionTs) = do
-      ts <- liftIO getCurrentTime
-      unlessM (rescheduleAction doWork ts actionTs) $
-        case action of
-          NSACreate ->
-            getNtfToken >>= \case
-              Just tkn@NtfToken {ntfTokenId = Just tknId, ntfTknStatus = NTActive, ntfMode = NMInstant} -> do
-                RcvQueue {clientNtfCreds} <- withStore c (`getPrimaryRcvQueue` connId)
-                case clientNtfCreds of
-                  Just ClientNtfCreds {ntfPrivateKey, notifierId} -> do
-                    nSubId <- agentNtfCreateSubscription c tknId tkn (SMPQueueNtf smpServer notifierId) ntfPrivateKey
-                    -- possible improvement: smaller retry until Active, less frequently (daily?) once Active
-                    let actionTs' = addUTCTime 30 ts
-                    withStore' c $ \db ->
-                      updateNtfSubscription db sub {ntfSubId = Just nSubId, ntfSubStatus = NASCreated NSNew} (NtfSubNTFAction NSACheck) actionTs'
-                  _ -> workerInternalError c connId "NSACreate - no notifier queue credentials"
-              _ -> workerInternalError c connId "NSACreate - no active token"
-          NSACheck ->
-            getNtfToken >>= \case
-              Just tkn ->
-                case ntfSubId of
-                  Just nSubId ->
-                    agentNtfCheckSubscription c nSubId tkn >>= \case
-                      NSAuth -> do
-                        getNtfServer c >>= \case
-                          Just ntfServer -> do
-                            withStore' c $ \db ->
-                              updateNtfSubscription db sub {ntfServer, ntfQueueId = Nothing, ntfSubId = Nothing, ntfSubStatus = NASNew} (NtfSubSMPAction NSASmpKey) ts
-                            ns <- asks ntfSupervisor
-                            atomically $ writeTBQueue (ntfSubQ ns) (connId, NSCNtfSMPWorker smpServer)
-                          _ -> workerInternalError c connId "NSACheck - failed to reset subscription, notification server not configured"
-                      status -> updateSubNextCheck ts status
-                  Nothing -> workerInternalError c connId "NSACheck - no subscription ID"
-              _ -> workerInternalError c connId "NSACheck - no active token"
-          NSADelete -> case ntfSubId of
-            Just nSubId ->
-              (getNtfToken >>= mapM_ (agentNtfDeleteSubscription c nSubId))
-                `agentFinally` continueDeletion
-            _ -> continueDeletion
-            where
-              continueDeletion = do
-                let sub' = sub {ntfSubId = Nothing, ntfSubStatus = NASOff}
-                withStore' c $ \db -> updateNtfSubscription db sub' (NtfSubSMPAction NSASmpDelete) ts
-                ns <- asks ntfSupervisor
-                atomically $ writeTBQueue (ntfSubQ ns) (connId, NSCNtfSMPWorker smpServer)
-          NSARotate -> case ntfSubId of
-            Just nSubId ->
-              (getNtfToken >>= mapM_ (agentNtfDeleteSubscription c nSubId))
-                `agentFinally` deleteCreate
-            _ -> deleteCreate
-            where
-              deleteCreate = do
-                withStore' c $ \db -> deleteNtfSubscription db connId
-                ns <- asks ntfSupervisor
-                atomically $ writeTBQueue (ntfSubQ ns) (connId, NSCCreate)
-      where
-        updateSubNextCheck ts toStatus = do
-          checkInterval <- asks $ ntfSubCheckInterval . config
-          let nextCheckTs = addUTCTime checkInterval ts
-          updateSub (NASCreated toStatus) (NtfSubNTFAction NSACheck) nextCheckTs
-        updateSub toStatus toAction actionTs' =
-          withStore' c $ \db ->
-            updateNtfSubscription db sub {ntfSubStatus = toStatus} toAction actionTs'

 runNtfSMPWorker :: forall m. AgentMonad m => AgentClient -> SMPServer -> TMVar () -> m ()
-runNtfSMPWorker c srv doWork = do
-  delay <- asks $ ntfSMPWorkerDelay . config
-  forever $ do
-    void . atomically $ readTMVar doWork
-    agentOperationBracket c AONtfNetwork throwWhenInactive runNtfSMPOperation
-    threadDelay delay
-  where
-    runNtfSMPOperation = do
-      nextSub_ <- withStore' c (`getNextNtfSubSMPAction` srv)
-      logInfo $ "runNtfSMPWorker, nextSub_ " <> tshow nextSub_
+runNtfSMPWorker c srv doWork = forever $ do
+  void . atomically $ readTMVar doWork
+  getNtfToken >>= \case
+    Just NtfToken {ntfTknStatus} -> do
+      nextSub_ <- withStore c (`getNextNtfSubSMPAction` srv)
+      ts <- liftIO getCurrentTime
      case nextSub_ of
        Nothing -> noWorkToDo
-        Just a@(NtfSubscription {connId}, _, _) -> do
-          ri <- asks $ reconnectInterval . config
-          withRetryInterval ri $ \_ loop ->
-            processAction a
-              `catchAgentError` retryOnError c "NtfSMPWorker" loop (workerInternalError c connId . show)
+        Just (ntfSub@NtfSubscription {connId, ntfServer}, ntfSubAction, rq@RcvQueue {ntfPublicKey}) ->
+          unlessM (rescheduleAction doWork ts ntfSub) $
+            case ntfSubAction of
+              NSAKey
+                | ntfTknStatus == NTActive ->
+                  case ntfPublicKey of
+                    Just ntfPubKey ->
+                      enableNotificationsWithNKey ntfPubKey
+                    _ -> do
+                      C.SignAlg a <- asks (cmdSignAlg . config)
+                      (ntfPubKey, ntfPrivKey) <- liftIO $ C.generateSignatureKeyPair a
+                      withStore c $ \st -> setRcvQueueNotifierKey st connId ntfPubKey ntfPrivKey
+                      enableNotificationsWithNKey ntfPubKey
+                | otherwise -> ntfInternalError c connId "NSAKey - token not active"
+                where
+                  enableNotificationsWithNKey ntfPubKey = do
+                    nId <- enableQueueNotifications c rq ntfPubKey
+                    withStore c $ \st -> do
+                      setRcvQueueNotifierId st connId nId
+                      updateNtfSubscription st connId ntfSub {ntfQueueId = Just nId, ntfSubStatus = NASKey, ntfSubActionTs = ts} (NtfSubAction NSACreate)
+                    ns <- asks ntfSupervisor
+                    atomically $ sendNtfSubCommand ns (connId, NSCNtfWorker ntfServer)
+    _ -> noWorkToDo
+  delay <- asks $ ntfWorkerThrottle . config
+  liftIO $ threadDelay delay
+  where
    noWorkToDo = void . atomically $ tryTakeTMVar doWork
-    processAction :: (NtfSubscription, NtfSubSMPAction, NtfActionTs) -> m ()
-    processAction (sub@NtfSubscription {connId, ntfServer}, smpAction, actionTs) = do
-      ts <- liftIO getCurrentTime
-      unlessM (rescheduleAction doWork ts actionTs) $
-        case smpAction of
-          NSASmpKey ->
-            getNtfToken >>= \case
-              Just NtfToken {ntfTknStatus = NTActive, ntfMode = NMInstant} -> do
-                rq <- withStore c (`getPrimaryRcvQueue` connId)
-                C.SignAlg a <- asks (cmdSignAlg . config)
-                (ntfPublicKey, ntfPrivateKey) <- liftIO $ C.generateSignatureKeyPair a
-                (rcvNtfPubDhKey, rcvNtfPrivDhKey) <- liftIO C.generateKeyPair'
-                (notifierId, rcvNtfSrvPubDhKey) <- enableQueueNotifications c rq ntfPublicKey rcvNtfPubDhKey
-                let rcvNtfDhSecret = C.dh' rcvNtfSrvPubDhKey rcvNtfPrivDhKey
-                withStore' c $ \db -> do
-                  setRcvQueueNtfCreds db connId $ Just ClientNtfCreds {ntfPublicKey, ntfPrivateKey, notifierId, rcvNtfDhSecret}
-                  updateNtfSubscription db sub {ntfQueueId = Just notifierId, ntfSubStatus = NASKey} (NtfSubNTFAction NSACreate) ts
-                ns <- asks ntfSupervisor
-                atomically $ sendNtfSubCommand ns (connId, NSCNtfWorker ntfServer)
-              _ -> workerInternalError c connId "NSASmpKey - no active token"
-          NSASmpDelete -> do
-            rq_ <- withStore' c $ \db -> do
-              setRcvQueueNtfCreds db connId Nothing
-              getPrimaryRcvQueue db connId
-            mapM_ (disableQueueNotifications c) rq_
-            withStore' c $ \db -> deleteNtfSubscription db connId

-rescheduleAction :: AgentMonad' m => TMVar () -> UTCTime -> UTCTime -> m Bool
-rescheduleAction doWork ts actionTs
-  | actionTs <= ts = pure False
+rescheduleAction :: AgentMonad m => TMVar () -> UTCTime -> NtfSubscription -> m Bool
+rescheduleAction doWork ts NtfSubscription {ntfSubActionTs}
+  | ntfSubActionTs <= ts = pure False
  | otherwise = do
    void . atomically $ tryTakeTMVar doWork
    void . forkIO $ do
-      liftIO $ threadDelay' $ diffToMicroseconds $ diffUTCTime actionTs ts
+      threadDelay $ diffInMicros ntfSubActionTs ts
      void . atomically $ tryPutTMVar doWork ()
    pure True

-retryOnError :: AgentMonad' m => AgentClient -> Text -> m () -> (AgentErrorType -> m ()) -> AgentErrorType -> m ()
-retryOnError c name loop done e = do
-  logError $ name <> " error: " <> tshow e
-  case e of
-    BROKER _ NETWORK -> retryLoop
-    BROKER _ TIMEOUT -> retryLoop
-    _ -> done e
-  where
-    retryLoop = do
-      atomically $ endAgentOperation c AONtfNetwork
-      atomically $ throwWhenInactive c
-      atomically $ beginAgentOperation c AONtfNetwork
-      loop
+fromPico :: Pico -> Integer
+fromPico (MkFixed i) = i

-workerInternalError :: AgentMonad m => AgentClient -> ConnId -> String -> m ()
-workerInternalError c connId internalErrStr = do
-  withStore' c $ \db -> setNullNtfSubscriptionAction db connId
-  notifyInternalError c connId internalErrStr
+diffInMicros :: UTCTime -> UTCTime -> Int
+diffInMicros a b = (`div` 1000000) . fromInteger . fromPico . nominalDiffTimeToSeconds $ diffUTCTime a b

-- TODO change error
-notifyInternalError :: MonadUnliftIO m => AgentClient -> ConnId -> String -> m ()
-notifyInternalError AgentClient {subQ} connId internalErrStr = atomically $ writeTBQueue subQ ("", connId, APC SAEConn $ ERR $ INTERNAL internalErrStr)
+ntfInternalError :: AgentMonad m => AgentClient -> ConnId -> String -> m ()
+ntfInternalError c@AgentClient {subQ} connId internalErrStr = do
+  withStore c $ \st -> setNullNtfSubscriptionAction st connId
+  atomically $ writeTBQueue subQ ("", connId, AP.ERR $ AP.INTERNAL internalErrStr)

-getNtfToken :: AgentMonad' m => m (Maybe NtfToken)
+getNtfToken :: AgentMonad m => m (Maybe NtfToken)
 getNtfToken = do
  tkn <- asks $ ntfTkn . ntfSupervisor
  readTVarIO tkn
@@ -331,26 +226,21 @@ nsRemoveNtfToken :: NtfSupervisor -> STM ()
 nsRemoveNtfToken ns = writeTVar (ntfTkn ns) Nothing

 sendNtfSubCommand :: NtfSupervisor -> (ConnId, NtfSupervisorCommand) -> STM ()
-sendNtfSubCommand ns cmd = do
-  tkn <- readTVar (ntfTkn ns)
-  when (instantNotifications tkn) $ writeTBQueue (ntfSubQ ns) cmd
+sendNtfSubCommand ns cmd =
+  readTVar (ntfTkn ns)
+    >>= mapM_ (\NtfToken {ntfTknStatus} -> when (ntfTknStatus == NTActive) $ writeTBQueue (ntfSubQ ns) cmd)

-instantNotifications :: Maybe NtfToken -> Bool
-instantNotifications = \case
-  Just NtfToken {ntfTknStatus = NTActive, ntfMode = NMInstant} -> True
-  _ -> False
-
-closeNtfSupervisor :: MonadUnliftIO m => NtfSupervisor -> m ()
+closeNtfSupervisor :: NtfSupervisor -> IO ()
 closeNtfSupervisor ns = do
  cancelNtfWorkers_ $ ntfWorkers ns
  cancelNtfWorkers_ $ ntfSMPWorkers ns

-cancelNtfWorkers_ :: MonadUnliftIO m => TMap (ProtocolServer s) (TMVar (), Async ()) -> m ()
+cancelNtfWorkers_ :: TMap ProtocolServer (TMVar (), Async ()) -> IO ()
 cancelNtfWorkers_ wsVar = do
-  ws <- atomically $ stateTVar wsVar (,M.empty)
-  mapM_ (uninterruptibleCancel . snd) ws
+  ws <- atomically $ stateTVar wsVar $ \ws -> (ws, M.empty)
+  forM_ ws $ uninterruptibleCancel . snd

-getNtfServer :: AgentMonad' m => AgentClient -> m (Maybe NtfServer)
+getNtfServer :: AgentMonad m => AgentClient -> m (Maybe NtfServer)
 getNtfServer c = do
  ntfServers <- readTVarIO $ ntfServers c
  case ntfServers of
@@ -24,16 +24,7 @@ instance StrEncoding QueryStringParams where
  strP = QSP QEscape . Q.parseSimpleQuery <$> A.takeTill (\c -> c == ' ' || c == '\n')

 queryParam :: StrEncoding a => ByteString -> QueryStringParams -> Parser a
-queryParam name q =
-  case queryParamStr name q of
-    Just p -> either fail pure $ parseAll strP p
+queryParam name (QSP _ q) =
+  case find ((== name) . fst) q of
+    Just (_, p) -> either fail pure $ parseAll strP p
    _ -> fail $ "no qs param " <> B.unpack name
-
-queryParam_ :: StrEncoding a => ByteString -> QueryStringParams -> Parser (Maybe a)
-queryParam_ name q =
-  case queryParamStr name q of
-    Just p -> either fail pure $ parseAll strP p
-    _ -> pure Nothing
-
-queryParamStr :: ByteString -> QueryStringParams -> Maybe ByteString
-queryParamStr name (QSP _ q) = snd <$> find ((== name) . fst) q
@@ -1,91 +1,28 @@
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}

-module Simplex.Messaging.Agent.RetryInterval
-  ( RetryInterval (..),
-    RetryInterval2 (..),
-    RetryIntervalMode (..),
-    RI2State (..),
-    withRetryInterval,
-    withRetryLock2,
-    updateRetryInterval2,
-  )
-where
+module Simplex.Messaging.Agent.RetryInterval where

-import Control.Concurrent (forkIO)
-import Control.Monad (void)
+import Control.Concurrent (threadDelay)
 import Control.Monad.IO.Class (MonadIO, liftIO)
-import Data.Int (Int64)
-import Simplex.Messaging.Util (threadDelay', whenM)
-import UnliftIO.STM

 data RetryInterval = RetryInterval
-  { initialInterval :: Int64,
-    increaseAfter :: Int64,
-    maxInterval :: Int64
+  { initialInterval :: Int,
+    increaseAfter :: Int,
+    maxInterval :: Int
  }

-data RetryInterval2 = RetryInterval2
-  { riSlow :: RetryInterval,
-    riFast :: RetryInterval
-  }
-
-data RI2State = RI2State
-  { slowInterval :: Int64,
-    fastInterval :: Int64
-  }
-  deriving (Show)
-
-updateRetryInterval2 :: RI2State -> RetryInterval2 -> RetryInterval2
-updateRetryInterval2 RI2State {slowInterval, fastInterval} RetryInterval2 {riSlow, riFast} =
-  RetryInterval2
-    { riSlow = riSlow {initialInterval = slowInterval, increaseAfter = 0},
-      riFast = riFast {initialInterval = fastInterval, increaseAfter = 0}
-    }
-
-data RetryIntervalMode = RISlow | RIFast
-  deriving (Eq, Show)
-
-withRetryInterval :: forall m a. MonadIO m => RetryInterval -> (Int64 -> m a -> m a) -> m a
-withRetryInterval ri action = callAction 0 $ initialInterval ri
+withRetryInterval :: forall m. MonadIO m => RetryInterval -> (m () -> m ()) -> m ()
+withRetryInterval RetryInterval {initialInterval, increaseAfter, maxInterval} action =
+  callAction 0 initialInterval
  where
-    callAction :: Int64 -> Int64 -> m a
-    callAction elapsed delay = action delay loop
+    callAction :: Int -> Int -> m ()
+    callAction elapsedTime delay = action loop
      where
        loop = do
-          liftIO $ threadDelay' delay
-          let elapsed' = elapsed + delay
-          callAction elapsed' $ nextDelay elapsed' delay ri
-
-- This function allows action to toggle between slow and fast retry intervals.
-withRetryLock2 :: forall m. MonadIO m => RetryInterval2 -> TMVar () -> (RI2State -> (RetryIntervalMode -> m ()) -> m ()) -> m ()
-withRetryLock2 RetryInterval2 {riSlow, riFast} lock action =
-  callAction (0, initialInterval riSlow) (0, initialInterval riFast)
-  where
-    callAction :: (Int64, Int64) -> (Int64, Int64) -> m ()
-    callAction slow fast = action (RI2State (snd slow) (snd fast)) loop
-      where
-        loop = \case
-          RISlow -> run slow riSlow (`callAction` fast)
-          RIFast -> run fast riFast (callAction slow)
-        run (elapsed, delay) ri call = do
-          wait delay
-          let elapsed' = elapsed + delay
-              delay' = nextDelay elapsed' delay ri
-          call (elapsed', delay')
-        wait delay = do
-          waiting <- newTVarIO True
-          _ <- liftIO . forkIO $ do
-            threadDelay' delay
-            atomically $ whenM (readTVar waiting) $ void $ tryPutTMVar lock ()
-          atomically $ do
-            takeTMVar lock
-            writeTVar waiting False
-
-nextDelay :: Int64 -> Int64 -> RetryInterval -> Int64
-nextDelay elapsed delay RetryInterval {increaseAfter, maxInterval} =
-  if elapsed < increaseAfter || delay == maxInterval
-    then delay
-    else min (delay * 3 `div` 2) maxInterval
+          let newDelay =
+                if elapsedTime < increaseAfter || delay == maxInterval
+                  then delay
+                  else min (delay * 3 `div` 2) maxInterval
+          liftIO $ threadDelay delay
+          callAction (elapsedTime + delay) newDelay
@@ -21,9 +21,8 @@ import Data.Text.Encoding (decodeUtf8)
 import Simplex.Messaging.Agent
 import Simplex.Messaging.Agent.Env.SQLite
 import Simplex.Messaging.Agent.Protocol
-import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore)
 import Simplex.Messaging.Transport (ATransport (..), TProxy, Transport (..), simplexMQVersion)
-import Simplex.Messaging.Transport.Server (loadTLSServerParams, runTransportServer, defaultTransportServerConfig)
+import Simplex.Messaging.Transport.Server (loadTLSServerParams, runTransportServer)
 import Simplex.Messaging.Util (bshow)
 import UnliftIO.Async (race_)
 import qualified UnliftIO.Exception as E
@@ -32,23 +31,24 @@ import UnliftIO.STM
 -- | Runs an SMP agent as a TCP service using passed configuration.
 --
 -- See a full agent executable here: https://github.com/simplex-chat/simplexmq/blob/master/apps/smp-agent/Main.hs
-runSMPAgent :: (MonadRandom m, MonadUnliftIO m) => ATransport -> AgentConfig -> InitialAgentServers -> SQLiteStore -> m ()
-runSMPAgent t cfg initServers store =
-  runSMPAgentBlocking t cfg initServers store =<< newEmptyTMVarIO
+runSMPAgent :: (MonadRandom m, MonadUnliftIO m) => ATransport -> AgentConfig -> InitialAgentServers -> m ()
+runSMPAgent t cfg initServers = do
+  started <- newEmptyTMVarIO
+  runSMPAgentBlocking t started cfg initServers

 -- | Runs an SMP agent as a TCP service using passed configuration with signalling.
 --
 -- This function uses passed TMVar to signal when the server is ready to accept TCP requests (True)
 -- and when it is disconnected from the TCP socket once the server thread is killed (False).
-runSMPAgentBlocking :: (MonadRandom m, MonadUnliftIO m) => ATransport -> AgentConfig -> InitialAgentServers -> SQLiteStore -> TMVar Bool -> m ()
-runSMPAgentBlocking (ATransport t) cfg@AgentConfig {tcpPort, caCertificateFile, certificateFile, privateKeyFile} initServers store started = do
-  liftIO (newSMPAgentEnv cfg store) >>= runReaderT (smpAgent t)
+runSMPAgentBlocking :: (MonadRandom m, MonadUnliftIO m) => ATransport -> TMVar Bool -> AgentConfig -> InitialAgentServers -> m ()
+runSMPAgentBlocking (ATransport t) started cfg@AgentConfig {tcpPort, caCertificateFile, certificateFile, privateKeyFile} initServers = do
+  runReaderT (smpAgent t) =<< newSMPAgentEnv cfg
  where
    smpAgent :: forall c m'. (Transport c, MonadUnliftIO m', MonadReader Env m') => TProxy c -> m' ()
    smpAgent _ = do
      -- tlsServerParams is not in Env to avoid breaking functional API w/t key and certificate generation
      tlsServerParams <- liftIO $ loadTLSServerParams caCertificateFile certificateFile privateKeyFile
-      runTransportServer started tcpPort tlsServerParams defaultTransportServerConfig $ \(h :: c) -> do
+      runTransportServer started tcpPort tlsServerParams $ \(h :: c) -> do
        liftIO . putLn h $ "Welcome to SMP agent v" <> B.pack simplexMQVersion
        c <- getAgentClient initServers
        logConnection c True
@@ -60,10 +60,10 @@ connectClient h c = race_ (send h c) (receive h c)

 receive :: forall c m. (Transport c, MonadUnliftIO m) => c -> AgentClient -> m ()
 receive h c@AgentClient {rcvQ, subQ} = forever $ do
-  (corrId, entId, cmdOrErr) <- tGet SClient h
+  (corrId, connId, cmdOrErr) <- tGet SClient h
  case cmdOrErr of
-    Right cmd -> write rcvQ (corrId, entId, cmd)
-    Left e -> write subQ (corrId, entId, APC SAEConn $ ERR e)
+    Right cmd -> write rcvQ (corrId, connId, cmd)
+    Left e -> write subQ (corrId, connId, ERR e)
  where
    write :: TBQueue (ATransmission p) -> ATransmission p -> m ()
    write q t = do
@@ -77,5 +77,5 @@ send h c@AgentClient {subQ} = forever $ do
  logClient c "<--" t

 logClient :: MonadUnliftIO m => AgentClient -> ByteString -> ATransmission a -> m ()
-logClient AgentClient {clientId} dir (corrId, connId, APC _ cmd) = do
+logClient AgentClient {clientId} dir (corrId, connId, cmd) = do
  logInfo . decodeUtf8 $ B.unwords [bshow clientId, dir, "A :", corrId, connId, B.takeWhile (/= ' ') $ serializeCommand cmd]
@@ -3,32 +3,25 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# OPTIONS_GHC -fno-warn-unticked-promoted-constructors #-}

 module Simplex.Messaging.Agent.Store where

+import Control.Concurrent.STM (TVar)
 import Control.Exception (Exception)
-import qualified Data.Attoparsec.ByteString.Char8 as A
+import Crypto.Random (ChaChaDRG)
 import Data.ByteString.Char8 (ByteString)
 import Data.Int (Int64)
 import Data.Kind (Type)
-import Data.List (find)
-import Data.List.NonEmpty (NonEmpty)
-import qualified Data.List.NonEmpty as L
-import Data.Maybe (isJust)
 import Data.Time (UTCTime)
 import Data.Type.Equality
 import Simplex.Messaging.Agent.Protocol
-import Simplex.Messaging.Agent.RetryInterval (RI2State)
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Crypto.Ratchet (RatchetX448)
-import Simplex.Messaging.Encoding.String
+import Simplex.Messaging.Crypto.Ratchet (RatchetX448, SkippedMsgDiff, SkippedMsgKeys)
+import Simplex.Messaging.Notifications.Client
+import Simplex.Messaging.Notifications.Protocol (DeviceToken, NtfTknStatus, NtfTokenId)
 import Simplex.Messaging.Protocol
  ( MsgBody,
    MsgFlags,
@@ -36,23 +29,88 @@ import Simplex.Messaging.Protocol
    NotifierId,
    NtfPrivateSignKey,
    NtfPublicVerifyKey,
-    QueueId,
    RcvDhSecret,
-    RcvNtfDhSecret,
    RcvPrivateSignKey,
    SndPrivateSignKey,
  )
 import qualified Simplex.Messaging.Protocol as SMP
-import Simplex.Messaging.Util ((<$?>))
 import Simplex.Messaging.Version

+-- * Store management
+
+-- | Store class type. Defines store access methods for implementations.
+class Monad m => MonadAgentStore s m where
+  -- Queue and Connection management
+  createRcvConn :: s -> TVar ChaChaDRG -> ConnData -> RcvQueue -> SConnectionMode c -> m ConnId
+  createSndConn :: s -> TVar ChaChaDRG -> ConnData -> SndQueue -> m ConnId
+  getConn :: s -> ConnId -> m SomeConn
+  getRcvConn :: s -> SMPServer -> SMP.RecipientId -> m SomeConn
+  deleteConn :: s -> ConnId -> m ()
+  upgradeRcvConnToDuplex :: s -> ConnId -> SndQueue -> m ()
+  upgradeSndConnToDuplex :: s -> ConnId -> RcvQueue -> m ()
+  setRcvQueueStatus :: s -> RcvQueue -> QueueStatus -> m ()
+  setRcvQueueConfirmedE2E :: s -> RcvQueue -> C.DhSecretX25519 -> m ()
+  setSndQueueStatus :: s -> SndQueue -> QueueStatus -> m ()
+  getRcvQueue :: s -> ConnId -> m RcvQueue
+
+  -- RcvQueue notifier key and ID
+  setRcvQueueNotifierKey :: s -> ConnId -> NtfPublicVerifyKey -> NtfPrivateSignKey -> m ()
+  setRcvQueueNotifierId :: s -> ConnId -> NotifierId -> m ()
+
+  -- Confirmations
+  createConfirmation :: s -> TVar ChaChaDRG -> NewConfirmation -> m ConfirmationId
+  acceptConfirmation :: s -> ConfirmationId -> ConnInfo -> m AcceptedConfirmation
+  getAcceptedConfirmation :: s -> ConnId -> m AcceptedConfirmation
+  removeConfirmations :: s -> ConnId -> m ()
+  setHandshakeVersion :: s -> ConnId -> Version -> Bool -> m ()
+
+  -- Invitations - sent via Contact connections
+  createInvitation :: s -> TVar ChaChaDRG -> NewInvitation -> m InvitationId
+  getInvitation :: s -> InvitationId -> m Invitation
+  acceptInvitation :: s -> InvitationId -> ConnInfo -> m ()
+  deleteInvitation :: s -> ConnId -> InvitationId -> m ()
+
+  -- Msg management
+  updateRcvIds :: s -> ConnId -> m (InternalId, InternalRcvId, PrevExternalSndId, PrevRcvMsgHash)
+  createRcvMsg :: s -> ConnId -> RcvMsgData -> m ()
+  updateSndIds :: s -> ConnId -> m (InternalId, InternalSndId, PrevSndMsgHash)
+  createSndMsg :: s -> ConnId -> SndMsgData -> m ()
+  getPendingMsgData :: s -> ConnId -> InternalId -> m (Maybe RcvQueue, PendingMsgData)
+  getPendingMsgs :: s -> ConnId -> m [InternalId]
+  setMsgUserAck :: s -> ConnId -> InternalId -> m MsgId
+  getLastMsg :: s -> ConnId -> SMP.MsgId -> m (Maybe RcvMsg)
+  deleteMsg :: s -> ConnId -> InternalId -> m ()
+
+  -- Double ratchet persistence
+  createRatchetX3dhKeys :: s -> ConnId -> C.PrivateKeyX448 -> C.PrivateKeyX448 -> m ()
+  getRatchetX3dhKeys :: s -> ConnId -> m (C.PrivateKeyX448, C.PrivateKeyX448)
+  createRatchet :: s -> ConnId -> RatchetX448 -> m ()
+  getRatchet :: s -> ConnId -> m RatchetX448
+  getSkippedMsgKeys :: s -> ConnId -> m SkippedMsgKeys
+  updateRatchet :: s -> ConnId -> RatchetX448 -> SkippedMsgDiff -> m ()
+
+  -- Notification device token persistence
+  createNtfToken :: s -> NtfToken -> m ()
+  getDeviceNtfToken :: s -> DeviceToken -> m (Maybe NtfToken, [NtfToken])
+  updateNtfTokenRegistration :: s -> NtfToken -> NtfTokenId -> C.DhSecretX25519 -> m ()
+  updateNtfToken :: s -> NtfToken -> NtfTknStatus -> Maybe NtfTknAction -> m ()
+  removeNtfToken :: s -> NtfToken -> m ()
+
+  -- Notification subscription persistence
+  getNtfSubscription :: s -> ConnId -> m (Maybe NtfSubscription)
+  createNtfSubscription :: s -> NtfSubscription -> NtfSubOrSMPAction -> m ()
+  markNtfSubscriptionForDeletion :: s -> ConnId -> m ()
+  updateNtfSubscription :: s -> ConnId -> NtfSubscription -> NtfSubOrSMPAction -> m ()
+  setNullNtfSubscriptionAction :: s -> ConnId -> m ()
+  deleteNtfSubscription :: s -> ConnId -> m ()
+  getNextNtfSubAction :: s -> NtfServer -> m (Maybe (NtfSubscription, NtfSubAction, RcvQueue))
+  getNextNtfSubSMPAction :: s -> SMPServer -> m (Maybe (NtfSubscription, NtfSubSMPAction, RcvQueue))
+
 -- * Queue types

 -- | A receive queue. SMP queue through which the agent receives messages from a sender.
 data RcvQueue = RcvQueue
-  { userId :: UserId,
-    connId :: ConnId,
-    server :: SMPServer,
+  { server :: SMPServer,
    -- | recipient queue ID
    rcvId :: SMP.RecipientId,
    -- | key used by the recipient to sign transmissions
@@ -64,56 +122,20 @@ data RcvQueue = RcvQueue
    -- | public sender's DH key and agreed shared DH secret for simple per-queue e2e
    e2eDhSecret :: Maybe C.DhSecretX25519,
    -- | sender queue ID
-    sndId :: SMP.SenderId,
+    sndId :: Maybe SMP.SenderId,
    -- | queue status
    status :: QueueStatus,
-    -- | database queue ID (within connection)
-    dbQueueId :: Int64,
-    -- | True for a primary or a next primary queue of the connection (next if dbReplaceQueueId is set)
-    primary :: Bool,
-    -- | database queue ID to replace, Nothing if this queue is not replacing another, `Just Nothing` is used for replacing old queues
-    dbReplaceQueueId :: Maybe Int64,
-    rcvSwchStatus :: Maybe RcvSwitchStatus,
-    -- | SMP client version
-    smpClientVersion :: Version,
-    -- | credentials used in context of notifications
-    clientNtfCreds :: Maybe ClientNtfCreds,
-    deleteErrors :: Int
-  }
-  deriving (Eq, Show)
-
-rcvQueueInfo :: RcvQueue -> RcvQueueInfo
-rcvQueueInfo rq@RcvQueue {server, rcvSwchStatus} =
-  RcvQueueInfo {rcvServer = server, rcvSwitchStatus = rcvSwchStatus, canAbortSwitch = canAbortRcvSwitch rq}
-
-canAbortRcvSwitch :: RcvQueue -> Bool
-canAbortRcvSwitch = maybe False canAbort . rcvSwchStatus
-  where
-    canAbort = \case
-      RSSwitchStarted -> True
-      RSSendingQADD -> True
-      -- if switch is in RSSendingQUSE, a race condition with sender deleting the original queue is possible
-      RSSendingQUSE -> False
-      -- if switch is in RSReceivedMessage status, aborting switch (deleting new queue)
-      -- will break the connection because the sender would have original queue deleted
-      RSReceivedMessage -> False
-
-data ClientNtfCreds = ClientNtfCreds
-  { -- | key pair to be used by the notification server to sign transmissions
-    ntfPublicKey :: NtfPublicVerifyKey,
-    ntfPrivateKey :: NtfPrivateSignKey,
+    -- | key pair to be used by the notification server to sign transmissions
+    ntfPublicKey :: Maybe NtfPublicVerifyKey,
+    ntfPrivateKey :: Maybe NtfPrivateSignKey,
    -- | queue ID to be used by the notification server for NSUB command
-    notifierId :: NotifierId,
-    -- | shared DH secret used to encrypt/decrypt notification metadata (NMsgMeta) from server to recipient
-    rcvNtfDhSecret :: RcvNtfDhSecret
+    notifierId :: Maybe NotifierId
  }
  deriving (Eq, Show)

 -- | A send queue. SMP queue through which the agent sends messages to a recipient.
 data SndQueue = SndQueue
-  { userId :: UserId,
-    connId :: ConnId,
-    server :: SMPServer,
+  { server :: SMPServer,
    -- | sender queue ID
    sndId :: SMP.SenderId,
    -- | key pair used by the sender to sign transmissions
@@ -124,103 +146,14 @@ data SndQueue = SndQueue
    -- | shared DH secret agreed for simple per-queue e2e encryption
    e2eDhSecret :: C.DhSecretX25519,
    -- | queue status
-    status :: QueueStatus,
-    -- | database queue ID (within connection)
-    dbQueueId :: Int64,
-    -- | True for a primary or a next primary queue of the connection (next if dbReplaceQueueId is set)
-    primary :: Bool,
-    -- | ID of the queue this one is replacing
-    dbReplaceQueueId :: Maybe Int64,
-    sndSwchStatus :: Maybe SndSwitchStatus,
-    -- | SMP client version
-    smpClientVersion :: Version
+    status :: QueueStatus
  }
  deriving (Eq, Show)

-sndQueueInfo :: SndQueue -> SndQueueInfo
-sndQueueInfo SndQueue {server, sndSwchStatus} =
-  SndQueueInfo {sndServer = server, sndSwitchStatus = sndSwchStatus}
-
-instance SMPQueue RcvQueue where
-  qServer RcvQueue {server} = server
-  {-# INLINE qServer #-}
-  qAddress RcvQueue {server, rcvId} = (server, rcvId)
-  {-# INLINE qAddress #-}
-  sameQueue addr q = sameQAddress addr (qAddress q)
-  {-# INLINE sameQueue #-}
-
-instance SMPQueue SndQueue where
-  qServer SndQueue {server} = server
-  {-# INLINE qServer #-}
-  qAddress SndQueue {server, sndId} = (server, sndId)
-  {-# INLINE qAddress #-}
-  sameQueue addr q = sameQAddress addr (qAddress q)
-  {-# INLINE sameQueue #-}
-
-findQ :: SMPQueue q => (SMPServer, SMP.QueueId) -> NonEmpty q -> Maybe q
-findQ = find . sameQueue
-{-# INLINE findQ #-}
-
-removeQ :: SMPQueue q => (SMPServer, SMP.QueueId) -> NonEmpty q -> Maybe (q, [q])
-removeQ = removeQP . sameQueue
-{-# INLINE removeQ #-}
-
-removeQP :: (q -> Bool) -> NonEmpty q -> Maybe (q, [q])
-removeQP p qs = case L.break p qs of
-  (_, []) -> Nothing
-  (qs1, q : qs2) -> Just (q, qs1 <> qs2)
-
-sndAddress :: RcvQueue -> (SMPServer, SMP.SenderId)
-sndAddress RcvQueue {server, sndId} = (server, sndId)
-{-# INLINE sndAddress #-}
-
-findRQ :: (SMPServer, SMP.SenderId) -> NonEmpty RcvQueue -> Maybe RcvQueue
-findRQ sAddr = find $ sameQAddress sAddr . sndAddress
-{-# INLINE findRQ #-}
-
-switchingRQ :: NonEmpty RcvQueue -> Maybe RcvQueue
-switchingRQ = find $ isJust . rcvSwchStatus
-{-# INLINE switchingRQ #-}
-
-updatedQs :: SMPQueueRec q => q -> NonEmpty q -> NonEmpty q
-updatedQs q = L.map $ \q' -> if dbQId q == dbQId q' then q else q'
-{-# INLINE updatedQs #-}
-
-class SMPQueue q => SMPQueueRec q where
-  qUserId :: q -> UserId
-  qConnId :: q -> ConnId
-  queueId :: q -> QueueId
-  dbQId :: q -> Int64
-  dbReplaceQId :: q -> Maybe Int64
-
-instance SMPQueueRec RcvQueue where
-  qUserId = userId
-  {-# INLINE qUserId #-}
-  qConnId = connId
-  {-# INLINE qConnId #-}
-  queueId = rcvId
-  {-# INLINE queueId #-}
-  dbQId = dbQueueId
-  {-# INLINE dbQId #-}
-  dbReplaceQId = dbReplaceQueueId
-  {-# INLINE dbReplaceQId #-}
-
-instance SMPQueueRec SndQueue where
-  qUserId = userId
-  {-# INLINE qUserId #-}
-  qConnId = connId
-  {-# INLINE qConnId #-}
-  queueId = sndId
-  {-# INLINE queueId #-}
-  dbQId = dbQueueId
-  {-# INLINE dbQId #-}
-  dbReplaceQId = dbReplaceQueueId
-  {-# INLINE dbReplaceQId #-}
-
 -- * Connection types

 -- | Type of a connection.
-data ConnType = CNew | CRcv | CSnd | CDuplex | CContact deriving (Eq, Show)
+data ConnType = CRcv | CSnd | CDuplex | CContact deriving (Eq, Show)

 -- | Connection of a specific type.
 --
@@ -233,41 +166,22 @@ data ConnType = CNew | CRcv | CSnd | CDuplex | CContact deriving (Eq, Show)
 -- - DuplexConnection is a connection that has both receive and send queues set up,
 --   typically created by upgrading a receive or a send connection with a missing queue.
 data Connection (d :: ConnType) where
-  NewConnection :: ConnData -> Connection CNew
  RcvConnection :: ConnData -> RcvQueue -> Connection CRcv
  SndConnection :: ConnData -> SndQueue -> Connection CSnd
-  DuplexConnection :: ConnData -> NonEmpty RcvQueue -> NonEmpty SndQueue -> Connection CDuplex
+  DuplexConnection :: ConnData -> RcvQueue -> SndQueue -> Connection CDuplex
  ContactConnection :: ConnData -> RcvQueue -> Connection CContact

 deriving instance Eq (Connection d)

 deriving instance Show (Connection d)

-toConnData :: Connection d -> ConnData
-toConnData = \case
-  NewConnection cData -> cData
-  RcvConnection cData _ -> cData
-  SndConnection cData _ -> cData
-  DuplexConnection cData _ _ -> cData
-  ContactConnection cData _ -> cData
-
-updateConnection :: ConnData -> Connection d -> Connection d
-updateConnection cData = \case
-  NewConnection _ -> NewConnection cData
-  RcvConnection _ rq -> RcvConnection cData rq
-  SndConnection _ sq -> SndConnection cData sq
-  DuplexConnection _ rqs sqs -> DuplexConnection cData rqs sqs
-  ContactConnection _ rq -> ContactConnection cData rq
-
 data SConnType :: ConnType -> Type where
-  SCNew :: SConnType CNew
  SCRcv :: SConnType CRcv
  SCSnd :: SConnType CSnd
  SCDuplex :: SConnType CDuplex
  SCContact :: SConnType CContact

 connType :: SConnType c -> ConnType
-connType SCNew = CNew
 connType SCRcv = CRcv
 connType SCSnd = CSnd
 connType SCDuplex = CDuplex
@@ -297,155 +211,11 @@ deriving instance Show SomeConn

 data ConnData = ConnData
  { connId :: ConnId,
-    userId :: UserId,
    connAgentVersion :: Version,
-    enableNtfs :: Bool,
-    duplexHandshake :: Maybe Bool, -- added in agent protocol v2
-    lastExternalSndId :: PrevExternalSndId,
-    deleted :: Bool,
-    ratchetSyncState :: RatchetSyncState
+    duplexHandshake :: Maybe Bool -- added in agent protocol v2
  }
  deriving (Eq, Show)

-- this function should be mirrored in the clients
-ratchetSyncAllowed :: ConnData -> Bool
-ratchetSyncAllowed cData@ConnData {ratchetSyncState} =
-  ratchetSyncSupported' cData && (ratchetSyncState `elem` ([RSAllowed, RSRequired] :: [RatchetSyncState]))
-
-ratchetSyncSupported' :: ConnData -> Bool
-ratchetSyncSupported' ConnData {connAgentVersion} = connAgentVersion >= 3
-
-- this function should be mirrored in the clients
-ratchetSyncSendProhibited :: ConnData -> Bool
-ratchetSyncSendProhibited ConnData {ratchetSyncState} =
-  ratchetSyncState `elem` ([RSRequired, RSStarted, RSAgreed] :: [RatchetSyncState])
-
-data PendingCommand = PendingCommand
-  { corrId :: ACorrId,
-    userId :: UserId,
-    connId :: ConnId,
-    command :: AgentCommand
-  }
-
-data AgentCmdType = ACClient | ACInternal
-
-instance StrEncoding AgentCmdType where
-  strEncode = \case
-    ACClient -> "CLIENT"
-    ACInternal -> "INTERNAL"
-  strP =
-    A.takeTill (== ' ') >>= \case
-      "CLIENT" -> pure ACClient
-      "INTERNAL" -> pure ACInternal
-      _ -> fail "bad AgentCmdType"
-
-data AgentCommand
-  = AClientCommand (APartyCmd 'Client)
-  | AInternalCommand InternalCommand
-
-instance StrEncoding AgentCommand where
-  strEncode = \case
-    AClientCommand (APC _ cmd) -> strEncode (ACClient, Str $ serializeCommand cmd)
-    AInternalCommand cmd -> strEncode (ACInternal, cmd)
-  strP =
-    strP_ >>= \case
-      ACClient -> AClientCommand <$> ((\(ACmd _ e cmd) -> checkParty $ APC e cmd) <$?> dbCommandP)
-      ACInternal -> AInternalCommand <$> strP
-
-data AgentCommandTag
-  = AClientCommandTag (APartyCmdTag 'Client)
-  | AInternalCommandTag InternalCommandTag
-  deriving (Show)
-
-instance StrEncoding AgentCommandTag where
-  strEncode = \case
-    AClientCommandTag t -> strEncode (ACClient, t)
-    AInternalCommandTag t -> strEncode (ACInternal, t)
-  strP =
-    strP_ >>= \case
-      ACClient -> AClientCommandTag <$> strP
-      ACInternal -> AInternalCommandTag <$> strP
-
-data InternalCommand
-  = ICAck SMP.RecipientId MsgId
-  | ICAckDel SMP.RecipientId MsgId InternalId
-  | ICAllowSecure SMP.RecipientId SMP.SndPublicVerifyKey
-  | ICDuplexSecure SMP.RecipientId SMP.SndPublicVerifyKey
-  | ICDeleteConn
-  | ICDeleteRcvQueue SMP.RecipientId
-  | ICQSecure SMP.RecipientId SMP.SndPublicVerifyKey
-  | ICQDelete SMP.RecipientId
-
-data InternalCommandTag
-  = ICAck_
-  | ICAckDel_
-  | ICAllowSecure_
-  | ICDuplexSecure_
-  | ICDeleteConn_
-  | ICDeleteRcvQueue_
-  | ICQSecure_
-  | ICQDelete_
-  deriving (Show)
-
-instance StrEncoding InternalCommand where
-  strEncode = \case
-    ICAck rId srvMsgId -> strEncode (ICAck_, rId, srvMsgId)
-    ICAckDel rId srvMsgId mId -> strEncode (ICAckDel_, rId, srvMsgId, mId)
-    ICAllowSecure rId sndKey -> strEncode (ICAllowSecure_, rId, sndKey)
-    ICDuplexSecure rId sndKey -> strEncode (ICDuplexSecure_, rId, sndKey)
-    ICDeleteConn -> strEncode ICDeleteConn_
-    ICDeleteRcvQueue rId -> strEncode (ICDeleteRcvQueue_, rId)
-    ICQSecure rId senderKey -> strEncode (ICQSecure_, rId, senderKey)
-    ICQDelete rId -> strEncode (ICQDelete_, rId)
-  strP =
-    strP >>= \case
-      ICAck_ -> ICAck <$> _strP <*> _strP
-      ICAckDel_ -> ICAckDel <$> _strP <*> _strP <*> _strP
-      ICAllowSecure_ -> ICAllowSecure <$> _strP <*> _strP
-      ICDuplexSecure_ -> ICDuplexSecure <$> _strP <*> _strP
-      ICDeleteConn_ -> pure ICDeleteConn
-      ICDeleteRcvQueue_ -> ICDeleteRcvQueue <$> _strP
-      ICQSecure_ -> ICQSecure <$> _strP <*> _strP
-      ICQDelete_ -> ICQDelete <$> _strP
-
-instance StrEncoding InternalCommandTag where
-  strEncode = \case
-    ICAck_ -> "ACK"
-    ICAckDel_ -> "ACK_DEL"
-    ICAllowSecure_ -> "ALLOW_SECURE"
-    ICDuplexSecure_ -> "DUPLEX_SECURE"
-    ICDeleteConn_ -> "DELETE_CONN"
-    ICDeleteRcvQueue_ -> "DELETE_RCV_QUEUE"
-    ICQSecure_ -> "QSECURE"
-    ICQDelete_ -> "QDELETE"
-  strP =
-    A.takeTill (== ' ') >>= \case
-      "ACK" -> pure ICAck_
-      "ACK_DEL" -> pure ICAckDel_
-      "ALLOW_SECURE" -> pure ICAllowSecure_
-      "DUPLEX_SECURE" -> pure ICDuplexSecure_
-      "DELETE_CONN" -> pure ICDeleteConn_
-      "DELETE_RCV_QUEUE" -> pure ICDeleteRcvQueue_
-      "QSECURE" -> pure ICQSecure_
-      "QDELETE" -> pure ICQDelete_
-      _ -> fail "bad InternalCommandTag"
-
-agentCommandTag :: AgentCommand -> AgentCommandTag
-agentCommandTag = \case
-  AClientCommand cmd -> AClientCommandTag $ aPartyCmdTag cmd
-  AInternalCommand cmd -> AInternalCommandTag $ internalCmdTag cmd
-
-internalCmdTag :: InternalCommand -> InternalCommandTag
-internalCmdTag = \case
-  ICAck {} -> ICAck_
-  ICAckDel {} -> ICAckDel_
-  ICAllowSecure {} -> ICAllowSecure_
-  ICDuplexSecure {} -> ICDuplexSecure_
-  ICDeleteConn -> ICDeleteConn_
-  ICDeleteRcvQueue {} -> ICDeleteRcvQueue_
-  ICQSecure {} -> ICQSecure_
-  ICQDelete _ -> ICQDelete_
-
 -- * Confirmation types

 data NewConfirmation = NewConfirmation
@@ -499,8 +269,7 @@ data RcvMsgData = RcvMsgData
    msgBody :: MsgBody,
    internalRcvId :: InternalRcvId,
    internalHash :: MsgHash,
-    externalPrevSndHash :: MsgHash,
-    encryptedMsgHash :: MsgHash
+    externalPrevSndHash :: MsgHash
  }

 data RcvMsg = RcvMsg
@@ -526,7 +295,6 @@ data PendingMsgData = PendingMsgData
    msgType :: AgentMessageType,
    msgFlags :: MsgFlags,
    msgBody :: MsgBody,
-    msgRetryState :: Maybe RI2State,
    internalTs :: InternalTs
  }
  deriving (Show)
@@ -562,14 +330,8 @@ data MsgBase = MsgBase

 newtype InternalId = InternalId {unId :: Int64} deriving (Eq, Show)

-instance StrEncoding InternalId where
-  strEncode = strEncode . unId
-  strP = InternalId <$> strP
-
 type InternalTs = UTCTime

-type AsyncCmdId = Int64
-
 -- * Store errors

 -- | Agent store error.
@@ -578,12 +340,8 @@ data StoreError
    SEInternal ByteString
  | -- | Failed to generate unique random ID
    SEUniqueID
-  | -- | User ID not found
-    SEUserNotFound
  | -- | Connection not found (or both queues absent).
    SEConnNotFound
-  | -- | Server not found.
-    SEServerNotFound
  | -- | Connection already used.
    SEConnDuplicate
  | -- | Wrong connection type, e.g. "send" connection when "receive" or "duplex" is expected, or vice versa.
@@ -595,8 +353,6 @@ data StoreError
    SEInvitationNotFound
  | -- | Message not found
    SEMsgNotFound
-  | -- | Command not found
-    SECmdNotFound
  | -- | Currently not used. The intention was to pass current expected queue status in methods,
    -- as we always know what it should be at any stage of the protocol,
    -- and in case it does not match use this error.
@@ -605,12 +361,8 @@ data StoreError
    SERatchetNotFound
  | -- | connection does not have associated x3dh keys
    SEX3dhKeysNotFound
+  | -- | Used in `getMsg` that is not implemented/used. TODO remove.
+    SENotImplemented
  | -- | Used to wrap agent errors inside store operations to avoid race conditions
    SEAgentError AgentErrorType
-  | -- | XFTP Server not found.
-    SEXFTPServerNotFound
-  | -- | XFTP File not found.
-    SEFileNotFound
-  | -- | XFTP Deleted snd chunk replica not found.
-    SEDeletedSndChunkReplicaNotFound
  deriving (Eq, Show, Exception)
@@ -1,61 +0,0 @@
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Common
-  ( SQLiteStore (..),
-    withConnection,
-    withTransaction,
-    withTransactionCtx,
-    dbBusyLoop,
-  )
-where
-
-import Control.Concurrent (threadDelay)
-import Data.Time.Clock (diffUTCTime, getCurrentTime)
-import Database.SQLite.Simple (SQLError)
-import qualified Database.SQLite.Simple as DB
-import Simplex.Messaging.Util (diffToMilliseconds)
-import UnliftIO.Exception (bracket)
-import qualified UnliftIO.Exception as E
-import UnliftIO.STM
-
-data SQLiteStore = SQLiteStore
-  { dbFilePath :: FilePath,
-    dbEncrypted :: TVar Bool,
-    dbConnection :: TMVar DB.Connection,
-    dbNew :: Bool
-  }
-
-withConnection :: SQLiteStore -> (DB.Connection -> IO a) -> IO a
-withConnection SQLiteStore {dbConnection} =
-  bracket
-    (atomically $ takeTMVar dbConnection)
-    (atomically . putTMVar dbConnection)
-
-withTransaction :: forall a. SQLiteStore -> (DB.Connection -> IO a) -> IO a
-withTransaction = withTransactionCtx Nothing
-
-withTransactionCtx :: forall a. Maybe String -> SQLiteStore -> (DB.Connection -> IO a) -> IO a
-withTransactionCtx ctx_ st action = withConnection st $ \db -> dbBusyLoop (transactionWithCtx db)
-  where
-    transactionWithCtx db = case ctx_ of
-      Nothing -> DB.withImmediateTransaction db (action db)
-      Just ctx -> do
-        t1 <- getCurrentTime
-        r <- DB.withImmediateTransaction db (action db)
-        t2 <- getCurrentTime
-        putStrLn $ "withTransactionCtx start :: " <> show t1 <> " :: " <> ctx
-        putStrLn $ "withTransactionCtx end   :: " <> show t2 <> " :: " <> ctx <> " :: duration=" <> show (diffToMilliseconds $ diffUTCTime t2 t1)
-        pure r
-
-dbBusyLoop :: forall a. IO a -> IO a
-dbBusyLoop action = loop 500 3000000
-  where
-    loop :: Int -> Int -> IO a
-    loop t tLim =
-      action `E.catch` \(e :: SQLError) ->
-        if tLim > t && DB.sqlError e == DB.ErrorBusy
-          then do
-            threadDelay t
-            loop (t * 9 `div` 8) (tLim - t)
-          else E.throwIO e
@@ -1,184 +1,78 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TupleSections #-}

 module Simplex.Messaging.Agent.Store.SQLite.Migrations
  ( Migration (..),
-    MigrationsToRun (..),
-    MTRError (..),
-    DownMigration (..),
    app,
    initialize,
    get,
    run,
-    getCurrent,
-    mtrErrorDescription,
-    -- for unit tests
-    migrationsToRun,
-    toDownMigration,
  )
 where

-import Control.Monad (forM_, when)
-import Data.Aeson (ToJSON)
-import qualified Data.Aeson as J
-import Data.List (intercalate, sortOn)
-import Data.List.NonEmpty (NonEmpty)
-import qualified Data.Map as M
-import Data.Maybe (isNothing, mapMaybe)
+import Control.Monad (forM_)
+import Data.Function (on)
+import Data.List (intercalate, sortBy)
 import Data.Text (Text)
-import Data.Text.Encoding (decodeLatin1)
 import Data.Time.Clock (getCurrentTime)
 import Database.SQLite.Simple (Connection, Only (..), Query (..))
 import qualified Database.SQLite.Simple as DB
 import Database.SQLite.Simple.QQ (sql)
 import qualified Database.SQLite3 as SQLite3
-import GHC.Generics (Generic)
-import Simplex.Messaging.Agent.Protocol (extraSMPServerHosts)
-import Simplex.Messaging.Agent.Store.SQLite.Common
 import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220101_initial
 import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220301_snd_queue_keys
 import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220322_notifications
 import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220608_v2
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220625_v2_ntf_mode
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220811_onion_hosts
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220817_connection_ntfs
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220905_commands
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220915_connection_queues
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230110_users
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230117_fkey_indexes
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230120_delete_errors
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230217_server_key_hash
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230223_files
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230320_retry_state
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230401_snd_files
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230510_files_pending_replicas_indexes
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230516_encrypted_rcv_message_hashes
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230531_switch_status
-import Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230615_ratchet_sync
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (dropPrefix, sumTypeJSON)
-import Simplex.Messaging.Transport.Client (TransportHost)

-data Migration = Migration {name :: String, up :: Text, down :: Maybe Text}
-  deriving (Eq, Show)
+data Migration = Migration {name :: String, up :: Text}
+  deriving (Show)

-schemaMigrations :: [(String, Query, Maybe Query)]
+schemaMigrations :: [(String, Query)]
 schemaMigrations =
-  [ ("20220101_initial", m20220101_initial, Nothing),
-    ("20220301_snd_queue_keys", m20220301_snd_queue_keys, Nothing),
-    ("20220322_notifications", m20220322_notifications, Nothing),
-    ("20220607_v2", m20220608_v2, Nothing),
-    ("m20220625_v2_ntf_mode", m20220625_v2_ntf_mode, Nothing),
-    ("m20220811_onion_hosts", m20220811_onion_hosts, Nothing),
-    ("m20220817_connection_ntfs", m20220817_connection_ntfs, Nothing),
-    ("m20220905_commands", m20220905_commands, Nothing),
-    ("m20220915_connection_queues", m20220915_connection_queues, Nothing),
-    ("m20230110_users", m20230110_users, Nothing),
-    ("m20230117_fkey_indexes", m20230117_fkey_indexes, Nothing),
-    ("m20230120_delete_errors", m20230120_delete_errors, Nothing),
-    ("m20230217_server_key_hash", m20230217_server_key_hash, Nothing),
-    ("m20230223_files", m20230223_files, Just down_m20230223_files),
-    ("m20230320_retry_state", m20230320_retry_state, Just down_m20230320_retry_state),
-    ("m20230401_snd_files", m20230401_snd_files, Just down_m20230401_snd_files),
-    ("m20230510_files_pending_replicas_indexes", m20230510_files_pending_replicas_indexes, Just down_m20230510_files_pending_replicas_indexes),
-    ("m20230516_encrypted_rcv_message_hashes", m20230516_encrypted_rcv_message_hashes, Just down_m20230516_encrypted_rcv_message_hashes),
-    ("m20230531_switch_status", m20230531_switch_status, Just down_m20230531_switch_status),
-    ("m20230615_ratchet_sync", m20230615_ratchet_sync, Just down_m20230615_ratchet_sync)
+  [ ("20220101_initial", m20220101_initial),
+    ("20220301_snd_queue_keys", m20220301_snd_queue_keys),
+    ("20220322_notifications", m20220322_notifications),
+    ("20220607_v2", m20220608_v2)
  ]

 -- | The list of migrations in ascending order by date
 app :: [Migration]
-app = sortOn name $ map migration schemaMigrations
+app = sortBy (compare `on` name) $ map migration schemaMigrations
  where
-    migration (name, up, down) = Migration {name, up = fromQuery up, down = fromQuery <$> down}
+    migration (name, query) = Migration {name = name, up = fromQuery query}

-get :: SQLiteStore -> [Migration] -> IO (Either MTRError MigrationsToRun)
-get st migrations = migrationsToRun migrations <$> withTransaction st getCurrent
+get :: Connection -> [Migration] -> IO (Either String [Migration])
+get conn migrations =
+  migrationsToRun migrations . map fromOnly
+    <$> DB.query_ conn "SELECT name FROM migrations ORDER BY name ASC;"

-getCurrent :: Connection -> IO [Migration]
-getCurrent db = map toMigration <$> DB.query_ db "SELECT name, down FROM migrations ORDER BY name ASC;"
+run :: Connection -> [Migration] -> IO ()
+run conn ms = DB.withImmediateTransaction conn . forM_ ms $
+  \Migration {name, up} -> insert name >> execSQL up
  where
-    toMigration (name, down) = Migration {name, up = "", down}
+    insert name = DB.execute conn "INSERT INTO migrations (name, ts) VALUES (?, ?);" . (name,) =<< getCurrentTime
+    execSQL = SQLite3.exec $ DB.connectionHandle conn

-run :: SQLiteStore -> MigrationsToRun -> IO ()
-run st = \case
-  MTRUp [] -> pure ()
-  MTRUp ms -> mapM_ runUp ms >> withConnection st (`execSQL` "VACUUM;")
-  MTRDown ms -> mapM_ runDown $ reverse ms
-  MTRNone -> pure ()
-  where
-    runUp Migration {name, up, down} = withTransaction st $ \db -> do
-      when (name == "m20220811_onion_hosts") $ updateServers db
-      insert db >> execSQL db up
-      where
-        insert db = DB.execute db "INSERT INTO migrations (name, down, ts) VALUES (?,?,?)" . (name,down,) =<< getCurrentTime
-        updateServers db = forM_ (M.assocs extraSMPServerHosts) $ \(h, h') ->
-          let hs = decodeLatin1 . strEncode $ ([h, h'] :: NonEmpty TransportHost)
-           in DB.execute db "UPDATE servers SET host = ? WHERE host = ?" (hs, decodeLatin1 $ strEncode h)
-    runDown DownMigration {downName, downQuery} = withTransaction st $ \db -> do
-      execSQL db downQuery
-      DB.execute db "DELETE FROM migrations WHERE name = ?" (Only downName)
-    execSQL db = SQLite3.exec $ DB.connectionHandle db
+initialize :: Connection -> IO ()
+initialize conn =
+  DB.execute_
+    conn
+    [sql|
+      CREATE TABLE IF NOT EXISTS migrations (
+        name TEXT NOT NULL,
+        ts TEXT NOT NULL,
+        PRIMARY KEY (name)
+      );
+    |]

-initialize :: SQLiteStore -> IO ()
-initialize st = withTransaction st $ \db -> do
-  cs :: [Text] <- map fromOnly <$> DB.query_ db "SELECT name FROM pragma_table_info('migrations')"
-  case cs of
-    [] -> createMigrations db
-    _ -> when ("down" `notElem` cs) $ DB.execute_ db "ALTER TABLE migrations ADD COLUMN down TEXT"
-  where
-    createMigrations db =
-      DB.execute_
-        db
-        [sql|
-          CREATE TABLE IF NOT EXISTS migrations (
-            name TEXT NOT NULL,
-            ts TEXT NOT NULL,
-            down TEXT,
-            PRIMARY KEY (name)
-          );
-        |]
-
-data DownMigration = DownMigration {downName :: String, downQuery :: Text}
-  deriving (Eq, Show)
-
-toDownMigration :: Migration -> Maybe DownMigration
-toDownMigration Migration {name, down} = DownMigration name <$> down
-
-data MigrationsToRun = MTRUp [Migration] | MTRDown [DownMigration] | MTRNone
-  deriving (Eq, Show)
-
-data MTRError
-  = MTRENoDown {dbMigrations :: [String]}
-  | MTREDifferent {appMigration :: String, dbMigration :: String}
-  deriving (Eq, Show, Generic)
-
-instance ToJSON MTRError where
-  toJSON = J.genericToJSON . sumTypeJSON $ dropPrefix "MTRE"
-  toEncoding = J.genericToEncoding . sumTypeJSON $ dropPrefix "MTRE"
-
-mtrErrorDescription :: MTRError -> String
-mtrErrorDescription = \case
-  MTRENoDown ms -> "database version is newer than the app, but no down migration for: " <> intercalate ", " ms
-  MTREDifferent a d -> "different migration in the app/database: " <> a <> " / " <> d
-
-migrationsToRun :: [Migration] -> [Migration] -> Either MTRError MigrationsToRun
-migrationsToRun [] [] = Right MTRNone
-migrationsToRun appMs [] = Right $ MTRUp appMs
-migrationsToRun [] dbMs
-  | length dms == length dbMs = Right $ MTRDown dms
-  | otherwise = Left $ MTRENoDown $ mapMaybe nameNoDown dbMs
-  where
-    dms = mapMaybe toDownMigration dbMs
-    nameNoDown m = if isNothing (down m) then Just $ name m else Nothing
+migrationsToRun :: [Migration] -> [String] -> Either String [Migration]
+migrationsToRun appMs [] = Right appMs
+migrationsToRun [] dbMs = Left $ "database version is newer than the app: " <> intercalate ", " dbMs
 migrationsToRun (a : as) (d : ds)
-  | name a == name d = migrationsToRun as ds
-  | otherwise = Left $ MTREDifferent (name a) (name d)
+  | name a == d = migrationsToRun as ds
+  | otherwise = Left $ "different migration in the app/database: " <> name a <> " / " <> d
@@ -107,8 +107,8 @@ CREATE TABLE snd_messages (
 CREATE TABLE conn_confirmations (
  confirmation_id BLOB NOT NULL PRIMARY KEY,
  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  e2e_snd_pub_key BLOB NOT NULL,
-  sender_key BLOB NOT NULL,
+  e2e_snd_pub_key BLOB NOT NULL, -- TODO per-queue key. Split?
+  sender_key BLOB NOT NULL, -- TODO per-queue key. Split?
  ratchet_state BLOB NOT NULL,
  sender_conn_info BLOB NOT NULL,
  accepted INTEGER NOT NULL,
@@ -18,7 +18,7 @@ CREATE TABLE ntf_servers (
 ) WITHOUT ROWID;

 CREATE TABLE ntf_tokens (
-  provider TEXT NOT NULL, -- apns
+  provider TEXT NOT NULL, -- apn
  device_token TEXT NOT NULL, -- ! this field is mislabeled and is actually saved as binary
  ntf_host TEXT NOT NULL,
  ntf_port TEXT NOT NULL,
@@ -22,12 +22,10 @@ ALTER TABLE rcv_queues ADD COLUMN ntf_private_key BLOB;

 ALTER TABLE rcv_queues ADD COLUMN ntf_id BLOB;

-ALTER TABLE rcv_queues ADD COLUMN rcv_ntf_dh_secret BLOB;
-
 CREATE UNIQUE INDEX idx_rcv_queues_ntf ON rcv_queues (host, port, ntf_id);

 CREATE TABLE ntf_subscriptions (
-  conn_id BLOB NOT NULL,
+  conn_id BLOB NOT NULL, -- ? make nullable for when connection is deleted but we still need to delete subscription
  smp_host TEXT NULL,
  smp_port TEXT NULL,
  smp_ntf_id BLOB,
@@ -35,13 +33,15 @@ CREATE TABLE ntf_subscriptions (
  ntf_port TEXT NOT NULL,
  ntf_sub_id BLOB,
  ntf_sub_status TEXT NOT NULL, -- see NtfAgentSubStatus
-  ntf_sub_action TEXT, -- if there is an action required on this subscription: NtfSubNTFAction
+  ntf_sub_action TEXT, -- if there is an action required on this subscription: NtfSubAction
  ntf_sub_smp_action TEXT, -- action with SMP server: NtfSubSMPAction; only one of this and ntf_sub_action can (should) be not null in same record
  ntf_sub_action_ts TEXT, -- the earliest time for the action, e.g. checks can be scheduled every X hours
  updated_by_supervisor INTEGER NOT NULL DEFAULT 0, -- to be checked on updates by workers to not overwrite supervisor command (state still should be updated)
  created_at TEXT NOT NULL DEFAULT (datetime('now')),
  updated_at TEXT NOT NULL DEFAULT (datetime('now')),
  PRIMARY KEY (conn_id),
+  -- FOREIGN KEY (conn_id) REFERENCES connections
+  --   ON DELETE SET NULL ON UPDATE CASCADE,
  FOREIGN KEY (smp_host, smp_port) REFERENCES servers (host, port)
    ON DELETE SET NULL ON UPDATE CASCADE,
  FOREIGN KEY (ntf_host, ntf_port) REFERENCES ntf_servers
@@ -1,14 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220625_v2_ntf_mode where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20220625_v2_ntf_mode :: Query
-m20220625_v2_ntf_mode =
-  [sql|
-ALTER TABLE ntf_tokens ADD COLUMN ntf_mode TEXT NULL;
-
-DELETE FROM ntf_tokens;
-|]
@@ -1,16 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220811_onion_hosts where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20220811_onion_hosts :: Query
-m20220811_onion_hosts =
-  [sql|
-ALTER TABLE conn_confirmations ADD COLUMN smp_client_version INTEGER;
-
-UPDATE ntf_servers
-SET ntf_host = 'ntf2.simplex.im,ntg7jdjy2i3qbib3sykiho3enekwiaqg3icctliqhtqcg6jmoh6cxiad.onion'
-WHERE ntf_host = 'ntf2.simplex.im';
-|]
@@ -1,12 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220817_connection_ntfs where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20220817_connection_ntfs :: Query
-m20220817_connection_ntfs =
-  [sql|
-ALTER TABLE connections ADD COLUMN enable_ntfs INTEGER;
-|]
@@ -1,23 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220905_commands where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20220905_commands :: Query
-m20220905_commands =
-  [sql|
-CREATE TABLE commands (
-  command_id INTEGER PRIMARY KEY,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  host TEXT,
-  port TEXT,
-  corr_id BLOB NOT NULL,
-  command_tag BLOB NOT NULL,
-  command BLOB NOT NULL,
-  agent_version INTEGER NOT NULL DEFAULT 1,
-  FOREIGN KEY (host, port) REFERENCES servers
-    ON DELETE RESTRICT ON UPDATE CASCADE
-);
-|]
@@ -1,52 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20220915_connection_queues where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20220915_connection_queues :: Query
-m20220915_connection_queues =
-  [sql|
-PRAGMA ignore_check_constraints=ON;
-
-- rcv_queues
-ALTER TABLE rcv_queues ADD COLUMN rcv_queue_id INTEGER CHECK (rcv_queue_id NOT NULL);
-UPDATE rcv_queues SET rcv_queue_id = 1;
-CREATE UNIQUE INDEX idx_rcv_queue_id ON rcv_queues (conn_id, rcv_queue_id);
-
-ALTER TABLE rcv_queues ADD COLUMN rcv_primary INTEGER CHECK (rcv_primary NOT NULL);
-UPDATE rcv_queues SET rcv_primary = 1;
-
-ALTER TABLE rcv_queues ADD COLUMN replace_rcv_queue_id INTEGER NULL;
-
-- snd_queues
-ALTER TABLE snd_queues ADD COLUMN snd_queue_id INTEGER CHECK (snd_queue_id NOT NULL);
-UPDATE snd_queues SET snd_queue_id = 1;
-CREATE UNIQUE INDEX idx_snd_queue_id ON snd_queues (conn_id, snd_queue_id);
-
-ALTER TABLE snd_queues ADD COLUMN snd_primary INTEGER CHECK (snd_primary NOT NULL);
-UPDATE snd_queues SET snd_primary = 1;
-
-ALTER TABLE snd_queues ADD COLUMN replace_snd_queue_id INTEGER NULL;
-
-- connections
-ALTER TABLE connections ADD COLUMN deleted INTEGER DEFAULT 0 CHECK (deleted NOT NULL);
-UPDATE connections SET deleted = 0;
-
-- messages
-CREATE TABLE snd_message_deliveries (
-  snd_message_delivery_id INTEGER PRIMARY KEY AUTOINCREMENT,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  snd_queue_id INTEGER NOT NULL,
-  internal_id INTEGER NOT NULL,
-  FOREIGN KEY (conn_id, internal_id) REFERENCES messages ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
-);
-
-CREATE INDEX idx_snd_message_deliveries ON snd_message_deliveries (conn_id, snd_queue_id);
-
-ALTER TABLE rcv_messages ADD COLUMN rcv_queue_id INTEGER CHECK (rcv_queue_id NOT NULL);
-UPDATE rcv_messages SET rcv_queue_id = 1;
-
-PRAGMA ignore_check_constraints=OFF;
-|]
@@ -1,29 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230110_users where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230110_users :: Query
-m20230110_users =
-  [sql|
-PRAGMA ignore_check_constraints=ON;
-
-CREATE TABLE users (
-  user_id INTEGER PRIMARY KEY AUTOINCREMENT
-);
-
-INSERT INTO users (user_id) VALUES (1);
-
-ALTER TABLE connections ADD COLUMN user_id INTEGER CHECK (user_id NOT NULL)
-REFERENCES users ON DELETE CASCADE;
-
-CREATE INDEX idx_connections_user ON connections(user_id);
-
-CREATE INDEX idx_commands_conn_id ON commands(conn_id);
-
-UPDATE connections SET user_id = 1;
-
-PRAGMA ignore_check_constraints=OFF;
-|]
@@ -1,27 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230117_fkey_indexes where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-- .lint fkey-indexes
-m20230117_fkey_indexes :: Query
-m20230117_fkey_indexes =
-  [sql|
-CREATE INDEX idx_commands_host_port ON commands(host, port);
-CREATE INDEX idx_conn_confirmations_conn_id ON conn_confirmations(conn_id);
-CREATE INDEX idx_conn_invitations_contact_conn_id ON conn_invitations(contact_conn_id);
-CREATE INDEX idx_messages_conn_id_internal_snd_id ON messages(conn_id, internal_snd_id);
-CREATE INDEX idx_messages_conn_id_internal_rcv_id ON messages(conn_id, internal_rcv_id);
-CREATE INDEX idx_messages_conn_id ON messages(conn_id);
-CREATE INDEX idx_ntf_subscriptions_ntf_host_ntf_port ON ntf_subscriptions(ntf_host, ntf_port);
-CREATE INDEX idx_ntf_subscriptions_smp_host_smp_port ON ntf_subscriptions(smp_host, smp_port);
-CREATE INDEX idx_ntf_tokens_ntf_host_ntf_port ON ntf_tokens(ntf_host, ntf_port);
-CREATE INDEX idx_ratchets_conn_id ON ratchets(conn_id);
-CREATE INDEX idx_rcv_messages_conn_id_internal_id ON rcv_messages(conn_id, internal_id);
-CREATE INDEX idx_skipped_messages_conn_id ON skipped_messages(conn_id);
-CREATE INDEX idx_snd_message_deliveries_conn_id_internal_id ON snd_message_deliveries(conn_id, internal_id);
-CREATE INDEX idx_snd_messages_conn_id_internal_id ON snd_messages(conn_id, internal_id);
-CREATE INDEX idx_snd_queues_host_port ON snd_queues(host, port);
-|]
@@ -1,20 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230120_delete_errors where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230120_delete_errors :: Query
-m20230120_delete_errors =
-  [sql|
-PRAGMA ignore_check_constraints=ON;
-
-ALTER TABLE rcv_queues ADD COLUMN delete_errors INTEGER DEFAULT 0 CHECK (delete_errors NOT NULL);
-UPDATE rcv_queues SET delete_errors = 0;
-
-ALTER TABLE users ADD COLUMN deleted INTEGER DEFAULT 0 CHECK (deleted NOT NULL);
-UPDATE users SET deleted = 0;
-
-PRAGMA ignore_check_constraints=OFF;
-|]
@@ -1,20 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230217_server_key_hash where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-- server_key_hash is not null for records whose entities refer to a server
-- that was previously saved with the same host and port but different key hash
-m20230217_server_key_hash :: Query
-m20230217_server_key_hash =
-  [sql|
-ALTER TABLE rcv_queues ADD COLUMN server_key_hash BLOB;
-
-ALTER TABLE snd_queues ADD COLUMN server_key_hash BLOB;
-
-ALTER TABLE ntf_subscriptions ADD COLUMN smp_server_key_hash BLOB;
-
-ALTER TABLE commands ADD COLUMN server_key_hash BLOB;
-|]
@@ -1,89 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230223_files where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230223_files :: Query
-m20230223_files =
-  [sql|
-CREATE TABLE xftp_servers (
-  xftp_server_id INTEGER PRIMARY KEY,
-  xftp_host TEXT NOT NULL,
-  xftp_port TEXT NOT NULL,
-  xftp_key_hash BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now')),
-  UNIQUE(xftp_host, xftp_port, xftp_key_hash)
-);
-
-CREATE TABLE rcv_files (
-  rcv_file_id INTEGER PRIMARY KEY,
-  rcv_file_entity_id BLOB NOT NULL,
-  user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
-  size INTEGER NOT NULL,
-  digest BLOB NOT NULL,
-  key BLOB NOT NULL,
-  nonce BLOB NOT NULL,
-  chunk_size INTEGER NOT NULL,
-  prefix_path TEXT NOT NULL,
-  tmp_path TEXT,
-  save_path TEXT NOT NULL,
-  status TEXT NOT NULL,
-  deleted INTEGER NOT NULL DEFAULT 0,
-  error TEXT,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now')),
-  UNIQUE(rcv_file_entity_id)
-);
-
-CREATE INDEX idx_rcv_files_user_id ON rcv_files(user_id);
-
-CREATE TABLE rcv_file_chunks (
-  rcv_file_chunk_id INTEGER PRIMARY KEY,
-  rcv_file_id INTEGER NOT NULL REFERENCES rcv_files ON DELETE CASCADE,
-  chunk_no INTEGER NOT NULL,
-  chunk_size INTEGER NOT NULL,
-  digest BLOB NOT NULL,
-  tmp_path TEXT,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_rcv_file_chunks_rcv_file_id ON rcv_file_chunks(rcv_file_id);
-
-CREATE TABLE rcv_file_chunk_replicas (
-  rcv_file_chunk_replica_id INTEGER PRIMARY KEY,
-  rcv_file_chunk_id INTEGER NOT NULL REFERENCES rcv_file_chunks ON DELETE CASCADE,
-  replica_number INTEGER NOT NULL,
-  xftp_server_id INTEGER NOT NULL REFERENCES xftp_servers ON DELETE CASCADE,
-  replica_id BLOB NOT NULL,
-  replica_key BLOB NOT NULL,
-  received INTEGER NOT NULL DEFAULT 0,
-  delay INTEGER,
-  retries INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_rcv_file_chunk_replicas_rcv_file_chunk_id ON rcv_file_chunk_replicas(rcv_file_chunk_id);
-CREATE INDEX idx_rcv_file_chunk_replicas_xftp_server_id ON rcv_file_chunk_replicas(xftp_server_id);
-|]
-
-- this is for tests, older versions do not support down migrations
-down_m20230223_files :: Query
-down_m20230223_files =
-  [sql|
-DROP INDEX idx_rcv_file_chunk_replicas_xftp_server_id;
-DROP INDEX idx_rcv_file_chunk_replicas_rcv_file_chunk_id;
-DROP TABLE rcv_file_chunk_replicas;
-
-DROP INDEX idx_rcv_file_chunks_rcv_file_id;
-DROP TABLE rcv_file_chunks;
-
-DROP INDEX idx_rcv_files_user_id;
-DROP TABLE rcv_files;
-
-DROP TABLE xftp_servers;
-|]
@@ -1,21 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230320_retry_state where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230320_retry_state :: Query
-m20230320_retry_state =
-  [sql|
-ALTER TABLE snd_messages ADD COLUMN retry_int_slow INTEGER;
-ALTER TABLE snd_messages ADD COLUMN retry_int_fast INTEGER;
-|]
-
-- this is for tests, older versions do not support down migrations
-down_m20230320_retry_state :: Query
-down_m20230320_retry_state =
-  [sql|
-ALTER TABLE snd_messages DROP COLUMN retry_int_fast;
-ALTER TABLE snd_messages DROP COLUMN retry_int_slow;
-|]
@@ -1,107 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230401_snd_files where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230401_snd_files :: Query
-m20230401_snd_files =
-  [sql|
-CREATE TABLE snd_files (
-  snd_file_id INTEGER PRIMARY KEY,
-  snd_file_entity_id BLOB NOT NULL,
-  user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
-  num_recipients INTEGER NOT NULL,
-  digest BLOB,
-  key BLOB NOT NUll,
-  nonce BLOB NOT NUll,
-  path TEXT NOT NULL,
-  prefix_path TEXT,
-  status TEXT NOT NULL,
-  deleted INTEGER NOT NULL DEFAULT 0,
-  error TEXT,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_snd_files_user_id ON snd_files(user_id);
-
-CREATE TABLE snd_file_chunks (
-  snd_file_chunk_id INTEGER PRIMARY KEY,
-  snd_file_id INTEGER NOT NULL REFERENCES snd_files ON DELETE CASCADE,
-  chunk_no INTEGER NOT NULL,
-  chunk_offset INTEGER NOT NULL,
-  chunk_size INTEGER NOT NULL,
-  digest BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_snd_file_chunks_snd_file_id ON snd_file_chunks(snd_file_id);
-
-CREATE TABLE snd_file_chunk_replicas (
-  snd_file_chunk_replica_id INTEGER PRIMARY KEY,
-  snd_file_chunk_id INTEGER NOT NULL REFERENCES snd_file_chunks ON DELETE CASCADE,
-  replica_number INTEGER NOT NULL,
-  xftp_server_id INTEGER NOT NULL REFERENCES xftp_servers ON DELETE CASCADE,
-  replica_id BLOB NOT NULL,
-  replica_key BLOB NOT NULL,
-  replica_status TEXT NOT NULL,
-  delay INTEGER,
-  retries INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_snd_file_chunk_replicas_snd_file_chunk_id ON snd_file_chunk_replicas(snd_file_chunk_id);
-CREATE INDEX idx_snd_file_chunk_replicas_xftp_server_id ON snd_file_chunk_replicas(xftp_server_id);
-
-CREATE TABLE snd_file_chunk_replica_recipients (
-  snd_file_chunk_replica_recipient_id INTEGER PRIMARY KEY,
-  snd_file_chunk_replica_id INTEGER NOT NULL REFERENCES snd_file_chunk_replicas ON DELETE CASCADE,
-  rcv_replica_id BLOB NOT NULL,
-  rcv_replica_key BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_snd_file_chunk_replica_recipients_snd_file_chunk_replica_id ON snd_file_chunk_replica_recipients(snd_file_chunk_replica_id);
-
-CREATE TABLE deleted_snd_chunk_replicas (
-  deleted_snd_chunk_replica_id INTEGER PRIMARY KEY,
-  user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
-  xftp_server_id INTEGER NOT NULL REFERENCES xftp_servers ON DELETE CASCADE,
-  replica_id BLOB NOT NULL,
-  replica_key BLOB NOT NULL,
-  chunk_digest BLOB NOT NULL,
-  delay INTEGER,
-  retries INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_deleted_snd_chunk_replicas_user_id ON deleted_snd_chunk_replicas(user_id);
-CREATE INDEX idx_deleted_snd_chunk_replicas_xftp_server_id ON deleted_snd_chunk_replicas(xftp_server_id);
-|]
-
-down_m20230401_snd_files :: Query
-down_m20230401_snd_files =
-  [sql|
-DROP INDEX idx_deleted_snd_chunk_replicas_xftp_server_id;
-DROP INDEX idx_deleted_snd_chunk_replicas_user_id;
-DROP TABLE deleted_snd_chunk_replicas;
-
-DROP INDEX idx_snd_file_chunk_replica_recipients_snd_file_chunk_replica_id;
-DROP TABLE snd_file_chunk_replica_recipients;
-
-DROP INDEX idx_snd_file_chunk_replicas_snd_file_chunk_id;
-DROP INDEX idx_snd_file_chunk_replicas_xftp_server_id;
-DROP TABLE snd_file_chunk_replicas;
-
-DROP INDEX idx_snd_file_chunks_snd_file_id;
-DROP TABLE snd_file_chunks;
-
-DROP INDEX idx_snd_files_user_id;
-DROP TABLE snd_files;
-|]
@@ -1,22 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230510_files_pending_replicas_indexes where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230510_files_pending_replicas_indexes :: Query
-m20230510_files_pending_replicas_indexes =
-  [sql|
-CREATE INDEX idx_rcv_file_chunk_replicas_pending ON rcv_file_chunk_replicas(received, replica_number);
-CREATE INDEX idx_snd_file_chunk_replicas_pending ON snd_file_chunk_replicas(replica_status, replica_number);
-CREATE INDEX idx_deleted_snd_chunk_replicas_pending ON deleted_snd_chunk_replicas(created_at);
-|]
-
-down_m20230510_files_pending_replicas_indexes :: Query
-down_m20230510_files_pending_replicas_indexes =
-  [sql|
-DROP INDEX idx_deleted_snd_chunk_replicas_pending;
-DROP INDEX idx_snd_file_chunk_replicas_pending;
-DROP INDEX idx_rcv_file_chunk_replicas_pending;
-|]
@@ -1,28 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230516_encrypted_rcv_message_hashes where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230516_encrypted_rcv_message_hashes :: Query
-m20230516_encrypted_rcv_message_hashes =
-  [sql|
-CREATE TABLE encrypted_rcv_message_hashes(
-  encrypted_rcv_message_hash_id INTEGER PRIMARY KEY,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  hash BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_encrypted_rcv_message_hashes_hash ON encrypted_rcv_message_hashes(conn_id, hash);
-|]
-
-down_m20230516_encrypted_rcv_message_hashes :: Query
-down_m20230516_encrypted_rcv_message_hashes =
-  [sql|
-DROP INDEX idx_encrypted_rcv_message_hashes_hash;
-
-DROP TABLE encrypted_rcv_message_hashes;
-|]
@@ -1,22 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230531_switch_status where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230531_switch_status :: Query
-m20230531_switch_status =
-  [sql|
-ALTER TABLE rcv_queues ADD COLUMN switch_status TEXT;
-ALTER TABLE rcv_queues ADD COLUMN deleted INTEGER NOT NULL DEFAULT 0;
-ALTER TABLE snd_queues ADD COLUMN switch_status TEXT;
-|]
-
-down_m20230531_switch_status :: Query
-down_m20230531_switch_status =
-  [sql|
-ALTER TABLE snd_queues DROP COLUMN switch_status;
-ALTER TABLE rcv_queues DROP COLUMN deleted;
-ALTER TABLE rcv_queues DROP COLUMN switch_status;
-|]
@@ -1,41 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Messaging.Agent.Store.SQLite.Migrations.M20230615_ratchet_sync where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-- Ratchet public keys are saved when ratchet re-synchronization is started - upon receiving other party's public keys,
-- keys are compared to determine ratchet initialization ordering for both parties.
-- This solves a possible race when both parties start ratchet re-synchronization at the same time.
-m20230615_ratchet_sync :: Query
-m20230615_ratchet_sync =
-  [sql|
-ALTER TABLE connections ADD COLUMN ratchet_sync_state TEXT NOT NULL DEFAULT 'ok';
-
-ALTER TABLE ratchets ADD COLUMN x3dh_pub_key_1 BLOB;
-ALTER TABLE ratchets ADD COLUMN x3dh_pub_key_2 BLOB;
-
-CREATE TABLE processed_ratchet_key_hashes(
-  processed_ratchet_key_hash_id INTEGER PRIMARY KEY,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  hash BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT (datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-);
-
-CREATE INDEX idx_processed_ratchet_key_hashes_hash ON processed_ratchet_key_hashes(conn_id, hash);
-|]
-
-down_m20230615_ratchet_sync :: Query
-down_m20230615_ratchet_sync =
-  [sql|
-DROP INDEX idx_processed_ratchet_key_hashes_hash;
-
-DROP TABLE processed_ratchet_key_hashes;
-
-ALTER TABLE ratchets DROP COLUMN x3dh_pub_key_2;
-ALTER TABLE ratchets DROP COLUMN x3dh_pub_key_1;
-
-ALTER TABLE connections DROP COLUMN ratchet_sync_state;
-|]
@@ -1,7 +1,6 @@
 CREATE TABLE migrations(
  name TEXT NOT NULL,
  ts TEXT NOT NULL,
-  down TEXT,
  PRIMARY KEY(name)
 );
 CREATE TABLE servers(
@@ -21,12 +20,7 @@ CREATE TABLE connections(
  last_snd_msg_hash BLOB NOT NULL DEFAULT x'',
  smp_agent_version INTEGER NOT NULL DEFAULT 1
  ,
-  duplex_handshake INTEGER NULL DEFAULT 0,
-  enable_ntfs INTEGER,
-  deleted INTEGER DEFAULT 0 CHECK(deleted NOT NULL),
-  user_id INTEGER CHECK(user_id NOT NULL)
-  REFERENCES users ON DELETE CASCADE,
-  ratchet_sync_state TEXT NOT NULL DEFAULT 'ok'
+  duplex_handshake INTEGER NULL DEFAULT 0
 ) WITHOUT ROWID;
 CREATE TABLE rcv_queues(
  host TEXT NOT NULL,
@@ -45,14 +39,6 @@ CREATE TABLE rcv_queues(
  ntf_public_key BLOB,
  ntf_private_key BLOB,
  ntf_id BLOB,
-  rcv_ntf_dh_secret BLOB,
-  rcv_queue_id INTEGER CHECK(rcv_queue_id NOT NULL),
-  rcv_primary INTEGER CHECK(rcv_primary NOT NULL),
-  replace_rcv_queue_id INTEGER NULL,
-  delete_errors INTEGER DEFAULT 0 CHECK(delete_errors NOT NULL),
-  server_key_hash BLOB,
-  switch_status TEXT,
-  deleted INTEGER NOT NULL DEFAULT 0,
  PRIMARY KEY(host, port, rcv_id),
  FOREIGN KEY(host, port) REFERENCES servers
  ON DELETE RESTRICT ON UPDATE CASCADE,
@@ -70,11 +56,6 @@ CREATE TABLE snd_queues(
  smp_client_version INTEGER NOT NULL DEFAULT 1,
  snd_public_key BLOB,
  e2e_pub_key BLOB,
-  snd_queue_id INTEGER CHECK(snd_queue_id NOT NULL),
-  snd_primary INTEGER CHECK(snd_primary NOT NULL),
-  replace_snd_queue_id INTEGER NULL,
-  server_key_hash BLOB,
-  switch_status TEXT,
  PRIMARY KEY(host, port, snd_id),
  FOREIGN KEY(host, port) REFERENCES servers
  ON DELETE RESTRICT ON UPDATE CASCADE
@@ -106,7 +87,6 @@ CREATE TABLE rcv_messages(
  external_prev_snd_hash BLOB NOT NULL,
  integrity BLOB NOT NULL,
  user_ack INTEGER NULL DEFAULT 0,
-  rcv_queue_id INTEGER CHECK(rcv_queue_id NOT NULL),
  PRIMARY KEY(conn_id, internal_rcv_id),
  FOREIGN KEY(conn_id, internal_id) REFERENCES messages
  ON DELETE CASCADE
@@ -117,8 +97,6 @@ CREATE TABLE snd_messages(
  internal_id INTEGER NOT NULL,
  internal_hash BLOB NOT NULL,
  previous_msg_hash BLOB NOT NULL DEFAULT x'',
-  retry_int_slow INTEGER,
-  retry_int_fast INTEGER,
  PRIMARY KEY(conn_id, internal_snd_id),
  FOREIGN KEY(conn_id, internal_id) REFERENCES messages
  ON DELETE CASCADE
@@ -126,16 +104,15 @@ CREATE TABLE snd_messages(
 CREATE TABLE conn_confirmations(
  confirmation_id BLOB NOT NULL PRIMARY KEY,
  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  e2e_snd_pub_key BLOB NOT NULL,
-  sender_key BLOB NOT NULL,
+  e2e_snd_pub_key BLOB NOT NULL, -- TODO per-queue key. Split?
+  sender_key BLOB NOT NULL, -- TODO per-queue key. Split?
  ratchet_state BLOB NOT NULL,
  sender_conn_info BLOB NOT NULL,
  accepted INTEGER NOT NULL,
  own_conn_info BLOB,
  created_at TEXT NOT NULL DEFAULT(datetime('now'))
  ,
-  smp_reply_queues BLOB NULL,
-  smp_client_version INTEGER
+  smp_reply_queues BLOB NULL
 ) WITHOUT ROWID;
 CREATE TABLE conn_invitations(
  invitation_id BLOB NOT NULL PRIMARY KEY,
@@ -155,9 +132,6 @@ CREATE TABLE ratchets(
  -- ratchet is initially empty on the receiving side(the side offering the connection)
  ratchet_state BLOB,
  e2e_version INTEGER NOT NULL DEFAULT 1
-  ,
-  x3dh_pub_key_1 BLOB,
-  x3dh_pub_key_2 BLOB
 ) WITHOUT ROWID;
 CREATE TABLE skipped_messages(
  skipped_message_id INTEGER PRIMARY KEY,
@@ -176,7 +150,7 @@ CREATE TABLE ntf_servers(
  PRIMARY KEY(ntf_host, ntf_port)
 ) WITHOUT ROWID;
 CREATE TABLE ntf_tokens(
-  provider TEXT NOT NULL, -- apns
+  provider TEXT NOT NULL, -- apn
  device_token TEXT NOT NULL, -- ! this field is mislabeled and is actually saved as binary
  ntf_host TEXT NOT NULL,
  ntf_port TEXT NOT NULL,
@@ -189,14 +163,14 @@ tkn_dh_secret BLOB, -- DH secret for e2e encryption of notifications
  tkn_status TEXT NOT NULL,
  tkn_action BLOB,
  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now')),
-  ntf_mode TEXT NULL, -- this is to check token status periodically to know when it was last checked
+  updated_at TEXT NOT NULL DEFAULT(datetime('now')), -- this is to check token status periodically to know when it was last checked
  PRIMARY KEY(provider, device_token, ntf_host, ntf_port),
  FOREIGN KEY(ntf_host, ntf_port) REFERENCES ntf_servers
  ON DELETE RESTRICT ON UPDATE CASCADE
 ) WITHOUT ROWID;
+CREATE UNIQUE INDEX idx_rcv_queues_ntf ON rcv_queues(host, port, ntf_id);
 CREATE TABLE ntf_subscriptions(
-  conn_id BLOB NOT NULL,
+  conn_id BLOB NOT NULL, -- ? make nullable for when connection is deleted but we still need to delete subscription
  smp_host TEXT NULL,
  smp_port TEXT NULL,
  smp_ntf_id BLOB,
@@ -204,260 +178,17 @@ CREATE TABLE ntf_subscriptions(
  ntf_port TEXT NOT NULL,
  ntf_sub_id BLOB,
  ntf_sub_status TEXT NOT NULL, -- see NtfAgentSubStatus
-  ntf_sub_action TEXT, -- if there is an action required on this subscription: NtfSubNTFAction
+  ntf_sub_action TEXT, -- if there is an action required on this subscription: NtfSubAction
  ntf_sub_smp_action TEXT, -- action with SMP server: NtfSubSMPAction; only one of this and ntf_sub_action can(should) be not null in same record
  ntf_sub_action_ts TEXT, -- the earliest time for the action, e.g. checks can be scheduled every X hours
  updated_by_supervisor INTEGER NOT NULL DEFAULT 0, -- to be checked on updates by workers to not overwrite supervisor command(state still should be updated)
  created_at TEXT NOT NULL DEFAULT(datetime('now')),
  updated_at TEXT NOT NULL DEFAULT(datetime('now')),
-  smp_server_key_hash BLOB,
  PRIMARY KEY(conn_id),
+  -- FOREIGN KEY(conn_id) REFERENCES connections
+  -- ON DELETE SET NULL ON UPDATE CASCADE,
  FOREIGN KEY(smp_host, smp_port) REFERENCES servers(host, port)
  ON DELETE SET NULL ON UPDATE CASCADE,
  FOREIGN KEY(ntf_host, ntf_port) REFERENCES ntf_servers
  ON DELETE RESTRICT ON UPDATE CASCADE
 ) WITHOUT ROWID;
-CREATE TABLE commands(
-  command_id INTEGER PRIMARY KEY,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  host TEXT,
-  port TEXT,
-  corr_id BLOB NOT NULL,
-  command_tag BLOB NOT NULL,
-  command BLOB NOT NULL,
-  agent_version INTEGER NOT NULL DEFAULT 1,
-  server_key_hash BLOB,
-  FOREIGN KEY(host, port) REFERENCES servers
-  ON DELETE RESTRICT ON UPDATE CASCADE
-);
-CREATE TABLE snd_message_deliveries(
-  snd_message_delivery_id INTEGER PRIMARY KEY AUTOINCREMENT,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  snd_queue_id INTEGER NOT NULL,
-  internal_id INTEGER NOT NULL,
-  FOREIGN KEY(conn_id, internal_id) REFERENCES messages ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
-);
-CREATE TABLE sqlite_sequence(name,seq);
-CREATE TABLE users(
-  user_id INTEGER PRIMARY KEY AUTOINCREMENT
-  ,
-  deleted INTEGER DEFAULT 0 CHECK(deleted NOT NULL)
-);
-CREATE TABLE xftp_servers(
-  xftp_server_id INTEGER PRIMARY KEY,
-  xftp_host TEXT NOT NULL,
-  xftp_port TEXT NOT NULL,
-  xftp_key_hash BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now')),
-  UNIQUE(xftp_host, xftp_port, xftp_key_hash)
-);
-CREATE TABLE rcv_files(
-  rcv_file_id INTEGER PRIMARY KEY,
-  rcv_file_entity_id BLOB NOT NULL,
-  user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
-  size INTEGER NOT NULL,
-  digest BLOB NOT NULL,
-  key BLOB NOT NULL,
-  nonce BLOB NOT NULL,
-  chunk_size INTEGER NOT NULL,
-  prefix_path TEXT NOT NULL,
-  tmp_path TEXT,
-  save_path TEXT NOT NULL,
-  status TEXT NOT NULL,
-  deleted INTEGER NOT NULL DEFAULT 0,
-  error TEXT,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now')),
-  UNIQUE(rcv_file_entity_id)
-);
-CREATE TABLE rcv_file_chunks(
-  rcv_file_chunk_id INTEGER PRIMARY KEY,
-  rcv_file_id INTEGER NOT NULL REFERENCES rcv_files ON DELETE CASCADE,
-  chunk_no INTEGER NOT NULL,
-  chunk_size INTEGER NOT NULL,
-  digest BLOB NOT NULL,
-  tmp_path TEXT,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE rcv_file_chunk_replicas(
-  rcv_file_chunk_replica_id INTEGER PRIMARY KEY,
-  rcv_file_chunk_id INTEGER NOT NULL REFERENCES rcv_file_chunks ON DELETE CASCADE,
-  replica_number INTEGER NOT NULL,
-  xftp_server_id INTEGER NOT NULL REFERENCES xftp_servers ON DELETE CASCADE,
-  replica_id BLOB NOT NULL,
-  replica_key BLOB NOT NULL,
-  received INTEGER NOT NULL DEFAULT 0,
-  delay INTEGER,
-  retries INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE snd_files(
-  snd_file_id INTEGER PRIMARY KEY,
-  snd_file_entity_id BLOB NOT NULL,
-  user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
-  num_recipients INTEGER NOT NULL,
-  digest BLOB,
-  key BLOB NOT NUll,
-  nonce BLOB NOT NUll,
-  path TEXT NOT NULL,
-  prefix_path TEXT,
-  status TEXT NOT NULL,
-  deleted INTEGER NOT NULL DEFAULT 0,
-  error TEXT,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE snd_file_chunks(
-  snd_file_chunk_id INTEGER PRIMARY KEY,
-  snd_file_id INTEGER NOT NULL REFERENCES snd_files ON DELETE CASCADE,
-  chunk_no INTEGER NOT NULL,
-  chunk_offset INTEGER NOT NULL,
-  chunk_size INTEGER NOT NULL,
-  digest BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE snd_file_chunk_replicas(
-  snd_file_chunk_replica_id INTEGER PRIMARY KEY,
-  snd_file_chunk_id INTEGER NOT NULL REFERENCES snd_file_chunks ON DELETE CASCADE,
-  replica_number INTEGER NOT NULL,
-  xftp_server_id INTEGER NOT NULL REFERENCES xftp_servers ON DELETE CASCADE,
-  replica_id BLOB NOT NULL,
-  replica_key BLOB NOT NULL,
-  replica_status TEXT NOT NULL,
-  delay INTEGER,
-  retries INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE snd_file_chunk_replica_recipients(
-  snd_file_chunk_replica_recipient_id INTEGER PRIMARY KEY,
-  snd_file_chunk_replica_id INTEGER NOT NULL REFERENCES snd_file_chunk_replicas ON DELETE CASCADE,
-  rcv_replica_id BLOB NOT NULL,
-  rcv_replica_key BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE deleted_snd_chunk_replicas(
-  deleted_snd_chunk_replica_id INTEGER PRIMARY KEY,
-  user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
-  xftp_server_id INTEGER NOT NULL REFERENCES xftp_servers ON DELETE CASCADE,
-  replica_id BLOB NOT NULL,
-  replica_key BLOB NOT NULL,
-  chunk_digest BLOB NOT NULL,
-  delay INTEGER,
-  retries INTEGER NOT NULL DEFAULT 0,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE encrypted_rcv_message_hashes(
-  encrypted_rcv_message_hash_id INTEGER PRIMARY KEY,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  hash BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE TABLE processed_ratchet_key_hashes(
-  processed_ratchet_key_hash_id INTEGER PRIMARY KEY,
-  conn_id BLOB NOT NULL REFERENCES connections ON DELETE CASCADE,
-  hash BLOB NOT NULL,
-  created_at TEXT NOT NULL DEFAULT(datetime('now')),
-  updated_at TEXT NOT NULL DEFAULT(datetime('now'))
-);
-CREATE UNIQUE INDEX idx_rcv_queues_ntf ON rcv_queues(host, port, ntf_id);
-CREATE UNIQUE INDEX idx_rcv_queue_id ON rcv_queues(conn_id, rcv_queue_id);
-CREATE UNIQUE INDEX idx_snd_queue_id ON snd_queues(conn_id, snd_queue_id);
-CREATE INDEX idx_snd_message_deliveries ON snd_message_deliveries(
-  conn_id,
-  snd_queue_id
-);
-CREATE INDEX idx_connections_user ON connections(user_id);
-CREATE INDEX idx_commands_conn_id ON commands(conn_id);
-CREATE INDEX idx_commands_host_port ON commands(host, port);
-CREATE INDEX idx_conn_confirmations_conn_id ON conn_confirmations(conn_id);
-CREATE INDEX idx_conn_invitations_contact_conn_id ON conn_invitations(
-  contact_conn_id
-);
-CREATE INDEX idx_messages_conn_id_internal_snd_id ON messages(
-  conn_id,
-  internal_snd_id
-);
-CREATE INDEX idx_messages_conn_id_internal_rcv_id ON messages(
-  conn_id,
-  internal_rcv_id
-);
-CREATE INDEX idx_messages_conn_id ON messages(conn_id);
-CREATE INDEX idx_ntf_subscriptions_ntf_host_ntf_port ON ntf_subscriptions(
-  ntf_host,
-  ntf_port
-);
-CREATE INDEX idx_ntf_subscriptions_smp_host_smp_port ON ntf_subscriptions(
-  smp_host,
-  smp_port
-);
-CREATE INDEX idx_ntf_tokens_ntf_host_ntf_port ON ntf_tokens(
-  ntf_host,
-  ntf_port
-);
-CREATE INDEX idx_ratchets_conn_id ON ratchets(conn_id);
-CREATE INDEX idx_rcv_messages_conn_id_internal_id ON rcv_messages(
-  conn_id,
-  internal_id
-);
-CREATE INDEX idx_skipped_messages_conn_id ON skipped_messages(conn_id);
-CREATE INDEX idx_snd_message_deliveries_conn_id_internal_id ON snd_message_deliveries(
-  conn_id,
-  internal_id
-);
-CREATE INDEX idx_snd_messages_conn_id_internal_id ON snd_messages(
-  conn_id,
-  internal_id
-);
-CREATE INDEX idx_snd_queues_host_port ON snd_queues(host, port);
-CREATE INDEX idx_rcv_files_user_id ON rcv_files(user_id);
-CREATE INDEX idx_rcv_file_chunks_rcv_file_id ON rcv_file_chunks(rcv_file_id);
-CREATE INDEX idx_rcv_file_chunk_replicas_rcv_file_chunk_id ON rcv_file_chunk_replicas(
-  rcv_file_chunk_id
-);
-CREATE INDEX idx_rcv_file_chunk_replicas_xftp_server_id ON rcv_file_chunk_replicas(
-  xftp_server_id
-);
-CREATE INDEX idx_snd_files_user_id ON snd_files(user_id);
-CREATE INDEX idx_snd_file_chunks_snd_file_id ON snd_file_chunks(snd_file_id);
-CREATE INDEX idx_snd_file_chunk_replicas_snd_file_chunk_id ON snd_file_chunk_replicas(
-  snd_file_chunk_id
-);
-CREATE INDEX idx_snd_file_chunk_replicas_xftp_server_id ON snd_file_chunk_replicas(
-  xftp_server_id
-);
-CREATE INDEX idx_snd_file_chunk_replica_recipients_snd_file_chunk_replica_id ON snd_file_chunk_replica_recipients(
-  snd_file_chunk_replica_id
-);
-CREATE INDEX idx_deleted_snd_chunk_replicas_user_id ON deleted_snd_chunk_replicas(
-  user_id
-);
-CREATE INDEX idx_deleted_snd_chunk_replicas_xftp_server_id ON deleted_snd_chunk_replicas(
-  xftp_server_id
-);
-CREATE INDEX idx_rcv_file_chunk_replicas_pending ON rcv_file_chunk_replicas(
-  received,
-  replica_number
-);
-CREATE INDEX idx_snd_file_chunk_replicas_pending ON snd_file_chunk_replicas(
-  replica_status,
-  replica_number
-);
-CREATE INDEX idx_deleted_snd_chunk_replicas_pending ON deleted_snd_chunk_replicas(
-  created_at
-);
-CREATE INDEX idx_encrypted_rcv_message_hashes_hash ON encrypted_rcv_message_hashes(
-  conn_id,
-  hash
-);
-CREATE INDEX idx_processed_ratchet_key_hashes_hash ON processed_ratchet_key_hashes(
-  conn_id,
-  hash
-);
@@ -1,25 +0,0 @@
-module Simplex.Messaging.Agent.TAsyncs where
-
-import Control.Concurrent.STM (stateTVar)
-import Control.Monad.IO.Unlift (MonadUnliftIO)
-import Simplex.Messaging.TMap (TMap)
-import qualified Simplex.Messaging.TMap as TM
-import UnliftIO.Async (Async, async)
-import UnliftIO.STM
-
-data TAsyncs = TAsyncs
-  { actionId :: TVar Int,
-    actions :: TMap Int (Async ())
-  }
-
-newTAsyncs :: STM TAsyncs
-newTAsyncs = TAsyncs <$> newTVar 0 <*> TM.empty
-
-newAsyncAction :: MonadUnliftIO m => (Int -> m ()) -> TAsyncs -> m ()
-newAsyncAction action as = do
-  aId <- atomically $ stateTVar (actionId as) $ \i -> (i + 1, i + 1)
-  a <- async $ action aId
-  atomically $ TM.insert aId a $ actions as
-
-removeAsyncAction :: Int -> TAsyncs -> STM ()
-removeAsyncAction aId = TM.delete aId . actions
@@ -1,65 +0,0 @@
-module Simplex.Messaging.Agent.TRcvQueues
-  ( TRcvQueues,
-    empty,
-    clear,
-    deleteConn,
-    hasConn,
-    getConns,
-    addQueue,
-    deleteQueue,
-    getSessQueues,
-    getDelSessQueues,
-  )
-where
-
-import Control.Concurrent.STM
-import qualified Data.Map.Strict as M
-import Data.Set (Set)
-import qualified Data.Set as S
-import Simplex.Messaging.Agent.Protocol (ConnId, UserId)
-import Simplex.Messaging.Agent.Store (RcvQueue (..))
-import Simplex.Messaging.Protocol (RecipientId, SMPServer)
-import Simplex.Messaging.TMap (TMap)
-import qualified Simplex.Messaging.TMap as TM
-
-newtype TRcvQueues = TRcvQueues (TMap (UserId, SMPServer, RecipientId) RcvQueue)
-
-empty :: STM TRcvQueues
-empty = TRcvQueues <$> TM.empty
-
-clear :: TRcvQueues -> STM ()
-clear (TRcvQueues qs) = TM.clear qs
-
-deleteConn :: ConnId -> TRcvQueues -> STM ()
-deleteConn cId (TRcvQueues qs) = modifyTVar' qs $ M.filter (\rq -> cId /= connId rq)
-
-hasConn :: ConnId -> TRcvQueues -> STM Bool
-hasConn cId (TRcvQueues qs) = any (\rq -> cId == connId rq) <$> readTVar qs
-
-getConns :: TRcvQueues -> STM (Set ConnId)
-getConns (TRcvQueues qs) = M.foldr' (S.insert . connId) S.empty <$> readTVar qs
-
-addQueue :: RcvQueue -> TRcvQueues -> STM ()
-addQueue rq (TRcvQueues qs) = TM.insert (qKey rq) rq qs
-
-deleteQueue :: RcvQueue -> TRcvQueues -> STM ()
-deleteQueue rq (TRcvQueues qs) = TM.delete (qKey rq) qs
-
-getSessQueues :: (UserId, SMPServer, Maybe ConnId) -> TRcvQueues -> STM [RcvQueue]
-getSessQueues tSess (TRcvQueues qs) = M.foldl' addQ [] <$> readTVar qs
-  where
-    addQ qs' rq = if rq `isSession` tSess then rq : qs' else qs'
-
-getDelSessQueues :: (UserId, SMPServer, Maybe ConnId) -> TRcvQueues -> STM [RcvQueue]
-getDelSessQueues tSess (TRcvQueues qs) = stateTVar qs $ M.foldl' addQ ([], M.empty)
-  where
-    addQ (removed, qs') rq
-      | rq `isSession` tSess = (rq : removed, qs')
-      | otherwise = (removed, M.insert (qKey rq) rq qs')
-
-isSession :: RcvQueue -> (UserId, SMPServer, Maybe ConnId) -> Bool
-isSession rq (uId, srv, connId_) =
-  userId rq == uId && server rq == srv && maybe True (connId rq ==) connId_
-
-qKey :: RcvQueue -> (UserId, SMPServer, ConnId)
-qKey rq = (userId rq, server rq, connId rq)
@@ -1,17 +1,14 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TupleSections #-}

 -- |
 -- Module      : Simplex.Messaging.Client
@@ -27,198 +24,77 @@
 -- See https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md
 module Simplex.Messaging.Client
  ( -- * Connect (disconnect) client to (from) SMP server
-    TransportSession,
-    ProtocolClient (thVersion, sessionId, sessionTs),
+    ProtocolClient (sessionId),
    SMPClient,
    getProtocolClient,
    closeProtocolClient,
-    protocolClientServer,
-    transportHost',
-    transportSession',

    -- * SMP protocol command functions
    createSMPQueue,
    subscribeSMPQueue,
-    subscribeSMPQueues,
    getSMPMessage,
    subscribeSMPQueueNotifications,
-    subscribeSMPQueuesNtfs,
    secureSMPQueue,
    enableSMPQueueNotifications,
-    disableSMPQueueNotifications,
-    enableSMPQueuesNtfs,
-    disableSMPQueuesNtfs,
    sendSMPMessage,
    ackSMPMessage,
    suspendSMPQueue,
    deleteSMPQueue,
-    deleteSMPQueues,
    sendProtocolCommand,

    -- * Supporting types and client configuration
    ProtocolClientError (..),
-    SMPClientError,
    ProtocolClientConfig (..),
-    NetworkConfig (..),
-    TransportSessionMode (..),
    defaultClientConfig,
-    defaultNetworkConfig,
-    transportClientConfig,
-    chooseTransportHost,
-    proxyUsername,
-    temporaryClientError,
    ServerTransmission,
-    ClientCommand,
  )
 where

+import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Exception
 import Control.Monad
-import Control.Monad.IO.Class (liftIO)
+import Control.Monad.Trans.Class
 import Control.Monad.Trans.Except
-import Data.Aeson (FromJSON (..), ToJSON (..))
-import qualified Data.Aeson as J
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
-import Data.Either (rights)
-import Data.Foldable (foldl')
-import Data.Functor (($>))
-import Data.Int (Int64)
-import Data.List (find)
-import Data.List.NonEmpty (NonEmpty (..), (<|))
-import qualified Data.List.NonEmpty as L
 import Data.Maybe (fromMaybe)
-import Data.Time.Clock (UTCTime, getCurrentTime)
-import GHC.Generics (Generic)
 import Network.Socket (ServiceName)
 import Numeric.Natural
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (dropPrefix, enumJSON)
 import Simplex.Messaging.Protocol as SMP
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport
-import Simplex.Messaging.Transport.Client (SocksProxy, TransportClientConfig (..), TransportHost (..), runTransportClient)
+import Simplex.Messaging.Transport.Client (runTransportClient)
 import Simplex.Messaging.Transport.KeepAlive
 import Simplex.Messaging.Transport.WebSockets (WS)
-import Simplex.Messaging.Util (bshow, raceAny_, threadDelay')
+import Simplex.Messaging.Util (bshow, liftError, raceAny_)
 import Simplex.Messaging.Version
 import System.Timeout (timeout)

 -- | 'SMPClient' is a handle used to send commands to a specific SMP server.
 --
 -- Use 'getSMPClient' to connect to an SMP server and create a client handle.
-data ProtocolClient err msg = ProtocolClient
-  { action :: Maybe (Async ()),
+data ProtocolClient msg = ProtocolClient
+  { action :: Async (),
+    connected :: TVar Bool,
    sessionId :: SessionId,
-    sessionTs :: UTCTime,
    thVersion :: Version,
-    timeoutPerBlock :: Int,
-    blockSize :: Int,
-    batch :: Bool,
-    client_ :: PClient err msg
-  }
-
-data PClient err msg = PClient
-  { connected :: TVar Bool,
-    transportSession :: TransportSession msg,
-    transportHost :: TransportHost,
+    protocolServer :: ProtocolServer,
    tcpTimeout :: Int,
-    batchDelay :: Maybe Int,
-    pingErrorCount :: TVar Int,
    clientCorrId :: TVar Natural,
-    sentCommands :: TMap CorrId (Request err msg),
-    sndQ :: TBQueue (NonEmpty SentRawTransmission),
-    rcvQ :: TBQueue (NonEmpty (SignedTransmission err msg)),
+    sentCommands :: TMap CorrId (Request msg),
+    sndQ :: TBQueue SentRawTransmission,
+    rcvQ :: TBQueue (SignedTransmission msg),
    msgQ :: Maybe (TBQueue (ServerTransmission msg))
  }

-type SMPClient = ProtocolClient ErrorType SMP.BrokerMsg
-
-- | Type for client command data
-type ClientCommand msg = (Maybe C.APrivateSignKey, QueueId, ProtoCommand msg)
+type SMPClient = ProtocolClient SMP.BrokerMsg

 -- | Type synonym for transmission from some SPM server queue.
-type ServerTransmission msg = (TransportSession msg, Version, SessionId, QueueId, msg)
-
-data HostMode
-  = -- | prefer (or require) onion hosts when connecting via SOCKS proxy
-    HMOnionViaSocks
-  | -- | prefer (or require) onion hosts
-    HMOnion
-  | -- | prefer (or require) public hosts
-    HMPublic
-  deriving (Eq, Show, Generic)
-
-instance FromJSON HostMode where
-  parseJSON = J.genericParseJSON . enumJSON $ dropPrefix "HM"
-
-instance ToJSON HostMode where
-  toJSON = J.genericToJSON . enumJSON $ dropPrefix "HM"
-  toEncoding = J.genericToEncoding . enumJSON $ dropPrefix "HM"
-
-- | network configuration for the client
-data NetworkConfig = NetworkConfig
-  { -- | use SOCKS5 proxy
-    socksProxy :: Maybe SocksProxy,
-    -- | determines critera which host is chosen from the list
-    hostMode :: HostMode,
-    -- | if above criteria is not met, if the below setting is True return error, otherwise use the first host
-    requiredHostMode :: Bool,
-    -- | transport sessions are created per user or per entity
-    sessionMode :: TransportSessionMode,
-    -- | timeout for the initial client TCP/TLS connection (microseconds)
-    tcpConnectTimeout :: Int,
-    -- | timeout of protocol commands (microseconds)
-    tcpTimeout :: Int,
-    -- | additional timeout per kilobyte (1024 bytes) to be sent
-    tcpTimeoutPerKb :: Int,
-    -- | TCP keep-alive options, Nothing to skip enabling keep-alive
-    tcpKeepAlive :: Maybe KeepAliveOpts,
-    -- | period for SMP ping commands (microseconds, 0 to disable)
-    smpPingInterval :: Int64,
-    -- | the count of PING errors after which SMP client terminates (and will be reconnected), 0 to disable
-    smpPingCount :: Int,
-    logTLSErrors :: Bool
-  }
-  deriving (Eq, Show, Generic, FromJSON)
-
-instance ToJSON NetworkConfig where
-  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
-  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
-
-data TransportSessionMode = TSMUser | TSMEntity
-  deriving (Eq, Show, Generic)
-
-instance ToJSON TransportSessionMode where
-  toJSON = J.genericToJSON . enumJSON $ dropPrefix "TSM"
-  toEncoding = J.genericToEncoding . enumJSON $ dropPrefix "TSM"
-
-instance FromJSON TransportSessionMode where
-  parseJSON = J.genericParseJSON . enumJSON $ dropPrefix "TSM"
-
-defaultNetworkConfig :: NetworkConfig
-defaultNetworkConfig =
-  NetworkConfig
-    { socksProxy = Nothing,
-      hostMode = HMOnionViaSocks,
-      requiredHostMode = False,
-      sessionMode = TSMUser,
-      tcpConnectTimeout = 15_000_000,
-      tcpTimeout = 10_000_000,
-      tcpTimeoutPerKb = 20_000, -- 20ms, should be less than 130ms to avoid Int overflow on 32 bit systems
-      tcpKeepAlive = Just defaultKeepAliveOpts,
-      smpPingInterval = 600_000_000, -- 10min
-      smpPingCount = 3,
-      logTLSErrors = False
-    }
-
-transportClientConfig :: NetworkConfig -> TransportClientConfig
-transportClientConfig NetworkConfig {socksProxy, tcpKeepAlive, logTLSErrors} =
-  TransportClientConfig {socksProxy, tcpKeepAlive, logTLSErrors}
+type ServerTransmission msg = (ProtocolServer, SessionId, QueueId, msg)

 -- | protocol client configuration.
 data ProtocolClientConfig = ProtocolClientConfig
@@ -226,12 +102,14 @@ data ProtocolClientConfig = ProtocolClientConfig
    qSize :: Natural,
    -- | default server port if port is not specified in ProtocolServer
    defaultTransport :: (ServiceName, ATransport),
-    -- | network configuration
-    networkConfig :: NetworkConfig,
-    -- | client-server protocol version range
-    serverVRange :: VersionRange,
-    -- | delay between sending batches of commands (microseconds)
-    batchDelay :: Maybe Int
+    -- | timeout of TCP commands (microseconds)
+    tcpTimeout :: Int,
+    -- | TCP keep-alive options, Nothing to skip enabling keep-alive
+    tcpKeepAlive :: Maybe KeepAliveOpts,
+    -- | period for SMP ping commands (microseconds)
+    smpPing :: Int,
+    -- | SMP client-server protocol version range
+    smpServerVRange :: VersionRange
  }

 -- | Default protocol client configuration.
@@ -240,78 +118,44 @@ defaultClientConfig =
  ProtocolClientConfig
    { qSize = 64,
      defaultTransport = ("443", transport @TLS),
-      networkConfig = defaultNetworkConfig,
-      serverVRange = supportedSMPServerVRange,
-      batchDelay = Nothing
+      tcpTimeout = 5_000_000,
+      tcpKeepAlive = Just defaultKeepAliveOpts,
+      smpPing = 600_000_000, -- 10min
+      smpServerVRange = supportedSMPServerVRange
    }

-data Request err msg = Request
+data Request msg = Request
  { queueId :: QueueId,
-    responseVar :: TMVar (Response err msg)
+    responseVar :: TMVar (Response msg)
  }

-type Response err msg = Either (ProtocolClientError err) msg
-
-chooseTransportHost :: NetworkConfig -> NonEmpty TransportHost -> Either (ProtocolClientError err) TransportHost
-chooseTransportHost NetworkConfig {socksProxy, hostMode, requiredHostMode} hosts =
-  firstOrError $ case hostMode of
-    HMOnionViaSocks -> maybe publicHost (const onionHost) socksProxy
-    HMOnion -> onionHost
-    HMPublic -> publicHost
-  where
-    firstOrError
-      | requiredHostMode = maybe (Left PCEIncompatibleHost) Right
-      | otherwise = Right . fromMaybe (L.head hosts)
-    isOnionHost = \case THOnionHost _ -> True; _ -> False
-    onionHost = find isOnionHost hosts
-    publicHost = find (not . isOnionHost) hosts
-
-protocolClientServer :: ProtocolTypeI (ProtoType msg) => ProtocolClient err msg -> String
-protocolClientServer = B.unpack . strEncode . snd3 . transportSession . client_
-  where
-    snd3 (_, s, _) = s
-
-transportHost' :: ProtocolClient err msg -> TransportHost
-transportHost' = transportHost . client_
-
-transportSession' :: ProtocolClient err msg -> TransportSession msg
-transportSession' = transportSession . client_
-
-type UserId = Int64
-
-- | Transport session key - includes entity ID if `sessionMode = TSMEntity`.
-type TransportSession msg = (UserId, ProtoServer msg, Maybe EntityId)
+type Response msg = Either ProtocolClientError msg

 -- | Connects to 'ProtocolServer' using passed client configuration
 -- and queue for messages and notifications.
 --
 -- A single queue can be used for multiple 'SMPClient' instances,
 -- as 'SMPServerTransmission' includes server information.
-getProtocolClient :: forall err msg. Protocol err msg => TransportSession msg -> ProtocolClientConfig -> Maybe (TBQueue (ServerTransmission msg)) -> (ProtocolClient err msg -> IO ()) -> IO (Either (ProtocolClientError err) (ProtocolClient err msg))
-getProtocolClient transportSession@(_, srv, _) cfg@ProtocolClientConfig {qSize, networkConfig, serverVRange, batchDelay} msgQ disconnected = do
-  case chooseTransportHost networkConfig (host srv) of
-    Right useHost ->
-      (atomically (mkProtocolClient useHost) >>= runClient useTransport useHost)
-        `catch` \(e :: IOException) -> pure . Left $ PCEIOError e
-    Left e -> pure $ Left e
+getProtocolClient :: forall msg. Protocol msg => ProtocolServer -> ProtocolClientConfig -> Maybe (TBQueue (ServerTransmission msg)) -> IO () -> IO (Either ProtocolClientError (ProtocolClient msg))
+getProtocolClient protocolServer cfg@ProtocolClientConfig {qSize, tcpTimeout, tcpKeepAlive, smpPing, smpServerVRange} msgQ disconnected =
+  (atomically mkProtocolClient >>= runClient useTransport)
+    `catch` \(e :: IOException) -> pure . Left $ PCEIOError e
  where
-    NetworkConfig {tcpConnectTimeout, tcpTimeout, tcpTimeoutPerKb, smpPingInterval} = networkConfig
-    mkProtocolClient :: TransportHost -> STM (PClient err msg)
-    mkProtocolClient transportHost = do
+    mkProtocolClient :: STM (ProtocolClient msg)
+    mkProtocolClient = do
      connected <- newTVar False
-      pingErrorCount <- newTVar 0
      clientCorrId <- newTVar 0
      sentCommands <- TM.empty
      sndQ <- newTBQueue qSize
      rcvQ <- newTBQueue qSize
      return
-        PClient
-          { connected,
-            transportSession,
-            transportHost,
+        ProtocolClient
+          { action = undefined,
+            sessionId = undefined,
+            thVersion = undefined,
+            connected,
+            protocolServer,
            tcpTimeout,
-            batchDelay,
-            pingErrorCount,
            clientCorrId,
            sentCommands,
            sndQ,
@@ -319,68 +163,57 @@ getProtocolClient transportSession@(_, srv, _) cfg@ProtocolClientConfig {qSize,
            msgQ
          }

-    runClient :: (ServiceName, ATransport) -> TransportHost -> PClient err msg -> IO (Either (ProtocolClientError err) (ProtocolClient err msg))
-    runClient (port', ATransport t) useHost c = do
-      cVar <- newEmptyTMVarIO
-      let tcConfig = transportClientConfig networkConfig
-          username = proxyUsername transportSession
+    runClient :: (ServiceName, ATransport) -> ProtocolClient msg -> IO (Either ProtocolClientError (ProtocolClient msg))
+    runClient (port', ATransport t) c = do
+      thVar <- newEmptyTMVarIO
      action <-
        async $
-          runTransportClient tcConfig (Just username) useHost port' (Just $ keyHash srv) (client t c cVar)
-            `finally` atomically (putTMVar cVar $ Left PCENetworkError)
-      c_ <- tcpConnectTimeout `timeout` atomically (takeTMVar cVar)
-      pure $ case c_ of
-        Just (Right c') -> Right c' {action = Just action}
+          runTransportClient (host protocolServer) port' (Just $ keyHash protocolServer) tcpKeepAlive (client t c thVar)
+            `finally` atomically (putTMVar thVar $ Left PCENetworkError)
+      th_ <- tcpTimeout `timeout` atomically (takeTMVar thVar)
+      pure $ case th_ of
+        Just (Right THandle {sessionId, thVersion}) -> Right c {action, sessionId, thVersion}
        Just (Left e) -> Left e
        Nothing -> Left PCENetworkError

    useTransport :: (ServiceName, ATransport)
-    useTransport = case port srv of
+    useTransport = case port protocolServer of
      "" -> defaultTransport cfg
      "80" -> ("80", transport @WS)
      p -> (p, transport @TLS)

-    client :: forall c. Transport c => TProxy c -> PClient err msg -> TMVar (Either (ProtocolClientError err) (ProtocolClient err msg)) -> c -> IO ()
-    client _ c cVar h =
-      runExceptT (protocolClientHandshake @err @msg h (keyHash srv) serverVRange) >>= \case
-        Left e -> atomically . putTMVar cVar . Left $ PCETransportError e
-        Right th@THandle {sessionId, thVersion, blockSize, batch} -> do
-          sessionTs <- getCurrentTime
-          let timeoutPerBlock = (blockSize * tcpTimeoutPerKb) `div` 1024
-              c' = ProtocolClient {action = Nothing, client_ = c, sessionId, thVersion, sessionTs, timeoutPerBlock, blockSize, batch}
+    client :: forall c. Transport c => TProxy c -> ProtocolClient msg -> TMVar (Either ProtocolClientError (THandle c)) -> c -> IO ()
+    client _ c thVar h =
+      runExceptT (protocolClientHandshake @msg h (keyHash protocolServer) smpServerVRange) >>= \case
+        Left e -> atomically . putTMVar thVar . Left $ PCETransportError e
+        Right th@THandle {sessionId, thVersion} -> do
          atomically $ do
            writeTVar (connected c) True
-            putTMVar cVar $ Right c'
-          raceAny_ ([send c' th, process c', receive c' th] <> [ping c' | smpPingInterval > 0])
-            `finally` disconnected c'
+            putTMVar thVar $ Right th
+          let c' = c {sessionId, thVersion} :: ProtocolClient msg
+          -- TODO remove ping if 0 is passed (or Nothing?)
+          raceAny_ [send c' th, process c', receive c' th, ping c']
+            `finally` disconnected

-    send :: Transport c => ProtocolClient err msg -> THandle c -> IO ()
-    send ProtocolClient {client_ = PClient {sndQ}} h = forever $ atomically (readTBQueue sndQ) >>= tPut h batchDelay
+    send :: Transport c => ProtocolClient msg -> THandle c -> IO ()
+    send ProtocolClient {sndQ} h = forever $ atomically (readTBQueue sndQ) >>= tPut h

-    receive :: Transport c => ProtocolClient err msg -> THandle c -> IO ()
-    receive ProtocolClient {client_ = PClient {rcvQ}} h = forever $ tGet h >>= atomically . writeTBQueue rcvQ
+    receive :: Transport c => ProtocolClient msg -> THandle c -> IO ()
+    receive ProtocolClient {rcvQ} h = forever $ tGet h >>= atomically . writeTBQueue rcvQ

-    ping :: ProtocolClient err msg -> IO ()
-    ping c@ProtocolClient {client_ = PClient {pingErrorCount}} = do
-      threadDelay' smpPingInterval
-      runExceptT (sendProtocolCommand c Nothing "" $ protocolPing @err @msg) >>= \case
-        Left PCEResponseTimeout -> do
-          cnt <- atomically $ stateTVar pingErrorCount $ \cnt -> (cnt + 1, cnt + 1)
-          when (maxCnt == 0 || cnt < maxCnt) $ ping c
-        _ -> ping c -- sendProtocolCommand resets pingErrorCount
-      where
-        maxCnt = smpPingCount networkConfig
+    ping :: ProtocolClient msg -> IO ()
+    ping c = forever $ do
+      threadDelay smpPing
+      runExceptT $ sendProtocolCommand c Nothing "" protocolPing

-    process :: ProtocolClient err msg -> IO ()
-    process c = forever $ atomically (readTBQueue $ rcvQ $ client_ c) >>= mapM_ (processMsg c)
-
-    processMsg :: ProtocolClient err msg -> SignedTransmission err msg -> IO ()
-    processMsg c@ProtocolClient {client_ = PClient {sentCommands}} (_, _, (corrId, qId, respOrErr)) =
+    process :: ProtocolClient msg -> IO ()
+    process ProtocolClient {sessionId, rcvQ, sentCommands} = forever $ do
+      (_, _, (corrId, qId, respOrErr)) <- atomically $ readTBQueue rcvQ
      if B.null $ bs corrId
-        then sendMsg respOrErr
+        then sendMsg qId respOrErr
        else do
          atomically (TM.lookup corrId sentCommands) >>= \case
-            Nothing -> sendMsg respOrErr
+            Nothing -> sendMsg qId respOrErr
            Just Request {queueId, responseVar} -> atomically $ do
              TM.delete corrId sentCommands
              putTMVar responseVar $
@@ -390,59 +223,46 @@ getProtocolClient transportSession@(_, srv, _) cfg@ProtocolClientConfig {qSize,
                    Right r -> case protocolError r of
                      Just e -> Left $ PCEProtocolError e
                      _ -> Right r
-                  else Left . PCEUnexpectedResponse $ bshow respOrErr
+                  else Left PCEUnexpectedResponse
      where
-        sendMsg :: Either err msg -> IO ()
-        sendMsg = \case
-          Right msg -> atomically $ mapM_ (`writeTBQueue` serverTransmission c qId msg) msgQ
-          Left e -> putStrLn $ "SMP client error: " <> show e
-
-proxyUsername :: TransportSession msg -> ByteString
-proxyUsername (userId, _, entityId_) = C.sha256Hash $ bshow userId <> maybe "" (":" <>) entityId_
+        sendMsg :: QueueId -> Either ErrorType msg -> IO ()
+        sendMsg qId = \case
+          Right cmd -> atomically $ mapM_ (`writeTBQueue` (protocolServer, sessionId, qId, cmd)) msgQ
+          -- TODO send everything else to errQ and log in agent
+          _ -> return ()

 -- | Disconnects client from the server and terminates client threads.
-closeProtocolClient :: ProtocolClient err msg -> IO ()
-closeProtocolClient = mapM_ uninterruptibleCancel . action
+closeProtocolClient :: ProtocolClient msg -> IO ()
+closeProtocolClient = uninterruptibleCancel . action

 -- | SMP client error type.
-data ProtocolClientError err
+data ProtocolClientError
  = -- | Correctly parsed SMP server ERR response.
    -- This error is forwarded to the agent client as `ERR SMP err`.
-    PCEProtocolError err
+    PCEProtocolError ErrorType
  | -- | Invalid server response that failed to parse.
    -- Forwarded to the agent client as `ERR BROKER RESPONSE`.
-    PCEResponseError err
+    PCEResponseError ErrorType
  | -- | Different response from what is expected to a certain SMP command,
    -- e.g. server should respond `IDS` or `ERR` to `NEW` command,
    -- other responses would result in this error.
    -- Forwarded to the agent client as `ERR BROKER UNEXPECTED`.
-    PCEUnexpectedResponse ByteString
+    PCEUnexpectedResponse
  | -- | Used for TCP connection and command response timeouts.
    -- Forwarded to the agent client as `ERR BROKER TIMEOUT`.
    PCEResponseTimeout
  | -- | Failure to establish TCP connection.
    -- Forwarded to the agent client as `ERR BROKER NETWORK`.
    PCENetworkError
-  | -- | No host compatible with network configuration
-    PCEIncompatibleHost
  | -- | TCP transport handshake or some other transport error.
    -- Forwarded to the agent client as `ERR BROKER TRANSPORT e`.
    PCETransportError TransportError
-  | -- | Error when cryptographically "signing" the command or when initializing crypto_box.
-    PCECryptoError C.CryptoError
+  | -- | Error when cryptographically "signing" the command.
+    PCESignatureError C.CryptoError
  | -- | IO Error
    PCEIOError IOException
  deriving (Eq, Show, Exception)

-type SMPClientError = ProtocolClientError ErrorType
-
-temporaryClientError :: ProtocolClientError err -> Bool
-temporaryClientError = \case
-  PCENetworkError -> True
-  PCEResponseTimeout -> True
-  PCEIOError _ -> True
-  _ -> False
-
 -- | Create a new SMP queue.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#create-queue-command
@@ -451,221 +271,130 @@ createSMPQueue ::
  RcvPrivateSignKey ->
  RcvPublicVerifyKey ->
  RcvPublicDhKey ->
-  Maybe BasicAuth ->
-  ExceptT SMPClientError IO QueueIdsKeys
-createSMPQueue c rpKey rKey dhKey auth =
-  sendSMPCommand c (Just rpKey) "" (NEW rKey dhKey auth) >>= \case
+  ExceptT ProtocolClientError IO QueueIdsKeys
+createSMPQueue c rpKey rKey dhKey =
+  sendSMPCommand c (Just rpKey) "" (NEW rKey dhKey) >>= \case
    IDS qik -> pure qik
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse

 -- | Subscribe to the SMP queue.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#subscribe-to-queue
-subscribeSMPQueue :: SMPClient -> RcvPrivateSignKey -> RecipientId -> ExceptT SMPClientError IO ()
-subscribeSMPQueue c rpKey rId =
+subscribeSMPQueue :: SMPClient -> RcvPrivateSignKey -> RecipientId -> ExceptT ProtocolClientError IO ()
+subscribeSMPQueue c@ProtocolClient {protocolServer, sessionId, msgQ} rpKey rId =
  sendSMPCommand c (Just rpKey) rId SUB >>= \case
    OK -> return ()
-    cmd@MSG {} -> liftIO $ writeSMPMessage c rId cmd
-    r -> throwE . PCEUnexpectedResponse $ bshow r
-
-- | Subscribe to multiple SMP queues batching commands if supported.
-subscribeSMPQueues :: SMPClient -> NonEmpty (RcvPrivateSignKey, RecipientId) -> IO (NonEmpty (Either SMPClientError ()))
-subscribeSMPQueues c qs = sendProtocolCommands c cs >>= mapM response . L.zip qs
-  where
-    cs = L.map (\(rpKey, rId) -> (Just rpKey, rId, Cmd SRecipient SUB)) qs
-    response ((_, rId), r) = case r of
-      Right OK -> pure $ Right ()
-      Right cmd@MSG {} -> writeSMPMessage c rId cmd $> Right ()
-      Right r' -> pure . Left . PCEUnexpectedResponse $ bshow r'
-      Left e -> pure $ Left e
-
-writeSMPMessage :: SMPClient -> RecipientId -> BrokerMsg -> IO ()
-writeSMPMessage c rId msg = atomically $ mapM_ (`writeTBQueue` serverTransmission c rId msg) (msgQ $ client_ c)
-
-serverTransmission :: ProtocolClient err msg -> RecipientId -> msg -> ServerTransmission msg
-serverTransmission ProtocolClient {thVersion, sessionId, client_ = PClient {transportSession}} entityId message =
-  (transportSession, thVersion, sessionId, entityId, message)
+    cmd@MSG {} ->
+      lift . atomically $ mapM_ (`writeTBQueue` (protocolServer, sessionId, rId, cmd)) msgQ
+    _ -> throwE PCEUnexpectedResponse

 -- | Get message from SMP queue. The server returns ERR PROHIBITED if a client uses SUB and GET via the same transport connection for the same queue
 --
 -- https://github.covm/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#receive-a-message-from-the-queue
-getSMPMessage :: SMPClient -> RcvPrivateSignKey -> RecipientId -> ExceptT SMPClientError IO (Maybe RcvMessage)
-getSMPMessage c rpKey rId =
+getSMPMessage :: SMPClient -> RcvPrivateSignKey -> RecipientId -> ExceptT ProtocolClientError IO (Maybe (MsgId, MsgFlags))
+getSMPMessage c@ProtocolClient {protocolServer, sessionId, msgQ} rpKey rId =
  sendSMPCommand c (Just rpKey) rId GET >>= \case
    OK -> pure Nothing
-    cmd@(MSG msg) -> liftIO (writeSMPMessage c rId cmd) $> Just msg
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    cmd@(MSG msgId _ msgFlags _) -> do
+      lift . atomically $ mapM_ (`writeTBQueue` (protocolServer, sessionId, rId, cmd)) msgQ
+      pure $ Just (msgId, msgFlags)
+    _ -> throwE PCEUnexpectedResponse

 -- | Subscribe to the SMP queue notifications.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#subscribe-to-queue-notifications
-subscribeSMPQueueNotifications :: SMPClient -> NtfPrivateSignKey -> NotifierId -> ExceptT SMPClientError IO ()
+subscribeSMPQueueNotifications :: SMPClient -> NtfPrivateSignKey -> NotifierId -> ExceptT ProtocolClientError IO ()
 subscribeSMPQueueNotifications = okSMPCommand NSUB

-- | Subscribe to multiple SMP queues notifications batching commands if supported.
-subscribeSMPQueuesNtfs :: SMPClient -> NonEmpty (NtfPrivateSignKey, NotifierId) -> IO (NonEmpty (Either SMPClientError ()))
-subscribeSMPQueuesNtfs = okSMPCommands NSUB
-
 -- | Secure the SMP queue by adding a sender public key.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#secure-queue-command
-secureSMPQueue :: SMPClient -> RcvPrivateSignKey -> RecipientId -> SndPublicVerifyKey -> ExceptT SMPClientError IO ()
+secureSMPQueue :: SMPClient -> RcvPrivateSignKey -> RecipientId -> SndPublicVerifyKey -> ExceptT ProtocolClientError IO ()
 secureSMPQueue c rpKey rId senderKey = okSMPCommand (KEY senderKey) c rpKey rId

 -- | Enable notifications for the queue for push notifications server.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#enable-notifications-command
-enableSMPQueueNotifications :: SMPClient -> RcvPrivateSignKey -> RecipientId -> NtfPublicVerifyKey -> RcvNtfPublicDhKey -> ExceptT SMPClientError IO (NotifierId, RcvNtfPublicDhKey)
-enableSMPQueueNotifications c rpKey rId notifierKey rcvNtfPublicDhKey =
-  sendSMPCommand c (Just rpKey) rId (NKEY notifierKey rcvNtfPublicDhKey) >>= \case
-    NID nId rcvNtfSrvPublicDhKey -> pure (nId, rcvNtfSrvPublicDhKey)
-    r -> throwE . PCEUnexpectedResponse $ bshow r
-
-- | Enable notifications for the multiple queues for push notifications server.
-enableSMPQueuesNtfs :: SMPClient -> NonEmpty (RcvPrivateSignKey, RecipientId, NtfPublicVerifyKey, RcvNtfPublicDhKey) -> IO (NonEmpty (Either SMPClientError (NotifierId, RcvNtfPublicDhKey)))
-enableSMPQueuesNtfs c qs = L.map response <$> sendProtocolCommands c cs
-  where
-    cs = L.map (\(rpKey, rId, notifierKey, rcvNtfPublicDhKey) -> (Just rpKey, rId, Cmd SRecipient $ NKEY notifierKey rcvNtfPublicDhKey)) qs
-    response = \case
-      Right (NID nId rcvNtfSrvPublicDhKey) -> Right (nId, rcvNtfSrvPublicDhKey)
-      Right r -> Left . PCEUnexpectedResponse $ bshow r
-      Left e -> Left e
-
-- | Disable notifications for the queue for push notifications server.
--
-- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#disable-notifications-command
-disableSMPQueueNotifications :: SMPClient -> RcvPrivateSignKey -> RecipientId -> ExceptT SMPClientError IO ()
-disableSMPQueueNotifications = okSMPCommand NDEL
-
-- | Disable notifications for multiple queues for push notifications server.
-disableSMPQueuesNtfs :: SMPClient -> NonEmpty (RcvPrivateSignKey, RecipientId) -> IO (NonEmpty (Either SMPClientError ()))
-disableSMPQueuesNtfs = okSMPCommands NDEL
+enableSMPQueueNotifications :: SMPClient -> RcvPrivateSignKey -> RecipientId -> NtfPublicVerifyKey -> ExceptT ProtocolClientError IO NotifierId
+enableSMPQueueNotifications c rpKey rId notifierKey =
+  sendSMPCommand c (Just rpKey) rId (NKEY notifierKey) >>= \case
+    NID nId -> pure nId
+    _ -> throwE PCEUnexpectedResponse

 -- | Send SMP message.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#send-message
-sendSMPMessage :: SMPClient -> Maybe SndPrivateSignKey -> SenderId -> MsgFlags -> MsgBody -> ExceptT SMPClientError IO ()
+sendSMPMessage :: SMPClient -> Maybe SndPrivateSignKey -> SenderId -> MsgFlags -> MsgBody -> ExceptT ProtocolClientError IO ()
 sendSMPMessage c spKey sId flags msg =
  sendSMPCommand c spKey sId (SEND flags msg) >>= \case
    OK -> pure ()
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse

 -- | Acknowledge message delivery (server deletes the message).
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#acknowledge-message-delivery
-ackSMPMessage :: SMPClient -> RcvPrivateSignKey -> QueueId -> MsgId -> ExceptT SMPClientError IO ()
-ackSMPMessage c rpKey rId msgId =
+ackSMPMessage :: SMPClient -> RcvPrivateSignKey -> QueueId -> MsgId -> ExceptT ProtocolClientError IO ()
+ackSMPMessage c@ProtocolClient {protocolServer, sessionId, msgQ} rpKey rId msgId =
  sendSMPCommand c (Just rpKey) rId (ACK msgId) >>= \case
    OK -> return ()
-    cmd@MSG {} -> liftIO $ writeSMPMessage c rId cmd
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    cmd@MSG {} ->
+      lift . atomically $ mapM_ (`writeTBQueue` (protocolServer, sessionId, rId, cmd)) msgQ
+    _ -> throwE PCEUnexpectedResponse

 -- | Irreversibly suspend SMP queue.
 -- The existing messages from the queue will still be delivered.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#suspend-queue
-suspendSMPQueue :: SMPClient -> RcvPrivateSignKey -> QueueId -> ExceptT SMPClientError IO ()
+suspendSMPQueue :: SMPClient -> RcvPrivateSignKey -> QueueId -> ExceptT ProtocolClientError IO ()
 suspendSMPQueue = okSMPCommand OFF

 -- | Irreversibly delete SMP queue and all messages in it.
 --
 -- https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#delete-queue
-deleteSMPQueue :: SMPClient -> RcvPrivateSignKey -> RecipientId -> ExceptT SMPClientError IO ()
+deleteSMPQueue :: SMPClient -> RcvPrivateSignKey -> QueueId -> ExceptT ProtocolClientError IO ()
 deleteSMPQueue = okSMPCommand DEL

-- | Delete multiple SMP queues batching commands if supported.
-deleteSMPQueues :: SMPClient -> NonEmpty (RcvPrivateSignKey, RecipientId) -> IO (NonEmpty (Either SMPClientError ()))
-deleteSMPQueues = okSMPCommands DEL
-
-okSMPCommand :: PartyI p => Command p -> SMPClient -> C.APrivateSignKey -> QueueId -> ExceptT SMPClientError IO ()
+okSMPCommand :: PartyI p => Command p -> SMPClient -> C.APrivateSignKey -> QueueId -> ExceptT ProtocolClientError IO ()
 okSMPCommand cmd c pKey qId =
  sendSMPCommand c (Just pKey) qId cmd >>= \case
    OK -> return ()
-    r -> throwE . PCEUnexpectedResponse $ bshow r
-
-okSMPCommands :: PartyI p => Command p -> SMPClient -> NonEmpty (C.APrivateSignKey, QueueId) -> IO (NonEmpty (Either SMPClientError ()))
-okSMPCommands cmd c qs = L.map response <$> sendProtocolCommands c cs
-  where
-    aCmd = Cmd sParty cmd
-    cs = L.map (\(pKey, qId) -> (Just pKey, qId, aCmd)) qs
-    response = \case
-      Right OK -> Right ()
-      Right r -> Left . PCEUnexpectedResponse $ bshow r
-      Left e -> Left e
+    _ -> throwE PCEUnexpectedResponse

 -- | Send SMP command
-sendSMPCommand :: PartyI p => SMPClient -> Maybe C.APrivateSignKey -> QueueId -> Command p -> ExceptT SMPClientError IO BrokerMsg
+sendSMPCommand :: PartyI p => SMPClient -> Maybe C.APrivateSignKey -> QueueId -> Command p -> ExceptT ProtocolClientError IO BrokerMsg
 sendSMPCommand c pKey qId cmd = sendProtocolCommand c pKey qId (Cmd sParty cmd)

-type PCTransmission err msg = (SentRawTransmission, TMVar (Response err msg))
-
-- | Send multiple commands with batching and collect responses
-- It will result in Int overflow on 32 bit platform for a large number of blocks (~13.4k blocks / ~1.2m subscriptions)
-- TODO switch to timeout or TimeManager that supports Int64
-sendProtocolCommands :: forall err msg. ProtocolEncoding err (ProtoCommand msg) => ProtocolClient err msg -> NonEmpty (ClientCommand msg) -> IO (NonEmpty (Either (ProtocolClientError err) msg))
-sendProtocolCommands c@ProtocolClient {client_ = PClient {sndQ, tcpTimeout, batchDelay}, batch, blockSize, timeoutPerBlock} cs = do
-  (h :| ts) <- mapM (runExceptT . mkTransmission c) cs
-  let h' :: Either (ProtocolClientError err) (PCTransmission err msg, Int) = (,timeoutPerBlock) <$> h
-      batchSz = if batch then either (const 0) tSize h else 0
-      ts' :: NonEmpty (Either (ProtocolClientError err) (PCTransmission err msg, Int)) =
-        L.reverse . fst3 $ foldl' batchTimeouts ([h'], timeoutPerBlock, batchSz) ts
-      ts_ :: (Maybe (NonEmpty SentRawTransmission)) =
-        L.nonEmpty . map (fst . fst) . rights $ L.toList ts'
-  mapM_ (atomically . writeTBQueue sndQ) ts_
-  forConcurrently ts' $ \case
-    Right ((_t, r), bt) -> withTimeout c (tcpTimeout + bt) (atomically $ takeTMVar r)
-    Left e -> pure $ Left e
-  where
-    fst3 (x, _, _) = x
-    -- tSize calculation matches the batching logic in tPut that does actual breaking of transmissions into blocks
-    tSize :: PCTransmission err msg -> Int
-    tSize ((sig, t), _) = maybe 0 C.signatureSize sig + B.length t + 3 -- 1 byte for signature size + 2 bytes for transmission size
-    batchTimeouts :: (NonEmpty (Either (ProtocolClientError err) (PCTransmission err msg, Int)), Int, Int) -> Either (ProtocolClientError err) (PCTransmission err msg) -> (NonEmpty (Either (ProtocolClientError err) (PCTransmission err msg, Int)), Int, Int)
-    batchTimeouts (ts, bt, batchSz) = \case
-      Left e -> (Left e <| ts, bt, batchSz)
-      Right t
-        | not batch ->
-          (Right (t, bt') <| ts, bt', 0)
-        | batchSz' + 1 > blockSize ->
-          (Right (t, bt') <| ts, bt', tSz)
-        | otherwise -> -- same block in the batch
-          (Right (t, bt) <| ts, bt, batchSz') -- 1 byte for the number of transmissions in the batch
-        where
-          batchSz' = batchSz + tSz
-          bt' = bt + timeoutPerBlock + fromMaybe 0 batchDelay
-          tSz = tSize t
-
 -- | Send Protocol command
-sendProtocolCommand :: forall err msg. ProtocolEncoding err (ProtoCommand msg) => ProtocolClient err msg -> Maybe C.APrivateSignKey -> QueueId -> ProtoCommand msg -> ExceptT (ProtocolClientError err) IO msg
-sendProtocolCommand c@ProtocolClient {client_ = PClient {sndQ, tcpTimeout}} pKey qId cmd = do
-  (t, r) <- mkTransmission c (pKey, qId, cmd)
-  ExceptT $ sendRecv t r
+sendProtocolCommand :: forall msg. ProtocolEncoding (ProtocolCommand msg) => ProtocolClient msg -> Maybe C.APrivateSignKey -> QueueId -> ProtocolCommand msg -> ExceptT ProtocolClientError IO msg
+sendProtocolCommand ProtocolClient {sndQ, sentCommands, clientCorrId, sessionId, thVersion, tcpTimeout} pKey qId cmd = do
+  corrId <- lift_ getNextCorrId
+  t <- signTransmission $ encodeTransmission thVersion sessionId (corrId, qId, cmd)
+  ExceptT $ sendRecv corrId t
  where
-    -- two separate "atomically" needed to avoid blocking
-    sendRecv :: SentRawTransmission -> TMVar (Response err msg) -> IO (Response err msg)
-    sendRecv t r = atomically (writeTBQueue sndQ [t]) >> withTimeout c tcpTimeout (atomically $ takeTMVar r)
+    lift_ :: STM a -> ExceptT ProtocolClientError IO a
+    lift_ action = ExceptT $ Right <$> atomically action

-withTimeout :: ProtocolClient err msg -> Int -> IO (Either (ProtocolClientError err) msg) -> IO (Either (ProtocolClientError err) msg)
-withTimeout ProtocolClient {client_ = PClient {pingErrorCount}} t a = do
-  timeout t a >>= \case
-    Just r -> atomically (writeTVar pingErrorCount 0) >> pure r
-    _ -> pure $ Left PCEResponseTimeout
-
-mkTransmission :: forall err msg. ProtocolEncoding err (ProtoCommand msg) => ProtocolClient err msg -> ClientCommand msg -> ExceptT (ProtocolClientError err) IO (PCTransmission err msg)
-mkTransmission ProtocolClient {sessionId, thVersion, client_ = PClient {clientCorrId, sentCommands}} (pKey, qId, cmd) = do
-  corrId <- liftIO $ atomically getNextCorrId
-  let t = signTransmission $ encodeTransmission thVersion sessionId (corrId, qId, cmd)
-  r <- liftIO . atomically $ mkRequest corrId
-  pure (t, r)
-  where
    getNextCorrId :: STM CorrId
    getNextCorrId = do
      i <- stateTVar clientCorrId $ \i -> (i, i + 1)
      pure . CorrId $ bshow i
-    signTransmission :: ByteString -> SentRawTransmission
-    signTransmission t = ((`C.sign` t) <$> pKey, t)
-    mkRequest :: CorrId -> STM (TMVar (Response err msg))
-    mkRequest corrId = do
+
+    signTransmission :: ByteString -> ExceptT ProtocolClientError IO SentRawTransmission
+    signTransmission t = case pKey of
+      Nothing -> return (Nothing, t)
+      Just pk -> do
+        sig <- liftError PCESignatureError $ C.sign pk t
+        return (Just sig, t)
+
+    -- two separate "atomically" needed to avoid blocking
+    sendRecv :: CorrId -> SentRawTransmission -> IO (Response msg)
+    sendRecv corrId t = atomically (send corrId t) >>= withTimeout . atomically . takeTMVar
+      where
+        withTimeout a = fromMaybe (Left PCEResponseTimeout) <$> timeout tcpTimeout a
+
+    send :: CorrId -> SentRawTransmission -> STM (TMVar (Response msg))
+    send corrId t = do
      r <- newEmptyTMVar
      TM.insert corrId (Request qId r) sentCommands
-      pure r
+      writeTBQueue sndQ t
+      return r
@@ -5,8 +5,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
-{-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}

 module Simplex.Messaging.Client.Agent where
@@ -17,46 +15,37 @@ import Control.Logger.Simple
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Trans.Except
-import Data.Bifunctor (first, bimap)
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
-import Data.Either (partitionEithers)
-import Data.List (partition)
-import Data.List.NonEmpty (NonEmpty)
-import qualified Data.List.NonEmpty as L
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
-import Data.Maybe (listToMaybe)
 import Data.Set (Set)
 import Data.Text.Encoding
-import Data.Tuple (swap)
 import Numeric.Natural
 import Simplex.Messaging.Agent.RetryInterval
 import Simplex.Messaging.Client
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Protocol (BrokerMsg, ProtocolServer (..), QueueId, SMPServer, NtfPrivateSignKey, NotifierId, RcvPrivateSignKey, RecipientId)
+import Simplex.Messaging.Protocol (BrokerMsg, ProtocolServer (..), QueueId, SMPServer)
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Transport
-import Simplex.Messaging.Util (catchAll_, tryE, ($>>=), toChunks)
+import Simplex.Messaging.Util (catchAll_, tryE, whenM, ($>>=))
 import System.Timeout (timeout)
-import UnliftIO (async)
+import UnliftIO (async, forConcurrently_)
 import UnliftIO.Exception (Exception)
 import qualified UnliftIO.Exception as E
 import UnliftIO.STM

-type SMPClientVar = TMVar (Either SMPClientError SMPClient)
+type SMPClientVar = TMVar (Either ProtocolClientError SMPClient)

 data SMPClientAgentEvent
  = CAConnected SMPServer
  | CADisconnected SMPServer (Set SMPSub)
  | CAReconnected SMPServer
-  | CAResubscribed SMPServer (NonEmpty SMPSub)
-  | CASubError SMPServer (NonEmpty (SMPSub, SMPClientError))
+  | CAResubscribed SMPServer SMPSub
+  | CASubError SMPServer SMPSub ProtocolClientError

 data SMPSubParty = SPRecipient | SPNotifier
-  deriving (Eq, Ord, Show)
+  deriving (Eq, Ord)

 type SMPSub = (SMPSubParty, QueueId)

@@ -66,23 +55,21 @@ data SMPClientAgentConfig = SMPClientAgentConfig
  { smpCfg :: ProtocolClientConfig,
    reconnectInterval :: RetryInterval,
    msgQSize :: Natural,
-    agentQSize :: Natural,
-    agentSubsBatchSize :: Int
+    agentQSize :: Natural
  }

 defaultSMPClientAgentConfig :: SMPClientAgentConfig
 defaultSMPClientAgentConfig =
  SMPClientAgentConfig
-    { smpCfg = defaultClientConfig {defaultTransport = ("5223", transport @TLS)},
+    { smpCfg = defaultClientConfig,
      reconnectInterval =
        RetryInterval
          { initialInterval = second,
            increaseAfter = 10 * second,
            maxInterval = 10 * second
          },
-      msgQSize = 256,
-      agentQSize = 256,
-      agentSubsBatchSize = 900
+      msgQSize = 64,
+      agentQSize = 64
    }
  where
    second = 1000000
@@ -121,7 +108,7 @@ newSMPClientAgent agentCfg@SMPClientAgentConfig {msgQSize, agentQSize} = do
  asyncClients <- newTVar []
  pure SMPClientAgent {agentCfg, msgQ, agentQ, smpClients, srvSubs, pendingSrvSubs, reconnections, asyncClients}

-getSMPServerClient' :: SMPClientAgent -> SMPServer -> ExceptT SMPClientError IO SMPClient
+getSMPServerClient' :: SMPClientAgent -> SMPServer -> ExceptT ProtocolClientError IO SMPClient
 getSMPServerClient' ca@SMPClientAgent {agentCfg, smpClients, msgQ} srv =
  atomically getClientVar >>= either newSMPClient waitForSMPClient
  where
@@ -134,19 +121,19 @@ getSMPServerClient' ca@SMPClientAgent {agentCfg, smpClients, msgQ} srv =
      TM.insert srv smpVar smpClients
      pure smpVar

-    waitForSMPClient :: SMPClientVar -> ExceptT SMPClientError IO SMPClient
+    waitForSMPClient :: SMPClientVar -> ExceptT ProtocolClientError IO SMPClient
    waitForSMPClient smpVar = do
-      let ProtocolClientConfig {networkConfig = NetworkConfig {tcpConnectTimeout}} = smpCfg agentCfg
-      smpClient_ <- liftIO $ tcpConnectTimeout `timeout` atomically (readTMVar smpVar)
+      let ProtocolClientConfig {tcpTimeout} = smpCfg agentCfg
+      smpClient_ <- liftIO $ tcpTimeout `timeout` atomically (readTMVar smpVar)
      liftEither $ case smpClient_ of
        Just (Right smpClient) -> Right smpClient
        Just (Left e) -> Left e
        Nothing -> Left PCEResponseTimeout

-    newSMPClient :: SMPClientVar -> ExceptT SMPClientError IO SMPClient
+    newSMPClient :: SMPClientVar -> ExceptT ProtocolClientError IO SMPClient
    newSMPClient smpVar = tryConnectClient pure tryConnectAsync
      where
-        tryConnectClient :: (SMPClient -> ExceptT SMPClientError IO a) -> ExceptT SMPClientError IO () -> ExceptT SMPClientError IO a
+        tryConnectClient :: (SMPClient -> ExceptT ProtocolClientError IO a) -> ExceptT ProtocolClientError IO () -> ExceptT ProtocolClientError IO a
        tryConnectClient successAction retryAction =
          tryE connectClient >>= \r -> case r of
            Right smp -> do
@@ -160,20 +147,20 @@ getSMPServerClient' ca@SMPClientAgent {agentCfg, smpClients, msgQ} srv =
                  putTMVar smpVar (Left e)
                  TM.delete srv smpClients
              throwE e
-        tryConnectAsync :: ExceptT SMPClientError IO ()
+        tryConnectAsync :: ExceptT ProtocolClientError IO ()
        tryConnectAsync = do
          a <- async connectAsync
          atomically $ modifyTVar' (asyncClients ca) (a :)
-        connectAsync :: ExceptT SMPClientError IO ()
+        connectAsync :: ExceptT ProtocolClientError IO ()
        connectAsync =
-          withRetryInterval (reconnectInterval agentCfg) $ \_ loop ->
+          withRetryInterval (reconnectInterval agentCfg) $ \loop ->
            void $ tryConnectClient (const reconnectClient) loop

-    connectClient :: ExceptT SMPClientError IO SMPClient
-    connectClient = ExceptT $ getProtocolClient (1, srv, Nothing) (smpCfg agentCfg) (Just msgQ) clientDisconnected
+    connectClient :: ExceptT ProtocolClientError IO SMPClient
+    connectClient = ExceptT $ getProtocolClient srv (smpCfg agentCfg) (Just msgQ) clientDisconnected

-    clientDisconnected :: SMPClient -> IO ()
-    clientDisconnected _ = do
+    clientDisconnected :: IO ()
+    clientDisconnected = do
      removeClientAndSubs >>= (`forM_` serverDown)
      logInfo . decodeUtf8 $ "Agent disconnected from " <> showServer srv

@@ -194,54 +181,44 @@ getSMPServerClient' ca@SMPClientAgent {agentCfg, smpClients, msgQ} srv =
            _ -> TM.insert srv sVar ps

    serverDown :: Map SMPSub C.APrivateSignKey -> IO ()
-    serverDown ss = unless (M.null ss) $ do
+    serverDown ss = unless (M.null ss) . void . runExceptT $ do
      notify . CADisconnected srv $ M.keysSet ss
-      void $ runExceptT reconnectServer
+      reconnectServer

-    reconnectServer :: ExceptT SMPClientError IO ()
+    reconnectServer :: ExceptT ProtocolClientError IO ()
    reconnectServer = do
      a <- async tryReconnectClient
      atomically $ modifyTVar' (reconnections ca) (a :)

-    tryReconnectClient :: ExceptT SMPClientError IO ()
+    tryReconnectClient :: ExceptT ProtocolClientError IO ()
    tryReconnectClient = do
-      withRetryInterval (reconnectInterval agentCfg) $ \_ loop ->
+      withRetryInterval (reconnectInterval agentCfg) $ \loop ->
        reconnectClient `catchE` const loop

-    reconnectClient :: ExceptT SMPClientError IO ()
+    reconnectClient :: ExceptT ProtocolClientError IO ()
    reconnectClient = do
      withSMP ca srv $ \smp -> do
-        liftIO $ notify $ CAReconnected srv
-        cs_ <- atomically $ mapM readTVar =<< TM.lookup srv (pendingSrvSubs ca)
-        forM_ cs_ $ \cs -> do
-          subs' <- filterM (fmap not . atomically . hasSub (srvSubs ca) srv . fst) $ M.assocs cs
-          let (nSubs, rSubs) = partition (isNotifier . fst . fst) subs'
-          subscribe_ smp SPNotifier nSubs
-          subscribe_ smp SPRecipient rSubs
+        notify $ CAReconnected srv
+        cs <- atomically $ mapM readTVar =<< TM.lookup srv (pendingSrvSubs ca)
+        forConcurrently_ (maybe [] M.assocs cs) $ \sub@(s, _) ->
+          whenM (atomically $ hasSub (srvSubs ca) srv s) $
+            subscribe_ smp sub `catchE` handleError s
      where
-        isNotifier = \case
-          SPNotifier -> True
-          SPRecipient -> False
+        subscribe_ :: SMPClient -> (SMPSub, C.APrivateSignKey) -> ExceptT ProtocolClientError IO ()
+        subscribe_ smp sub@(s, _) = do
+          smpSubscribe smp sub
+          atomically $ addSubscription ca srv sub
+          notify $ CAResubscribed srv s

-        subscribe_ :: SMPClient -> SMPSubParty -> [(SMPSub, C.APrivateSignKey)] -> ExceptT SMPClientError IO ()
-        subscribe_ smp party = mapM_ subscribeBatch . toChunks (agentSubsBatchSize agentCfg)
-          where
-            subscribeBatch subs' = do
-              let subs'' :: (NonEmpty (QueueId, C.APrivateSignKey)) = L.map (first snd) subs'
-              rs <- liftIO $ smpSubscribeQueues party ca smp srv subs''
-              let rs' :: (NonEmpty ((SMPSub, C.APrivateSignKey), Either SMPClientError ())) =
-                    L.zipWith (first . const) subs' rs
-                  rs'' :: [Either (SMPSub, SMPClientError) (SMPSub, C.APrivateSignKey)] =
-                    map (\(sub, r) -> bimap (fst sub,) (const sub) r) $ L.toList rs'
-                  (errs, oks) = partitionEithers rs''
-                  (tempErrs, finalErrs) = partition (temporaryClientError . snd) errs
-              mapM_ (atomically . addSubscription ca srv) oks
-              mapM_ (liftIO . notify . CAResubscribed srv) $ L.nonEmpty $ map fst oks
-              mapM_ (atomically . removePendingSubscription ca srv . fst) finalErrs 
-              mapM_ (liftIO . notify . CASubError srv) $ L.nonEmpty finalErrs
-              mapM_ (throwE . snd) $ listToMaybe tempErrs
+        handleError :: SMPSub -> ProtocolClientError -> ExceptT ProtocolClientError IO ()
+        handleError s = \case
+          e@PCEResponseTimeout -> throwE e
+          e@PCENetworkError -> throwE e
+          e -> do
+            notify $ CASubError srv s e
+            atomically $ removePendingSubscription ca srv s

-    notify :: SMPClientAgentEvent -> IO ()
+    notify :: SMPClientAgentEvent -> ExceptT ProtocolClientError IO ()
    notify evt = atomically $ writeTBQueue (agentQ ca) evt

 closeSMPClientAgent :: MonadUnliftIO m => SMPClientAgent -> m ()
@@ -261,15 +238,15 @@ closeSMPServerClients c = readTVarIO (smpClients c) >>= mapM_ (forkIO . closeCli
 cancelActions :: Foldable f => TVar (f (Async ())) -> IO ()
 cancelActions as = readTVarIO as >>= mapM_ uninterruptibleCancel

-withSMP :: SMPClientAgent -> SMPServer -> (SMPClient -> ExceptT SMPClientError IO a) -> ExceptT SMPClientError IO a
+withSMP :: SMPClientAgent -> SMPServer -> (SMPClient -> ExceptT ProtocolClientError IO a) -> ExceptT ProtocolClientError IO a
 withSMP ca srv action = (getSMPServerClient' ca srv >>= action) `catchE` logSMPError
  where
-    logSMPError :: SMPClientError -> ExceptT SMPClientError IO a
+    logSMPError :: ProtocolClientError -> ExceptT ProtocolClientError IO a
    logSMPError e = do
      liftIO $ putStrLn $ "SMP error (" <> show srv <> "): " <> show e
      throwE e

-subscribeQueue :: SMPClientAgent -> SMPServer -> (SMPSub, C.APrivateSignKey) -> ExceptT SMPClientError IO ()
+subscribeQueue :: SMPClientAgent -> SMPServer -> (SMPSub, C.APrivateSignKey) -> ExceptT ProtocolClientError IO ()
 subscribeQueue ca srv sub = do
  atomically $ addPendingSubscription ca srv sub
  withSMP ca srv $ \smp -> subscribe_ smp `catchE` handleError
@@ -283,40 +260,11 @@ subscribeQueue ca srv sub = do
        removePendingSubscription ca srv $ fst sub
      throwE e

-subscribeQueuesSMP :: SMPClientAgent -> SMPServer -> NonEmpty (RecipientId, RcvPrivateSignKey) -> IO (NonEmpty (RecipientId, Either SMPClientError ()))
-subscribeQueuesSMP = subscribeQueues_ SPRecipient
-
-subscribeQueuesNtfs :: SMPClientAgent -> SMPServer -> NonEmpty (NotifierId, NtfPrivateSignKey) -> IO (NonEmpty (NotifierId, Either SMPClientError ()))
-subscribeQueuesNtfs = subscribeQueues_ SPNotifier
-
-subscribeQueues_ :: SMPSubParty -> SMPClientAgent -> SMPServer -> NonEmpty (QueueId, C.APrivateSignKey) -> IO (NonEmpty (QueueId, Either SMPClientError ()))
-subscribeQueues_ party ca srv subs = do
-  atomically $ forM_ subs $ addPendingSubscription ca srv . first (party,)
-  runExceptT (getSMPServerClient' ca srv) >>= \case
-    Left e -> pure $ L.map ((,Left e) . fst) subs
-    Right smp -> smpSubscribeQueues party ca smp srv subs
-
-smpSubscribeQueues :: SMPSubParty -> SMPClientAgent -> SMPClient -> SMPServer -> NonEmpty (QueueId, C.APrivateSignKey) -> IO (NonEmpty (QueueId, Either SMPClientError ()))
-smpSubscribeQueues party ca smp srv subs = do
-  rs <- L.zip subs <$> subscribe smp (L.map swap subs)
-  atomically $ forM rs $ \(sub, r) -> (fst sub,) <$> case r of
-    Right () -> do
-      addSubscription ca srv $ first (party,) sub
-      pure $ Right ()
-    Left e -> do
-      when (e /= PCENetworkError && e /= PCEResponseTimeout) $
-        removePendingSubscription ca srv $ (party,) $ fst sub
-      pure $ Left e
-  where
-    subscribe = case party of
-      SPRecipient -> subscribeSMPQueues
-      SPNotifier -> subscribeSMPQueuesNtfs
-
 showServer :: SMPServer -> ByteString
 showServer ProtocolServer {host, port} =
-  strEncode host <> B.pack (if null port then "" else ':' : port)
+  B.pack $ host <> if null port then "" else ':' : port

-smpSubscribe :: SMPClient -> (SMPSub, C.APrivateSignKey) -> ExceptT SMPClientError IO ()
+smpSubscribe :: SMPClient -> (SMPSub, C.APrivateSignKey) -> ExceptT ProtocolClientError IO ()
 smpSubscribe smp ((party, queueId), privKey) = subscribe_ smp privKey queueId
  where
    subscribe_ = case party of
@@ -8,7 +8,6 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -67,9 +66,7 @@ module Simplex.Messaging.Crypto

    -- * key encoding/decoding
    encodePubKey,
-    decodePubKey,
    encodePrivKey,
-    decodePrivKey,
    pubKeyBytes,

    -- * sign/verify
@@ -91,45 +88,29 @@ module Simplex.Messaging.Crypto
    -- * AES256 AEAD-GCM scheme
    Key (..),
    IV (..),
-    GCMIV (unGCMIV), -- constructor is not exported
    AuthTag (..),
+    encryptAES,
+    decryptAES,
    encryptAEAD,
    decryptAEAD,
-    encryptAESNoPad,
-    decryptAESNoPad,
    authTagSize,
    randomAesKey,
    randomIV,
-    randomGCMIV,
    ivSize,
-    gcmIVSize,
-    gcmIV,

    -- * NaCl crypto_box
    CbNonce (unCbNonce),
-    pattern CbNonce,
    cbEncrypt,
-    cbEncryptMaxLenBS,
    cbDecrypt,
    cbNonce,
    randomCbNonce,
    pseudoRandomCbNonce,

-    -- * NaCl crypto_secretbox
-    SbKey (unSbKey),
-    pattern SbKey,
-    sbEncrypt,
-    sbDecrypt,
-    sbKey,
-    unsafeSbKey,
-    randomSbKey,
-
    -- * pseudo-random bytes
    pseudoRandomBytes,

-    -- * digests
+    -- * SHA256 hash
    sha256Hash,
-    sha512Hash,

    -- * Message padding / un-padding
    pad,
@@ -137,13 +118,6 @@ module Simplex.Messaging.Crypto

    -- * Cryptography error type
    CryptoError (..),
-
-    -- * Limited size ByteStrings
-    MaxLenBS,
-    pattern MaxLenBS,
-    maxLenBS,
-    unsafeMaxLenBS,
-    appendMaxLenBS,
  )
 where

@@ -155,7 +129,7 @@ import Crypto.Cipher.AES (AES256)
 import qualified Crypto.Cipher.Types as AES
 import qualified Crypto.Cipher.XSalsa as XSalsa
 import qualified Crypto.Error as CE
-import Crypto.Hash (Digest, SHA256, SHA512, hash)
+import Crypto.Hash (Digest, SHA256 (..), hash)
 import qualified Crypto.MAC.Poly1305 as Poly1305
 import qualified Crypto.PubKey.Curve25519 as X25519
 import qualified Crypto.PubKey.Curve448 as X448
@@ -168,23 +142,22 @@ import Data.ASN1.Types
 import Data.Aeson (FromJSON (..), ToJSON (..))
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Bifunctor (bimap, first)
-import Data.ByteArray (ByteArrayAccess)
 import qualified Data.ByteArray as BA
 import Data.ByteString.Base64 (decode, encode)
 import qualified Data.ByteString.Base64.URL as U
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
+import Data.ByteString.Internal (c2w, w2c)
 import Data.ByteString.Lazy (fromStrict, toStrict)
 import Data.Constraint (Dict (..))
 import Data.Kind (Constraint, Type)
 import Data.String
 import Data.Type.Equality
-import Data.Typeable (Proxy (Proxy), Typeable)
-import Data.Word (Word32)
+import Data.Typeable (Typeable)
 import Data.X509
 import Database.SQLite.Simple.FromField (FromField (..))
 import Database.SQLite.Simple.ToField (ToField (..))
-import GHC.TypeLits (ErrorMessage (..), KnownNat, Nat, TypeError, natVal, type (+))
+import GHC.TypeLits (ErrorMessage (..), TypeError)
 import Network.Transport.Internal (decodeWord16, encodeWord16)
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Encoding.String
@@ -277,12 +250,6 @@ deriving instance Eq (PrivateKey a)

 deriving instance Show (PrivateKey a)

-instance StrEncoding (PrivateKey X25519) where
-  strEncode = strEncode . encodePrivKey
-  {-# INLINE strEncode #-}
-  strDecode = decodePrivKey
-  {-# INLINE strDecode #-}
-
 data APrivateKey
  = forall a.
    AlgorithmI a =>
@@ -329,12 +296,6 @@ instance Encoding APrivateSignKey where
  smpDecode = decodePrivKey
  {-# INLINE smpDecode #-}

-instance StrEncoding APrivateSignKey where
-  strEncode = strEncode . encodePrivKey
-  {-# INLINE strEncode #-}
-  strDecode = decodePrivKey
-  {-# INLINE strDecode #-}
-
 data APublicVerifyKey
  = forall a.
    (AlgorithmI a, SignatureAlgorithm a) =>
@@ -680,9 +641,6 @@ instance SignatureSize (Signature a) where
    SignatureEd25519 _ -> Ed25519.signatureSize
    SignatureEd448 _ -> Ed448.signatureSize

-instance SignatureSize ASignature where
-  signatureSize (ASignature _ s) = signatureSize s
-
 instance SignatureSize APrivateSignKey where
  signatureSize (APrivateSignKey _ k) = signatureSize k

@@ -709,13 +667,9 @@ data CryptoError
    AESDecryptError
  | -- CryptoBox decryption error
    CBDecryptError
-  | -- Poly1305 initialization error
-    CryptoPoly1305Error CE.CryptoError
  | -- | message is larger that allowed padded length minus 2 (to prepend message length)
    -- (or required un-padded length is larger than the message length)
    CryptoLargeMsgError
-  | -- | padded message is shorter than 2 bytes
-    CryptoInvalidMsgError
  | -- | failure parsing message header
    CryptoHeaderError String
  | -- | no sending chain key in ratchet state
@@ -723,9 +677,9 @@ data CryptoError
  | -- | header decryption error (could indicate that another key should be tried)
    CERatchetHeader
  | -- | too many skipped messages
-    CERatchetTooManySkipped Word32
+    CERatchetTooManySkipped
  | -- | earlier message number (or, possibly, skipped message that failed to decrypt?)
-    CERatchetEarlierMessage Word32
+    CERatchetEarlierMessage
  | -- | duplicate message number
    CERatchetDuplicateMessage
  deriving (Eq, Show, Exception)
@@ -763,32 +717,16 @@ instance FromJSON Key where

 -- | IV bytes newtype.
 newtype IV = IV {unIV :: ByteString}
-  deriving (Eq, Show)

 instance Encoding IV where
  smpEncode = unIV
  smpP = IV <$> A.take (ivSize @AES256)

-instance ToJSON IV where
-  toJSON = strToJSON . unIV
-  toEncoding = strToJEncoding . unIV
-
-instance FromJSON IV where
-  parseJSON = fmap IV . strParseJSON "IV"
-
-- | GCMIV bytes newtype.
-newtype GCMIV = GCMIV {unGCMIV :: ByteString}
-
-gcmIV :: ByteString -> Either CryptoError GCMIV
-gcmIV s
-  | B.length s == gcmIVSize = Right $ GCMIV s
-  | otherwise = Left CryptoIVError
-
 newtype AuthTag = AuthTag {unAuthTag :: AES.AuthTag}

 instance Encoding AuthTag where
-  smpEncode = BA.convert . unAuthTag
-  smpP = AuthTag . AES.AuthTag . BA.convert <$> A.take authTagSize
+  smpEncode = B.pack . map w2c . BA.unpack . AES.unAuthTag . unAuthTag
+  smpP = AuthTag . AES.AuthTag . BA.pack . map c2w . B.unpack <$> A.take authTagSize

 -- | Certificate fingerpint newtype.
 --
@@ -814,58 +752,38 @@ instance FromField KeyHash where fromField = blobFieldDecoder $ parseAll strP
 sha256Hash :: ByteString -> ByteString
 sha256Hash = BA.convert . (hash :: ByteString -> Digest SHA256)

-- | SHA512 digest.
-sha512Hash :: ByteString -> ByteString
-sha512Hash = BA.convert . (hash :: ByteString -> Digest SHA512)
-
-- | AEAD-GCM encryption with associated data.
+-- | AEAD-GCM encryption with empty associated data.
 --
-- Used as part of double ratchet encryption.
-- This function requires 16 bytes IV, it transforms IV in cryptonite_aes_gcm_init here:
-- https://github.com/haskell-crypto/cryptonite/blob/master/cbits/cryptonite_aes.c
+-- Used as part of hybrid E2E encryption scheme and for SMP transport blocks encryption.
+encryptAES :: Key -> IV -> Int -> ByteString -> ExceptT CryptoError IO (AuthTag, ByteString)
+encryptAES key iv paddedLen = encryptAEAD key iv paddedLen ""
+
+-- | AEAD-GCM encryption.
+--
+-- Used as part of hybrid E2E encryption scheme and for SMP transport blocks encryption.
 encryptAEAD :: Key -> IV -> Int -> ByteString -> ByteString -> ExceptT CryptoError IO (AuthTag, ByteString)
 encryptAEAD aesKey ivBytes paddedLen ad msg = do
  aead <- initAEAD @AES256 aesKey ivBytes
  msg' <- liftEither $ pad msg paddedLen
  pure . first AuthTag $ AES.aeadSimpleEncrypt aead ad msg' authTagSize

-- Used to encrypt WebRTC frames.
-- This function requires 12 bytes IV, it does not transform IV.
-encryptAESNoPad :: Key -> GCMIV -> ByteString -> ExceptT CryptoError IO (AuthTag, ByteString)
-encryptAESNoPad key iv = encryptAEADNoPad key iv ""
-
-encryptAEADNoPad :: Key -> GCMIV -> ByteString -> ByteString -> ExceptT CryptoError IO (AuthTag, ByteString)
-encryptAEADNoPad aesKey ivBytes ad msg = do
-  aead <- initAEADGCM aesKey ivBytes
-  pure . first AuthTag $ AES.aeadSimpleEncrypt aead ad msg authTagSize
-
-- | AEAD-GCM decryption with associated data.
+-- | AEAD-GCM decryption with empty associated data.
 --
-- Used as part of double ratchet encryption.
-- This function requires 16 bytes IV, it transforms IV in cryptonite_aes_gcm_init here:
-- https://github.com/haskell-crypto/cryptonite/blob/master/cbits/cryptonite_aes.c
-- To make it compatible with WebCrypto we will need to start using initAEADGCM.
+-- Used as part of hybrid E2E encryption scheme and for SMP transport blocks decryption.
+decryptAES :: Key -> IV -> ByteString -> AuthTag -> ExceptT CryptoError IO ByteString
+decryptAES key iv = decryptAEAD key iv ""
+
+-- | AEAD-GCM decryption.
+--
+-- Used as part of hybrid E2E encryption scheme and for SMP transport blocks decryption.
 decryptAEAD :: Key -> IV -> ByteString -> ByteString -> AuthTag -> ExceptT CryptoError IO ByteString
 decryptAEAD aesKey ivBytes ad msg (AuthTag authTag) = do
  aead <- initAEAD @AES256 aesKey ivBytes
  liftEither . unPad =<< maybeError AESDecryptError (AES.aeadSimpleDecrypt aead ad msg authTag)

-- Used to decrypt WebRTC frames.
-- This function requires 12 bytes IV, it does not transform IV.
-decryptAESNoPad :: Key -> GCMIV -> ByteString -> AuthTag -> ExceptT CryptoError IO ByteString
-decryptAESNoPad key iv = decryptAEADNoPad key iv ""
-
-decryptAEADNoPad :: Key -> GCMIV -> ByteString -> ByteString -> AuthTag -> ExceptT CryptoError IO ByteString
-decryptAEADNoPad aesKey iv ad msg (AuthTag tag) = do
-  aead <- initAEADGCM aesKey iv
-  maybeError AESDecryptError (AES.aeadSimpleDecrypt aead ad msg tag)
-
-maxMsgLen :: Int
-maxMsgLen = 2 ^ (16 :: Int) - 3
-
 pad :: ByteString -> Int -> Either CryptoError ByteString
 pad msg paddedLen
-  | len <= maxMsgLen && padLen >= 0 = Right $ encodeWord16 (fromIntegral len) <> msg <> B.replicate padLen '#'
+  | padLen >= 0 = Right $ encodeWord16 (fromIntegral len) <> msg <> B.replicate padLen '#'
  | otherwise = Left CryptoLargeMsgError
  where
    len = B.length msg
@@ -873,50 +791,12 @@ pad msg paddedLen

 unPad :: ByteString -> Either CryptoError ByteString
 unPad padded
-  | B.length lenWrd == 2 && B.length rest >= len = Right $ B.take len rest
-  | otherwise = Left CryptoInvalidMsgError
+  | B.length rest >= len = Right $ B.take len rest
+  | otherwise = Left CryptoLargeMsgError
  where
    (lenWrd, rest) = B.splitAt 2 padded
    len = fromIntegral $ decodeWord16 lenWrd

-newtype MaxLenBS (i :: Nat) = MLBS {unMaxLenBS :: ByteString}
-
-pattern MaxLenBS :: ByteString -> MaxLenBS i
-pattern MaxLenBS s <- MLBS s
-
-{-# COMPLETE MaxLenBS #-}
-
-instance KnownNat i => Encoding (MaxLenBS i) where
-  smpEncode (MLBS s) = smpEncode s
-  smpP = first show . maxLenBS <$?> smpP
-
-instance KnownNat i => StrEncoding (MaxLenBS i) where
-  strEncode (MLBS s) = strEncode s
-  strP = first show . maxLenBS <$?> strP
-
-maxLenBS :: forall i. KnownNat i => ByteString -> Either CryptoError (MaxLenBS i)
-maxLenBS s
-  | B.length s > maxLength @i = Left CryptoLargeMsgError
-  | otherwise = Right $ MLBS s
-
-unsafeMaxLenBS :: forall i. KnownNat i => ByteString -> MaxLenBS i
-unsafeMaxLenBS = MLBS
-
-padMaxLenBS :: forall i. KnownNat i => MaxLenBS i -> MaxLenBS (i + 2)
-padMaxLenBS (MLBS msg) = MLBS $ encodeWord16 (fromIntegral len) <> msg <> B.replicate padLen '#'
-  where
-    len = B.length msg
-    padLen = maxLength @i - len
-
-appendMaxLenBS :: (KnownNat i, KnownNat j) => MaxLenBS i -> MaxLenBS j -> MaxLenBS (i + j)
-appendMaxLenBS (MLBS s1) (MLBS s2) = MLBS $ s1 <> s2
-
-maxLength :: forall i. KnownNat i => Int
-maxLength = fromIntegral (natVal $ Proxy @i)
-
-- this function requires 16 bytes IV, it transforms IV in cryptonite_aes_gcm_init here:
-- https://github.com/haskell-crypto/cryptonite/blob/master/cbits/cryptonite_aes.c
-- This is used for double ratchet encryption, so to make it compatible with WebCrypto we will need to deprecate it and start using initAEADGCM
 initAEAD :: forall c. AES.BlockCipher c => Key -> IV -> ExceptT CryptoError IO (AES.AEAD c)
 initAEAD (Key aesKey) (IV ivBytes) = do
  iv <- makeIV @c ivBytes
@@ -924,12 +804,6 @@ initAEAD (Key aesKey) (IV ivBytes) = do
    cipher <- AES.cipherInit aesKey
    AES.aeadInit AES.AEAD_GCM cipher iv

-- this function requires 12 bytes IV, it does not transforms IV.
-initAEADGCM :: Key -> GCMIV -> ExceptT CryptoError IO (AES.AEAD AES256)
-initAEADGCM (Key aesKey) (GCMIV ivBytes) = cryptoFailable $ do
-  cipher <- AES.cipherInit aesKey
-  AES.aeadInit AES.AEAD_GCM cipher ivBytes
-
 -- | Random AES256 key.
 randomAesKey :: IO Key
 randomAesKey = Key <$> getRandomBytes aesKeySize
@@ -938,15 +812,9 @@ randomAesKey = Key <$> getRandomBytes aesKeySize
 randomIV :: IO IV
 randomIV = IV <$> getRandomBytes (ivSize @AES256)

-randomGCMIV :: IO GCMIV
-randomGCMIV = GCMIV <$> getRandomBytes gcmIVSize
-
 ivSize :: forall c. AES.BlockCipher c => Int
 ivSize = AES.blockSize (undefined :: c)

-gcmIVSize :: Int
-gcmIVSize = 12
-
 makeIV :: AES.BlockCipher c => ByteString -> ExceptT CryptoError IO (AES.IV c)
 makeIV bs = maybeError CryptoIVError $ AES.makeIV bs

@@ -959,12 +827,12 @@ cryptoFailable = liftEither . first AESCipherError . CE.eitherCryptoError
 -- | Message signing.
 --
 -- Used by SMP clients to sign SMP commands and by SMP agents to sign messages.
-sign' :: SignatureAlgorithm a => PrivateKey a -> ByteString -> Signature a
-sign' (PrivateKeyEd25519 pk k) msg = SignatureEd25519 $ Ed25519.sign pk k msg
-sign' (PrivateKeyEd448 pk k) msg = SignatureEd448 $ Ed448.sign pk k msg
+sign' :: SignatureAlgorithm a => PrivateKey a -> ByteString -> ExceptT CryptoError IO (Signature a)
+sign' (PrivateKeyEd25519 pk k) msg = pure . SignatureEd25519 $ Ed25519.sign pk k msg
+sign' (PrivateKeyEd448 pk k) msg = pure . SignatureEd448 $ Ed448.sign pk k msg

-sign :: APrivateSignKey -> ByteString -> ASignature
-sign (APrivateSignKey a k) = ASignature a . sign' k
+sign :: APrivateSignKey -> ByteString -> ExceptT CryptoError IO ASignature
+sign (APrivateSignKey a k) = fmap (ASignature a) . sign' k

 -- | Signature verification.
 --
@@ -984,36 +852,16 @@ dh' (PublicKeyX448 k) (PrivateKeyX448 pk _) = DhSecretX448 $ X448.dh k pk

 -- | NaCl @crypto_box@ encrypt with a shared DH secret and 192-bit nonce.
 cbEncrypt :: DhSecret X25519 -> CbNonce -> ByteString -> Int -> Either CryptoError ByteString
-cbEncrypt (DhSecretX25519 secret) = sbEncrypt_ secret
-
-- | NaCl @secret_box@ encrypt with a symmetric 256-bit key and 192-bit nonce.
-sbEncrypt :: SbKey -> CbNonce -> ByteString -> Int -> Either CryptoError ByteString
-sbEncrypt (SbKey key) = sbEncrypt_ key
-
-sbEncrypt_ :: ByteArrayAccess key => key -> CbNonce -> ByteString -> Int -> Either CryptoError ByteString
-sbEncrypt_ secret (CbNonce nonce) msg paddedLen = cryptoBox secret nonce <$> pad msg paddedLen
-
-- | NaCl @crypto_box@ encrypt with a shared DH secret and 192-bit nonce.
-cbEncryptMaxLenBS :: KnownNat i => DhSecret X25519 -> CbNonce -> MaxLenBS i -> ByteString
-cbEncryptMaxLenBS (DhSecretX25519 secret) (CbNonce nonce) = cryptoBox secret nonce . unMaxLenBS . padMaxLenBS
-
-cryptoBox :: ByteArrayAccess key => key -> ByteString -> ByteString -> ByteString
-cryptoBox secret nonce s = BA.convert tag <> c
+cbEncrypt secret (CbNonce nonce) msg paddedLen = cryptoBox <$> pad msg paddedLen
  where
-    (rs, c) = xSalsa20 secret nonce s
-    tag = Poly1305.auth rs c
+    cryptoBox s = BA.convert tag <> c
+      where
+        (rs, c) = xSalsa20 secret nonce s
+        tag = Poly1305.auth rs c

 -- | NaCl @crypto_box@ decrypt with a shared DH secret and 192-bit nonce.
 cbDecrypt :: DhSecret X25519 -> CbNonce -> ByteString -> Either CryptoError ByteString
-cbDecrypt (DhSecretX25519 secret) = sbDecrypt_ secret
-
-- | NaCl @secret_box@ decrypt with a symmetric 256-bit key and 192-bit nonce.
-sbDecrypt :: SbKey -> CbNonce -> ByteString -> Either CryptoError ByteString
-sbDecrypt (SbKey key) = sbDecrypt_ key
-
-- | NaCl @crypto_box@ decrypt with a shared DH secret and 192-bit nonce.
-sbDecrypt_ :: ByteArrayAccess key => key -> CbNonce -> ByteString -> Either CryptoError ByteString
-sbDecrypt_ secret (CbNonce nonce) packet
+cbDecrypt secret (CbNonce nonce) packet
  | B.length packet < 16 = Left CBDecryptError
  | BA.constEq tag' tag = unPad msg
  | otherwise = Left CBDecryptError
@@ -1022,13 +870,8 @@ sbDecrypt_ secret (CbNonce nonce) packet
    (rs, msg) = xSalsa20 secret nonce c
    tag = Poly1305.auth rs c

-newtype CbNonce = CryptoBoxNonce {unCbNonce :: ByteString}
-  deriving (Eq, Show)
-
-pattern CbNonce :: ByteString -> CbNonce
-pattern CbNonce s <- CryptoBoxNonce s
-
-{-# COMPLETE CbNonce #-}
+newtype CbNonce = CbNonce {unCbNonce :: ByteString}
+  deriving (Show)

 instance StrEncoding CbNonce where
  strEncode (CbNonce s) = strEncode s
@@ -1038,74 +881,37 @@ instance ToJSON CbNonce where
  toJSON = strToJSON
  toEncoding = strToJEncoding

-instance FromJSON CbNonce where
-  parseJSON = strParseJSON "CbNonce"
-
-instance FromField CbNonce where fromField f = CryptoBoxNonce <$> fromField f
-
-instance ToField CbNonce where toField (CryptoBoxNonce s) = toField s
-
 cbNonce :: ByteString -> CbNonce
 cbNonce s
-  | len == 24 = CryptoBoxNonce s
-  | len > 24 = CryptoBoxNonce . fst $ B.splitAt 24 s
-  | otherwise = CryptoBoxNonce $ s <> B.replicate (24 - len) (toEnum 0)
+  | len == 24 = CbNonce s
+  | len > 24 = CbNonce . fst $ B.splitAt 24 s
+  | otherwise = CbNonce $ s <> B.replicate (24 - len) (toEnum 0)
  where
    len = B.length s

 randomCbNonce :: IO CbNonce
-randomCbNonce = CryptoBoxNonce <$> getRandomBytes 24
+randomCbNonce = CbNonce <$> getRandomBytes 24

 pseudoRandomCbNonce :: TVar ChaChaDRG -> STM CbNonce
-pseudoRandomCbNonce gVar = CryptoBoxNonce <$> pseudoRandomBytes 24 gVar
+pseudoRandomCbNonce gVar = CbNonce <$> pseudoRandomBytes 24 gVar

 pseudoRandomBytes :: Int -> TVar ChaChaDRG -> STM ByteString
-pseudoRandomBytes n gVar = stateTVar gVar $ randomBytesGenerate n
+pseudoRandomBytes n gVar = do
+  g <- readTVar gVar
+  let (bytes, g') = randomBytesGenerate n g
+  writeTVar gVar g'
+  return bytes

 instance Encoding CbNonce where
  smpEncode = unCbNonce
-  smpP = CryptoBoxNonce <$> A.take 24
+  smpP = CbNonce <$> A.take 24

-newtype SbKey = SecretBoxKey {unSbKey :: ByteString}
-  deriving (Eq, Show)
-
-pattern SbKey :: ByteString -> SbKey
-pattern SbKey s <- SecretBoxKey s
-
-{-# COMPLETE SbKey #-}
-
-instance StrEncoding SbKey where
-  strEncode (SbKey s) = strEncode s
-  strP = sbKey <$?> strP
-
-instance ToJSON SbKey where
-  toJSON = strToJSON
-  toEncoding = strToJEncoding
-
-instance FromJSON SbKey where
-  parseJSON = strParseJSON "SbKey"
-
-instance FromField SbKey where fromField f = SecretBoxKey <$> fromField f
-
-instance ToField SbKey where toField (SecretBoxKey s) = toField s
-
-sbKey :: ByteString -> Either String SbKey
-sbKey s
-  | B.length s == 32 = Right $ SecretBoxKey s
-  | otherwise = Left "SbKey: invalid length"
-
-unsafeSbKey :: ByteString -> SbKey
-unsafeSbKey s = either error id $ sbKey s
-
-randomSbKey :: IO SbKey
-randomSbKey = SecretBoxKey <$> getRandomBytes 32
-
-xSalsa20 :: ByteArrayAccess key => key -> ByteString -> ByteString -> (ByteString, ByteString)
-xSalsa20 secret nonce msg = (rs, msg')
+xSalsa20 :: DhSecret X25519 -> ByteString -> ByteString -> (ByteString, ByteString)
+xSalsa20 (DhSecretX25519 shared) nonce msg = (rs, msg')
  where
    zero = B.replicate 16 $ toEnum 0
    (iv0, iv1) = B.splitAt 8 nonce
-    state0 = XSalsa.initialize 20 secret (zero `B.append` iv0)
+    state0 = XSalsa.initialize 20 shared (zero `B.append` iv0)
    state1 = XSalsa.derive state0 iv1
    (rs, state2) = XSalsa.generate state1 32
    (msg', _) = XSalsa.combine state2 msg
@@ -1,211 +0,0 @@
-{-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE PatternSynonyms #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
-
-module Simplex.Messaging.Crypto.Lazy
-  ( sha256Hash,
-    sha512Hash,
-    pad,
-    unPad,
-    splitLen,
-    sbEncrypt,
-    sbDecrypt,
-    sbEncryptTailTag,
-    sbDecryptTailTag,
-    fastReplicate,
-    SbState,
-    cbInit,
-    sbInit,
-    sbEncryptChunk,
-    sbDecryptChunk,
-    sbEncryptChunkLazy,
-    sbDecryptChunkLazy,
-    sbAuth,
-    LazyByteString,
-  )
-where
-
-import qualified Crypto.Cipher.XSalsa as XSalsa
-import qualified Crypto.Error as CE
-import Crypto.Hash (Digest, hashlazy)
-import Crypto.Hash.Algorithms (SHA256, SHA512)
-import qualified Crypto.MAC.Poly1305 as Poly1305
-import Data.Bifunctor (first)
-import Data.ByteArray (ByteArrayAccess)
-import qualified Data.ByteArray as BA
-import qualified Data.ByteString as S
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import qualified Data.ByteString.Lazy.Char8 as LB
-import qualified Data.ByteString.Lazy.Internal as LB
-import Data.Composition ((.:.))
-import Data.Int (Int64)
-import Data.List.NonEmpty (NonEmpty (..))
-import Foreign (sizeOf)
-import Simplex.Messaging.Crypto (CbNonce, CryptoError (..), DhSecret (..), DhSecretX25519, SbKey, pattern CbNonce, pattern SbKey)
-import Simplex.Messaging.Encoding
-
-type LazyByteString = LB.ByteString
-
-- | SHA512 digest of a lazy bytestring.
-sha256Hash :: LazyByteString -> ByteString
-sha256Hash = BA.convert . (hashlazy :: LazyByteString -> Digest SHA256)
-
-- | SHA512 digest of a lazy bytestring.
-sha512Hash :: LazyByteString -> ByteString
-sha512Hash = BA.convert . (hashlazy :: LazyByteString -> Digest SHA512)
-
-- this function does not validate the length of the message to avoid consuming all chunks,
-- but if the passed string is longer it will truncate it to specified length
-pad :: LazyByteString -> Int64 -> Int64 -> Either CryptoError LazyByteString
-pad msg len paddedLen
-  | padLen >= 0 = Right $ LB.fromStrict encodedLen <> LB.take len msg <> fastReplicate padLen '#'
-  | otherwise = Left CryptoLargeMsgError
-  where
-    encodedLen = smpEncode len -- 8 bytes Int64 encoded length
-    padLen = paddedLen - len - 8
-
-fastReplicate :: Int64 -> Char -> LazyByteString
-fastReplicate n c
-  | n <= 0 = LB.empty
-  | n < chSize' = LB.fromStrict $ B.replicate (fromIntegral n) c
-  | otherwise = LB.fromChunks $ B.replicate (fromIntegral r) c : replicate (fromIntegral q) chPad
-  where
-    chSize = 65536 - 2 * sizeOf (undefined :: Int)
-    chPad = B.replicate chSize c
-    chSize' = fromIntegral chSize
-    (q, r) = quotRem n chSize'
-
-- this function does not validate the length of the message to avoid consuming all chunks,
-- so it can return a shorter string than expected
-unPad :: LazyByteString -> Either CryptoError LazyByteString
-unPad = fmap snd . splitLen
-
-splitLen :: LazyByteString -> Either CryptoError (Int64, LazyByteString)
-splitLen padded
-  | LB.length lenStr == 8 = case smpDecode $ LB.toStrict lenStr of
-    Right len
-      | len < 0 -> Left CryptoInvalidMsgError
-      | otherwise -> Right (len, LB.take len rest)
-    Left _ -> Left CryptoInvalidMsgError
-  | otherwise = Left CryptoInvalidMsgError
-  where
-    (lenStr, rest) = LB.splitAt 8 padded
-
-- | NaCl @secret_box@ lazy encrypt with a symmetric 256-bit key and 192-bit nonce.
-- The resulting string will be bigger than paddedLen by the size of the auth tag (16 bytes).
-sbEncrypt :: SbKey -> CbNonce -> LazyByteString -> Int64 -> Int64 -> Either CryptoError LazyByteString
-sbEncrypt (SbKey key) (CbNonce nonce) msg len paddedLen =
-  prependTag <$> (secretBox sbEncryptChunk key nonce =<< pad msg len paddedLen)
-  where
-    prependTag (tag :| cs) = LB.Chunk tag $ LB.fromChunks cs
-
-- | NaCl @secret_box@ decrypt with a symmetric 256-bit key and 192-bit nonce.
-- The resulting string will be smaller than packet size by the size of the auth tag (16 bytes).
-sbDecrypt :: SbKey -> CbNonce -> LazyByteString -> Either CryptoError LazyByteString
-sbDecrypt (SbKey key) (CbNonce nonce) packet
-  | LB.length tag' < 16 = Left CBDecryptError
-  | otherwise = case secretBox sbDecryptChunk key nonce c of
-    Right (tag :| cs)
-      | BA.constEq (LB.toStrict tag') tag -> unPad $ LB.fromChunks cs
-      | otherwise -> Left CBDecryptError
-    Left e -> Left e
-  where
-    (tag', c) = LB.splitAt 16 packet
-
-secretBox :: ByteArrayAccess key => (SbState -> ByteString -> (ByteString, SbState)) -> key -> ByteString -> LazyByteString -> Either CryptoError (NonEmpty ByteString)
-secretBox sbProcess secret nonce msg = run <$> sbInit_ secret nonce
-  where
-    run state =
-      let (!cs, !state') = secretBoxLazy_ sbProcess state msg
-       in BA.convert (sbAuth state') :| reverse cs
-
-- | NaCl @secret_box@ lazy encrypt with a symmetric 256-bit key and 192-bit nonce with appended auth tag (more efficient with large files).
-sbEncryptTailTag :: SbKey -> CbNonce -> LazyByteString -> Int64 -> Int64 -> Either CryptoError LazyByteString
-sbEncryptTailTag (SbKey key) (CbNonce nonce) msg len paddedLen =
-  LB.fromChunks <$> (secretBoxTailTag sbEncryptChunk key nonce =<< pad msg len paddedLen)
-
-- | NaCl @secret_box@ decrypt with a symmetric 256-bit key and 192-bit nonce with appended auth tag (more efficient with large files).
-- paddedLen should NOT include the tag length, it should be the same number that is passed to sbEncrypt / sbEncryptTailTag.
-sbDecryptTailTag :: SbKey -> CbNonce -> Int64 -> LazyByteString -> Either CryptoError (Bool, LazyByteString)
-sbDecryptTailTag (SbKey key) (CbNonce nonce) paddedLen packet =
-  case secretBox sbDecryptChunk key nonce c of
-    Right (tag :| cs) ->
-      let valid = LB.length tag' == 16 && BA.constEq (LB.toStrict tag') tag
-       in (valid,) <$> unPad (LB.fromChunks cs)
-    Left e -> Left e
-  where
-    (c, tag') = LB.splitAt paddedLen packet
-
-secretBoxTailTag :: ByteArrayAccess key => (SbState -> ByteString -> (ByteString, SbState)) -> key -> ByteString -> LazyByteString -> Either CryptoError [ByteString]
-secretBoxTailTag sbProcess secret nonce msg = run <$> sbInit_ secret nonce
-  where
-    run state =
-      let (cs, state') = secretBoxLazy_ sbProcess state msg
-       in reverse $ BA.convert (sbAuth state') : cs
-
-- passes lazy bytestring via initialized secret box returning the reversed list of chunks
-secretBoxLazy_ :: (SbState -> ByteString -> (ByteString, SbState)) -> SbState -> LazyByteString -> ([ByteString], SbState)
-secretBoxLazy_ sbProcess state = foldlChunks update ([], state)
-  where
-    update (cs, st) chunk = let (!c, !st') = sbProcess st chunk in (c : cs, st')
-
-type SbState = (XSalsa.State, Poly1305.State)
-
-cbInit :: DhSecretX25519 -> CbNonce -> Either CryptoError SbState
-cbInit (DhSecretX25519 secret) (CbNonce nonce) = sbInit_ secret nonce
-{-# INLINE cbInit #-}
-
-sbInit :: SbKey -> CbNonce -> Either CryptoError SbState
-sbInit (SbKey secret) (CbNonce nonce) = sbInit_ secret nonce
-{-# INLINE sbInit #-}
-
-sbInit_ :: ByteArrayAccess key => key -> ByteString -> Either CryptoError SbState
-sbInit_ secret nonce = (state2,) <$> cryptoPassed (Poly1305.initialize rs)
-  where
-    zero = B.replicate 16 $ toEnum 0
-    (iv0, iv1) = B.splitAt 8 nonce
-    state0 = XSalsa.initialize 20 secret (zero `B.append` iv0)
-    state1 = XSalsa.derive state0 iv1
-    (rs :: ByteString, state2) = XSalsa.generate state1 32
-
-sbEncryptChunkLazy :: SbState -> LazyByteString -> (LazyByteString, SbState)
-sbEncryptChunkLazy = sbProcessChunkLazy_ sbEncryptChunk
-
-sbDecryptChunkLazy :: SbState -> LazyByteString -> (LazyByteString, SbState)
-sbDecryptChunkLazy = sbProcessChunkLazy_ sbDecryptChunk
-
-sbProcessChunkLazy_ :: (SbState -> ByteString -> (ByteString, SbState)) -> SbState -> LazyByteString -> (LazyByteString, SbState)
-sbProcessChunkLazy_ = first (LB.fromChunks . reverse) .:. secretBoxLazy_
-{-# INLINE sbProcessChunkLazy_ #-}
-
-sbEncryptChunk :: SbState -> ByteString -> (ByteString, SbState)
-sbEncryptChunk (st, authSt) chunk =
-  let (!c, !st') = XSalsa.combine st chunk
-      !authSt' = Poly1305.update authSt c
-   in (c, (st', authSt'))
-
-sbDecryptChunk :: SbState -> ByteString -> (ByteString, SbState)
-sbDecryptChunk (st, authSt) chunk =
-  let (!s, !st') = XSalsa.combine st chunk
-      !authSt' = Poly1305.update authSt chunk
-   in (s, (st', authSt'))
-
-sbAuth :: SbState -> Poly1305.Auth
-sbAuth = Poly1305.finalize . snd
-
-cryptoPassed :: CE.CryptoFailable b -> Either CryptoError b
-cryptoPassed = \case
-  CE.CryptoPassed a -> Right a
-  CE.CryptoFailed e -> Left $ CryptoPoly1305Error e
-
-foldlChunks :: (a -> S.ByteString -> a) -> a -> LazyByteString -> a
-foldlChunks f = go
-  where
-    go !a LB.Empty = a
-    go !a (LB.Chunk c cs) = go (f a c) cs
-{-# INLINE foldlChunks #-}
@@ -41,11 +41,11 @@ import Simplex.Messaging.Parsers (blobFieldDecoder, parseE, parseE')
 import Simplex.Messaging.Util (tryE)
 import Simplex.Messaging.Version

-currentE2EEncryptVersion :: Version
-currentE2EEncryptVersion = 2
+e2eEncryptVersion :: Version
+e2eEncryptVersion = 1

-supportedE2EEncryptVRange :: VersionRange
-supportedE2EEncryptVRange = mkVersionRange 1 currentE2EEncryptVersion
+e2eEncryptVRange :: VersionRange
+e2eEncryptVRange = mkVersionRange 1 e2eEncryptVersion

 data E2ERatchetParams (a :: Algorithm)
  = E2ERatchetParams Version (PublicKey a) (PublicKey a)
@@ -96,27 +96,20 @@ data RatchetInitParams = RatchetInitParams
  deriving (Eq, Show)

 x3dhSnd :: DhAlgorithm a => PrivateKey a -> PrivateKey a -> E2ERatchetParams a -> RatchetInitParams
-x3dhSnd spk1 spk2 (E2ERatchetParams v rk1 rk2) =
-  x3dh v (publicKey spk1, rk1) (dh' rk1 spk2) (dh' rk2 spk1) (dh' rk2 spk2)
+x3dhSnd spk1 spk2 (E2ERatchetParams _ rk1 rk2) =
+  x3dh (publicKey spk1, rk1) (dh' rk1 spk2) (dh' rk2 spk1) (dh' rk2 spk2)

 x3dhRcv :: DhAlgorithm a => PrivateKey a -> PrivateKey a -> E2ERatchetParams a -> RatchetInitParams
-x3dhRcv rpk1 rpk2 (E2ERatchetParams v sk1 sk2) =
-  x3dh v (sk1, publicKey rpk1) (dh' sk2 rpk1) (dh' sk1 rpk2) (dh' sk2 rpk2)
+x3dhRcv rpk1 rpk2 (E2ERatchetParams _ sk1 sk2) =
+  x3dh (sk1, publicKey rpk1) (dh' sk2 rpk1) (dh' sk1 rpk2) (dh' sk2 rpk2)

-x3dh :: DhAlgorithm a => Version -> (PublicKey a, PublicKey a) -> DhSecret a -> DhSecret a -> DhSecret a -> RatchetInitParams
-x3dh v (sk1, rk1) dh1 dh2 dh3 =
+x3dh :: DhAlgorithm a => (PublicKey a, PublicKey a) -> DhSecret a -> DhSecret a -> DhSecret a -> RatchetInitParams
+x3dh (sk1, rk1) dh1 dh2 dh3 =
  RatchetInitParams {assocData, ratchetKey = RatchetKey sk, sndHK = Key hk, rcvNextHK = Key nhk}
  where
    assocData = Str $ pubKeyBytes sk1 <> pubKeyBytes rk1
-    dhs = dhBytes' dh1 <> dhBytes' dh2 <> dhBytes' dh3
-    (hk, nhk, sk)
-      -- for backwards compatibility with clients using agent version before 3.4.0
-      | v == 1 =
-        let (hk', rest) = B.splitAt 32 dhs
-         in uncurry (hk',,) $ B.splitAt 32 rest
-      | otherwise =
-        let salt = B.replicate 64 '\0'
-         in hkdf3 salt dhs "SimpleXX3DH"
+    (hk, rest) = B.splitAt 32 $ dhBytes' dh1 <> dhBytes' dh2 <> dhBytes' dh3
+    (nhk, sk) = B.splitAt 32 rest

 type RatchetX448 = Ratchet 'X448

@@ -217,12 +210,12 @@ instance FromField MessageKey where fromField = blobFieldDecoder smpDecode
 -- Please note that sPKey is not stored, and its public part together with random salt
 -- is sent to the recipient.
 initSndRatchet ::
-  forall a. (AlgorithmI a, DhAlgorithm a) => VersionRange -> PublicKey a -> PrivateKey a -> RatchetInitParams -> Ratchet a
-initSndRatchet rcVersion rcDHRr rcDHRs RatchetInitParams {assocData, ratchetKey, sndHK, rcvNextHK} = do
+  forall a. (AlgorithmI a, DhAlgorithm a) => PublicKey a -> PrivateKey a -> RatchetInitParams -> Ratchet a
+initSndRatchet rcDHRr rcDHRs RatchetInitParams {assocData, ratchetKey, sndHK, rcvNextHK} = do
  -- state.RK, state.CKs, state.NHKs = KDF_RK_HE(SK, DH(state.DHRs, state.DHRr))
  let (rcRK, rcCKs, rcNHKs) = rootKdf ratchetKey rcDHRr rcDHRs
   in Ratchet
-        { rcVersion,
+        { rcVersion = e2eEncryptVRange,
          rcAD = assocData,
          rcDHRs,
          rcRK,
@@ -240,10 +233,10 @@ initSndRatchet rcVersion rcDHRr rcDHRs RatchetInitParams {assocData, ratchetKey,
 -- Please note that the public part of rcDHRs was sent to the sender
 -- as part of the connection request and random salt was received from the sender.
 initRcvRatchet ::
-  forall a. (AlgorithmI a, DhAlgorithm a) => VersionRange -> PrivateKey a -> RatchetInitParams -> Ratchet a
-initRcvRatchet rcVersion rcDHRs RatchetInitParams {assocData, ratchetKey, sndHK, rcvNextHK} =
+  forall a. (AlgorithmI a, DhAlgorithm a) => PrivateKey a -> RatchetInitParams -> Ratchet a
+initRcvRatchet rcDHRs RatchetInitParams {assocData, ratchetKey, sndHK, rcvNextHK} =
  Ratchet
-    { rcVersion,
+    { rcVersion = e2eEncryptVRange,
      rcAD = assocData,
      rcDHRs,
      rcRK = ratchetKey,
@@ -423,9 +416,9 @@ rcDecrypt rc@Ratchet {rcRcv, rcAD = Str rcAD} rcMKSkipped msg' = do
    skipMessageKeys :: Word32 -> Ratchet a -> Either CryptoError (Ratchet a, SkippedMsgKeys)
    skipMessageKeys _ r@Ratchet {rcRcv = Nothing} = Right (r, M.empty)
    skipMessageKeys untilN r@Ratchet {rcRcv = Just rr@RcvRatchet {rcCKr, rcHKr}, rcNr}
-      | rcNr > untilN + 1 = Left $ CERatchetEarlierMessage (rcNr - untilN - 1)
+      | rcNr > untilN + 1 = Left CERatchetEarlierMessage
      | rcNr == untilN + 1 = Left CERatchetDuplicateMessage
-      | rcNr + maxSkip < untilN = Left $ CERatchetTooManySkipped (untilN + 1 - rcNr)
+      | rcNr + maxSkip < untilN = Left CERatchetTooManySkipped
      | rcNr == untilN = Right (r, M.empty)
      | otherwise =
        let (rcCKr', rcNr', mks) = advanceRcvRatchet (untilN - rcNr) rcCKr rcNr M.empty
@@ -472,6 +465,7 @@ rcDecrypt rc@Ratchet {rcRcv, rcAD = Str rcAD} rcMKSkipped msg' = do
    decryptMessage :: MessageKey -> EncRatchetMessage -> ExceptT CryptoError IO (Either CryptoError ByteString)
    decryptMessage (MessageKey mk iv) EncRatchetMessage {emHeader, emBody, emAuthTag} =
      -- DECRYPT(mk, cipher-text, CONCAT(AD, enc_header))
+      -- TODO add associated data
      tryE $ decryptAEAD mk iv (rcAD <> emHeader) emBody emAuthTag

 rootKdf :: (AlgorithmI a, DhAlgorithm a) => RatchetKey -> PublicKey a -> PrivateKey a -> (RatchetKey, RatchetKey, Key)
@@ -13,7 +13,6 @@ module Simplex.Messaging.Encoding
    Large (..),
    smpEncodeList,
    smpListP,
-    lenEncode,
  )
 where

@@ -198,9 +197,3 @@ instance (Encoding a, Encoding b, Encoding c, Encoding d, Encoding e, Encoding f
  {-# INLINE smpEncode #-}
  smpP = (,,,,,,) <$> smpP <*> smpP <*> smpP <*> smpP <*> smpP <*> smpP <*> smpP
  {-# INLINE smpP #-}
-
-instance (Encoding a, Encoding b, Encoding c, Encoding d, Encoding e, Encoding f, Encoding g, Encoding h) => Encoding (a, b, c, d, e, f, g, h) where
-  smpEncode (a, b, c, d, e, f, g, h) = smpEncode a <> smpEncode b <> smpEncode c <> smpEncode d <> smpEncode e <> smpEncode f <> smpEncode g <> smpEncode h
-  {-# INLINE smpEncode #-}
-  smpP = (,,,,,,,) <$> smpP <*> smpP <*> smpP <*> smpP <*> smpP <*> smpP <*> smpP <*> smpP
-  {-# INLINE smpP #-}
@@ -6,7 +6,6 @@ module Simplex.Messaging.Encoding.String
    StrEncoding (..),
    Str (..),
    strP_,
-    _strP,
    strToJSON,
    strToJEncoding,
    strParseJSON,
@@ -29,14 +28,10 @@ import qualified Data.ByteString.Char8 as B
 import Data.Char (isAlphaNum)
 import Data.Int (Int64)
 import qualified Data.List.NonEmpty as L
-import Data.Set (Set)
-import qualified Data.Set as S
 import Data.Text (Text)
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
-import Data.Time.Clock (UTCTime)
 import Data.Time.Clock.System (SystemTime (..))
-import Data.Time.Format.ISO8601
-import Data.Word (Word16, Word32)
+import Data.Word (Word16)
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Parsers (parseAll)
 import Simplex.Messaging.Util ((<$?>))
@@ -75,10 +70,6 @@ instance StrEncoding Str where
  strEncode = unStr
  strP = Str <$> A.takeTill (== ' ') <* optional A.space

-instance StrEncoding String where
-  strEncode = strEncode . B.pack
-  strP = B.unpack <$> strP
-
 instance ToJSON Str where
  toJSON (Str s) = strToJSON s
  toEncoding (Str s) = strToJEncoding s
@@ -98,16 +89,10 @@ instance StrEncoding Word16 where
  strP = A.decimal
  {-# INLINE strP #-}

-instance StrEncoding Word32 where
-  strEncode = B.pack . show
-  {-# INLINE strEncode #-}
-  strP = A.decimal
-  {-# INLINE strP #-}
-
 instance StrEncoding Char where
  strEncode = smpEncode
  {-# INLINE strEncode #-}
-  strP = smpP
+  strP = strP
  {-# INLINE strP #-}

 instance StrEncoding Bool where
@@ -116,26 +101,14 @@ instance StrEncoding Bool where
  strP = smpP
  {-# INLINE strP #-}

-instance StrEncoding Int where
-  strEncode = B.pack . show
-  {-# INLINE strEncode #-}
-  strP = A.decimal
-  {-# INLINE strP #-}
-
 instance StrEncoding Int64 where
  strEncode = B.pack . show
-  {-# INLINE strEncode #-}
  strP = A.decimal
-  {-# INLINE strP #-}

 instance StrEncoding SystemTime where
  strEncode = strEncode . systemSeconds
  strP = MkSystemTime <$> strP <*> pure 0

-instance StrEncoding UTCTime where
-  strEncode = B.pack . iso8601Show
-  strP = maybe (Left "bad UTCTime") Right . iso8601ParseM . B.unpack <$?> A.takeTill (\c -> c == ' ' || c == '\n')
-
 -- lists encode/parse as comma-separated strings
 strEncodeList :: StrEncoding a => [a] -> ByteString
 strEncodeList = B.intercalate "," . map strEncode
@@ -148,12 +121,8 @@ instance StrEncoding a => StrEncoding (L.NonEmpty a) where
  strEncode = strEncodeList . L.toList
  strP = L.fromList <$> listItem `A.sepBy1'` A.char ','

-instance (StrEncoding a, Ord a) => StrEncoding (Set a) where
-  strEncode = strEncodeList . S.toList
-  strP = S.fromList <$> listItem `A.sepBy'` A.char ','
-
 listItem :: StrEncoding a => Parser a
-listItem = parseAll strP <$?> A.takeTill (\c -> c == ',' || c == ' ' || c == '\n')
+listItem = parseAll strP <$?> A.takeTill (== ',')

 instance (StrEncoding a, StrEncoding b) => StrEncoding (a, b) where
  strEncode (a, b) = B.unwords [strEncode a, strEncode b]
@@ -182,9 +151,6 @@ instance (StrEncoding a, StrEncoding b, StrEncoding c, StrEncoding d, StrEncodin
 strP_ :: StrEncoding a => Parser a
 strP_ = strP <* A.space

-_strP :: StrEncoding a => Parser a
-_strP = A.space *> strP
-
 strToJSON :: StrEncoding a => a -> J.Value
 strToJSON = J.String . decodeLatin1 . strEncode

@@ -1,67 +1,229 @@
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}

 module Simplex.Messaging.Notifications.Client where

 import Control.Monad.Except
 import Control.Monad.Trans.Except
+import qualified Data.Attoparsec.ByteString.Char8 as A
+import Data.Text.Encoding (decodeLatin1, encodeUtf8)
+import Data.Time (UTCTime)
 import Data.Word (Word16)
+import Database.SQLite.Simple.FromField (FromField (..))
+import Database.SQLite.Simple.ToField (ToField (..))
+import Simplex.Messaging.Agent.Protocol (ConnId)
 import Simplex.Messaging.Client
 import qualified Simplex.Messaging.Crypto as C
+import Simplex.Messaging.Encoding
 import Simplex.Messaging.Notifications.Protocol
-import Simplex.Messaging.Protocol (ErrorType)
-import Simplex.Messaging.Util (bshow)
+import Simplex.Messaging.Parsers (blobFieldDecoder, fromTextField_)
+import Simplex.Messaging.Protocol (NotifierId, ProtocolServer, SMPServer)

-type NtfClient = ProtocolClient ErrorType NtfResponse
+type NtfServer = ProtocolServer

-type NtfClientError = ProtocolClientError ErrorType
+type NtfClient = ProtocolClient NtfResponse

-ntfRegisterToken :: NtfClient -> C.APrivateSignKey -> NewNtfEntity 'Token -> ExceptT NtfClientError IO (NtfTokenId, C.PublicKeyX25519)
+ntfRegisterToken :: NtfClient -> C.APrivateSignKey -> NewNtfEntity 'Token -> ExceptT ProtocolClientError IO (NtfTokenId, C.PublicKeyX25519)
 ntfRegisterToken c pKey newTkn =
  sendNtfCommand c (Just pKey) "" (TNEW newTkn) >>= \case
    NRTknId tknId dhKey -> pure (tknId, dhKey)
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse

-ntfVerifyToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> NtfRegCode -> ExceptT NtfClientError IO ()
+ntfVerifyToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> NtfRegCode -> ExceptT ProtocolClientError IO ()
 ntfVerifyToken c pKey tknId code = okNtfCommand (TVFY code) c pKey tknId

-ntfCheckToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> ExceptT NtfClientError IO NtfTknStatus
+ntfCheckToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> ExceptT ProtocolClientError IO NtfTknStatus
 ntfCheckToken c pKey tknId =
  sendNtfCommand c (Just pKey) tknId TCHK >>= \case
    NRTkn stat -> pure stat
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse

-ntfReplaceToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> DeviceToken -> ExceptT NtfClientError IO ()
-ntfReplaceToken c pKey tknId token = okNtfCommand (TRPL token) c pKey tknId
-
-ntfDeleteToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> ExceptT NtfClientError IO ()
+ntfDeleteToken :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> ExceptT ProtocolClientError IO ()
 ntfDeleteToken = okNtfCommand TDEL

-ntfEnableCron :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> Word16 -> ExceptT NtfClientError IO ()
+ntfEnableCron :: NtfClient -> C.APrivateSignKey -> NtfTokenId -> Word16 -> ExceptT ProtocolClientError IO ()
 ntfEnableCron c pKey tknId int = okNtfCommand (TCRN int) c pKey tknId

-ntfCreateSubscription :: NtfClient -> C.APrivateSignKey -> NewNtfEntity 'Subscription -> ExceptT NtfClientError IO NtfSubscriptionId
+ntfCreateSubscription :: NtfClient -> C.APrivateSignKey -> NewNtfEntity 'Subscription -> ExceptT ProtocolClientError IO NtfSubscriptionId
 ntfCreateSubscription c pKey newSub =
  sendNtfCommand c (Just pKey) "" (SNEW newSub) >>= \case
    NRSubId subId -> pure subId
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse

-ntfCheckSubscription :: NtfClient -> C.APrivateSignKey -> NtfSubscriptionId -> ExceptT NtfClientError IO NtfSubStatus
+ntfCheckSubscription :: NtfClient -> C.APrivateSignKey -> NtfSubscriptionId -> ExceptT ProtocolClientError IO NtfSubStatus
 ntfCheckSubscription c pKey subId =
  sendNtfCommand c (Just pKey) subId SCHK >>= \case
    NRSub stat -> pure stat
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse

-ntfDeleteSubscription :: NtfClient -> C.APrivateSignKey -> NtfSubscriptionId -> ExceptT NtfClientError IO ()
+ntfDeleteSubscription :: NtfClient -> C.APrivateSignKey -> NtfSubscriptionId -> ExceptT ProtocolClientError IO ()
 ntfDeleteSubscription = okNtfCommand SDEL

 -- | Send notification server command
-sendNtfCommand :: NtfEntityI e => NtfClient -> Maybe C.APrivateSignKey -> NtfEntityId -> NtfCommand e -> ExceptT NtfClientError IO NtfResponse
+sendNtfCommand :: NtfEntityI e => NtfClient -> Maybe C.APrivateSignKey -> NtfEntityId -> NtfCommand e -> ExceptT ProtocolClientError IO NtfResponse
 sendNtfCommand c pKey entId cmd = sendProtocolCommand c pKey entId (NtfCmd sNtfEntity cmd)

-okNtfCommand :: NtfEntityI e => NtfCommand e -> NtfClient -> C.APrivateSignKey -> NtfEntityId -> ExceptT NtfClientError IO ()
+okNtfCommand :: NtfEntityI e => NtfCommand e -> NtfClient -> C.APrivateSignKey -> NtfEntityId -> ExceptT ProtocolClientError IO ()
 okNtfCommand cmd c pKey entId =
  sendNtfCommand c (Just pKey) entId cmd >>= \case
    NROk -> return ()
-    r -> throwE . PCEUnexpectedResponse $ bshow r
+    _ -> throwE PCEUnexpectedResponse
+
+data NtfTknAction
+  = NTARegister
+  | NTAVerify NtfRegCode -- code to verify token
+  | NTACheck
+  | NTACron Word16
+  | NTADelete
+  deriving (Show)
+
+instance Encoding NtfTknAction where
+  smpEncode = \case
+    NTARegister -> "R"
+    NTAVerify code -> smpEncode ('V', code)
+    NTACheck -> "C"
+    NTACron interval -> smpEncode ('I', interval)
+    NTADelete -> "D"
+  smpP =
+    A.anyChar >>= \case
+      'R' -> pure NTARegister
+      'V' -> NTAVerify <$> smpP
+      'C' -> pure NTACheck
+      'I' -> NTACron <$> smpP
+      'D' -> pure NTADelete
+      _ -> fail "bad NtfTknAction"
+
+instance FromField NtfTknAction where fromField = blobFieldDecoder smpDecode
+
+instance ToField NtfTknAction where toField = toField . smpEncode
+
+data NtfToken = NtfToken
+  { deviceToken :: DeviceToken,
+    ntfServer :: NtfServer,
+    ntfTokenId :: Maybe NtfTokenId,
+    -- | key used by the ntf server to verify transmissions
+    ntfPubKey :: C.APublicVerifyKey,
+    -- | key used by the ntf client to sign transmissions
+    ntfPrivKey :: C.APrivateSignKey,
+    -- | client's DH keys (to repeat registration if necessary)
+    ntfDhKeys :: C.KeyPair 'C.X25519,
+    -- | shared DH secret used to encrypt/decrypt notifications e2e
+    ntfDhSecret :: Maybe C.DhSecretX25519,
+    -- | token status
+    ntfTknStatus :: NtfTknStatus,
+    -- | pending token action and the earliest time
+    ntfTknAction :: Maybe NtfTknAction
+  }
+  deriving (Show)
+
+newNtfToken :: DeviceToken -> NtfServer -> C.ASignatureKeyPair -> C.KeyPair 'C.X25519 -> NtfToken
+newNtfToken deviceToken ntfServer (ntfPubKey, ntfPrivKey) ntfDhKeys =
+  NtfToken
+    { deviceToken,
+      ntfServer,
+      ntfTokenId = Nothing,
+      ntfPubKey,
+      ntfPrivKey,
+      ntfDhKeys,
+      ntfDhSecret = Nothing,
+      ntfTknStatus = NTNew,
+      ntfTknAction = Just NTARegister
+    }
+
+data NtfSubOrSMPAction = NtfSubAction NtfSubAction | NtfSubSMPAction NtfSubSMPAction
+
+data NtfSubAction
+  = NSACreate
+  | NSACheck
+  | NSADelete
+  deriving (Show)
+
+instance Encoding NtfSubAction where
+  smpEncode = \case
+    NSACreate -> "N"
+    NSACheck -> "C"
+    NSADelete -> "D"
+  smpP =
+    A.anyChar >>= \case
+      'N' -> pure NSACreate
+      'C' -> pure NSACheck
+      'D' -> pure NSADelete
+      _ -> fail "bad NtfSubAction"
+
+instance FromField NtfSubAction where fromField = blobFieldDecoder smpDecode
+
+instance ToField NtfSubAction where toField = toField . smpEncode
+
+data NtfSubSMPAction
+  = NSAKey
+  deriving (Show)
+
+instance Encoding NtfSubSMPAction where
+  smpEncode = \case
+    NSAKey -> "K"
+  smpP =
+    A.anyChar >>= \case
+      'K' -> pure NSAKey
+      _ -> fail "bad NtfSubSMPAction"
+
+instance FromField NtfSubSMPAction where fromField = blobFieldDecoder smpDecode
+
+instance ToField NtfSubSMPAction where toField = toField . smpEncode
+
+data NtfAgentSubStatus
+  = -- | subscription started
+    NASNew
+  | -- | state after NKEY - notifier ID is assigned to queue on SMP server
+    NASKey
+  | -- | state after SNEW - subscription created on notification server
+    NASCreated NtfSubStatus
+  | -- | state after SDEL (subscription is deleted on notification server)
+    NASDeleted
+  deriving (Eq, Show)
+
+instance Encoding NtfAgentSubStatus where
+  smpEncode = \case
+    NASNew -> "NEW"
+    NASKey -> "KEY"
+    NASCreated status -> "CREATED " <> smpEncode status
+    NASDeleted -> "DELETED"
+  smpP =
+    A.takeTill (== ' ') >>= \case
+      "NEW" -> pure NASNew
+      "KEY" -> pure NASKey
+      "CREATED" -> do
+        _ <- A.space
+        NASCreated <$> smpP
+      "DELETED" -> pure NASDeleted
+      _ -> fail "bad NtfAgentSubStatus"
+
+instance FromField NtfAgentSubStatus where fromField = fromTextField_ $ either (const Nothing) Just . smpDecode . encodeUtf8
+
+instance ToField NtfAgentSubStatus where toField = toField . decodeLatin1 . smpEncode
+
+data NtfSubscription = NtfSubscription
+  { connId :: ConnId,
+    smpServer :: SMPServer,
+    ntfQueueId :: Maybe NotifierId,
+    ntfServer :: NtfServer,
+    ntfSubId :: Maybe NtfSubscriptionId,
+    ntfSubStatus :: NtfAgentSubStatus,
+    ntfSubActionTs :: UTCTime
+  }
+  deriving (Show)
+
+newNtfSubscription :: ConnId -> SMPServer -> Maybe NotifierId -> NtfServer -> NtfAgentSubStatus -> UTCTime -> NtfSubscription
+newNtfSubscription connId smpServer ntfQueueId ntfServer ntfSubStatus ntfSubActionTs =
+  NtfSubscription
+    { connId,
+      smpServer,
+      ntfQueueId,
+      ntfServer,
+      ntfSubId = Nothing,
+      ntfSubStatus,
+      ntfSubActionTs
+    }
@@ -1,7 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -11,7 +10,7 @@

 module Simplex.Messaging.Notifications.Protocol where

-import Data.Aeson (FromJSON (..), ToJSON (..), (.=))
+import Data.Aeson (FromJSON (..), ToJSON (..))
 import qualified Data.Aeson as J
 import qualified Data.Aeson.Encoding as JE
 import qualified Data.Attoparsec.ByteString.Char8 as A
@@ -24,14 +23,13 @@ import Data.Type.Equality
 import Data.Word (Word16)
 import Database.SQLite.Simple.FromField (FromField (..))
 import Database.SQLite.Simple.ToField (ToField (..))
-import Simplex.Messaging.Agent.Protocol (updateSMPServerHosts)
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Notifications.Transport (ntfClientHandshake)
 import Simplex.Messaging.Parsers (fromTextField_)
 import Simplex.Messaging.Protocol hiding (Command (..), CommandTag (..))
-import Simplex.Messaging.Util (eitherToMaybe, (<$?>))
+import Simplex.Messaging.Util ((<$?>))

 data NtfEntity = Token | Subscription
  deriving (Show)
@@ -57,7 +55,6 @@ data NtfCommandTag (e :: NtfEntity) where
  TNEW_ :: NtfCommandTag 'Token
  TVFY_ :: NtfCommandTag 'Token
  TCHK_ :: NtfCommandTag 'Token
-  TRPL_ :: NtfCommandTag 'Token
  TDEL_ :: NtfCommandTag 'Token
  TCRN_ :: NtfCommandTag 'Token
  SNEW_ :: NtfCommandTag 'Subscription
@@ -74,7 +71,6 @@ instance NtfEntityI e => Encoding (NtfCommandTag e) where
    TNEW_ -> "TNEW"
    TVFY_ -> "TVFY"
    TCHK_ -> "TCHK"
-    TRPL_ -> "TRPL"
    TDEL_ -> "TDEL"
    TCRN_ -> "TCRN"
    SNEW_ -> "SNEW"
@@ -92,7 +88,6 @@ instance ProtocolMsgTag NtfCmdTag where
    "TNEW" -> Just $ NCT SToken TNEW_
    "TVFY" -> Just $ NCT SToken TVFY_
    "TCHK" -> Just $ NCT SToken TCHK_
-    "TRPL" -> Just $ NCT SToken TRPL_
    "TDEL" -> Just $ NCT SToken TDEL_
    "TCRN" -> Just $ NCT SToken TCRN_
    "SNEW" -> Just $ NCT SSubscription SNEW_
@@ -147,9 +142,8 @@ instance Encoding ANewNtfEntity where
      'S' -> ANE SSubscription <$> (NewNtfSub <$> smpP <*> smpP <*> smpP)
      _ -> fail "bad ANewNtfEntity"

-instance Protocol ErrorType NtfResponse where
-  type ProtoCommand NtfResponse = NtfCmd
-  type ProtoType NtfResponse = 'PNTF
+instance Protocol NtfResponse where
+  type ProtocolCommand NtfResponse = NtfCmd
  protocolClientHandshake = ntfClientHandshake
  protocolPing = NtfCmd SSubscription PING
  protocolError = \case
@@ -163,8 +157,6 @@ data NtfCommand (e :: NtfEntity) where
  TVFY :: NtfRegCode -> NtfCommand 'Token
  -- | check token status
  TCHK :: NtfCommand 'Token
-  -- | replace device token (while keeping all existing subscriptions)
-  TRPL :: DeviceToken -> NtfCommand 'Token
  -- | delete token - all subscriptions will be removed and no more notifications will be sent
  TDEL :: NtfCommand 'Token
  -- | enable periodic background notification to fetch the new messages - interval is in minutes, minimum is 20, 0 to disable
@@ -184,13 +176,12 @@ data NtfCmd = forall e. NtfEntityI e => NtfCmd (SNtfEntity e) (NtfCommand e)

 deriving instance Show NtfCmd

-instance NtfEntityI e => ProtocolEncoding ErrorType (NtfCommand e) where
+instance NtfEntityI e => ProtocolEncoding (NtfCommand e) where
  type Tag (NtfCommand e) = NtfCommandTag e
  encodeProtocol _v = \case
    TNEW newTkn -> e (TNEW_, ' ', newTkn)
    TVFY code -> e (TVFY_, ' ', code)
    TCHK -> e TCHK_
-    TRPL tkn -> e (TRPL_, ' ', tkn)
    TDEL -> e TDEL_
    TCRN int -> e (TCRN_, ' ', int)
    SNEW newSub -> e (SNEW_, ' ', newSub)
@@ -203,9 +194,6 @@ instance NtfEntityI e => ProtocolEncoding ErrorType (NtfCommand e) where

  protocolP _v tag = (\(NtfCmd _ c) -> checkEntity c) <$?> protocolP _v (NCT (sNtfEntity @e) tag)

-  fromProtocolError = fromProtocolError @ErrorType @NtfResponse
-  {-# INLINE fromProtocolError #-}
-
  checkCredentials (sig, _, entityId, _) cmd = case cmd of
    -- TNEW and SNEW must have signature but NOT token/subscription IDs
    TNEW {} -> sigNoEntity
@@ -223,7 +211,7 @@ instance NtfEntityI e => ProtocolEncoding ErrorType (NtfCommand e) where
        | not (B.null entityId) = Left $ CMD HAS_AUTH
        | otherwise = Right cmd

-instance ProtocolEncoding ErrorType NtfCmd where
+instance ProtocolEncoding NtfCmd where
  type Tag NtfCmd = NtfCmdTag
  encodeProtocol _v (NtfCmd _ c) = encodeProtocol _v c

@@ -233,7 +221,6 @@ instance ProtocolEncoding ErrorType NtfCmd where
        TNEW_ -> TNEW <$> _smpP
        TVFY_ -> TVFY <$> _smpP
        TCHK_ -> pure TCHK
-        TRPL_ -> TRPL <$> _smpP
        TDEL_ -> pure TDEL
        TCRN_ -> TCRN <$> _smpP
    NCT SSubscription tag ->
@@ -243,9 +230,6 @@ instance ProtocolEncoding ErrorType NtfCmd where
        SDEL_ -> pure SDEL
        PING_ -> pure PING

-  fromProtocolError = fromProtocolError @ErrorType @NtfResponse
-  {-# INLINE fromProtocolError #-}
-
  checkCredentials t (NtfCmd e c) = NtfCmd e <$> checkCredentials t c

 data NtfResponseTag
@@ -260,7 +244,7 @@ data NtfResponseTag

 instance Encoding NtfResponseTag where
  smpEncode = \case
-    NRTknId_ -> "IDTKN" -- it should be "TID", "SID"
+    NRTknId_ -> "IDTKN"
    NRSubId_ -> "IDSUB"
    NROk_ -> "OK"
    NRErr_ -> "ERR"
@@ -290,7 +274,7 @@ data NtfResponse
  | NRPong
  deriving (Show)

-instance ProtocolEncoding ErrorType NtfResponse where
+instance ProtocolEncoding NtfResponse where
  type Tag NtfResponse = NtfResponseTag
  encodeProtocol _v = \case
    NRTknId entId dhKey -> e (NRTknId_, ' ', entId, dhKey)
@@ -313,13 +297,6 @@ instance ProtocolEncoding ErrorType NtfResponse where
    NRSub_ -> NRSub <$> _smpP
    NRPong_ -> pure NRPong

-  fromProtocolError = \case
-    PECmdSyntax -> CMD SYNTAX
-    PECmdUnknown -> CMD UNKNOWN
-    PESession -> SESSION
-    PEBlock -> BLOCK
-  {-# INLINE fromProtocolError #-}
-
  checkCredentials (_, _, entId, _) cmd = case cmd of
    -- IDTKN response must not have queue ID
    NRTknId {} -> noEntity
@@ -339,7 +316,7 @@ instance ProtocolEncoding ErrorType NtfResponse where
        | otherwise = Left $ CMD HAS_AUTH

 data SMPQueueNtf = SMPQueueNtf
-  { smpServer :: SMPServer,
+  { smpServer :: ProtocolServer,
    notifierId :: NotifierId
  }
  deriving (Eq, Ord, Show)
@@ -347,47 +324,30 @@ data SMPQueueNtf = SMPQueueNtf
 instance Encoding SMPQueueNtf where
  smpEncode SMPQueueNtf {smpServer, notifierId} = smpEncode (smpServer, notifierId)
  smpP = do
-    smpServer <- updateSMPServerHosts <$> smpP
-    notifierId <- smpP
-    pure SMPQueueNtf {smpServer, notifierId}
+    (smpServer, notifierId) <- smpP
+    pure $ SMPQueueNtf smpServer notifierId

-instance StrEncoding SMPQueueNtf where
-  strEncode SMPQueueNtf {smpServer, notifierId} = strEncode smpServer <> "/" <> strEncode notifierId
-  strP = do
-    smpServer <- updateSMPServerHosts <$> strP
-    notifierId <- A.char '/' *> strP
-    pure SMPQueueNtf {smpServer, notifierId}
-
-data PushProvider = PPApnsDev | PPApnsProd | PPApnsTest
+data PushProvider = PPApns
  deriving (Eq, Ord, Show)

 instance Encoding PushProvider where
  smpEncode = \case
-    PPApnsDev -> "AD"
-    PPApnsProd -> "AP"
-    PPApnsTest -> "AT"
+    PPApns -> "A"
  smpP =
-    A.take 2 >>= \case
-      "AD" -> pure PPApnsDev
-      "AP" -> pure PPApnsProd
-      "AT" -> pure PPApnsTest
+    A.anyChar >>= \case
+      'A' -> pure PPApns
      _ -> fail "bad PushProvider"

-instance StrEncoding PushProvider where
-  strEncode = \case
-    PPApnsDev -> "apns_dev"
-    PPApnsProd -> "apns_prod"
-    PPApnsTest -> "apns_test"
-  strP =
-    A.takeTill (== ' ') >>= \case
-      "apns_dev" -> pure PPApnsDev
-      "apns_prod" -> pure PPApnsProd
-      "apns_test" -> pure PPApnsTest
-      _ -> fail "bad PushProvider"
+instance TextEncoding PushProvider where
+  textEncode = \case
+    PPApns -> "apple"
+  textDecode = \case
+    "apple" -> Just PPApns
+    _ -> Nothing

-instance FromField PushProvider where fromField = fromTextField_ $ eitherToMaybe . strDecode . encodeUtf8
+instance FromField PushProvider where fromField = fromTextField_ textDecode

-instance ToField PushProvider where toField = toField . decodeLatin1 . strEncode
+instance ToField PushProvider where toField = toField . textEncode

 data DeviceToken = DeviceToken PushProvider ByteString
  deriving (Eq, Ord, Show)
@@ -396,18 +356,6 @@ instance Encoding DeviceToken where
  smpEncode (DeviceToken p t) = smpEncode (p, t)
  smpP = DeviceToken <$> smpP <*> smpP

-instance StrEncoding DeviceToken where
-  strEncode (DeviceToken p t) = strEncode p <> " " <> t
-  strP = DeviceToken <$> strP <* A.space <*> hexStringP
-    where
-      hexStringP =
-        A.takeWhile (\c -> A.isDigit c || (c >= 'a' && c <= 'f')) >>= \s ->
-          if even (B.length s) then pure s else fail "odd number of hex characters"
-
-instance ToJSON DeviceToken where
-  toEncoding (DeviceToken pp t) = J.pairs $ "pushProvider" .= decodeLatin1 (strEncode pp) <> "token" .= decodeLatin1 t
-  toJSON (DeviceToken pp t) = J.object ["pushProvider" .= decodeLatin1 (strEncode pp), "token" .= decodeLatin1 t]
-
 type NtfEntityId = ByteString

 type NtfSubscriptionId = NtfEntityId
@@ -421,50 +369,28 @@ data NtfSubStatus
    NSPending
  | -- | connected and subscribed to SMP server
    NSActive
-  | -- | disconnected/unsubscribed from SMP server
-    NSInactive
-  | -- | END received
+  | -- | NEND received (we currently do not support it)
    NSEnd
  | -- | SMP AUTH error
-    NSAuth
-  | -- | SMP error other than AUTH
-    NSErr ByteString
-  deriving (Eq, Ord, Show)
-
-ntfShouldSubscribe :: NtfSubStatus -> Bool
-ntfShouldSubscribe = \case
-  NSNew -> True
-  NSPending -> True
-  NSActive -> True
-  NSInactive -> True
-  NSEnd -> False
-  NSAuth -> False
-  NSErr _ -> False
+    NSSMPAuth
+  deriving (Eq, Show)

 instance Encoding NtfSubStatus where
  smpEncode = \case
    NSNew -> "NEW"
    NSPending -> "PENDING" -- e.g. after SMP server disconnect/timeout while ntf server is retrying to connect
    NSActive -> "ACTIVE"
-    NSInactive -> "INACTIVE"
    NSEnd -> "END"
-    NSAuth -> "AUTH"
-    NSErr err -> "ERR " <> err
+    NSSMPAuth -> "SMP_AUTH"
  smpP =
    A.takeTill (== ' ') >>= \case
      "NEW" -> pure NSNew
      "PENDING" -> pure NSPending
      "ACTIVE" -> pure NSActive
-      "INACTIVE" -> pure NSInactive
      "END" -> pure NSEnd
-      "AUTH" -> pure NSAuth
-      "ERR" -> NSErr <$> (A.space *> A.takeByteString)
+      "SMP_AUTH" -> pure NSSMPAuth
      _ -> fail "bad NtfSubStatus"

-instance StrEncoding NtfSubStatus where
-  strEncode = smpEncode
-  strP = smpP
-
 data NtfTknStatus
  = -- | Token created in DB
    NTNew
@@ -498,10 +424,6 @@ instance Encoding NtfTknStatus where
      "EXPIRED" -> pure NTExpired
      _ -> fail "bad NtfTknStatus"

-instance StrEncoding NtfTknStatus where
-  strEncode = smpEncode
-  strP = smpP
-
 instance FromField NtfTknStatus where fromField = fromTextField_ $ either (const Nothing) Just . smpDecode . encodeUtf8

 instance ToField NtfTknStatus where toField = toField . decodeLatin1 . smpEncode
@@ -4,334 +4,157 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}

 module Simplex.Messaging.Notifications.Server where

-import Control.Concurrent.STM (stateTVar)
 import Control.Logger.Simple
 import Control.Monad.Except
+import Control.Monad.IO.Unlift (MonadUnliftIO)
 import Control.Monad.Reader
-import Data.Bifunctor (second)
+import Crypto.Random (MonadRandom)
 import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
 import Data.Functor (($>))
-import Data.Int (Int64)
-import Data.List (intercalate, sort)
-import Data.List.NonEmpty (NonEmpty(..))
-import qualified Data.List.NonEmpty as L
-import Data.Map.Strict (Map)
-import qualified Data.Map.Strict as M
-import Data.Maybe (catMaybes)
 import qualified Data.Text as T
-import Data.Text.Encoding (decodeLatin1)
-import Data.Time.Clock (UTCTime (..), diffTimeToPicoseconds, getCurrentTime)
 import Data.Time.Clock.System (getSystemTime)
-import Data.Time.Format.ISO8601 (iso8601Show)
 import Network.Socket (ServiceName)
-import Simplex.Messaging.Client (ProtocolClientError (..), SMPClientError)
 import Simplex.Messaging.Client.Agent
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Notifications.Protocol
 import Simplex.Messaging.Notifications.Server.Env
-import Simplex.Messaging.Notifications.Server.Push.APNS (PNMessageData (..), PushNotification (..), PushProviderError (..))
-import Simplex.Messaging.Notifications.Server.Stats
+import Simplex.Messaging.Notifications.Server.Push.APNS
 import Simplex.Messaging.Notifications.Server.Store
-import Simplex.Messaging.Notifications.Server.StoreLog
 import Simplex.Messaging.Notifications.Transport
-import Simplex.Messaging.Protocol (ErrorType (..), ProtocolServer (host), SMPServer, SignedTransmission, Transmission, encodeTransmission, tGet, tPut)
+import Simplex.Messaging.Protocol (ErrorType (..), SMPServer, SignedTransmission, Transmission, encodeTransmission, tGet, tPut)
 import qualified Simplex.Messaging.Protocol as SMP
 import Simplex.Messaging.Server
-import Simplex.Messaging.Server.Stats
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport (ATransport (..), THandle (..), TProxy, Transport (..))
 import Simplex.Messaging.Transport.Server (runTransportServer)
 import Simplex.Messaging.Util
-import System.Exit (exitFailure)
-import System.IO (BufferMode (..), hPutStrLn, hSetBuffering)
-import System.Mem.Weak (deRefWeak)
-import UnliftIO (IOMode (..), async, uninterruptibleCancel, withFile)
-import UnliftIO.Concurrent (forkIO, killThread, mkWeakThreadId)
-import UnliftIO.Directory (doesFileExist, renameFile)
+import UnliftIO (async, uninterruptibleCancel)
+import UnliftIO.Concurrent (forkFinally, threadDelay)
 import UnliftIO.Exception
 import UnliftIO.STM

-runNtfServer :: NtfServerConfig -> IO ()
+runNtfServer :: (MonadRandom m, MonadUnliftIO m) => NtfServerConfig -> m ()
 runNtfServer cfg = do
  started <- newEmptyTMVarIO
  runNtfServerBlocking started cfg

-runNtfServerBlocking :: TMVar Bool -> NtfServerConfig -> IO ()
+runNtfServerBlocking :: (MonadRandom m, MonadUnliftIO m) => TMVar Bool -> NtfServerConfig -> m ()
 runNtfServerBlocking started cfg = runReaderT (ntfServer cfg started) =<< newNtfServerEnv cfg

-type M a = ReaderT NtfEnv IO a
-
-ntfServer :: NtfServerConfig -> TMVar Bool -> M ()
-ntfServer cfg@NtfServerConfig {transports, transportConfig = tCfg} started = do
-  restoreServerStats
+ntfServer :: forall m. (MonadUnliftIO m, MonadReader NtfEnv m) => NtfServerConfig -> TMVar Bool -> m ()
+ntfServer NtfServerConfig {transports} started = do
  s <- asks subscriber
  ps <- asks pushServer
-  subs <- readTVarIO =<< asks (subscriptions . store)
-  void . forkIO $ resubscribe s subs
-  raceAny_ (ntfSubscriber s : ntfPush ps : map runServer transports <> serverStatsThread_ cfg) `finally` stopServer
+  raceAny_ (ntfSubscriber s : ntfPush ps : map runServer transports)
  where
-    runServer :: (ServiceName, ATransport) -> M ()
+    runServer :: (ServiceName, ATransport) -> m ()
    runServer (tcpPort, ATransport t) = do
      serverParams <- asks tlsServerParams
-      runTransportServer started tcpPort serverParams tCfg (runClient t)
+      runTransportServer started tcpPort serverParams (runClient t)

-    runClient :: Transport c => TProxy c -> c -> M ()
+    runClient :: Transport c => TProxy c -> c -> m ()
    runClient _ h = do
      kh <- asks serverIdentity
      liftIO (runExceptT $ ntfServerHandshake h kh supportedNTFServerVRange) >>= \case
        Right th -> runNtfClientTransport th
        Left _ -> pure ()

-    stopServer :: M ()
-    stopServer = do
-      withNtfLog closeStoreLog
-      saveServerStats
-      asks (smpSubscribers . subscriber) >>= readTVarIO >>= mapM_ (\SMPSubscriber {subThreadId} -> readTVarIO subThreadId >>= mapM_ (liftIO . deRefWeak >=> mapM_ killThread))
-
-    serverStatsThread_ :: NtfServerConfig -> [M ()]
-    serverStatsThread_ NtfServerConfig {logStatsInterval = Just interval, logStatsStartTime, serverStatsLogFile} =
-      [logServerStats logStatsStartTime interval serverStatsLogFile]
-    serverStatsThread_ _ = []
-
-    logServerStats :: Int64 -> Int64 -> FilePath -> M ()
-    logServerStats startAt logInterval statsFilePath = do
-      initialDelay <- (startAt -) . fromIntegral . (`div` 1000000_000000) . diffTimeToPicoseconds . utctDayTime <$> liftIO getCurrentTime
-      liftIO $ putStrLn $ "server stats log enabled: " <> statsFilePath
-      liftIO $ threadDelay' $ 1000000 * (initialDelay + if initialDelay < 0 then 86400 else 0)
-      NtfServerStats {fromTime, tknCreated, tknVerified, tknDeleted, subCreated, subDeleted, ntfReceived, ntfDelivered, activeTokens, activeSubs} <- asks serverStats
-      let interval = 1000000 * logInterval
-      withFile statsFilePath AppendMode $ \h -> liftIO $ do
-        hSetBuffering h LineBuffering
-        forever $ do
-          ts <- getCurrentTime
-          fromTime' <- atomically $ swapTVar fromTime ts
-          tknCreated' <- atomically $ swapTVar tknCreated 0
-          tknVerified' <- atomically $ swapTVar tknVerified 0
-          tknDeleted' <- atomically $ swapTVar tknDeleted 0
-          subCreated' <- atomically $ swapTVar subCreated 0
-          subDeleted' <- atomically $ swapTVar subDeleted 0
-          ntfReceived' <- atomically $ swapTVar ntfReceived 0
-          ntfDelivered' <- atomically $ swapTVar ntfDelivered 0
-          tkn <- atomically $ periodStatCounts activeTokens ts
-          sub <- atomically $ periodStatCounts activeSubs ts
-          hPutStrLn h $
-            intercalate
-              ","
-              [ iso8601Show $ utctDay fromTime',
-                show tknCreated',
-                show tknVerified',
-                show tknDeleted',
-                show subCreated',
-                show subDeleted',
-                show ntfReceived',
-                show ntfDelivered',
-                dayCount tkn,
-                weekCount tkn,
-                monthCount tkn,
-                dayCount sub,
-                weekCount sub,
-                monthCount sub
-              ]
-          threadDelay' interval
-
-resubscribe :: NtfSubscriber -> Map NtfSubscriptionId NtfSubData -> M ()
-resubscribe NtfSubscriber {newSubQ} subs = do
-  subs' <- atomically $ filterM (fmap ntfShouldSubscribe . readTVar . subStatus) $ M.elems subs
-  atomically . writeTBQueue newSubQ $ map NtfSub subs'
-  liftIO $ logInfo $ "SMP resubscriptions queued (" <> tshow (length subs') <> " subscriptions)"
-
-ntfSubscriber :: NtfSubscriber -> M ()
+ntfSubscriber :: forall m. (MonadUnliftIO m, MonadReader NtfEnv m) => NtfSubscriber -> m ()
 ntfSubscriber NtfSubscriber {smpSubscribers, newSubQ, smpAgent = ca@SMPClientAgent {msgQ, agentQ}} = do
  raceAny_ [subscribe, receiveSMP, receiveAgent]
  where
-    subscribe :: M ()
-    subscribe = forever $ do
-      subs <- atomically (readTBQueue newSubQ)
-      let ss = L.groupAllWith server subs
-      batchSize <- asks $ subsBatchSize . config
-      forM_ ss $ \serverSubs -> do
-        let srv = server $ L.head serverSubs
-            batches = toChunks batchSize $ L.toList serverSubs
-        SMPSubscriber {newSubQ = subscriberSubQ} <- getSMPSubscriber srv
-        mapM_ (atomically . writeTQueue subscriberSubQ) batches
+    subscribe :: m ()
+    subscribe =
+      forever $
+        atomically (readTBQueue newSubQ) >>= \case
+          sub@(NtfSub NtfSubData {smpQueue = SMPQueueNtf {smpServer}}) -> do
+            SMPSubscriber {newSubQ = subscriberSubQ} <- getSMPSubscriber smpServer
+            atomically $ writeTBQueue subscriberSubQ sub

-    server :: NtfEntityRec 'Subscription -> SMPServer
-    server (NtfSub sub) = ntfSubServer sub
-
-    getSMPSubscriber :: SMPServer -> M SMPSubscriber
+    getSMPSubscriber :: SMPServer -> m SMPSubscriber
    getSMPSubscriber smpServer =
      atomically (TM.lookup smpServer smpSubscribers) >>= maybe createSMPSubscriber pure
      where
        createSMPSubscriber = do
-          sub@SMPSubscriber {subThreadId} <- atomically newSMPSubscriber
-          atomically $ TM.insert smpServer sub smpSubscribers
-          tId <- mkWeakThreadId =<< forkIO (runSMPSubscriber sub)
-          atomically . writeTVar subThreadId $ Just tId
-          pure sub
+          qSize <- asks $ subQSize . config
+          newSubscriber <- atomically $ newSMPSubscriber qSize
+          atomically $ TM.insert smpServer newSubscriber smpSubscribers
+          _ <- runSMPSubscriber newSubscriber `forkFinally` \_ -> atomically (TM.delete smpServer smpSubscribers >> failSubscriptions newSubscriber)
+          pure newSubscriber
+        -- TODO mark subscriptions as failed
+        failSubscriptions _ = pure ()

-    runSMPSubscriber :: SMPSubscriber -> M ()
+    runSMPSubscriber :: SMPSubscriber -> m ()
    runSMPSubscriber SMPSubscriber {newSubQ = subscriberSubQ} =
-      forever $ do
-        subs <- atomically (peekTQueue subscriberSubQ)
-        let subs' = L.map (\(NtfSub sub) -> sub) subs
-            srv = server $ L.head subs
-        logSubStatus srv "subscribing" $ length subs
-        mapM_ (\NtfSubData {smpQueue} -> updateSubStatus smpQueue NSPending) subs'
-        rs <- liftIO $ subscribeQueues srv subs'
-        (subs'', oks, errs) <- foldM process ([], 0, []) rs
-        atomically $ do
-          void $ readTQueue subscriberSubQ
-          mapM_ (writeTQueue subscriberSubQ . L.map NtfSub) $ L.nonEmpty subs''
-        logSubStatus srv "retrying" $ length subs''
-        logSubStatus srv "subscribed" oks
-        logSubErrors srv errs
-      where
-        process :: ([NtfSubData], Int, [NtfSubStatus]) -> (NtfSubData, Either SMPClientError ()) -> M ([NtfSubData], Int, [NtfSubStatus])
-        process (subs, oks, errs) (sub@NtfSubData {smpQueue}, r) = case r of
-          Right _ -> updateSubStatus smpQueue NSActive $> (subs, oks + 1, errs)
-          Left e -> update <$> handleSubError smpQueue e
-          where
-            update = \case
-              Just err -> (subs, oks, err : errs) -- permanent error, log and don't retry subscription
-              Nothing -> (sub : subs, oks, errs) -- temporary error, retry subscription
+      forever $
+        atomically (peekTBQueue subscriberSubQ) >>= \case
+          NtfSub NtfSubData {smpQueue, notifierKey} -> do
+            let SMPQueueNtf {smpServer, notifierId} = smpQueue
+            liftIO (runExceptT $ subscribeQueue ca smpServer ((SPNotifier, notifierId), notifierKey)) >>= \case
+              Right _ -> do
+                -- update subscription status
+                _ <- atomically $ readTBQueue subscriberSubQ
+                pure ()
+              Left _e -> pure ()

-    -- | Subscribe to queues. The list of results can have a different order.
-    subscribeQueues :: SMPServer -> NonEmpty NtfSubData -> IO (NonEmpty (NtfSubData, Either SMPClientError ()))
-    subscribeQueues srv subs =
-      L.map (second snd) . L.zip subs <$> subscribeQueuesNtfs ca srv (L.map sub subs)
-      where
-        sub NtfSubData {smpQueue = SMPQueueNtf {notifierId}, notifierKey} = (notifierId, notifierKey)
-
-    receiveSMP :: M ()
+    receiveSMP :: m ()
    receiveSMP = forever $ do
-      ((_, srv, _), _, _, ntfId, msg) <- atomically $ readTBQueue msgQ
-      let smpQueue = SMPQueueNtf srv ntfId
+      (srv, _sessId, ntfId, msg) <- atomically $ readTBQueue msgQ
      case msg of
-        SMP.NMSG nmsgNonce encNMsgMeta -> do
-          ntfTs <- liftIO getSystemTime
-          st <- asks store
+        SMP.NMSG -> do
          NtfPushServer {pushQ} <- asks pushServer
-          stats <- asks serverStats
-          atomically $ updatePeriodStats (activeSubs stats) ntfId
+          st <- asks store
          atomically $
-            findNtfSubscriptionToken st smpQueue
-              >>= mapM_ (\tkn -> writeTBQueue pushQ (tkn, PNMessage PNMessageData {smpQueue, ntfTs, nmsgNonce, encNMsgMeta}))
-          incNtfStat ntfReceived
-        SMP.END -> updateSubStatus smpQueue NSEnd
+            findNtfSubscriptionToken st (SMPQueueNtf srv ntfId)
+              >>= mapM_ (\tkn -> writeTBQueue pushQ (tkn, PNMessage srv ntfId))
        _ -> pure ()
+      pure ()

    receiveAgent =
      forever $
        atomically (readTBQueue agentQ) >>= \case
          CAConnected _ -> pure ()
-          CADisconnected srv subs -> do
-            logSubStatus srv "disconnected" $ length subs
-            forM_ subs $ \(_, ntfId) -> do
-              let smpQueue = SMPQueueNtf srv ntfId
-              updateSubStatus smpQueue NSInactive
-          CAReconnected srv ->
-            logInfo $ "SMP server reconnected " <> showServer' srv
-          CAResubscribed srv subs -> do
-            forM_ subs $ \(_, ntfId) -> updateSubStatus (SMPQueueNtf srv ntfId) NSActive
-            logSubStatus srv "resubscribed" $ length subs
-          CASubError srv errs ->
-            forM errs (\((_, ntfId), err) -> handleSubError (SMPQueueNtf srv ntfId) err)
-              >>= logSubErrors srv . catMaybes . L.toList
+          CADisconnected _srv _subs -> do
+            -- update subscription statuses
+            pure ()
+          CAReconnected _ -> pure ()
+          CAResubscribed _srv _sub -> do
+            -- update subscription status
+            pure ()
+          CASubError _srv _sub _err -> do
+            -- update subscription status
+            pure ()

-    logSubStatus srv event n = when (n > 0) $
-      logInfo $ "SMP server " <> event <> " " <> showServer' srv <> " (" <> tshow n <> " subscriptions)"
-
-    logSubErrors :: SMPServer -> [NtfSubStatus] -> M ()        
-    logSubErrors srv errs = forM_ (L.group $ sort errs) $ \errs' -> do
-      logError $ "SMP subscription errors on server " <> showServer' srv <> ": " <> tshow (L.head errs') <> " (" <> tshow (length errs') <> " errors)"
-
-    showServer' = decodeLatin1 . strEncode . host
-
-    handleSubError :: SMPQueueNtf -> SMPClientError -> M (Maybe NtfSubStatus)
-    handleSubError smpQueue = \case
-      PCEProtocolError AUTH -> updateSubStatus smpQueue NSAuth $> Just NSAuth
-      PCEProtocolError e -> updateErr "SMP error " e
-      PCEResponseError e -> updateErr "ResponseError " e
-      PCEUnexpectedResponse r -> updateErr "UnexpectedResponse " r
-      PCETransportError e -> updateErr "TransportError " e
-      PCECryptoError e -> updateErr "CryptoError " e
-      PCEIncompatibleHost -> let e = NSErr "IncompatibleHost" in updateSubStatus smpQueue e $> Just e
-      PCEResponseTimeout -> pure Nothing
-      PCENetworkError -> pure Nothing
-      PCEIOError _ -> pure Nothing
-      where
-        updateErr :: Show e => ByteString -> e -> M (Maybe NtfSubStatus)
-        updateErr errType e = updateSubStatus smpQueue (NSErr $ errType <> bshow e) $> Just (NSErr errType)
-
-    updateSubStatus smpQueue status = do
-      st <- asks store
-      atomically (findNtfSubscription st smpQueue)
-        >>= mapM_
-          ( \NtfSubData {ntfSubId, subStatus} -> do
-              atomically $ writeTVar subStatus status
-              withNtfLog $ \sl -> logSubscriptionStatus sl ntfSubId status
-          )
-
-ntfPush :: NtfPushServer -> M ()
-ntfPush s@NtfPushServer {pushQ} = forever $ do
-  (tkn@NtfTknData {ntfTknId, token = DeviceToken pp _, tknStatus}, ntf) <- atomically (readTBQueue pushQ)
-  liftIO $ logDebug $ "sending push notification to " <> T.pack (show pp)
+ntfPush :: MonadUnliftIO m => NtfPushServer -> m ()
+ntfPush s@NtfPushServer {pushQ} = liftIO . forever . runExceptT $ do
+  (tkn@NtfTknData {token = DeviceToken pp _, tknStatus}, ntf) <- atomically (readTBQueue pushQ)
+  logDebug $ "sending push notification to " <> T.pack (show pp)
  status <- readTVarIO tknStatus
-  case ntf of
-    PNVerification _
-      | status /= NTInvalid && status /= NTExpired ->
-        deliverNotification pp tkn ntf >>= \case
-          Right _ -> do
-            status_ <- atomically $ stateTVar tknStatus $ \status' -> if status' == NTActive then (Nothing, NTActive) else (Just NTConfirmed, NTConfirmed)
-            forM_ status_ $ \status' -> withNtfLog $ \sl -> logTokenStatus sl ntfTknId status'
-          _ -> pure ()
-      | otherwise -> logError "bad notification token status"
-    PNCheckMessages -> checkActiveTkn status $ do
-      void $ deliverNotification pp tkn ntf
-    PNMessage {} -> checkActiveTkn status $ do
-      stats <- asks serverStats
-      atomically $ updatePeriodStats (activeTokens stats) ntfTknId
-      void $ deliverNotification pp tkn ntf
-      incNtfStat ntfDelivered
+  case (status, ntf) of
+    (_, PNVerification _) -> do
+      -- TODO check token status
+      deliverNotification pp tkn ntf
+      atomically $ modifyTVar tknStatus $ \status' -> if status' == NTActive then NTActive else NTConfirmed
+    (NTActive, PNCheckMessages) -> do
+      deliverNotification pp tkn ntf
+    (NTActive, PNMessage _ _) -> do
+      deliverNotification pp tkn ntf
+    _ -> do
+      logError "bad notification token status"
  where
-    checkActiveTkn :: NtfTknStatus -> M () -> M ()
-    checkActiveTkn status action
-      | status == NTActive = action
-      | otherwise = liftIO $ logError "bad notification token status"
-    deliverNotification :: PushProvider -> NtfTknData -> PushNotification -> M (Either PushProviderError ())
-    deliverNotification pp tkn@NtfTknData {ntfTknId, tknStatus} ntf = do
+    deliverNotification :: PushProvider -> PushProviderClient
+    deliverNotification pp tkn ntf = do
      deliver <- liftIO $ getPushClient s pp
-      liftIO (runExceptT $ deliver tkn ntf) >>= \case
-        Right _ -> pure $ Right ()
-        Left e -> case e of
-          PPConnection _ -> retryDeliver
-          PPRetryLater -> retryDeliver
-          PPCryptoError _ -> err e
-          PPResponseError _ _ -> err e
-          PPTokenInvalid -> updateTknStatus NTInvalid >> err e
-          PPPermanentError -> err e
-      where
-        retryDeliver :: M (Either PushProviderError ())
-        retryDeliver = do
-          deliver <- liftIO $ newPushClient s pp
-          liftIO (runExceptT $ deliver tkn ntf) >>= either err (pure . Right)
-        updateTknStatus :: NtfTknStatus -> M ()
-        updateTknStatus status = do
-          atomically $ writeTVar tknStatus status
-          withNtfLog $ \sl -> logTokenStatus sl ntfTknId status
-        err e = logError (T.pack $ "Push provider error (" <> show pp <> "): " <> show e) $> Left e
+      -- TODO retry later based on the error
+      deliver tkn ntf `catchError` \e -> logError (T.pack $ "Push provider error (" <> show pp <> "): " <> show e) >> throwError e

-runNtfClientTransport :: Transport c => THandle c -> M ()
+runNtfClientTransport :: (Transport c, MonadUnliftIO m, MonadReader NtfEnv m) => THandle c -> m ()
 runNtfClientTransport th@THandle {sessionId} = do
  qSize <- asks $ clientQSize . config
  ts <- liftIO getSystemTime
@@ -339,33 +162,32 @@ runNtfClientTransport th@THandle {sessionId} = do
  s <- asks subscriber
  ps <- asks pushServer
  expCfg <- asks $ inactiveClientExpiration . config
-  raceAny_ ([liftIO $ send th c, client c s ps, receive th c] <> disconnectThread_ c expCfg)
-    `finally` liftIO (clientDisconnected c)
+  raceAny_ ([send th c, client c s ps, receive th c] <> disconnectThread_ c expCfg)
+    `finally` clientDisconnected c
  where
-    disconnectThread_ c expCfg = maybe [] ((: []) . liftIO . disconnectTransport th c activeAt) expCfg
+    disconnectThread_ c expCfg = maybe [] ((: []) . disconnectTransport th c activeAt) expCfg

-clientDisconnected :: NtfServerClient -> IO ()
+clientDisconnected :: MonadUnliftIO m => NtfServerClient -> m ()
 clientDisconnected NtfServerClient {connected} = atomically $ writeTVar connected False

-receive :: Transport c => THandle c -> NtfServerClient -> M ()
+receive :: (Transport c, MonadUnliftIO m, MonadReader NtfEnv m) => THandle c -> NtfServerClient -> m ()
 receive th NtfServerClient {rcvQ, sndQ, activeAt} = forever $ do
-  ts <- liftIO $ tGet th
-  forM_ ts $ \t@(_, _, (corrId, entId, cmdOrError)) -> do
-    atomically . writeTVar activeAt =<< liftIO getSystemTime
-    logDebug "received transmission"
-    case cmdOrError of
-      Left e -> write sndQ (corrId, entId, NRErr e)
-      Right cmd ->
-        verifyNtfTransmission t cmd >>= \case
-          VRVerified req -> write rcvQ req
-          VRFailed -> write sndQ (corrId, entId, NRErr AUTH)
+  t@(_, _, (corrId, entId, cmdOrError)) <- tGet th
+  atomically . writeTVar activeAt =<< liftIO getSystemTime
+  logDebug "received transmission"
+  case cmdOrError of
+    Left e -> write sndQ (corrId, entId, NRErr e)
+    Right cmd ->
+      verifyNtfTransmission t cmd >>= \case
+        VRVerified req -> write rcvQ req
+        VRFailed -> write sndQ (corrId, entId, NRErr AUTH)
  where
    write q t = atomically $ writeTBQueue q t

-send :: Transport c => THandle c -> NtfServerClient -> IO ()
+send :: (Transport c, MonadUnliftIO m) => THandle c -> NtfServerClient -> m ()
 send h@THandle {thVersion = v} NtfServerClient {sndQ, sessionId, activeAt} = forever $ do
  t <- atomically $ readTBQueue sndQ
-  void . liftIO $ tPut h Nothing [(Nothing, encodeTransmission v sessionId t)]
+  void . liftIO $ tPut h (Nothing, encodeTransmission v sessionId t)
  atomically . writeTVar activeAt =<< liftIO getSystemTime

 -- instance Show a => Show (TVar a) where
@@ -373,7 +195,8 @@ send h@THandle {thVersion = v} NtfServerClient {sndQ, sessionId, activeAt} = for

 data VerificationResult = VRVerified NtfRequest | VRFailed

-verifyNtfTransmission :: SignedTransmission ErrorType NtfCmd -> NtfCmd -> M VerificationResult
+verifyNtfTransmission ::
+  forall m. (MonadUnliftIO m, MonadReader NtfEnv m) => SignedTransmission NtfCmd -> NtfCmd -> m VerificationResult
 verifyNtfTransmission (sig_, signed, (corrId, entId, _)) cmd = do
  st <- asks store
  case cmd of
@@ -394,26 +217,28 @@ verifyNtfTransmission (sig_, signed, (corrId, entId, _)) cmd = do
      s_ <- atomically $ findNtfSubscription st smpQueue
      case s_ of
        Nothing -> do
+          -- TODO move active token check here to differentiate error
          t_ <- atomically $ getActiveNtfToken st tknId
          verifyToken' t_ $ VRVerified (NtfReqNew corrId (ANE SSubscription sub))
        Just s@NtfSubData {tokenId = subTknId} ->
          if subTknId == tknId
            then do
+              -- TODO move active token check here to differentiate error
              t_ <- atomically $ getActiveNtfToken st subTknId
              verifyToken' t_ $ verifiedSubCmd s c
            else pure $ maybe False (dummyVerifyCmd signed) sig_ `seq` VRFailed
-    NtfCmd SSubscription PING -> pure $ VRVerified $ NtfReqPing corrId entId
    NtfCmd SSubscription c -> do
      s_ <- atomically $ getNtfSubscription st entId
      case s_ of
        Just s@NtfSubData {tokenId = subTknId} -> do
+          -- TODO move active token check here to differentiate error
          t_ <- atomically $ getActiveNtfToken st subTknId
          verifyToken' t_ $ verifiedSubCmd s c
        _ -> pure $ maybe False (dummyVerifyCmd signed) sig_ `seq` VRFailed
  where
    verifiedTknCmd t c = VRVerified (NtfReqCmd SToken (NtfTkn t) (corrId, entId, c))
    verifiedSubCmd s c = VRVerified (NtfReqCmd SSubscription (NtfSub s) (corrId, entId, c))
-    verifyToken :: Maybe NtfTknData -> (NtfTknData -> VerificationResult) -> M VerificationResult
+    verifyToken :: Maybe NtfTknData -> (NtfTknData -> VerificationResult) -> m VerificationResult
    verifyToken t_ positiveVerificationResult =
      pure $ case t_ of
        Just t@NtfTknData {tknVerifyKey} ->
@@ -421,17 +246,17 @@ verifyNtfTransmission (sig_, signed, (corrId, entId, _)) cmd = do
            then positiveVerificationResult t
            else VRFailed
        _ -> maybe False (dummyVerifyCmd signed) sig_ `seq` VRFailed
-    verifyToken' :: Maybe NtfTknData -> VerificationResult -> M VerificationResult
+    verifyToken' :: Maybe NtfTknData -> VerificationResult -> m VerificationResult
    verifyToken' t_ = verifyToken t_ . const

-client :: NtfServerClient -> NtfSubscriber -> NtfPushServer -> M ()
-client NtfServerClient {rcvQ, sndQ} NtfSubscriber {newSubQ, smpAgent = ca} NtfPushServer {pushQ, intervalNotifiers} =
+client :: forall m. (MonadUnliftIO m, MonadReader NtfEnv m) => NtfServerClient -> NtfSubscriber -> NtfPushServer -> m ()
+client NtfServerClient {rcvQ, sndQ} NtfSubscriber {newSubQ} NtfPushServer {pushQ, intervalNotifiers} =
  forever $
    atomically (readTBQueue rcvQ)
      >>= processCommand
      >>= atomically . writeTBQueue sndQ
  where
-    processCommand :: NtfRequest -> M (Transmission NtfResponse)
+    processCommand :: NtfRequest -> m (Transmission NtfResponse)
    processCommand = \case
      NtfReqNew corrId (ANE SToken newTkn@(NewNtfTkn _ _ dhPubKey)) -> do
        logDebug "TNEW - new token"
@@ -440,13 +265,12 @@ client NtfServerClient {rcvQ, sndQ} NtfSubscriber {newSubQ, smpAgent = ca} NtfPu
        let dhSecret = C.dh' dhPubKey srvDhPrivKey
        tknId <- getId
        regCode <- getRegCode
-        tkn <- atomically $ mkNtfTknData tknId newTkn ks dhSecret regCode
-        atomically $ addNtfToken st tknId tkn
-        atomically $ writeTBQueue pushQ (tkn, PNVerification regCode)
-        withNtfLog (`logCreateToken` tkn)
-        incNtfStat tknCreated
+        atomically $ do
+          tkn <- mkNtfTknData tknId newTkn ks dhSecret regCode
+          addNtfToken st tknId tkn
+          writeTBQueue pushQ (tkn, PNVerification regCode)
        pure (corrId, "", NRTknId tknId srvDhPubKey)
-      NtfReqCmd SToken (NtfTkn tkn@NtfTknData {ntfTknId, tknStatus, tknRegCode, tknDhSecret, tknDhKeys = (srvDhPubKey, srvDhPrivKey), tknCronInterval}) (corrId, tknId, cmd) -> do
+      NtfReqCmd SToken (NtfTkn tkn@NtfTknData {ntfTknId, tknStatus, tknRegCode, tknDhSecret, tknDhKeys = (srvDhPubKey, srvDhPrivKey)}) (corrId, tknId, cmd) -> do
        status <- readTVarIO tknStatus
        (corrId,tknId,) <$> case cmd of
          TNEW (NewNtfTkn _ _ dhPubKey) -> do
@@ -465,57 +289,31 @@ client NtfServerClient {rcvQ, sndQ} NtfSubscriber {newSubQ, smpAgent = ca} NtfPu
              atomically $ writeTVar tknStatus NTActive
              tIds <- atomically $ removeInactiveTokenRegistrations st tkn
              forM_ tIds cancelInvervalNotifications
-              withNtfLog $ \s -> logTokenStatus s tknId NTActive
-              incNtfStat tknVerified
              pure NROk
            | otherwise -> do
              logDebug "TVFY - incorrect code or token status"
              pure $ NRErr AUTH
-          TCHK -> do
-            logDebug "TCHK"
-            pure $ NRTkn status
-          TRPL token' -> do
-            logDebug "TRPL - replace token"
-            st <- asks store
-            regCode <- getRegCode
-            atomically $ do
-              removeTokenRegistration st tkn
-              writeTVar tknStatus NTRegistered
-              let tkn' = tkn {token = token', tknRegCode = regCode}
-              addNtfToken st tknId tkn'
-              writeTBQueue pushQ (tkn', PNVerification regCode)
-            withNtfLog $ \s -> logUpdateToken s tknId token' regCode
-            incNtfStat tknDeleted
-            incNtfStat tknCreated
-            pure NROk
+          TCHK -> pure $ NRTkn status
          TDEL -> do
            logDebug "TDEL"
            st <- asks store
-            qs <- atomically $ deleteNtfToken st tknId
-            forM_ qs $ \SMPQueueNtf {smpServer, notifierId} ->
-              atomically $ removeSubscription ca smpServer (SPNotifier, notifierId)
+            atomically $ deleteNtfToken st tknId
            cancelInvervalNotifications tknId
-            withNtfLog (`logDeleteToken` tknId)
-            incNtfStat tknDeleted
            pure NROk
          TCRN 0 -> do
            logDebug "TCRN 0"
-            atomically $ writeTVar tknCronInterval 0
            cancelInvervalNotifications tknId
-            withNtfLog $ \s -> logTokenCron s tknId 0
            pure NROk
          TCRN int
            | int < 20 -> pure $ NRErr QUOTA
            | otherwise -> do
              logDebug "TCRN"
-              atomically $ writeTVar tknCronInterval int
              atomically (TM.lookup tknId intervalNotifiers) >>= \case
                Nothing -> runIntervalNotifier int
                Just IntervalNotifier {interval, action} ->
                  unless (interval == int) $ do
                    uninterruptibleCancel action
                    runIntervalNotifier int
-              withNtfLog $ \s -> logTokenCron s tknId int
              pure NROk
            where
              runIntervalNotifier interval = do
@@ -524,85 +322,83 @@ client NtfServerClient {rcvQ, sndQ} NtfSubscriber {newSubQ, smpAgent = ca} NtfPu
                atomically $ TM.insert tknId notifier intervalNotifiers
                where
                  intervalNotifier delay = forever $ do
-                    liftIO $ threadDelay' delay
+                    threadDelay delay
                    atomically $ writeTBQueue pushQ (tkn, PNCheckMessages)
      NtfReqNew corrId (ANE SSubscription newSub) -> do
        logDebug "SNEW - new subscription"
        st <- asks store
        subId <- getId
-        sub <- atomically $ mkNtfSubData subId newSub
-        resp <-
-          atomically (addNtfSubscription st subId sub) >>= \case
-            Just _ -> atomically (writeTBQueue newSubQ [NtfSub sub]) $> NRSubId subId
-            _ -> pure $ NRErr AUTH
-        withNtfLog (`logCreateSubscription` sub)
-        incNtfStat subCreated
-        pure (corrId, "", resp)
-      NtfReqCmd SSubscription (NtfSub NtfSubData {smpQueue = SMPQueueNtf {smpServer, notifierId}, notifierKey = registeredNKey, subStatus}) (corrId, subId, cmd) -> do
+        atomically $ do
+          sub <- mkNtfSubData newSub
+          (corrId,"",)
+            <$> ( addNtfSubscription st subId sub >>= \case
+                    Just _ -> writeTBQueue newSubQ (NtfSub sub) $> NRSubId subId
+                    _ -> pure $ NRErr AUTH
+                )
+      NtfReqCmd SSubscription (NtfSub NtfSubData {notifierKey = registeredNKey, subStatus}) (corrId, subId, cmd) -> do
        status <- readTVarIO subStatus
        (corrId,subId,) <$> case cmd of
          SNEW (NewNtfSub _ _ notifierKey) -> do
            logDebug "SNEW - existing subscription"
-            -- possible improvement: retry if subscription failed, if pending or AUTH do nothing
+            -- TODO retry if subscription failed, if pending or AUTH do nothing
            pure $
              if notifierKey == registeredNKey
                then NRSubId subId
                else NRErr AUTH
-          SCHK -> do
-            logDebug "SCHK"
-            pure $ NRSub status
-          SDEL -> do
-            logDebug "SDEL"
-            st <- asks store
-            atomically $ deleteNtfSubscription st subId
-            atomically $ removeSubscription ca smpServer (SPNotifier, notifierId)
-            withNtfLog (`logDeleteSubscription` subId)
-            incNtfStat subDeleted
-            pure NROk
+          SCHK -> pure $ NRSub status
+          SDEL -> pure NROk
          PING -> pure NRPong
-      NtfReqPing corrId entId -> pure (corrId, entId, NRPong)
-    getId :: M NtfEntityId
+    getId :: m NtfEntityId
    getId = getRandomBytes =<< asks (subIdBytes . config)
-    getRegCode :: M NtfRegCode
+    getRegCode :: m NtfRegCode
    getRegCode = NtfRegCode <$> (getRandomBytes =<< asks (regCodeBytes . config))
-    getRandomBytes :: Int -> M ByteString
+    getRandomBytes :: Int -> m ByteString
    getRandomBytes n = do
      gVar <- asks idsDrg
      atomically (C.pseudoRandomBytes n gVar)
-    cancelInvervalNotifications :: NtfTokenId -> M ()
+    cancelInvervalNotifications :: NtfTokenId -> m ()
    cancelInvervalNotifications tknId =
      atomically (TM.lookupDelete tknId intervalNotifiers)
        >>= mapM_ (uninterruptibleCancel . action)

-withNtfLog :: (StoreLog 'WriteMode -> IO a) -> M ()
-withNtfLog action = liftIO . mapM_ action =<< asks storeLog
-
-incNtfStat :: (NtfServerStats -> TVar Int) -> M ()
-incNtfStat statSel = do
-  stats <- asks serverStats
-  atomically $ modifyTVar' (statSel stats) (+ 1)
-
-saveServerStats :: M ()
-saveServerStats =
-  asks (serverStatsBackupFile . config)
-    >>= mapM_ (\f -> asks serverStats >>= atomically . getNtfServerStatsData >>= liftIO . saveStats f)
-  where
-    saveStats f stats = do
-      logInfo $ "saving server stats to file " <> T.pack f
-      B.writeFile f $ strEncode stats
-      logInfo "server stats saved"
-
-restoreServerStats :: M ()
-restoreServerStats = asks (serverStatsBackupFile . config) >>= mapM_ restoreStats
-  where
-    restoreStats f = whenM (doesFileExist f) $ do
-      logInfo $ "restoring server stats from file " <> T.pack f
-      liftIO (strDecode <$> B.readFile f) >>= \case
-        Right d -> do
-          s <- asks serverStats
-          atomically $ setNtfServerStats s d
-          renameFile f $ f <> ".bak"
-          logInfo "server stats restored"
-        Left e -> do
-          logInfo $ "error restoring server stats: " <> T.pack e
-          liftIO exitFailure
+-- NReqCreate corrId tokenId smpQueue -> pure (corrId, "", NROk)
+-- do
+-- st <- asks store
+-- (pubDhKey, privDhKey) <- liftIO C.generateKeyPair'
+-- let dhSecret = C.dh' dhPubKey privDhKey
+-- sub <- atomically $ mkNtfSubsciption smpQueue token verifyKey dhSecret
+-- addSubRetry 3 st sub >>= \case
+--   Nothing -> pure (corrId, "", NRErr INTERNAL)
+--   Just sId -> do
+--     atomically $ writeTBQueue subQ sub
+--     pure (corrId, sId, NRSubId pubDhKey)
+-- where
+--   addSubRetry :: Int -> NtfSubscriptionsStore -> NtfSubsciption -> m (Maybe NtfSubsciptionId)
+--   addSubRetry 0 _ _ = pure Nothing
+--   addSubRetry n st sub = do
+--     sId <- getId
+--     -- create QueueRec record with these ids and keys
+--     atomically (addNtfSub st sId sub) >>= \case
+--       Nothing -> addSubRetry (n - 1) st sub
+--       _ -> pure $ Just sId
+--   getId :: m NtfSubsciptionId
+--   getId = do
+--     n <- asks $ subIdBytes . config
+--     gVar <- asks idsDrg
+--     atomically (randomBytes n gVar)
+-- NReqCommand sub@NtfSubsciption {tokenId, subStatus} (corrId, subId, cmd) ->
+--   (corrId,subId,) <$> case cmd of
+--     NCSubCreate tokenId smpQueue -> pure NROk
+-- do
+--   st <- asks store
+--   (pubDhKey, privDhKey) <- liftIO C.generateKeyPair'
+--   let dhSecret = C.dh' (dhPubKey newSub) privDhKey
+--   atomically (updateNtfSub st sub newSub dhSecret) >>= \case
+--     Nothing -> pure $ NRErr INTERNAL
+--     _ -> atomically $ do
+--       whenM ((== NSEnd) <$> readTVar status) $ writeTBQueue subQ sub
+--       pure $ NRSubId pubDhKey
+-- NCSubCheck -> NRStat <$> readTVarIO subStatus
+-- NCSubDelete -> do
+--   st <- asks store
+--   atomically (deleteNtfSub st subId) $> NROk
@@ -2,18 +2,16 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE KindSignatures #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}

 module Simplex.Messaging.Notifications.Server.Env where

-import Control.Concurrent (ThreadId)
 import Control.Concurrent.Async (Async)
+import Control.Monad (void)
 import Control.Monad.IO.Unlift
 import Crypto.Random
 import Data.ByteString.Char8 (ByteString)
-import Data.Int (Int64)
-import Data.List.NonEmpty (NonEmpty)
-import Data.Time.Clock (getCurrentTime)
 import Data.Time.Clock.System (SystemTime)
 import Data.Word (Word16)
 import Data.X509.Validation (Fingerprint (..))
@@ -24,17 +22,13 @@ import Simplex.Messaging.Client.Agent
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Notifications.Protocol
 import Simplex.Messaging.Notifications.Server.Push.APNS
-import Simplex.Messaging.Notifications.Server.Stats
 import Simplex.Messaging.Notifications.Server.Store
-import Simplex.Messaging.Notifications.Server.StoreLog
 import Simplex.Messaging.Protocol (CorrId, SMPServer, Transmission)
 import Simplex.Messaging.Server.Expiration
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport (ATransport)
-import Simplex.Messaging.Transport.Server (loadFingerprint, loadTLSServerParams, TransportServerConfig)
-import System.IO (IOMode (..))
-import System.Mem.Weak (Weak)
+import Simplex.Messaging.Transport.Server (loadFingerprint, loadTLSServerParams)
 import UnliftIO.STM

 data NtfServerConfig = NtfServerConfig
@@ -46,19 +40,11 @@ data NtfServerConfig = NtfServerConfig
    pushQSize :: Natural,
    smpAgentCfg :: SMPClientAgentConfig,
    apnsConfig :: APNSPushClientConfig,
-    subsBatchSize :: Int,
    inactiveClientExpiration :: Maybe ExpirationConfig,
-    storeLogFile :: Maybe FilePath,
    -- CA certificate private key is not needed for initialization
    caCertificateFile :: FilePath,
    privateKeyFile :: FilePath,
-    certificateFile :: FilePath,
-    -- stats config - see SMP server config
-    logStatsInterval :: Maybe Int64,
-    logStatsStartTime :: Int64,
-    serverStatsLogFile :: FilePath,
-    serverStatsBackupFile :: Maybe FilePath,
-    transportConfig :: TransportServerConfig
+    certificateFile :: FilePath
  }

 defaultInactiveClientExpiration :: ExpirationConfig
@@ -73,28 +59,27 @@ data NtfEnv = NtfEnv
    subscriber :: NtfSubscriber,
    pushServer :: NtfPushServer,
    store :: NtfStore,
-    storeLog :: Maybe (StoreLog 'WriteMode),
    idsDrg :: TVar ChaChaDRG,
-    tlsServerParams :: T.ServerParams,
    serverIdentity :: C.KeyHash,
-    serverStats :: NtfServerStats
+    tlsServerParams :: T.ServerParams,
+    serverIdentity :: C.KeyHash
  }

 newNtfServerEnv :: (MonadUnliftIO m, MonadRandom m) => NtfServerConfig -> m NtfEnv
-newNtfServerEnv config@NtfServerConfig {subQSize, pushQSize, smpAgentCfg, apnsConfig, storeLogFile, caCertificateFile, certificateFile, privateKeyFile} = do
+newNtfServerEnv config@NtfServerConfig {subQSize, pushQSize, smpAgentCfg, apnsConfig, caCertificateFile, certificateFile, privateKeyFile} = do
  idsDrg <- newTVarIO =<< drgNew
  store <- atomically newNtfStore
-  storeLog <- liftIO $ mapM (`readWriteNtfStore` store) storeLogFile
  subscriber <- atomically $ newNtfSubscriber subQSize smpAgentCfg
  pushServer <- atomically $ newNtfPushServer pushQSize apnsConfig
+  -- TODO not creating APNS client on start to pass CI test, has to be replaced with mock APNS server
+  void . liftIO $ newPushClient pushServer PPApns
  tlsServerParams <- liftIO $ loadTLSServerParams caCertificateFile certificateFile privateKeyFile
  Fingerprint fp <- liftIO $ loadFingerprint caCertificateFile
-  serverStats <- atomically . newNtfServerStats =<< liftIO getCurrentTime
-  pure NtfEnv {config, subscriber, pushServer, store, storeLog, idsDrg, tlsServerParams, serverIdentity = C.KeyHash fp, serverStats}
+  pure NtfEnv {config, subscriber, pushServer, store, idsDrg, tlsServerParams, serverIdentity = C.KeyHash fp}

 data NtfSubscriber = NtfSubscriber
  { smpSubscribers :: TMap SMPServer SMPSubscriber,
-    newSubQ :: TBQueue [NtfEntityRec 'Subscription],
+    newSubQ :: TBQueue (NtfEntityRec 'Subscription),
    smpAgent :: SMPClientAgent
  }

@@ -105,16 +90,14 @@ newNtfSubscriber qSize smpAgentCfg = do
  smpAgent <- newSMPClientAgent smpAgentCfg
  pure NtfSubscriber {smpSubscribers, newSubQ, smpAgent}

-data SMPSubscriber = SMPSubscriber
-  { newSubQ :: TQueue (NonEmpty (NtfEntityRec 'Subscription)),
-    subThreadId :: TVar (Maybe (Weak ThreadId))
+newtype SMPSubscriber = SMPSubscriber
+  { newSubQ :: TBQueue (NtfEntityRec 'Subscription)
  }

-newSMPSubscriber :: STM SMPSubscriber
-newSMPSubscriber = do
-  newSubQ <- newTQueue
-  subThreadId <- newTVar Nothing
-  pure SMPSubscriber {newSubQ, subThreadId}
+newSMPSubscriber :: Natural -> STM SMPSubscriber
+newSMPSubscriber qSize = do
+  newSubQ <- newTBQueue qSize
+  pure SMPSubscriber {newSubQ}

 data NtfPushServer = NtfPushServer
  { pushQ :: TBQueue (NtfTknData, PushNotification),
@@ -137,10 +120,11 @@ newNtfPushServer qSize apnsConfig = do
  pure NtfPushServer {pushQ, pushClients, intervalNotifiers, apnsConfig}

 newPushClient :: NtfPushServer -> PushProvider -> IO PushProviderClient
-newPushClient NtfPushServer {apnsConfig, pushClients} pp = do
-  c <- apnsPushProviderClient <$> createAPNSPushClient (apnsProviderHost pp) apnsConfig
-  atomically $ TM.insert pp c pushClients
-  pure c
+newPushClient NtfPushServer {apnsConfig, pushClients} = \case
+  PPApns -> do
+    c <- apnsPushProviderClient <$> createAPNSPushClient apnsConfig
+    atomically $ TM.insert PPApns c pushClients
+    pure c

 getPushClient :: NtfPushServer -> PushProvider -> IO PushProviderClient
 getPushClient s@NtfPushServer {pushClients} pp =
@@ -149,7 +133,6 @@ getPushClient s@NtfPushServer {pushClients} pp =
 data NtfRequest
  = NtfReqNew CorrId ANewNtfEntity
  | forall e. NtfEntityI e => NtfReqCmd (SNtfEntity e) (NtfEntityRec e) (Transmission (NtfCommand e))
-  | NtfReqPing CorrId NtfEntityId

 data NtfServerClient = NtfServerClient
  { rcvQ :: TBQueue NtfRequest,
--- a/Show More
+++ b/Show More