0.4.2

Added clarification that you are able to create multiple invitations by entering /connect multiple times without invalidating the previously created invitations.

README.md

@@ -165,6 +165,8 @@ This diagram shows how to connect and message a contact:
 
 Once you've set up your local profile, enter `/c` (for `/connect`) to create a new connection and generate an invitation. Send this invitation to your contact via any other channel.
 
+You are able to create multiple invitations by entering `/connect` multiple times and sending these invitations to the corresponding contacts you'd like to connect with.
+
 The invitation has the format `smp::<server>::<queue_id>::<rsa_public_key_for_this_queue_only>`. The invitation can only be used once and even if this is intercepted, the attacker would not be able to use it to send you the messages via this queue once your contact confirms that the connection is established.
 
 The contact who received the invitation should enter `/c <invitation>` to accept the connection. This establishes the connection, and both parties are notified.
@@ -175,7 +177,7 @@ Use `/help` in chat to see the list of available commands.
 
 ### Groups
 
-To create a group use `/g <group>`, the add contacts to it with `/a <group> <name>`and send messages with `#<group> <message>`. Use `/help groups` for other commands.
+To create a group use `/g <group>`, then add contacts to it with `/a <group> <name>`and send messages with `#<group> <message>`. Use `/help groups` for other commands.
 
 ![simplex-chat](./images/groups.gif)
 
@@ -185,7 +187,7 @@ To create a group use `/g <group>`, the add contacts to it with `/a <group> <nam
 
 You can send a file to your contact with `/f @<contact> <file_path>` - the recipient will have to accept it before it is sent. Use `/help files` for other commands.
 
-![simplex-chat](./images/file-transfer.gif)
+![simplex-chat](./images/files.gif)
 
 You can send files to a group with `/f #<group> <file_path>`.
 
@@ -216,12 +218,12 @@ order by internal_id desc;
 
 1. Mobile and desktop apps (in progress).
 2. SMP protocol improvements:
-  - SMP queue redundancy and rotation.
-  - Message delivery confirmation.
-  - Support multiple devices.
+    - SMP queue redundancy and rotation.
+    - Message delivery confirmation.
+    - Support multiple devices.
 3. Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
-  - keep all your contacts and groups even if you lose the domain.
-  - the server doesn't have information about your contacts and groups.
+    - keep all your contacts and groups even if you lose the domain.
+    - the server doesn't have information about your contacts and groups.
 4. Media server to optimize sending large files to groups.
 5. Channels server for large groups and broadcast channels.
 

apps/simplex-chat/Main.hs

@@ -20,7 +20,7 @@ welcomeGetOpts :: IO ChatOpts
 welcomeGetOpts = do
   appDir <- getAppUserDataDirectory "simplex"
   opts@ChatOpts {dbFile} <- getChatOpts appDir
-  putStrLn "SimpleX chat prototype v0.3.1"
+  putStrLn "SimpleX chat prototype v0.4.0"
   putStrLn $ "db: " <> dbFile <> ".chat.db, " <> dbFile <> ".agent.db"
   putStrLn "type \"/help\" or \"/h\" for usage info"
   pure opts

package.yaml

@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 0.4.0
+version: 0.4.2
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme

src/Simplex/Chat/Notification.hs

@@ -1,9 +1,11 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Simplex.Chat.Notification (Notification (..), initializeNotifications) where
 
+import Control.Exception
 import Control.Monad (void)
 import Data.List (isInfixOf)
 import Data.Map (Map, fromList)
@@ -19,18 +21,22 @@ import System.Process (readCreateProcess, shell)
 data Notification = Notification {title :: Text, text :: Text}
 
 initializeNotifications :: IO (Notification -> IO ())
-initializeNotifications = case os of
-  "darwin" -> pure $ notify macScript
-  "mingw32" -> initWinNotify
-  "linux" ->
-    doesFileExist "/proc/sys/kernel/osrelease" >>= \case
-      False -> pure $ notify linuxScript
-      True -> do
-        v <- readFile "/proc/sys/kernel/osrelease"
-        if "Microsoft" `isInfixOf` v || "WSL" `isInfixOf` v
-          then initWslNotify
-          else pure $ notify linuxScript
-  _ -> pure . const $ pure ()
+initializeNotifications =
+  hideException <$> case os of
+    "darwin" -> pure $ notify macScript
+    "mingw32" -> initWinNotify
+    "linux" ->
+      doesFileExist "/proc/sys/kernel/osrelease" >>= \case
+        False -> pure $ notify linuxScript
+        True -> do
+          v <- readFile "/proc/sys/kernel/osrelease"
+          if "Microsoft" `isInfixOf` v || "WSL" `isInfixOf` v
+            then initWslNotify
+            else pure $ notify linuxScript
+    _ -> pure . const $ pure ()
+
+hideException :: (a -> IO ()) -> (a -> IO ())
+hideException f a = f a `catch` \(_ :: SomeException) -> pure ()
 
 notify :: (Notification -> Text) -> Notification -> IO ()
 notify script notification =
@@ -46,7 +52,7 @@ macScript :: Notification -> Text
 macScript Notification {title, text} = "osascript -e 'display notification \"" <> macEscape text <> "\" with title \"" <> macEscape title <> "\"'"
 
 macEscape :: Text -> Text
-macEscape = replaceAll $ fromList [('"', "\\\"")]
+macEscape = replaceAll $ fromList [('"', "\\\""), ('\'', "")]
 
 initWslNotify :: IO (Notification -> IO ())
 initWslNotify = notify . wslScript <$> savePowershellScript

src/Simplex/Chat/Store.hs

@@ -1321,7 +1321,12 @@ createRcvFileChunk st RcvFileTransfer {fileId, fileInvitation = FileInvitation {
     getLastChunkNo db = do
       ns <- DB.query db "SELECT chunk_number FROM rcv_file_chunks WHERE file_id = ? ORDER BY chunk_number DESC LIMIT 1" (Only fileId)
       pure $ case map fromOnly ns of
-        [] -> if chunkNo == 1 then RcvChunkOk else RcvChunkError
+        []
+          | chunkNo == 1 ->
+            if chunkSize >= fileSize
+              then RcvChunkFinal
+              else RcvChunkOk
+          | otherwise -> RcvChunkError
         n : _
           | chunkNo == n -> RcvChunkDuplicate
           | chunkNo == n + 1 ->

tests/ChatTests.hs

@@ -42,6 +42,7 @@ chatTests = do
     it "update user profiles and notify contacts" testUpdateProfile
   describe "sending and receiving files" $ do
     it "send and receive file" testFileTransfer
+    it "send and receive a small file" testSmallFileTransfer
     it "sender cancelled file transfer" testFileSndCancel
     it "recipient cancelled file transfer" testFileRcvCancel
     it "send and receive file to group" testGroupFileTransfer
@@ -420,6 +421,29 @@ testFileTransfer =
       dest <- B.readFile "./tests/tmp/test.jpg"
       dest `shouldBe` src
 
+testSmallFileTransfer :: IO ()
+testSmallFileTransfer =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      connectUsers alice bob
+      alice #> "/f @bob ./tests/fixtures/test.txt"
+      alice <## "use /fc 1 to cancel sending"
+      bob <# "alice> sends file test.txt (11 bytes / 11 bytes)"
+      bob <## "use /fr 1 [<dir>/ | <path>] to receive it"
+      bob ##> "/fr 1 ./tests/tmp"
+      bob <## "saving file 1 from alice to ./tests/tmp/test.txt"
+      concurrentlyN_
+        [ do
+            bob <## "started receiving file 1 (test.txt) from alice"
+            bob <## "completed receiving file 1 (test.txt) from alice",
+          do
+            alice <## "started sending file 1 (test.txt) to bob"
+            alice <## "completed sending file 1 (test.txt) to bob"
+        ]
+      src <- B.readFile "./tests/fixtures/test.txt"
+      dest <- B.readFile "./tests/tmp/test.txt"
+      dest `shouldBe` src
+
 testFileSndCancel :: IO ()
 testFileSndCancel =
   testChat2 aliceProfile bobProfile $

tests/fixtures/test.txt

@@ -0,0 +1 @@
+hello there